an open-source alternative to the dots, bots and muses of the world, run an office of claude code/codex like agents on your laptop, sandboxes or anywhere, uses your existing subscriptions
HTML agent-harnessagent-orchestrationagentsai-agentsautonomous-agentsclaude-codecodexcoding-agentsdesktop-appdeveloper-toolselectrongemini-cliharnessharness-engineeringlocal-firstmemorymulti-agentopencodeorchestrationtypescript
perf(restore): restore team in parallel and memoise login-shell capture
Vyapak Goyal29df58cce2f8
diff --git a/src/main/pty.ts b/src/main/pty.tsindex eb8d4491..4a27de84 100644--- a/src/main/pty.ts+++ b/src/main/pty.ts@@ -71,6 +71,8 @@ export class PtyManager {* (archive, worktree removal, map cleanup) that the explicit kill() path* runs. Best-effort — set once by the main process. */private exitHandler: ((id: string) => void) | null = null;+ /** script → captured output, from captureFromLoginShell. See the memo note there. */+ private shellCapture = new Map<string, string>();/** The default/fallback output sink — set to the PRIMARY window. Used only for* sessions with no recorded owner; owned sessions route to their owner. */@@ -113,6 +115,54 @@ export class PtyManager {try { wc.send(channel, payload); } catch { /* window tore down mid-send */ }}+ /** Run `script` in the user's INTERACTIVE login shell and return only what the+ * script itself printed.+ *+ * An interactive shell is required to pick up nvm/asdf/brew PATH edits, but it+ * also runs the user's rc files, which are free to print. This machine's zsh+ * emits `Restored session: <date>` from its session-save plugin BEFORE the+ * script's own output, which silently poisoned every value we read back:+ * a plain `.trim()` on `echo "$PATH"` yielded+ * `"Restored session: …\n/opt/homebrew/bin:…"` and that whole string was+ * handed to every agent as its PATH. Fencing the output between two markers+ * makes rc-file chatter (before, after, or both) impossible to mistake for a+ * result. Returns null when the shell fails or the fence never appears. */+ private captureFromLoginShell(script: string): string | null {+ // Memoised for the process lifetime, keyed by script. Every spawn runs this+ // TWICE (resolveCommand's `which`, then the PATH capture) and each call boots+ // a full interactive login shell (rc files and all) — hundreds of ms of+ // BLOCKING spawnSync on the main process. Restoring a team of N agents paid+ // that 2N times and no amount of renderer-side concurrency could hide it,+ // because spawnSync stalls the whole event loop. The user's shell PATH and+ // binary locations don't change mid-session, so one capture per script is+ // enough; a PATH edit made while the app is running needs a restart to be+ // seen. Only successful captures are cached — a null (shell failed / fence+ // missing) stays retryable.+ const cached = this.shellCapture.get(script);+ if (cached !== undefined) return cached;+ const value = this.captureFromLoginShellUncached(script);+ if (value !== null) this.shellCapture.set(script, value);+ return value;+ }++ private captureFromLoginShellUncached(script: string): string | null {+ const mark = '__MD_SHELL_FENCE__';+ try {+ const res = spawnSync(+ process.env.SHELL ?? '/bin/zsh',+ ['-ilc', `printf %s ${mark}; ${script}; printf %s ${mark}`],+ { encoding: 'utf8', timeout: 3000 }+ );+ const out = res.stdout ?? '';+ const start = out.indexOf(mark);+ const end = out.lastIndexOf(mark);+ if (start < 0 || end <= start) return null;+ return out.slice(start + mark.length, end);+ } catch {+ return null;+ }+ }+/** Resolve a bare command (e.g. 'claude') against the user's PATH +* common install locations. Needed because Electron's spawn env on* macOS launches without the user's interactive shell PATH. */@@ -156,14 +206,11 @@ export class PtyManager {return command;}// macOS / Linux — `which` against an interactive shell so we pick up nvm/asdf/brew paths.- try {- const res = spawnSync(process.env.SHELL ?? '/bin/zsh', ['-ilc', `which ${command}`], {- encoding: 'utf8',- timeout: 3000- });- const path = res.stdout.trim().split('\n').pop();+ const which = this.captureFromLoginShell(`which ${command}`);+ if (which) {+ const path = which.trim().split('\n').map((l) => l.trim()).filter(Boolean).pop();if (path && existsSync(path)) return path;- } catch { /* fall through */ }+ }// Common explicit locationsconst candidates = [`/opt/homebrew/bin/${command}`,@@ -190,15 +237,12 @@ export class PtyManager {const userPath = (() => {// Windows has no interactive login-shell PATH problem — use the process PATH directly.if (process.platform === 'win32') return process.env.PATH || '';- try {- const res = spawnSync(process.env.SHELL ?? '/bin/zsh', ['-ilc', 'echo -n "$PATH"'], {- encoding: 'utf8',- timeout: 3000- });- return res.stdout.trim() || process.env.PATH || '';- } catch {- return process.env.PATH || '';- }+ const shellPath = this.captureFromLoginShell('printf %s "$PATH"')?.trim();+ // A PATH is a single colon-joined line. Anything multi-line is rc-file+ // noise that slipped the fence — fall back rather than hand the agent a+ // corrupt PATH it would carry into every subprocess it spawns.+ if (shellPath && !shellPath.includes('\n')) return shellPath;+ return process.env.PATH || '';})();// On Windows, .cmd/.bat files (and extensionless shims) cannot be executeddiff --git a/src/renderer/src/components/AgentStrip.tsx b/src/renderer/src/components/AgentStrip.tsxindex fe0ac713..fdc6b5dd 100644--- a/src/renderer/src/components/AgentStrip.tsx+++ b/src/renderer/src/components/AgentStrip.tsx@@ -127,9 +127,15 @@ export function AgentStrip({ config }: AgentStripProps) {let alreadyLive = 0;const failures: string[] = [];try {- for (const a of [...restorableAgents]) {+ // Restore every agent CONCURRENTLY. Each spawn is keyed by its own ptyId and+ // touches no cross-agent state in the renderer, and in the main process the+ // whole `pty:spawn` handler (hive registry read-modify-write included) runs+ // synchronously between awaits, so concurrent handlers can't interleave+ // mid-update. Serially this cost the sum of every agent's git probe + spawn;+ // a 6-agent team took ~6× one agent for no reason.+ await Promise.all([...restorableAgents].map(async (a) => {// Per-agent guard: one agent's failure (or a rejected IPC call) must NEVER- // abort the whole loop — an unhandled rejection here used to make the+ // abort the others — an unhandled rejection here used to make the// entire restore a silent no-op after the first bad agent.try {const provider = inferAgentProvider(a.command, a.provider);@@ -139,7 +145,7 @@ export function AgentStrip({ config }: AgentStripProps) {// config to rebuild one). Keep it restorable and SAY why rather than// silently dropping it — silent removal read as "nothing happened".failures.push(`${a.name}: no saved command`);- continue;+ return;}const [exe, ...args] = tokenizeCommand(command);const ptyId = a.ptyId ?? `pty-${a.id}`;@@ -216,7 +222,7 @@ export function AgentStrip({ config }: AgentStripProps) {failures.push(`${a.name}: ${e instanceof Error ? e.message : String(e)}`);console.error('[restore] error for', a.id, e);}- }+ }));} finally {// addAgent auto-selects each spawn; put the user back where they were.const sel = useStore.getState();