@ctrl-spc/cli 1.3.0 → 1.3.1

package/dist/dispatch.js

@@ -1,10 +1,21 @@
 import { spawn } from 'node:child_process';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 import { resolveAgentCommand } from './agents.js';
 function shellQuote(value) {
     return `'${value.replaceAll("'", "'\\''")}'`;
 }
-function appleScriptString(value) {
-    return `"${value.replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`;
+export function agentTerminalScript(request, executable) {
+    const command = agentTerminalCommand(request, executable);
+    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)}`,
+        '',
+    ].join('\n');
 }
 export function agentTerminalCommand(request, executable) {
     const prompt = shellQuote(request.prompt);
@@ -25,22 +36,39 @@ export async function launchAgentDispatch(request) {
     const executable = resolveAgentCommand(request.agent_kind);
     if (!executable)
         throw new Error(`${request.agent_kind} is not installed on this machine.`);
-    const command = agentTerminalCommand(request, executable);
-    const script = `tell application "Terminal" to activate\ntell application "Terminal" to do script ${appleScriptString(command)}`;
-    await new Promise((resolve, reject) => {
-        const child = spawn('/usr/bin/osascript', ['-e', script], {
-            stdio: ['ignore', 'ignore', 'pipe'],
+    const directory = await mkdtemp(join(tmpdir(), 'ctrl-spc-dispatch-'));
+    const scriptPath = join(directory, `ctrl-spc-${request.id}.command`);
+    try {
+        await writeFile(scriptPath, agentTerminalScript(request, executable), {
+            encoding: 'utf8',
+            flag: 'wx',
+            mode: 0o700,
         });
-        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 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'}.`));
+            });
         });
-    });
+    }
+    catch (error) {
+        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 createAgentDispatchController(client, machineId, agents, deps = {}) {
     const claim = deps.claim ?? (async () => {

package/package.json

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