very-happy-cli 0.2.200 → 0.2.201

package/dist/{run-CVAIFpsp.cjs → run-BqlWdDTL.cjs}

@@ -1,28 +1,29 @@
 'use strict';
 
-var mirrorProtocol = require('./mirrorProtocol-CCl9dtzh.cjs');
+var mirrorProtocol = require('./mirrorProtocol-YUoEuIYO.cjs');
 var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
-var piRunnerArgs = require('./piRunnerArgs-DOEJJymf.cjs');
+var piRunnerArgs = require('./piRunnerArgs-T2cAiaGW.cjs');
 var fs = require('fs/promises');
 var os$1 = require('os');
 var tmp = require('tmp');
 var axios = require('axios');
+var sessionMetadata = require('./sessionMetadata-B44cL4Xj.cjs');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var configuration = require('./configuration-ClUt7pqs.cjs');
-var api = require('./api-BPWRzeNF.cjs');
-var spawnAgents = require('./spawnAgents-IiuqX0S5.cjs');
-var logger = require('./logger-D28MY1Bv.cjs');
-var index$2 = require('./index-DUwOmhnq.cjs');
-var auth = require('./auth-oAnLi4Tl.cjs');
+var configuration = require('./configuration-LWFmTxty.cjs');
+var api = require('./api-KVVs-GkM.cjs');
+var spawnAgents = require('./spawnAgents-DvbEDCIq.cjs');
+var logger = require('./logger-Hyhy2boA.cjs');
+var index$2 = require('./index-DnEgpRo4.cjs');
+var auth = require('./auth-CXCX-iJ-.cjs');
 var child_process = require('child_process');
-var _package = require('./package-BFSsS_dl.cjs');
-var doctor = require('./doctor-C9D-t20z.cjs');
-var spawnHappyCLI = require('./spawnHappyCLI-C3XuIB2N.cjs');
-var persistence = require('./persistence-TpVFA5-I.cjs');
-var controlClient = require('./controlClient-SYDFcIkk.cjs');
-var sessionOps = require('./sessionOps-CIFvoFPA.cjs');
-var index = require('./index-BiutHOAO.cjs');
+var _package = require('./package-06cGlmeD.cjs');
+var doctor = require('./doctor-DOzji0f7.cjs');
+var spawnHappyCLI = require('./spawnHappyCLI-CI7Ax4mF.cjs');
+var persistence = require('./persistence-_W9tE-bW.cjs');
+var controlClient = require('./controlClient-TVMpETsR.cjs');
+var sessionOps = require('./sessionOps-SxZr9veq.cjs');
+var index = require('./index-44o_qMvE.cjs');
 var fastify = require('fastify');
 var z = require('zod');
 var fastifyTypeProviderZod = require('fastify-type-provider-zod');
