orchestrating 0.3.2 → 0.4.0

package/bin/orch

@@ -676,6 +676,43 @@ async function handleDaemon(projectsDir) {
         }
       }
 
+      if (msg.type === "update_cli") {
+        process.stderr.write(`${GREEN}${PREFIX} Update requested — running npm i -g orchestrating${RESET}\n`);
+        try {
+          const result = execSync("npm i -g orchestrating 2>&1", { encoding: "utf-8", timeout: 60_000 });
+          // Get the new version
+          let ver = "unknown";
+          try {
+            ver = execSync("npm list -g orchestrating --depth=0 2>/dev/null", { encoding: "utf-8" })
+              .match(/orchestrating@([\d.]+)/)?.[1] || "unknown";
+          } catch {}
+          process.stderr.write(`${GREEN}${PREFIX} Updated to v${ver}${RESET}\n`);
+          if (sock.readyState === WebSocket.OPEN) {
+            sock.send(JSON.stringify({
+              type: "update_result",
+              hostname,
+              success: true,
+              version: ver,
+            }));
+          }
+          // Restart daemon after a short delay so the result message gets sent
+          process.stderr.write(`${GREEN}${PREFIX} Restarting daemon...${RESET}\n`);
+          setTimeout(() => {
+            process.exit(0); // launchd/systemd will restart us with the new version
+          }, 1000);
+        } catch (err) {
+          process.stderr.write(`${RED}${PREFIX} Update failed: ${err.message}${RESET}\n`);
+          if (sock.readyState === WebSocket.OPEN) {
+            sock.send(JSON.stringify({
+              type: "update_result",
+              hostname,
+              success: false,
+              error: err.message,
+            }));
+          }
+        }
+      }
+
       if (msg.type === "browse_directory") {
         const { requestId: browseReqId, path: dirPath } = msg;
         try {
@@ -1020,6 +1057,7 @@ if (adapter) {
   // Spawn claude with bidirectional stdin/stdout (stream-json mode)
   // Follow-ups are sent via stdin — no more kill/respawn.
   let claudeSessionId = null; // Claude's internal session ID (from init event)
+  let pendingRespawn = null; // { prompt } — set when permission grant needs respawn
 
   function spawnClaude(claudeArgs) {
     const proc = spawn(command, claudeArgs, {
@@ -1067,8 +1105,8 @@ if (adapter) {
         if (yoloMode && event.kind === "permission_denied") {
           process.stderr.write(`${GREEN}[yolo] Auto-approving: ${event.toolName}${RESET}\n`);
           approvePermission(event.toolName, "session");
-          // Permissions are file-based — need respawn for Claude to pick them up
-          respawnWithContinue(`Permission for ${event.toolName} was granted. Please retry your last action.`);
+          // Queue respawn — Claude will exit after this turn, then we respawn with -c
+          pendingRespawn = { prompt: `Permission for ${event.toolName} was granted. Please retry your last action.` };
         }
       }
     });
@@ -1080,8 +1118,23 @@ if (adapter) {
     proc.on("exit", (code) => {
       childRunning = false;
       const exitCode = code ?? 0;
-      sendToServer({ type: "exit", sessionId, exitCode });
-      setTimeout(() => process.exit(exitCode), 200);
+
+      if (exitCode !== 0 || exitRequested) {
+        // Non-zero exit or user requested stop — terminate
+        sendToServer({ type: "exit", sessionId, exitCode });
+        setTimeout(() => process.exit(exitCode), 200);
+      } else if (pendingRespawn) {
+        // Permission grant/deny triggered a respawn — do it now
+        const { prompt: respawnPrompt } = pendingRespawn;
+        pendingRespawn = null;
+        respawnWithContinue(respawnPrompt);
+      } else {
+        // Normal exit (turn complete) — stay alive, emit idle, wait for follow-ups
+        sendToServer({
+          type: "agent_event", sessionId,
+          event: { kind: "status", status: "idle" },
+        });
+      }
     });
 
     proc.on("error", (err) => {
@@ -1246,10 +1299,9 @@ if (adapter) {
 
   handleServerMessage = (msg) => {
     if (msg.type === "agent_input" && (msg.text || msg.images)) {
-      // Follow-up from dashboard — send via stdin (no respawn!)
+      // Follow-up from dashboard
       if (childRunning) {
         process.stderr.write(`${DIM}[orch] Queuing input — claude is still processing${RESET}\n`);
-        // TODO: queue and send after current turn completes
         return;
       }
       let promptText = msg.text || "continue";
@@ -1266,17 +1318,33 @@ if (adapter) {
         const fileList = imagePaths.map((p) => `[Attached image: ${p} — use Read tool to view]`).join("\n");
         promptText = `${fileList}\n\n${promptText}`;
       }
-      sendFollowUp(promptText);
+      // If process is still alive, send via stdin; otherwise respawn
+      if (child && child.exitCode === null) {
+        sendFollowUp(promptText);
+      } else {
+        respawnWithContinue(promptText);
+      }
     } else if (msg.type === "agent_permission" && msg.tool && msg.action === "allow") {
       const scope = msg.scope || "session";
       approvePermission(msg.tool, scope);
       process.stderr.write(`${GREEN}Permission granted (${scope}): ${msg.tool}${RESET}\n`);
-      // Permissions are file-based in Claude Code — need to restart the process
-      // so it picks up the updated settings.local.json
-      respawnWithContinue(`Permission for ${msg.tool} was granted. Please retry your last action.`);
+      // Permissions are file-based — Claude needs restart to pick up settings.local.json
+      const respawnPrompt = `Permission for ${msg.tool} was granted. Please retry your last action.`;
+      if (child && child.exitCode === null) {
+        // Process still running — queue respawn for when it exits
+        pendingRespawn = { prompt: respawnPrompt };
+      } else {
+        // Process already exited — respawn now
+        respawnWithContinue(respawnPrompt);
+      }
     } else if (msg.type === "agent_permission" && msg.tool && msg.action === "deny") {
       process.stderr.write(`${RED}Permission denied: ${msg.tool}${RESET}\n`);
-      respawnWithContinue(`Permission for ${msg.tool} was denied by the user. Do not retry this tool — find an alternative approach or skip this step.`);
+      const denyPrompt = `Permission for ${msg.tool} was denied by the user. Do not retry this tool — find an alternative approach or skip this step.`;
+      if (child && child.exitCode === null) {
+        pendingRespawn = { prompt: denyPrompt };
+      } else {
+        respawnWithContinue(denyPrompt);
+      }
     } else if (msg.type === "agent_permission" && msg.tool && msg.action === "revoke") {
       removePermission(msg.tool);
       broadcastPermissions();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrating",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Stream terminal sessions to the orchestrat.ing dashboard",
   "type": "module",
   "bin": {