mika kuns
b4b6225432
WorkerConnectionModalViewModel's StartWorker/RerunInstaller swallowed missing-exe and Process.Start failures behind an empty catch and closed the dialog anyway, looking like success. Now both show an inline error and keep the dialog open; only a real launch closes it. IslandsShellViewModel.RestartWorkerAsync never checked whether the relaunched worker actually stayed up, and its status property was never bound in any view. RestartWorkerService now fails if the new process exits within a short survival window, and the outcome routes through the footer error/success strip instead of the dead RestartWorkerStatus. InstallArtifactLocator.Find() is now virtual and its two subclasses unsealed so tests can fake exe resolution without touching the real filesystem/registry.
80 lines
2.3 KiB
C#
80 lines
2.3 KiB
C#
using System;
|
|
using System.Diagnostics;
|
|
using System.IO;
|
|
using ClaudeDo.Ui.Localization;
|
|
using ClaudeDo.Ui.Services;
|
|
using CommunityToolkit.Mvvm.ComponentModel;
|
|
using CommunityToolkit.Mvvm.Input;
|
|
|
|
namespace ClaudeDo.Ui.ViewModels.Modals;
|
|
|
|
public sealed partial class WorkerConnectionModalViewModel : ViewModelBase
|
|
{
|
|
private readonly WorkerLocator _workerLocator;
|
|
private readonly InstallerLocator _installerLocator;
|
|
|
|
// Test seam: real Process.Start by default, swappable to simulate a blocked/failed launch.
|
|
internal Action<ProcessStartInfo> ProcessStarter { get; set; } = psi => Process.Start(psi);
|
|
|
|
public WorkerConnectionModalViewModel(WorkerLocator workerLocator, InstallerLocator installerLocator)
|
|
{
|
|
_workerLocator = workerLocator;
|
|
_installerLocator = installerLocator;
|
|
}
|
|
|
|
public Action? CloseAction { get; set; }
|
|
|
|
[ObservableProperty] private string? _errorText;
|
|
|
|
[RelayCommand] private void Close() => CloseAction?.Invoke();
|
|
|
|
[RelayCommand]
|
|
private void StartWorker()
|
|
{
|
|
var exe = _workerLocator.Find();
|
|
if (exe is null)
|
|
{
|
|
ErrorText = Loc.T("modals.workerConnection.workerNotFound");
|
|
return;
|
|
}
|
|
try
|
|
{
|
|
ProcessStarter(new ProcessStartInfo(exe) { UseShellExecute = true });
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
ErrorText = Loc.T("modals.workerConnection.startFailed", ex.Message);
|
|
return;
|
|
}
|
|
ErrorText = null;
|
|
CloseAction?.Invoke();
|
|
}
|
|
|
|
[RelayCommand]
|
|
private void RerunInstaller()
|
|
{
|
|
var path = _installerLocator.Find();
|
|
if (path is null)
|
|
{
|
|
ErrorText = Loc.T("modals.workerConnection.installerNotFound");
|
|
return;
|
|
}
|
|
try
|
|
{
|
|
// See IslandsShellViewModel.UpdateNow: an inherited CWD inside the install dir
|
|
// makes the installer block its own app\ rename.
|
|
ProcessStarter(new ProcessStartInfo(path)
|
|
{
|
|
UseShellExecute = true,
|
|
WorkingDirectory = Path.GetTempPath(),
|
|
});
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
ErrorText = Loc.T("modals.workerConnection.startFailed", ex.Message);
|
|
return;
|
|
}
|
|
Environment.Exit(0);
|
|
}
|
|
}
|