Skip to content

Open-source AI browser agent for Chrome and Firefox (monorepo) 🧠

companion: serialize model removal with installs

Barack Sokullu3720276e19ce
diff --git a/webbrain-systray/internal/localmodel/manager.go b/webbrain-systray/internal/localmodel/manager.go
index 046cb6a24..f515c0974 100644
--- a/webbrain-systray/internal/localmodel/manager.go
+++ b/webbrain-systray/internal/localmodel/manager.go
@@ -78,6 +78,7 @@ type Manager struct {
plan Plan
cancel context.CancelFunc
installDone chan struct{}
+ removing bool
cmd *exec.Cmd
starting chan struct{} // closed after Start either publishes cmd or fails
exited chan struct{}
@@ -500,7 +501,7 @@ func (m *Manager) setPhase(phase, step string, err error) {
func (m *Manager) Busy() bool {
m.mu.Lock()
defer m.mu.Unlock()
- return m.phase == PhaseDownloading || m.phase == PhaseInstalling || m.phase == PhaseStarting || m.phase == PhaseStopping
+ return m.removing || m.phase == PhaseDownloading || m.phase == PhaseInstalling || m.phase == PhaseStarting || m.phase == PhaseStopping
}
// --- install ---------------------------------------------------------------------
@@ -523,6 +524,10 @@ func (m *Manager) Install(format string) error {
return errors.New("MLX needs a Mac with Apple Silicon")
}
m.mu.Lock()
+ if m.removing {
+ m.mu.Unlock()
+ return errors.New("the local model is being removed")
+ }
if m.phase == PhaseDownloading || m.phase == PhaseInstalling || m.phase == PhaseStarting {
m.mu.Unlock()
return errors.New("an install is already running")
@@ -818,6 +823,10 @@ func (m *Manager) Start() (startErr error) {
plan := MakePlan(info, s.Local, format)
m.mu.Lock()
+ if m.removing {
+ m.mu.Unlock()
+ return errors.New("the local model is being removed")
+ }
if m.cmd != nil || m.starting != nil {
m.mu.Unlock()
return nil
@@ -1049,8 +1058,25 @@ func (m *Manager) Running() bool {
// Remove deletes the files of one format (stopping the server first).
func (m *Manager) Remove(format string) error {
- if m.Busy() && !m.Running() {
- return errors.New("wait for the current operation to finish")
+ m.mu.Lock()
+ if m.removing {
+ m.mu.Unlock()
+ return errors.New("the local model is already being removed")
+ }
+ m.removing = true
+ cancel, done := m.cancel, m.installDone
+ m.mu.Unlock()
+ defer func() {
+ m.mu.Lock()
+ m.removing = false
+ m.mu.Unlock()
+ m.changed()
+ }()
+ if cancel != nil {
+ cancel()
+ }
+ if done != nil {
+ <-done
}
if _, err := m.store.Update(func(s *settings.Settings) { s.Local.AutoStart = false }); err != nil {
return err
diff --git a/webbrain-systray/internal/localmodel/manager_test.go b/webbrain-systray/internal/localmodel/manager_test.go
index 67a6ed356..2a22730dd 100644
--- a/webbrain-systray/internal/localmodel/manager_test.go
+++ b/webbrain-systray/internal/localmodel/manager_test.go
@@ -153,6 +153,68 @@ func TestRemoveReportsRuntimeDirectoryReadError(t *testing.T) {
}
}
+func TestRemoveWaitsForInstallAndRejectsRetry(t *testing.T) {
+ t.Setenv("WBC_HOME", t.TempDir())
+ store, err := settings.Open()
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err := store.Update(func(s *settings.Settings) { s.Local.AutoStart = true }); err != nil {
+ t.Fatal(err)
+ }
+ model := filepath.Join(ggufDir(), "partial-model")
+ if err := os.MkdirAll(ggufDir(), 0o700); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.WriteFile(model, []byte("partial"), 0o600); err != nil {
+ t.Fatal(err)
+ }
+ done, cancelled := make(chan struct{}), make(chan struct{})
+ t.Cleanup(func() {
+ select {
+ case <-done:
+ default:
+ close(done)
+ }
+ })
+ m := NewManager(store, func([]core.LocalUpstream) error { return nil }, nil)
+ m.phase, m.installDone, m.cancel = PhaseDownloading, done, func() { close(cancelled) }
+ removed := make(chan error, 1)
+ go func() { removed <- m.Remove("gguf") }()
+ select {
+ case <-cancelled:
+ case <-time.After(5 * time.Second):
+ t.Fatal("Remove did not cancel the installer")
+ }
+ if !m.Busy() {
+ t.Fatal("Remove did not reserve the manager")
+ }
+ if err := m.Install("gguf"); err == nil {
+ t.Fatal("Retry started during removal")
+ }
+ if err := m.Start(); err == nil {
+ t.Fatal("Start was accepted during removal")
+ }
+ if _, err := os.Stat(model); err != nil {
+ t.Fatalf("Remove deleted files before the installer stopped: %v", err)
+ }
+ close(done)
+ select {
+ case err := <-removed:
+ if err != nil {
+ t.Fatal(err)
+ }
+ case <-time.After(5 * time.Second):
+ t.Fatal("Remove did not finish after the installer stopped")
+ }
+ if _, err := os.Stat(model); !os.IsNotExist(err) {
+ t.Fatalf("Remove left model files behind: %v", err)
+ }
+ if store.Get().Local.AutoStart {
+ t.Fatal("Remove left autostart enabled")
+ }
+}
+
func TestRuntimeArchivesHavePinnedChecksums(t *testing.T) {
for asset, size := range llamaAssetSizes {
if size <= 0 || len(llamaAssetSHA[asset]) != 64 {