very-happy-cli 0.2.178 → 0.2.180

package/dist/{runClaudeDeps-RRw-Nusc.cjs → runClaudeDeps-B1ysqTvx.cjs}

@@ -1,95 +1,99 @@
 'use strict';
 
-var logger = require('./logger-DXTWlPzP.cjs');
-var controlClient = require('./controlClient-BTaZlbC6.cjs');
+var logger = require('./logger-CphW5nUE.cjs');
+var controlClient = require('./controlClient-Bqv5v5OM.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
+var deterministicJson = require('./deterministicJson-xqA6DaOm.cjs');
+var client = require('./client-DJplzPjD.cjs');
 var node_crypto = require('node:crypto');
-var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
-var index = require('./index-DFPT4HOO.cjs');
+var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
+var query = require('./query-BETKBrnz.cjs');
 var claudeAgentSdk = require('@anthropic-ai/claude-agent-sdk');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
-var systemPrompt = require('./systemPrompt-3PYi3EUY.cjs');
+var systemPrompt = require('./systemPrompt-DlyEk35T.cjs');
 var path$1 = require('node:path');
-var specialCommands = require('./specialCommands-BJ-nqY4s.cjs');
+var specialCommands = require('./specialCommands-BRufxlqe.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
-var attachmentLimits = require('./attachmentLimits-SqeAHrVC.cjs');
+var pushNotifications = require('./pushNotifications-DI92havG.cjs');
 require('tweetnacl');
-var configuration = require('./configuration-4TGMrjul.cjs');
-require('./index-_l1Sdmbi.cjs');
-require('./registerCommonHandlers-C0_fyBQ0.cjs');
+var configuration = require('./configuration-CYO-kPOS.cjs');
+require('./index-Dv0Q48P3.cjs');
+require('./registerCommonHandlers-C7a_dUWs.cjs');
 require('os');
 require('child_process');
 require('@paralleldrive/cuid2');
-require('./persistence-BfX72dne.cjs');
+require('./persistence-9BMYspxG.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('chalk');
 var types = require('./types-CRS-srZK.cjs');
 var path = require('./path-B7zW-WwE.cjs');
 var fs = require('fs/promises');
-var time = require('./time-A6zR3Iy6.cjs');
+var time = require('./time-Cjv0zxQO.cjs');
 var node_fs = require('node:fs');
-var deterministicJson = require('./deterministicJson-BjNQsAjO.cjs');
-var sessionScanner = require('./sessionScanner-CDOYsEUD.cjs');
+var sessionScanner = require('./sessionScanner-CaO8bLaG.cjs');
 var node_child_process = require('node:child_process');
-var streamRelay = require('./streamRelay-9kBPpbvU.cjs');
-var attachmentContent = require('./attachmentContent-bpQTBJ0y.cjs');
+var streamRelay = require('./streamRelay-Dy6amlzx.cjs');
+var attachmentContent = require('./attachmentContent-CEm13_gF.cjs');
 var promises = require('node:fs/promises');
-var claudeSessionFork = require('./claudeSessionFork-kYCP1IJB.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DYl7l4Ts.cjs');
-var doctor = require('./doctor-BshRnjLi.cjs');
+var claudeSessionFork = require('./claudeSessionFork-Be16vzGc.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CIsvBrVe.cjs');
+var doctor = require('./doctor-BrgSlfXn.cjs');
 var node_http = require('node:http');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var projectPath = require('./projectPath-ChLhdOyt.cjs');
-var titleGenerator = require('./titleGenerator-D26gvNaS.cjs');
+var projectPath = require('./projectPath-C3ioB4Bu.cjs');
+var processTreeSnapshot = require('./processTreeSnapshot-mDbnuojn.cjs');
+var titleGenerator = require('./titleGenerator-Cgp5ihFb.cjs');
 var oneShotPrompts = require('./oneShotPrompts-CL0dip9C.cjs');
-var reportProgressTool = require('./reportProgressTool-B9nCzbkL.cjs');
+var reportProgressTool = require('./reportProgressTool-14AXr959.cjs');
 require('node:util');
-require('./smallFastModel-D_uxGMo3.cjs');
-require('./trimIdent-4gvk9Wk6.cjs');
-require('node:os');
-require('./agentGuidance-BtBx2xxE.cjs');
-require('./rateLimitWindows-Czb7_7cK.cjs');
+require('./prompt-lgF9IE82.cjs');
 require('zod');
-require('./package-DY4zTbKS.cjs');
-require('util');
-require('crypto');
-require('path');
-require('cross-spawn');
+require('./client-D_loZ9IK.cjs');
+require('./context-6TP-iz_c.cjs');
+require('./sessionOps-BrGiU9-s.cjs');
 require('./authRelay-Dy1qU9td.cjs');
-require('./client-Dnza1hgN.cjs');
-require('./context-JoKu0V54.cjs');
-require('./sessionOps-BAnr7n8t.cjs');
-require('./resources-JDPugcDq.cjs');
-require('./tools-CxJp4T1T.cjs');
-require('./peerTools-iy3_6Yc5.cjs');
+require('./resources-CvIlkzpP.cjs');
+require('./tools-BL7Byl_x.cjs');
+require('./peerTools-DQNlrcqM.cjs');
+require('node:os');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-BRTIOX5b.cjs');
+require('./remoteSessionClient-D843fkzL.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-BN5vZt3K.cjs');
+require('./downloadTarget-CEb9che-.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-DCQ87Aan.cjs');
+require('./bootstrap-DoA7okld.cjs');
+require('./package-KhLqBDX9.cjs');
+require('./agentGuidance-BtBx2xxE.cjs');
+require('./trimIdent-4gvk9Wk6.cjs');
+require('./webPanels-FCgFKvVe.cjs');
 require('./previewPath-B0rBdhy1.cjs');
-require('./sync-Dhmtk66S.cjs');
+require('crypto');
+require('./smallFastModel-D_uxGMo3.cjs');
+require('./rateLimitWindows-YRIYVdo4.cjs');
+require('util');
+require('path');
+require('cross-spawn');
+require('./sync-Bn-idAoy.cjs');
 require('./transcriptCursor-DcXGLeSc.cjs');
-require('./startFileWatcher-Bqlqjt93.cjs');
+require('./startFileWatcher-D9cYzZOq.cjs');
 require('node:readline');
 require('./doctor-u46qYYKX.cjs');
 require('ps-list');
-require('./doctorReadiness-BCZGcN0a.cjs');
-require('./detectCLI-DR9ZaN6B.cjs');
+require('./doctorReadiness-Dl6yRQCy.cjs');
+require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
 require('./cliUpdate-DsKXPFYp.cjs');
-require('./piRunnerArgs-CRQVR9o-.cjs');
-require('./sessionModeFile-CLLdidiJ.cjs');
+require('./piRunnerArgs-DGaq6VYM.cjs');
+require('./acpSessionResume-CR5pmgVo.cjs');
 require('url');
 require('node:module');
-require('./client-C4zKGjiJ.cjs');
+require('./client-BWjaHKtj.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 
 const SCHEDULE_WAKEUP_GRACE_MS = 6e4;
@@ -127,6 +131,41 @@ function createScheduledWakeupTracker() {
   return { observe, pending };
 }
 
+function modelTarget(model) {
+  return model == null || model === "" ? void 0 : model;
+}
+function needsModelSwitch(current, next) {
+  return modelTarget(current) !== modelTarget(next);
+}
+function modelSwitchFailureNotice(model, error) {
+  const name = modelTarget(model) ?? "default";
+  const detail = error instanceof Error ? error.message : String(error);
+  return `\u26A0\uFE0F Could not switch to model "${name}" \u2014 continuing with the previous model. ${detail}`;
+}
+
+const CLAUDE_MODEL_NOT_FOUND = "model_not_found";
+function retiredModelFrom(message, runningModel) {
+  const m = message;
+  if (!m || m.type !== "assistant" || m.error !== CLAUDE_MODEL_NOT_FOUND) return null;
+  if ((m.parent_tool_use_id ?? null) !== null) return null;
+  return modelTarget(runningModel) ?? null;
+}
+function createRetiredModels() {
+  const retired = /* @__PURE__ */ new Set();
+  return {
+    retire(model) {
+      retired.add(model);
+    },
+    effective(model) {
+      const target = modelTarget(model);
+      return target !== void 0 && retired.has(target) ? void 0 : target;
+    }
+  };
+}
+function retiredModelNotice(model) {
+  return `\u26A0\uFE0F Model "${model}" is no longer available \u2014 switched this session to the default model. Pick another model to change it, then send your message again.`;
+}
+
 class Session {
   path;
   logPath;
@@ -155,6 +194,8 @@ class Session {
   backgroundTasks = [];
   /** B-587 review P3-4: CronCreate / ScheduleWakeup pending in this Claude process. */
   scheduledWakeups = createScheduledWakeupTracker();
+  /** B-634 ③: model ids Claude Code reported as model_not_found — session-scoped, survives relaunches. */
+  retiredModels = createRetiredModels();
   /**
    * Window after a user-initiated abort during which stray promise rejections
    * from tearing down the SDK query (MCP transports, in-flight tool calls,
@@ -208,6 +249,20 @@ class Session {
   sessionFoundCallbacks = [];
   /** Keep alive interval reference for cleanup */
   keepAliveInterval;
+  /**
+   * B-645: project context rides in front of real user messages (never the
+   * system prompt), so it survives relaunches without touching the mode hash
+   * or prewarm key. One per session process; created on first use.
+   */
+  _projectInjector = null;
+  get projectInjector() {
+    return this._projectInjector ??= deterministicJson.createProjectInjector({
+      client: client.sharedProjectsClient(),
+      sessionId: () => this.client.sessionId,
+      metadata: () => this.client.getMetadata?.() ?? null,
+      agent: "claude"
+    });
+  }
   constructor(opts) {
     this.path = opts.path;
     this.api = opts.api;
@@ -594,6 +649,112 @@ function createRuntimeControls(isThinking) {
   return { setQuery, observe, request, stopRunningTasks };
 }
 
+const CLAUDE_COMMAND_LIFECYCLE_STATES = ["queued", "started", "completed", "cancelled", "discarded", "refused"];
+function readClaudeCommandLifecycle(frame) {
+  const m = frame;
+  if (!m) return null;
+  const isLifecycle = m.type === "command_lifecycle" || m.type === "system" && m.subtype === "command_lifecycle";
+  if (!isLifecycle || typeof m.command_uuid !== "string" || m.command_uuid.length === 0) return null;
+  const state = CLAUDE_COMMAND_LIFECYCLE_STATES.find((candidate) => candidate === m.state);
+  return state ? { uuid: m.command_uuid, state } : null;
+}
+const uuidList = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string" && item.length > 0) : [];
+const INTERRUPT_CANCEL_QUEUED_CAPABILITY = "interrupt_cancel_queued_v1";
+const PENDING_MAX = 256;
+const REPORTED_MAX = 512;
+const MSG_LIFECYCLE_CAPABILITY = "msg_lifecycle_v1";
+function createClaudeCommandTracker() {
+  const pending = /* @__PURE__ */ new Map();
+  const reported = /* @__PURE__ */ new Set();
+  const drop = (uuid) => {
+    pending.delete(uuid);
+    if (reported.has(uuid)) return null;
+    reported.add(uuid);
+    if (reported.size > REPORTED_MAX) reported.delete(reported.values().next().value);
+    return uuid;
+  };
+  return {
+    /** A uuid-stamped user message (prompt or steer) was handed to the Query. */
+    track(uuid, payload) {
+      if (!pending.has(uuid) && pending.size >= PENDING_MAX) pending.delete(pending.keys().next().value);
+      pending.set(uuid, { started: false, payload });
+    },
+    isTracked(uuid) {
+      return pending.has(uuid);
+    },
+    /** A lifecycle frame; returns the uuids now known to have never run. */
+    observe(lifecycle) {
+      const entry = pending.get(lifecycle.uuid);
+      if (!entry) return [];
+      switch (lifecycle.state) {
+        case "queued":
+          return [];
+        case "started":
+          entry.started = true;
+          return [];
+        case "completed":
+          pending.delete(lifecycle.uuid);
+          return [];
+        default: {
+          if (entry.started) {
+            pending.delete(lifecycle.uuid);
+            return [];
+          }
+          const dropped = drop(lifecycle.uuid);
+          return dropped ? [dropped] : [];
+        }
+      }
+    },
+    /**
+     * An interrupt's receipt: `cancelled` members we track never ran;
+     * `still_queued` members we track are returned for the per-uuid
+     * follow-up (`cancel_async_message`) a CLI without cancel_queued needs.
+     */
+    onInterruptReceipt(receipt) {
+      const dropped = [];
+      for (const uuid of uuidList(receipt?.cancelled)) {
+        if (!pending.has(uuid)) continue;
+        const result = drop(uuid);
+        if (result) dropped.push(result);
+      }
+      const stillQueued = uuidList(receipt?.still_queued).filter((uuid) => pending.has(uuid));
+      return { dropped, stillQueued };
+    },
+    /** The answer to `cancel_async_message`: true = withdrawn before it ran; false = already dequeued, its lifecycle frames follow. */
+    onCancelResponse(uuid, cancelled) {
+      if (!cancelled || !pending.has(uuid)) return [];
+      const dropped = drop(uuid);
+      return dropped ? [dropped] : [];
+    },
+    /**
+     * B-634 ②: the Query is over — every tracked message that never
+     * `started` and was not already reported, in the order it was sent.
+     * Untracked afterwards; a later frame for one of them is ignored.
+     */
+    takeUnconfirmed() {
+      const out = [];
+      for (const [uuid, entry] of pending) {
+        if (entry.started || entry.payload === void 0 || reported.has(uuid)) continue;
+        out.push({ uuid, payload: entry.payload });
+      }
+      for (const { uuid } of out) pending.delete(uuid);
+      return out;
+    },
+    clear() {
+      pending.clear();
+    }
+  };
+}
+function planUnconfirmedCommands(commands, context) {
+  if (context.aborted || !context.parkFree) return { redeliver: null, tombstone: commands.map((c) => c.uuid) };
+  const index = commands.findIndex((c) => !context.redelivered.has(c.uuid));
+  if (index < 0) return { redeliver: null, tombstone: commands.map((c) => c.uuid) };
+  return {
+    redeliver: commands[index],
+    tombstone: commands.filter((_, i) => i !== index).map((c) => c.uuid)
+  };
+}
+
 const AUTH_FAILURE_RESULT_TEXT = /Failed to authenticate|OAuth session expired/i;
 const QUERY_RECYCLE_NOTICE = {
   authentication_failed: "\u26A0\uFE0F Claude Code could not refresh its OAuth session. This agent process was ended so your next message starts a fresh one that re-reads the credentials on this machine; if it fails again, run `claude` on the machine to log in again."
@@ -747,18 +908,6 @@ async function awaitFileExist(file, timeout = 1e4) {
   return false;
 }
 
-function modelTarget(model) {
-  return model == null || model === "" ? void 0 : model;
-}
-function needsModelSwitch(current, next) {
-  return modelTarget(current) !== modelTarget(next);
-}
-function modelSwitchFailureNotice(model, error) {
-  const name = modelTarget(model) ?? "default";
-  const detail = error instanceof Error ? error.message : String(error);
-  return `\u26A0\uFE0F Could not switch to model "${name}" \u2014 continuing with the previous model. ${detail}`;
-}
-
 const SDK_TIMING_FIELDS = ["ttft_ms", "time_to_request_ms", "time_to_request_from_spawn_ms"];
 function delta(from, to) {
   if (typeof from !== "number" || typeof to !== "number" || to < from) return "-";
@@ -1093,88 +1242,6 @@ function createClaudeTurnTracker() {
   };
 }
 
-const CLAUDE_COMMAND_LIFECYCLE_STATES = ["queued", "started", "completed", "cancelled", "discarded", "refused"];
-function readClaudeCommandLifecycle(frame) {
-  const m = frame;
-  if (!m) return null;
-  const isLifecycle = m.type === "command_lifecycle" || m.type === "system" && m.subtype === "command_lifecycle";
-  if (!isLifecycle || typeof m.command_uuid !== "string" || m.command_uuid.length === 0) return null;
-  const state = CLAUDE_COMMAND_LIFECYCLE_STATES.find((candidate) => candidate === m.state);
-  return state ? { uuid: m.command_uuid, state } : null;
-}
-const uuidList = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string" && item.length > 0) : [];
-const INTERRUPT_CANCEL_QUEUED_CAPABILITY = "interrupt_cancel_queued_v1";
-const PENDING_MAX = 256;
-const REPORTED_MAX = 512;
-function createClaudeCommandTracker() {
-  const pending = /* @__PURE__ */ new Map();
-  const reported = /* @__PURE__ */ new Set();
-  const drop = (uuid) => {
-    pending.delete(uuid);
-    if (reported.has(uuid)) return null;
-    reported.add(uuid);
-    if (reported.size > REPORTED_MAX) reported.delete(reported.values().next().value);
-    return uuid;
-  };
-  return {
-    /** A uuid-stamped user message (prompt or steer) was handed to the Query. */
-    track(uuid) {
-      if (!pending.has(uuid) && pending.size >= PENDING_MAX) pending.delete(pending.keys().next().value);
-      pending.set(uuid, { started: false });
-    },
-    isTracked(uuid) {
-      return pending.has(uuid);
-    },
-    /** A lifecycle frame; returns the uuids now known to have never run. */
-    observe(lifecycle) {
-      const entry = pending.get(lifecycle.uuid);
-      if (!entry) return [];
-      switch (lifecycle.state) {
-        case "queued":
-          return [];
-        case "started":
-          entry.started = true;
-          return [];
-        case "completed":
-          pending.delete(lifecycle.uuid);
-          return [];
-        default: {
-          if (entry.started) {
-            pending.delete(lifecycle.uuid);
-            return [];
-          }
-          const dropped = drop(lifecycle.uuid);
-          return dropped ? [dropped] : [];
-        }
-      }
-    },
-    /**
-     * An interrupt's receipt: `cancelled` members we track never ran;
-     * `still_queued` members we track are returned for the per-uuid
-     * follow-up (`cancel_async_message`) a CLI without cancel_queued needs.
-     */
-    onInterruptReceipt(receipt) {
-      const dropped = [];
-      for (const uuid of uuidList(receipt?.cancelled)) {
-        if (!pending.has(uuid)) continue;
-        const result = drop(uuid);
-        if (result) dropped.push(result);
-      }
-      const stillQueued = uuidList(receipt?.still_queued).filter((uuid) => pending.has(uuid));
-      return { dropped, stillQueued };
-    },
-    /** The answer to `cancel_async_message`: true = withdrawn before it ran; false = already dequeued, its lifecycle frames follow. */
-    onCancelResponse(uuid, cancelled) {
-      if (!cancelled || !pending.has(uuid)) return [];
-      const dropped = drop(uuid);
-      return dropped ? [dropped] : [];
-    },
-    clear() {
-      pending.clear();
-    }
-  };
-}
-
 const SET_MODEL_TIMEOUT_MS = 3e4;
 const PROMPT_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function promptUuid(uuid) {
@@ -1300,7 +1367,7 @@ async function claudeRemote(opts) {
     const messages2 = new PushableAsyncIterable();
     const startedAt = Date.now();
     try {
-      const response2 = index.query({
+      const response2 = query.query({
         prompt: messages2,
         options: buildSdkOptions(lease.mode, { settingsPath: lease.hookSettingsPath, abort: abort.signal })
       });
@@ -1348,9 +1415,14 @@ async function claudeRemote(opts) {
   const discardWarm = (reason) => {
     warm?.lease.discard(reason);
   };
+  const withoutRetiredModel = (next) => {
+    if (!next || !opts.retiredModels) return next;
+    const model = opts.retiredModels.effective(next.mode.model);
+    return model === next.mode.model ? next : { ...next, mode: { ...next.mode, model } };
+  };
   let initial;
   try {
-    initial = await opts.nextMessage();
+    initial = withoutRetiredModel(await opts.nextMessage());
   } catch (error) {
     discardWarm("error");
     throw error;
@@ -1459,7 +1531,7 @@ async function claudeRemote(opts) {
     messages = new PushableAsyncIterable();
     messages.push(initialUserMessage);
     timingMarks.spawnAt = Date.now();
-    response = index.query({
+    response = query.query({
       prompt: messages,
       options: buildSdkOptions(initial.mode, { settingsPath: opts.hookSettingsPath, abort: opts.signal })
     });
@@ -1510,7 +1582,7 @@ async function claudeRemote(opts) {
       steer: (message, nextMode, localKey) => {
         mode = { ...nextMode, model: mode.model };
         const uuid = promptUuid(localKey);
-        if (uuid.uuid) commandTracker.track(uuid.uuid);
+        if (uuid.uuid) commandTracker.track(uuid.uuid, { message, mode: nextMode });
         messages.push({
           type: "user",
           parent_tool_use_id: null,
@@ -1524,7 +1596,7 @@ async function claudeRemote(opts) {
   }
   let lastAssistantError;
   turn.pushed();
-  if (initialUserMessage.uuid) commandTracker.track(initialUserMessage.uuid);
+  if (initialUserMessage.uuid) commandTracker.track(initialUserMessage.uuid, { message: initial.message, mode: initial.mode });
   let modelUnconfirmed = false;
   let pullingNext = false;
   const pullNextMessage = () => {
@@ -1533,8 +1605,10 @@ async function claudeRemote(opts) {
       return;
     }
     pullingNext = true;
-    opts.nextMessage().then(async (next) => {
+    opts.nextMessage().then(async (pulled) => {
+      let next = withoutRetiredModel(pulled);
       if (!next) {
+        pullingNext = false;
         messages.end();
         return;
       }
@@ -1554,8 +1628,9 @@ async function claudeRemote(opts) {
       updateThinking(true);
       turn.pushed();
       const uuid = promptUuid(next.uuid);
-      if (uuid.uuid) commandTracker.track(uuid.uuid);
+      if (uuid.uuid) commandTracker.track(uuid.uuid, { message: next.message, mode: next.mode });
       timingMarks = { pushedAt: next.enqueuedAt ?? Date.now() };
+      pullingNext = false;
       messages.push({
         type: "user",
         parent_tool_use_id: null,
@@ -1564,9 +1639,8 @@ async function claudeRemote(opts) {
         message: { role: "user", content: next.message }
       });
     }).catch(() => {
-      messages.end();
-    }).finally(() => {
       pullingNext = false;
+      messages.end();
     });
   };
   const recycleIfPoisoned = (result) => {
@@ -1605,6 +1679,17 @@ async function claudeRemote(opts) {
       if (message.type === "assistant" && message.error) {
         lastAssistantError = message.error;
       }
+      const retired = opts.retiredModels ? retiredModelFrom(message, mode.model) : null;
+      if (retired) {
+        opts.retiredModels.retire(retired);
+        mode = { ...mode, model: void 0 };
+        logger.logger.debug(`[claudeRemote] Model ${retired} reported model_not_found; moving the session to the default model`);
+        opts.onCompletionEvent?.(retiredModelNotice(retired));
+        void withTimeout(response.setModel(void 0), SET_MODEL_TIMEOUT_MS, "set_model").catch((e) => {
+          logger.logger.debug(`[claudeRemote] setModel(default) after model_not_found failed: ${e instanceof Error ? e.message : String(e)}`);
+          modelUnconfirmed = true;
+        });
+      }
       if (message.type === "assistant" && timingMarks.firstAssistantAt === void 0) {
         timingMarks.firstAssistantAt = Date.now();
       } else if (message.type === "system" && message.subtype === "init" && timingMarks.initAt === void 0) {
@@ -1718,6 +1803,13 @@ async function claudeRemote(opts) {
     }
   } finally {
     updateThinking(false);
+    if (cliCapabilities.has(MSG_LIFECYCLE_CAPABILITY)) {
+      const unconfirmed = commandTracker.takeUnconfirmed();
+      if (unconfirmed.length > 0) {
+        logger.logger.debug(`[claudeRemote] Query ended with ${unconfirmed.length} user message(s) never started: ${unconfirmed.map((c) => c.uuid).join(", ")}`);
+        opts.onCommandsUnconfirmed?.(unconfirmed, { aborted: opts.signal?.aborted === true });
+      }
+    }
   }
 }
 
@@ -2688,7 +2780,7 @@ class OutgoingMessageQueue {
   }
   queue = [];
   nextId = 1;
-  lock = new attachmentLimits.AsyncLock();
+  lock = new pushNotifications.AsyncLock();
   processTimer;
   delayTimers = /* @__PURE__ */ new Map();
   /**
@@ -3637,7 +3729,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
   logger.logger.debug("[claudeRemoteLauncher] Starting remote launcher");
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   logger.logger.debug(`[claudeRemoteLauncher] TTY available: ${hasTTY}`);
-  let messageBuffer$1 = new messageBuffer.MessageBuffer();
+  let messageBuffer = new sessionExitLifecycle.MessageBuffer();
   let inkInstance = null;
   if (hasTTY) {
     const [{ render }, { default: React }, { RemoteModeDisplay }] = await Promise.all([
@@ -3647,7 +3739,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
     ]);
     console.clear();
     inkInstance = render(React.createElement(RemoteModeDisplay, {
-      messageBuffer: messageBuffer$1,
+      messageBuffer,
       logPath: process.env.DEBUG ? session.logPath : void 0,
       onExit: async () => {
         logger.logger.debug("[remote]: Exiting client via Ctrl-C");
@@ -3821,14 +3913,14 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
     session.scheduledWakeups.observe(message);
     if (message.type === "system" && message.subtype === "api_retry") {
       const notice = describeClaudeApiRetry(message);
-      messageBuffer$1.addMessage(notice, "status");
+      messageBuffer.addMessage(notice, "status");
       if (apiRetryGate.observe(message, Date.now())) {
         session.client.sendSessionEvent({ type: "message", message: notice, kind: "claude-api-retry" });
       }
     } else if (message.type === "system" && message.subtype === "informational") {
       const warning = describeClaudeInformational(message);
       if (warning) {
-        messageBuffer$1.addMessage(warning, "status");
+        messageBuffer.addMessage(warning, "status");
         session.client.sendSessionEvent({ type: "message", message: warning, kind: "claude-warning" });
       }
     } else if (message.type === "result") {
@@ -3839,7 +3931,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
       sdkToLogConverter.convert(message);
       return;
     }
-    formatClaudeMessageForInk(message, messageBuffer$1);
+    formatClaudeMessageForInk(message, messageBuffer);
     if (message.type === "assistant") {
       let umessage = message;
       if (umessage.message.content && Array.isArray(umessage.message.content)) {
@@ -3949,6 +4041,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
   }
   try {
     const modeGate = new LaunchModeGate(session.queue.modeHasher);
+    const redeliveredCommands = /* @__PURE__ */ new Set();
     let previousSessionId = null;
     await Promise.race([
       rewindReconciler.startup().catch((error) => logger.logger.debug("[rewind] startup reconcile failed", error)),
@@ -3956,15 +4049,15 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
     ]);
     while (!exitReason) {
       logger.logger.debug("[remote]: launch");
-      messageBuffer$1.addMessage("\u2550".repeat(40), "status");
+      messageBuffer.addMessage("\u2550".repeat(40), "status");
       const isNewSession = session.sessionId !== previousSessionId;
       if (isNewSession) {
-        messageBuffer$1.addMessage("Starting new Claude session...", "status");
+        messageBuffer.addMessage("Starting new Claude session...", "status");
         permissionHandler.reset();
         sdkToLogConverter.resetParentChain();
         logger.logger.debug(`[remote]: New session detected (previous: ${previousSessionId}, current: ${session.sessionId})`);
       } else {
-        messageBuffer$1.addMessage("Continuing Claude session...", "status");
+        messageBuffer.addMessage("Continuing Claude session...", "status");
         logger.logger.debug(`[remote]: Continuing existing session: ${session.sessionId}`);
       }
       previousSessionId = session.sessionId;
@@ -4004,10 +4097,15 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
             return permissionHandler.isAborted(toolCallId);
           },
           nextMessage: async () => {
+            const finalize = async (text) => {
+              const out = await session.projectInjector.decorate(text);
+              onPromptFinalized?.(out);
+              return out;
+            };
             const parked = modeGate.takeParked();
             if (parked) {
               permissionHandler.handleModeChange(parked.mode.permissionMode);
-              if (typeof parked.message === "string") onPromptFinalized?.(parked.message);
+              if (typeof parked.message === "string") return { ...parked, message: await finalize(parked.message) };
               return parked;
             }
             await rewindReconciler.settled(controller.signal);
@@ -4036,8 +4134,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
                   sessionId: session.client.sessionId
                 });
                 logger.logger.debug(`[remote] Staged ${staged.length} attachment(s) for the coding agent`);
-                const withAttachments = attachmentContent.appendStagedAttachmentsToPrompt(msg.message, staged);
-                onPromptFinalized?.(withAttachments);
+                const withAttachments = await finalize(attachmentContent.appendStagedAttachmentsToPrompt(msg.message, staged));
                 return {
                   message: withAttachments,
                   mode: msg.mode,
@@ -4045,9 +4142,9 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
                   uuid: promptUuidFor(msg.sourceIds)
                 };
               }
-              onPromptFinalized?.(msg.message);
+              const finalized = await finalize(msg.message);
               return {
-                message: msg.message,
+                message: finalized,
                 mode: msg.mode,
                 enqueuedAt: msg.enqueuedAt,
                 uuid: promptUuidFor(msg.sourceIds)
@@ -4121,6 +4218,25 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
           // queued behind a pre-empting steer's turn) before the model
           // read them — the same tombstone a destroyed queue item gets
           // (B-332), so the web shows them as not delivered, not answered.
+          retiredModels: session.retiredModels,
+          // B-634 ②: messages the Query ended without Claude Code ever
+          // starting them — sent once more, or tombstoned (B-332).
+          onCommandsUnconfirmed: (commands, { aborted }) => {
+            const plan = planUnconfirmedCommands(commands, {
+              aborted: aborted || exitReason !== null,
+              parkFree: !modeGate.hasParked,
+              redelivered: redeliveredCommands
+            });
+            if (plan.redeliver) {
+              redeliveredCommands.add(plan.redeliver.uuid);
+              logger.logger.debug(`[remote]: re-sending unconfirmed user message ${plan.redeliver.uuid} into the next launch`);
+              modeGate.park({ message: plan.redeliver.payload.message, mode: plan.redeliver.payload.mode, uuid: plan.redeliver.uuid });
+            }
+            if (plan.tombstone.length > 0) {
+              logger.logger.debug(`[remote]: ${plan.tombstone.length} user message(s) never started before the query ended`);
+              session.client.sendQueueCancelReason(plan.tombstone, "aborted");
+            }
+          },
           onCommandsDropped: (uuids) => {
             logger.logger.debug(`[remote]: ${uuids.length} user message(s) never read before the turn ended`);
             session.client.sendQueueCancelReason(uuids, "aborted");
@@ -4229,7 +4345,7 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
       }
     });
     logger.logger.debug(`[remote]: cleanup done +${Date.now() - t0}ms rawMode=${process.stdin.isRaw}`);
-    messageBuffer$1.clear();
+    messageBuffer.clear();
     if (abortFuture) {
       abortFuture.resolve(void 0);
     }
@@ -4263,7 +4379,7 @@ async function loop(opts) {
     logger.logger.debug(`[loop] Iteration with mode: ${mode}`);
     switch (mode) {
       case "local": {
-        const { claudeLocalLauncher } = await Promise.resolve().then(function () { return require('./claudeLocalLauncher-21-xh5gc.cjs'); });
+        const { claudeLocalLauncher } = await Promise.resolve().then(function () { return require('./claudeLocalLauncher-BhvPbcyH.cjs'); });
         const result = await claudeLocalLauncher(session);
         switch (result.type) {
           case "switch":
@@ -4428,71 +4544,6 @@ function cleanupHookSettingsFile(filepath) {
   }
 }
 
-async function settleSessionOnExit(sessionId, intent, deps) {
-  if (intent === "archive") {
-    deps.updateMetadata((currentMetadata) => ({
-      ...currentMetadata,
-      lifecycleState: "archived",
-      lifecycleStateSince: Date.now(),
-      archivedBy: "cli",
-      archiveReason: "User terminated"
-    }));
-  }
-  if (intent === "hibernate" && deps.hibernation) {
-    const stamp = deps.hibernation;
-    const handler = (currentMetadata) => ({ ...currentMetadata, hibernation: stamp });
-    const landed = deps.updateMetadataAndWait ? await deps.updateMetadataAndWait(handler) : (deps.updateMetadata(handler), false);
-    if (!landed) deps.log?.("[START] hibernation stamp not confirmed before going offline");
-  }
-  deps.sendSessionDeath();
-  try {
-    if (intent === "archive") await deps.archiveSession(sessionId);
-    else await deps.deactivateSession(sessionId);
-  } catch (error) {
-    deps.log?.(`[START] ${intent === "archive" ? "archiveSession" : "deactivateSession"} during cleanup failed:`, error);
-  }
-}
-class SessionExitGate {
-  decided = null;
-  hibernateCommitted = false;
-  deferred = null;
-  /** Returns the intent to act on, or null when cleanup already started. */
-  claim(intent) {
-    if (this.decided === "hibernate" && !this.hibernateCommitted && intent !== "hibernate") {
-      if (this.deferred !== "archive") this.deferred = intent;
-      return null;
-    }
-    if (this.decided !== null) return null;
-    this.decided = intent;
-    return intent;
-  }
-  get current() {
-    return this.decided;
-  }
-  /** B-587: an exit was requested while the hibernation was deciding. */
-  get exitRequested() {
-    return this.deferred !== null;
-  }
-  /** B-587: the hibernation passed its last check — no more deferral. */
-  commitHibernate() {
-    if (this.decided === "hibernate") this.hibernateCommitted = true;
-  }
-  /**
-   * B-587: a hibernation that aborted hands the exit back. Returns the exit
-   * deferred meanwhile (the caller must run it now), or null.
-   */
-  release(intent) {
-    if (this.decided !== intent || intent === "hibernate" && this.hibernateCommitted) return null;
-    this.decided = null;
-    const deferred = this.deferred;
-    this.deferred = null;
-    return deferred;
-  }
-}
-function exitIntentFromArchiveFlag(archive) {
-  return archive ?? true ? "archive" : "offline";
-}
-
 function isUnsupportedSideQuestionError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return /unknown|unsupported|not supported|unrecognized|invalid.*subtype/i.test(message);
@@ -4669,7 +4720,7 @@ function registerSideQuestionHandler(rpc, deps) {
   const retainMs = deps.retainMs ?? SIDE_QUESTION_RETAIN_MS;
   const maxRunMs = deps.maxRunMs ?? SIDE_QUESTION_MAX_RUN_MS;
   const fork = deps.run ?? (async (input) => {
-    const { query } = await Promise.resolve().then(function () { return require('./index-DFPT4HOO.cjs'); });
+    const { query } = await Promise.resolve().then(function () { return require('./index-DmTlDRSL.cjs'); });
     return runSideQuestion(query, input);
   });
   const run = async (input, live) => {
@@ -4783,6 +4834,25 @@ function registerSideQuestionHandler(rpc, deps) {
   };
 }
 
+function replayClaudeForkJsonl(file, sink) {
+  let replayed = 0;
+  for (const line of file.split("\n")) {
+    if (line.trim().length === 0) continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    const result = types.RawJSONLinesSchema.safeParse(parsed);
+    if (!result.success) continue;
+    sink.send(result.data);
+    replayed += 1;
+  }
+  if (replayed > 0) sink.closeTurn();
+  return replayed;
+}
+
 const ANALYZE_MIN_INTERVAL_MS = 5 * 60 * 1e3;
 const HOURLY_LIMIT = 30;
 const HOURLY_WINDOW_MS = 60 * 60 * 1e3;
@@ -5072,24 +5142,28 @@ function resolveMessageMode(current, meta, ctx) {
 }
 
 exports.reportSessionEditToDaemon = controlClient.reportSessionEditToDaemon;
+exports.startHappyServer = deterministicJson.startHappyServer;
+exports.SessionExitGate = sessionExitLifecycle.SessionExitGate;
+exports.exitIntentFromArchiveFlag = sessionExitLifecycle.exitIntentFromArchiveFlag;
+exports.settleSessionOnExit = sessionExitLifecycle.settleSessionOnExit;
 exports.claudeCheckSession = systemPrompt.claudeCheckSession;
 exports.parseSpecialCommand = specialCommands.parseSpecialCommand;
 exports.contentLogMetadata = contentLogMetadata.contentLogMetadata;
 exports.RawJSONLinesSchema = types.RawJSONLinesSchema;
 exports.getProjectPath = path.getProjectPath;
-exports.startHappyServer = deterministicJson.startHappyServer;
 exports.createSessionScanner = sessionScanner.createSessionScanner;
 exports.MessageQueue2 = registerKillSessionHandler.MessageQueue2;
 exports.registerKillSessionHandler = registerKillSessionHandler.registerKillSessionHandler;
 exports.getEnvironmentInfo = doctor.getEnvironmentInfo;
 exports.EditReportThrottle = editPaths.EditReportThrottle;
 exports.extractClaudeEditPaths = editPaths.extractClaudeEditPaths;
+exports.snapshotTree = processTreeSnapshot.snapshotTree;
+exports.terminateSurvivors = processTreeSnapshot.terminateSurvivors;
 exports.TitleGenerator = titleGenerator.TitleGenerator;
 exports.createSelfReportState = reportProgressTool.createSelfReportState;
 exports.BoardAnalyzer = BoardAnalyzer;
 exports.FileRateLimiter = FileRateLimiter;
 exports.PrewarmHookGate = PrewarmHookGate;
-exports.SessionExitGate = SessionExitGate;
 exports.acquirePrewarmSlot = acquirePrewarmSlot;
 exports.claudeModeHash = claudeModeHash;
 exports.claudePrewarmEligibility = claudePrewarmEligibility;
@@ -5098,7 +5172,6 @@ exports.cleanupHookSettingsFile = cleanupHookSettingsFile;
 exports.createClaudePrewarmLease = createClaudePrewarmLease;
 exports.disposeAllClaudePrewarms = disposeAllClaudePrewarms;
 exports.evaluatePrewarmPrediction = evaluatePrewarmPrediction;
-exports.exitIntentFromArchiveFlag = exitIntentFromArchiveFlag;
 exports.formatPrewarmLine = formatPrewarmLine;
 exports.generateHookSettingsFile = generateHookSettingsFile;
 exports.loop = loop;
@@ -5107,8 +5180,8 @@ exports.prewarmPredictionMeta = prewarmPredictionMeta;
 exports.prewarmSlotDir = prewarmSlotDir;
 exports.readPrewarmCache = readPrewarmCache;
 exports.registerSideQuestionHandler = registerSideQuestionHandler;
+exports.replayClaudeForkJsonl = replayClaudeForkJsonl;
 exports.resolveMessageMode = resolveMessageMode;
-exports.settleSessionOnExit = settleSessionOnExit;
 exports.startHookServer = startHookServer;
 exports.withAssistantDenylist = withAssistantDenylist;
 exports.writePrewarmCache = writePrewarmCache;