@ctrl-spc/cli 1.3.1 → 1.3.2

package/dist/dispatch.js

@@ -1,19 +1,30 @@
 import { spawn } from 'node:child_process';
-import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { access, mkdtemp, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { setTimeout as delay } from 'node:timers/promises';
 import { resolveAgentCommand } from './agents.js';
 function shellQuote(value) {
     return `'${value.replaceAll("'", "'\\''")}'`;
 }
-export function agentTerminalScript(request, executable) {
-    const command = agentTerminalCommand(request, executable);
+function agentInvocationCommand(request, executable) {
+    const prompt = shellQuote(request.prompt);
+    const binary = shellQuote(executable);
+    const fresh = `exec ${binary} ${prompt}`;
+    if (request.mode === 'start')
+        return fresh;
+    const resume = request.agent_kind === 'claude'
+        ? `${binary} --continue ${prompt}`
+        : `${binary} resume --last ${prompt}`;
+    return `${resume} || ${fresh}`;
+}
+export function agentTerminalScript(request, executable, markerPath) {
     return [
-        '#!/bin/zsh',
-        'script_path="$0"',
-        '/bin/rm -f -- "$script_path"',
-        '/bin/rmdir -- "${script_path%/*}" 2>/dev/null || true',
-        `exec /bin/zsh -lc ${shellQuote(command)}`,
+        '#!/bin/sh',
+        `cd ${shellQuote(request.workspace_root)} || exit 72`,
+        `: > ${shellQuote(markerPath)} || exit 73`,
+        '/bin/rm -f -- "$0"',
+        agentInvocationCommand(request, executable),
         '',
     ].join('\n');
 }
@@ -29,46 +40,77 @@ export function agentTerminalCommand(request, executable) {
 }
 /** Opens a visible agent conversation. Resume is best-effort and falls back
  * to a fresh task conversation in the same project checkout. */
-export async function launchAgentDispatch(request) {
-    if (process.platform !== 'darwin') {
+export async function launchAgentDispatch(request, deps = {}) {
+    if ((deps.platform ?? process.platform) !== 'darwin') {
         throw new Error('Automatic agent launch currently requires macOS Terminal.');
     }
-    const executable = resolveAgentCommand(request.agent_kind);
+    const executable = (deps.resolveExecutable ?? resolveAgentCommand)(request.agent_kind);
     if (!executable)
         throw new Error(`${request.agent_kind} is not installed on this machine.`);
+    const timeoutMs = deps.timeoutMs ?? 10_000;
     const directory = await mkdtemp(join(tmpdir(), 'ctrl-spc-dispatch-'));
-    const scriptPath = join(directory, `ctrl-spc-${request.id}.command`);
+    const scriptPath = join(directory, 'launch.command');
+    const markerPath = join(directory, 'launched');
     try {
-        await writeFile(scriptPath, agentTerminalScript(request, executable), {
+        await writeFile(scriptPath, agentTerminalScript(request, executable, markerPath), {
             encoding: 'utf8',
             flag: 'wx',
             mode: 0o700,
         });
-        await new Promise((resolve, reject) => {
-            const child = spawn('/usr/bin/open', ['-a', 'Terminal', scriptPath], {
-                stdio: ['ignore', 'ignore', 'pipe'],
-            });
-            let stderr = '';
-            child.stderr.on('data', (chunk) => { stderr += String(chunk); });
-            child.once('error', reject);
-            child.once('exit', (code) => {
-                if (code === 0)
-                    resolve();
-                else
-                    reject(new Error(stderr.trim() || `Terminal launch exited with code ${code ?? 'unknown'}.`));
-            });
-        });
+        await (deps.openTerminal ?? openTerminalCommandFile)(scriptPath, timeoutMs);
+        await (deps.waitForAcknowledgement ?? waitForLaunchAcknowledgement)(markerPath, timeoutMs);
     }
-    catch (error) {
+    finally {
         await rm(directory, { recursive: true, force: true }).catch(() => { });
-        throw error;
     }
-    // The script removes itself after Terminal opens it. This fallback handles
-    // cases where Terminal accepts the file but never executes it.
-    const cleanup = setTimeout(() => {
-        void rm(directory, { recursive: true, force: true });
-    }, 60_000);
-    cleanup.unref();
+}
+export function terminalOpenArguments(scriptPath) {
+    return ['-b', 'com.apple.Terminal', scriptPath];
+}
+async function openTerminalCommandFile(scriptPath, timeoutMs) {
+    await new Promise((resolve, reject) => {
+        const child = spawn('/usr/bin/open', terminalOpenArguments(scriptPath), {
+            stdio: ['ignore', 'ignore', 'pipe'],
+        });
+        let stderr = '';
+        let settled = false;
+        const finish = (error) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            if (error)
+                reject(error);
+            else
+                resolve();
+        };
+        const timer = setTimeout(() => {
+            child.kill('SIGTERM');
+            finish(new Error(`Terminal launch timed out after ${timeoutMs}ms.`));
+        }, timeoutMs);
+        timer.unref();
+        child.stderr.on('data', (chunk) => { stderr += String(chunk); });
+        child.once('error', (error) => finish(error));
+        child.once('exit', (code) => {
+            if (code === 0)
+                finish();
+            else
+                finish(new Error(stderr.trim() || `Terminal launch exited with code ${code ?? 'unknown'}.`));
+        });
+    });
+}
+async function waitForLaunchAcknowledgement(markerPath, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        try {
+            await access(markerPath);
+            return;
+        }
+        catch {
+            await delay(50);
+        }
+    }
+    throw new Error(`Terminal accepted the launch but did not start the agent within ${timeoutMs}ms.`);
 }
 export function createAgentDispatchController(client, machineId, agents, deps = {}) {
     const claim = deps.claim ?? (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl-spc/cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "CTRL+SPC CLI — per-machine agent for browser login, project linking, presence, and the local MCP server.",
   "engines": {
     "node": ">=22"