@hueyexe/opencode-ensemble 0.6.4 → 0.7.0

package/src/watchdog.ts

@@ -32,8 +32,38 @@ export class Watchdog {
     this.checkIntervalMs = opts.checkIntervalMs ?? 60_000
   }
 
+  private static STALE_THRESHOLD_MS = Number(process.env.STALE_WORKTREE_THRESHOLD_MS) || 300_000
+
+  /** Clean up worktrees and workspaces for shutdown/error members past the stale threshold. */
+  async cleanupStaleWorktrees(): Promise<void> {
+    const cutoff = Date.now() - Watchdog.STALE_THRESHOLD_MS
+    const stale = this.db.query(
+      `SELECT tm.team_id, tm.name, tm.worktree_dir, tm.workspace_id
+       FROM team_member tm
+       JOIN team t ON tm.team_id = t.id
+       WHERE t.status = 'active'
+         AND tm.status IN ('shutdown', 'error')
+         AND tm.worktree_dir IS NOT NULL
+         AND tm.time_updated < ?`
+    ).all(cutoff) as Array<{ team_id: string; name: string; worktree_dir: string; workspace_id: string | null }>
+
+    for (const m of stale) {
+      try {
+        if (m.workspace_id) {
+          await this.client.workspace.remove({ id: m.workspace_id })
+        }
+        await this.client.worktree.remove({ worktreeRemoveInput: { directory: m.worktree_dir } })
+        this.db.run(
+          "UPDATE team_member SET worktree_dir = NULL, worktree_branch = NULL, workspace_id = NULL WHERE team_id = ? AND name = ?",
+          [m.team_id, m.name]
+        )
+      } catch { /* best effort */ }
+    }
+  }
+
   /** Run a single check for stale busy members. */
   async check(): Promise<void> {
+    await this.cleanupStaleWorktrees()
     if (this.ttlMs === 0) return
 
     const cutoff = Date.now() - this.ttlMs
@@ -70,10 +100,9 @@ export class Watchdog {
     }
   }
 
-  /** Start the periodic check. */
+  /** Start the periodic check. Runs stale worktree GC regardless of TTL setting. */
   start(): void {
     if (this.timer) return
-    if (this.ttlMs === 0) return
     this.timer = setInterval(() => this.check(), this.checkIntervalMs)
   }