@@ -30,69 +31,69 @@ var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var node_crypto = require('node:crypto');
 var previewPath = require('./previewPath-B0rBdhy1.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var rateLimitWindows = require('./rateLimitWindows-BREA7OZj.cjs');
-var peerTools = require('./peerTools-Z8V2E0AF.cjs');
+var rateLimitWindows = require('./rateLimitWindows-DjJjgjt4.cjs');
+var peerTools = require('./peerTools-CTCyRdg2.cjs');
 var os = require('node:os');
-var remoteSessionClient = require('./remoteSessionClient-DleOeQlN.cjs');
-var bootstrap = require('./bootstrap-DUKAKxrJ.cjs');
-var index$1 = require('./index-CbzettaI.cjs');
+var remoteSessionClient = require('./remoteSessionClient-DoxfnpnK.cjs');
+var bootstrap = require('./bootstrap-N1PY4ypX.cjs');
+var index$1 = require('./index-BuOzDU17.cjs');
 var require$$0 = require('fs');
 var require$$1 = require('path');
 var node_child_process = require('node:child_process');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var doctorReadiness = require('./doctorReadiness-Dl6yRQCy.cjs');
-var machineMetadata = require('./machineMetadata-BzjrIn_N.cjs');
+var machineMetadata = require('./machineMetadata-BLymhM03.cjs');
 var fileStore = require('./fileStore-7qhnbs6N.cjs');
 var pi = require('./pi-DlsrPCTa.cjs');
-var codexAccount = require('./codexAccount-DfeCHUOU.cjs');
+var codexAccount = require('./codexAccount-D-OBY29W.cjs');
 var require$$3 = require('crypto');
 var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
-var handleResumeCommand = require('./handleResumeCommand-CjCtwrrm.cjs');
+var handleResumeCommand = require('./handleResumeCommand-ChnR-12l.cjs');
 var webPanels = require('./webPanels-FCgFKvVe.cjs');
 var promises = require('node:fs/promises');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var client = require('./client-BnoN4P4t.cjs');
-var sessionLock = require('./sessionLock-DglhFHzB.cjs');
-var client$1 = require('./client-D0_UOmC1.cjs');
+var client = require('./client-BoymtYLP.cjs');
+var sessionLock = require('./sessionLock-unMOEniJ.cjs');
+var client$1 = require('./client-P1VkI76z.cjs');
 var daemonSupervisor = require('./daemonSupervisor-alqGPANc.cjs');
-var accountService = require('./accountService-BDJo14mY.cjs');
-var daemonAccounts = require('./daemonAccounts-Ch_rSTSX.cjs');
+var accountService = require('./accountService-Cns8UYGI.cjs');
+var daemonAccounts = require('./daemonAccounts-ciidbU2h.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var startFileWatcher = require('./startFileWatcher-CeDJl9mN.cjs');
-var sync = require('./sync-BvxhuW9R.cjs');
+var startFileWatcher = require('./startFileWatcher-DBW14aP2.cjs');
+var sync = require('./sync-C764ZzE6.cjs');
 var types = require('./types-CRS-srZK.cjs');
 var tmuxSocket = require('./tmuxSocket-Dg11Olx0.cjs');
 var processTermination = require('./processTermination-f17wxlMb.cjs');
 var doctor$1 = require('./doctor-CJpFhHoK.cjs');
 var resources = require('./resources-BZ_Be0qM.cjs');
 var node_util = require('node:util');
-var template = require('./template-M1YGFYUT.cjs');
-var client$2 = require('./client-1zIbVVX5.cjs');
+var template = require('./template-3fV9bi0X.cjs');
+var client$2 = require('./client-DI8Rxsbw.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
-var store = require('./store-DOZAMV4W.cjs');
-require('./acpSessionResume-B_W8uTI6.cjs');
-require('./pushNotifications-C1i2W1GQ.cjs');
+var store = require('./store-Cpb1LMNW.cjs');
+require('./acpSessionResume-DklOhwir.cjs');
+require('./pushNotifications-DdzTbrA3.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
-require('./reconnectGate-YQ5jXJfY.cjs');
+require('./reconnectGate-DeDhtQJW.cjs');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./time-D-v2Cd9e.cjs');
-require('./registerCommonHandlers-D95IxqDN.cjs');
+require('./time-CDBZWYDb.cjs');
+require('./registerCommonHandlers-BrEtSwNk.cjs');
 require('util');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
 require('chalk');
 require('node:module');
 require('tweetnacl');
-require('./browser-Ds-N-Dup.cjs');
+require('./browser-B0SEB6r3.cjs');
 require('open');
 require('./specialCommands-J3JFOq0J.cjs');
 require('./ids-B6ZC0HGt.cjs');
 require('url');
-require('./localHappyAgentAuth-CjtNcaI0.cjs');
-require('./claudeAccountEnv-D33xXRE7.cjs');
+require('./localHappyAgentAuth-DxlQgaer.cjs');
+require('./claudeAccountEnv-Btp39mfa.cjs');
 require('node:readline');
 require('node-pty');
 require('./processTreeSnapshot-D5iNblp6.cjs');
@@ -7074,6 +7075,7 @@ function listIssueReceipts(home, now = Date.now()) {
 
 const ISSUE_POLL_MS = 5e3;
 const ISSUE_SPAWNED_BY = "issue";
+const ISSUE_SPAWN_UNKNOWN_GRACE_MS = 6e4;
 const FIRST_MESSAGE_KEY_WAIT_MS = 1e4;
 function issueKeyFromPrompt(prompt) {
   return /^You are assigned issue ([A-Z]+-\d{1,9}):/.exec(prompt)?.[1] ?? null;
@@ -7125,10 +7127,35 @@ function createIssueWorker(deps) {
     writeIssueReceipt(home, receipt);
     return receipt;
   };
-  async function fail(receipt, error, unknown = false) {
-    await client.fail(receipt.dispatchId, { machineId: deps.machineId, claimId: receipt.claimId, error: error.slice(0, 4e3), ...unknown ? { unknown: true } : {} });
-    save({ ...receipt, phase: unknown ? receipt.phase : "failed" });
-    deps.log(`Issue dispatch ${receipt.dispatchId} ${unknown ? "outcome unknown" : "failed"}`);
+  const now = deps.now ?? Date.now;
+  const unknownSpawns = /* @__PURE__ */ new Map();
+  async function fail(receipt, error) {
+    await client.fail(receipt.dispatchId, { machineId: deps.machineId, claimId: receipt.claimId, error: error.slice(0, 4e3) });
+    save({ ...receipt, phase: "failed" });
+    deps.log(`Issue dispatch ${receipt.dispatchId} failed`);
+  }
+  function holdUnknown(view, receipt, reason) {
+    const held = unknownSpawns.get(view.id);
+    unknownSpawns.set(view.id, { view, receipt, reason, deadline: held?.deadline ?? now() + ISSUE_SPAWN_UNKNOWN_GRACE_MS });
+    deps.log(`Issue dispatch ${view.id} spawn outcome unknown; re-checking`);
+  }
+  async function recheckUnknown() {
+    for (const [id, held] of [...unknownSpawns]) {
+      if (closed) return;
+      const matches = persistedRunSessions(held.view.runId);
+      try {
+        if (matches.length === 1) {
+          unknownSpawns.delete(id);
+          await afterSpawn(held.view, save({ ...held.receipt, sessionId: matches[0], phase: "spawned" }));
+        } else if (matches.length > 1 || now() >= held.deadline) {
+          unknownSpawns.delete(id);
+          await fail(held.receipt, matches.length > 1 ? `Spawn produced ${matches.length} sessions for this run; stop the extra ones and retry` : `Session did not start within ${Math.round(ISSUE_SPAWN_UNKNOWN_GRACE_MS / 1e3)} s (${held.reason}); check the machine before retrying`);
+        }
+      } catch (error) {
+        if (httpCode(error) === "issue_dispatch_claim_mismatch" || error instanceof client$2.IssuesUnsupportedError) unknownSpawns.delete(id);
+        deps.log(`Issue dispatch ${id} remains pending${error instanceof client$2.IssueRequestError && error.code ? ` (${error.code})` : ""}`);
+      }
+    }
   }
   async function complete(receipt) {
     let lastError;
@@ -7187,7 +7214,7 @@ function createIssueWorker(deps) {
         await fail({ ...receipt, phase: "claimed" }, accountUnavailableError(spawned.errorMessage, "issue") ?? spawned.errorMessage);
         return;
       }
-      if (spawned.type === "error" && spawned.startupExit?.exited) {
+      if (spawned.type === "error" && (spawned.startupExit?.exited || spawned.notStarted)) {
         await fail(receipt, `Session failed to start: ${spawned.errorMessage}`);
         return;
       }
@@ -7198,25 +7225,36 @@ function createIssueWorker(deps) {
       if (spawned.type !== "success") {
         const matches = persistedRunSessions(view.runId);
         if (matches.length !== 1) {
-          await fail(receipt, `Spawn outcome unknown: ${spawned.errorMessage}`, true);
+          holdUnknown(view, receipt, spawned.errorMessage);
           return;
         }
         receipt = save({ ...receipt, sessionId: matches[0], phase: "spawned" });
       } else {
         receipt = save({ ...receipt, sessionId: spawned.sessionId, phase: "spawned" });
       }
-      runBySession.set(receipt.sessionId, view.runId);
-      if (spawn.projectId && deps.joinProject) await deps.joinProject(receipt.sessionId, spawn.projectId).catch(() => void 0);
-    }
-    if (receipt.phase === "spawning") {
+    } else if (receipt.phase === "spawning") {
       const matches = persistedRunSessions(view.runId);
       if (matches.length !== 1) {
-        await fail(receipt, "Spawn outcome unknown; verify the old process before retrying", true);
+        holdUnknown(view, receipt, "the spawn was interrupted by a daemon restart");
         return;
       }
       receipt = save({ ...receipt, sessionId: matches[0], phase: "spawned" });
-      runBySession.set(receipt.sessionId, view.runId);
+    } else {
+      if (receipt.sessionId && !receipt.ended) runBySession.set(receipt.sessionId, view.runId);
+      await deliverAndComplete(view, receipt);
+      return;
     }
+    await afterSpawn(view, receipt);
+  }
+  async function afterSpawn(view, receipt) {
+    runBySession.set(receipt.sessionId, view.runId);
+    const projectId = view.spawn?.projectId;
+    if (projectId && deps.joinProject) await deps.joinProject(receipt.sessionId, projectId).catch(() => void 0);
+    await deliverAndComplete(view, receipt);
+  }
+  async function deliverAndComplete(view, receipt) {
+    const spawn = view.spawn;
+    const agent = spawn.agent;
     if (receipt.phase === "spawned") {
       const sessionId = receipt.sessionId;
       const mode = spawnAgents.sanitizeSpawnPermissionMode(spawn.permissionMode ?? void 0);
@@ -7307,6 +7345,7 @@ function createIssueWorker(deps) {
     if (running || closed || Date.now() < retryAt) return;
     running = true;
     try {
+      await recheckUnknown();
       let dispatches;
       try {
         dispatches = (await client.poll(deps.machineId)).dispatches ?? [];
@@ -7788,7 +7827,8 @@ async function startDaemon() {
           logger.logger.debug(`[DAEMON RUN] Directory creation failed: ${errorMessage}`);
           return {
             type: "error",
-            errorMessage
+            errorMessage,
+            notStarted: true
           };
         }
       }
@@ -7847,11 +7887,11 @@ async function startDaemon() {
             const requested = forkSpawnAccount(options.agentProfileId, options.parentSessionId, (id) => accountServiceRef.sessionAccount(id));
             spawnAccountId = accountServiceRef.resolveSpawnAccount(accountAgent, requested);
           } catch (error) {
-            return { type: "error", errorMessage: error instanceof Error ? error.message : String(error) };
+            return { type: "error", errorMessage: error instanceof Error ? error.message : String(error), notStarted: true };
           }
           if (spawnAccountId) extraEnv[store.SPAWN_ACCOUNT_ENV] = spawnAccountId;
         } else if (options.agentProfileId) {
-          return { type: "error", errorMessage: `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${options.agent} yet` };
+          return { type: "error", errorMessage: `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${options.agent} yet`, notStarted: true };
         }
         const claudeAuthStatus = claudeAuthServiceRef?.current()?.status;
         if ((options.agent ?? "claude") === "claude" && claudeAuthStatus && !spawnAccountId) {
@@ -7878,7 +7918,8 @@ async function startDaemon() {
           logger.logger.warn(`[DAEMON RUN] ${errorMessage}`);
           return {
             type: "error",
-            errorMessage
+            errorMessage,
+            notStarted: true
           };
         }
         let tmuxSessionName = extraEnv.TMUX_SESSION_NAME;
@@ -7899,7 +7940,8 @@ async function startDaemon() {
           if (!spawnAgents.isSpawnAgent(agent)) {
             return {
               type: "error",
-              errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`
+              errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`,
+              notStarted: true
             };
           }
           const resumeId = agent === "claude" ? options.resumeClaudeSessionId : agent === "codex" ? options.resumeCodexThreadId : void 0;
@@ -7985,7 +8027,8 @@ async function startDaemon() {
             default:
               return {
                 type: "error",
-                errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`
+                errorMessage: `Unsupported agent type: '${options.agent}'. Please update your CLI to the latest version.`,
+                notStarted: true
               };
           }
           const args = [
@@ -8055,7 +8098,8 @@ async function startDaemon() {
         logger.logger.debug("[DAEMON RUN] Failed to spawn process - no PID returned");
         return Promise.resolve({
           type: "error",
-          errorMessage: "Failed to spawn Happy process - no PID returned"
+          errorMessage: "Failed to spawn Happy process - no PID returned",
+          notStarted: true
         });
       }
       timer?.mark("spawned");
@@ -8281,7 +8325,9 @@ async function startDaemon() {
             HAPPY_RECONNECT_SEQ: String(tracked.encryption.seq),
             HAPPY_RECONNECT_METADATA_VERSION: String(tracked.encryption.metadataVersion),
             HAPPY_RECONNECT_AGENT_STATE_VERSION: String(tracked.encryption.agentStateVersion),
-            ...teamEnv
+            ...teamEnv,
+            // B-874c: an issue run's binding rides every relaunch (digest, MCP context).
+            ...sessionMetadata.issueRelaunchEnv(metadata)
           }
         });
         if (result.type === "success") {
@@ -8423,6 +8469,8 @@ async function startDaemon() {
             HAPPY_RECONNECT_METADATA_VERSION: String(tracked.encryption.metadataVersion),
             HAPPY_RECONNECT_AGENT_STATE_VERSION: String(tracked.encryption.agentStateVersion),
             ...teamEnv,
+            // B-874c: see resumeSessionImpl.
+            ...sessionMetadata.issueRelaunchEnv(metadata),
             ...options?.auto ? { [sessionLock.AUTO_RESTARTED_ENV]: sessionLock.encodeAutoRestarted(options.auto.kind, options.auto.target) } : {}
           }
         });