very-happy-cli 0.2.189 → 0.2.191

package/dist/{runClaudeDeps-ck5_GYlP.cjs → runClaudeDeps-CYuozSC6.cjs}

@@ -1,77 +1,77 @@
 'use strict';
 
-var logger = require('./logger-BP1SW7Cs.cjs');
-var controlClient = require('./controlClient-F7hAEEy2.cjs');
+var logger = require('./logger-Ct2zvaq0.cjs');
+var controlClient = require('./controlClient-C13_pSKG.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var deterministicJson = require('./deterministicJson-D0LU_XbO.cjs');
-var client = require('./client-DIfxYk7B.cjs');
+var deterministicJson = require('./deterministicJson-CpFFgUL_.cjs');
+var client = require('./client-C5-C0t2a.cjs');
 var node_crypto = require('node:crypto');
 var specialCommands = require('./specialCommands-J3JFOq0J.cjs');
 var sessionExitLifecycle = require('./sessionExitLifecycle-DFltxXU8.cjs');
-var query = require('./query-CE2XDhhw.cjs');
+var query = require('./query-u2GX-I0C.cjs');
 var claudeAgentSdk = require('@anthropic-ai/claude-agent-sdk');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
-var systemPrompt = require('./systemPrompt-Dy_Rf-0Z.cjs');
+var systemPrompt = require('./systemPrompt-DV5IReD4.cjs');
 var path$1 = require('node:path');
 require('axios');
 require('node:events');
 require('socket.io-client');
-var pushNotifications = require('./pushNotifications-CalIS9sq.cjs');
+var pushNotifications = require('./pushNotifications-23YSd-0l.cjs');
 require('tweetnacl');
-var configuration = require('./configuration-C0ctLGW2.cjs');
-require('./index-BOe6dKnL.cjs');
-require('./registerCommonHandlers-DZPozYxc.cjs');
+var configuration = require('./configuration-DfPBa-9d.cjs');
+require('./index-CLUHaPU8.cjs');
+require('./registerCommonHandlers-D1MiSfcB.cjs');
 require('os');
 require('child_process');
 require('@paralleldrive/cuid2');
-require('./persistence-CrzC7yr_.cjs');
+require('./persistence-A2NeERZJ.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-XwEZxKGc.cjs');
+var time = require('./time-Cy0a-7YX.cjs');
 var node_fs = require('node:fs');
-var sessionScanner = require('./sessionScanner-Cr6PJ3PT.cjs');
+var sessionScanner = require('./sessionScanner-AHjnicxi.cjs');
 var node_child_process = require('node:child_process');
-var streamRelay = require('./streamRelay-D9a4cBEa.cjs');
-var attachmentContent = require('./attachmentContent-Cc5b7TPr.cjs');
+var streamRelay = require('./streamRelay-BhI6jqF-.cjs');
+var attachmentContent = require('./attachmentContent-BO2njyza.cjs');
 var promises = require('node:fs/promises');
-var claudeSessionFork = require('./claudeSessionFork-DsbcuDEJ.cjs');
-var rateLimitReporter = require('./rateLimitReporter-BKmoOZQi.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DhCjrs44.cjs');
-var doctor = require('./doctor-wVNvRarN.cjs');
+var claudeSessionFork = require('./claudeSessionFork-Cko4SaVi.cjs');
+var rateLimitReporter = require('./rateLimitReporter-CaTzBe3x.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-hvCsEn7b.cjs');
+var doctor = require('./doctor-BEU0_1Xv.cjs');
 var node_http = require('node:http');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var processTreeSnapshot = require('./processTreeSnapshot-mDbnuojn.cjs');
-var titleGenerator = require('./titleGenerator-DVX0NZUn.cjs');
+var titleGenerator = require('./titleGenerator-RGHWP2YL.cjs');
 var oneShotPrompts = require('./oneShotPrompts-CL0dip9C.cjs');
-var reportProgressTool = require('./reportProgressTool-DznxPKES.cjs');
+var reportProgressTool = require('./reportProgressTool-tzQLCLIw.cjs');
 require('node:util');
 require('./prompt-Bof2aQkI.cjs');
 require('node:os');
 require('zod');
 require('./pi-DlsrPCTa.cjs');
 require('./fileStore-7qhnbs6N.cjs');
-require('./client-BNmFaRXZ.cjs');
-require('./context-D-hEk5pC.cjs');
-require('./sessionOps-BzeOKIEF.cjs');
+require('./client-C-OdTbrU.cjs');
+require('./context-Co7hUaW-.cjs');
+require('./sessionOps-DXlTmS7J.cjs');
 require('./authRelay-Dy1qU9td.cjs');
 require('./resources-BZ_Be0qM.cjs');
-require('./tools-CjMafO_D.cjs');
-require('./peerTools-B4315xjX.cjs');
+require('./tools-B1x1j6tz.cjs');
+require('./peerTools-CElYh-5u.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-Dq8XTLQP.cjs');
+require('./remoteSessionClient-6ymeMVa4.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
 require('./limits-C-a7gr04.cjs');
-require('./downloadTarget-aNcCxVRL.cjs');
+require('./downloadTarget-CikzJv1h.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-CDY-Vz8q.cjs');
-require('./package-CYDdLA6R.cjs');
+require('./bootstrap-sly4qPPY.cjs');
+require('./package-9n7wd2dT.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
 require('./trimIdent-4gvk9Wk6.cjs');
 require('./webPanels-FCgFKvVe.cjs');
@@ -81,22 +81,22 @@ require('./promptCacheTtl-B8PCzE6k.cjs');
 require('util');
 require('path');
 require('cross-spawn');
-require('./sync-CoChLEIg.cjs');
+require('./sync-Ba8N6xba.cjs');
 require('./transcriptCursor-DcXGLeSc.cjs');
-require('./startFileWatcher-C-XCZ5t2.cjs');
+require('./startFileWatcher-9Stpxe7p.cjs');
 require('node:readline');
-require('./rateLimitWindows-Cs56YJCH.cjs');
+require('./rateLimitWindows-B2Kx6L0S.cjs');
 require('./doctor-u46qYYKX.cjs');
 require('ps-list');
 require('./doctorReadiness-Dl6yRQCy.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
 require('./cliUpdate-DsKXPFYp.cjs');
-require('./piRunnerArgs-BtzW_kfh.cjs');
-require('./acpSessionResume-2BTMsB7_.cjs');
+require('./piRunnerArgs-BnFU0K73.cjs');
+require('./acpSessionResume-TvP_4Zq2.cjs');
 require('url');
 require('node:module');
-require('./client-D0aYWt53.cjs');
+require('./client-BscskEBk.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 
 const SCHEDULE_WAKEUP_GRACE_MS = 6e4;
@@ -768,6 +768,10 @@ function planUnconfirmedCommands(commands, context) {
     tombstone: commands.filter((_, i) => i !== index).map((c) => c.uuid)
   };
 }
+function planUndeliveredMessage(message, context) {
+  if (context.exiting || !context.parkFree) return null;
+  return { ...message, finalized: true };
+}
 
 const AUTH_FAILURE_RESULT_TEXT = /Failed to authenticate|OAuth session expired/i;
 const QUERY_RECYCLE_NOTICE = {
@@ -934,6 +938,56 @@ function compactOutcomeEvent(result, status) {
   return "Compaction completed";
 }
 
+class TimeoutError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "TimeoutError";
+  }
+}
+function withTimeout(promise, ms, label) {
+  promise.catch(() => {
+  });
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new TimeoutError(`${label ? `${label} ` : ""}timed out after ${ms}ms`)), ms);
+  });
+  return Promise.race([promise, timeout]).finally(() => {
+    if (timer) clearTimeout(timer);
+  });
+}
+
+const GET_SETTINGS_TIMEOUT_MS = 3e3;
+const EFFORTS = /* @__PURE__ */ new Set(["low", "medium", "high", "xhigh", "max"]);
+function parseClaudeRunFacts(raw) {
+  const facts = {};
+  if (!raw || typeof raw !== "object") return facts;
+  const { applied, effective } = raw;
+  if (applied && typeof applied === "object" && "effort" in applied) {
+    const effort = applied.effort;
+    if (effort === null) facts.effort = null;
+    else if (typeof effort === "string" && EFFORTS.has(effort)) facts.effort = effort;
+  }
+  if (effective && typeof effective === "object") {
+    const model = effective.model;
+    facts.configuredModel = typeof model === "string" && model.trim() ? model.trim() : null;
+  }
+  return facts;
+}
+async function readClaudeRunFacts(query, timeoutMs = GET_SETTINGS_TIMEOUT_MS) {
+  const reader = query;
+  if (typeof reader?.getSettings !== "function") return null;
+  try {
+    return parseClaudeRunFacts(await withTimeout(reader.getSettings(), timeoutMs, "get_settings"));
+  } catch {
+    return null;
+  }
+}
+async function liveModelTarget(query, model, timeoutMs = GET_SETTINGS_TIMEOUT_MS) {
+  if (model) return model;
+  const facts = await readClaudeRunFacts(query, timeoutMs);
+  return facts?.configuredModel ?? void 0;
+}
+
 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 "-";
@@ -1198,24 +1252,6 @@ function createClaudePrewarmLease(input) {
   return lease;
 }
 
-class TimeoutError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "TimeoutError";
-  }
-}
-function withTimeout(promise, ms, label) {
-  promise.catch(() => {
-  });
-  let timer;
-  const timeout = new Promise((_, reject) => {
-    timer = setTimeout(() => reject(new TimeoutError(`${label ? `${label} ` : ""}timed out after ${ms}ms`)), ms);
-  });
-  return Promise.race([promise, timeout]).finally(() => {
-    if (timer) clearTimeout(timer);
-  });
-}
-
 function readClaudeSessionState(message) {
   const m = message;
   if (!m || m.type !== "system" || m.subtype !== "session_state_changed") return null;
@@ -1506,7 +1542,7 @@ async function claudeRemote(opts) {
         }
         if (!reason && decision.switchModel) {
           try {
-            await withTimeout(w.response.setModel(modelTarget(initial.mode.model)), w.lease.adoptTimeoutMs);
+            await withTimeout(w.response.setModel(await liveModelTarget(w.response, modelTarget(initial.mode.model), w.lease.adoptTimeoutMs)), w.lease.adoptTimeoutMs);
           } catch {
             reason = "set-model-failed";
           }
@@ -1558,7 +1594,8 @@ async function claudeRemote(opts) {
     messages.push(initialUserMessage);
   } else {
     messages = new PushableAsyncIterable();
-    messages.push(initialUserMessage);
+    const resumeOnConfigModel = !!startFrom && modelTarget(initial.mode.model) === void 0;
+    if (!resumeOnConfigModel) messages.push(initialUserMessage);
     timingMarks.spawnAt = Date.now();
     opts.onStartArgsUsed?.();
     response = query.query({
@@ -1570,6 +1607,13 @@ async function claudeRemote(opts) {
     } catch (error) {
       logger.logger.debug("[claudeRemote] Model capability discovery unavailable");
     }
+    if (resumeOnConfigModel) {
+      const target = await liveModelTarget(response, void 0);
+      if (target) {
+        await withTimeout(response.setModel(target), SET_MODEL_TIMEOUT_MS, "set_model").then(() => logger.logger.debug(`[claudeRemote] Resumed on the settings model ${target}`)).catch((e) => logger.logger.debug(`[claudeRemote] setModel(settings model) on resume failed: ${e instanceof Error ? e.message : String(e)}`));
+      }
+      messages.push(initialUserMessage);
+    }
     timingMarks.handshakeAt = Date.now();
   }
   const prewarmTiming = adopted ? "adopted" : void 0;
@@ -1629,11 +1673,17 @@ async function claudeRemote(opts) {
   if (initialUserMessage.uuid) commandTracker.track(initialUserMessage.uuid, { message: initial.message, mode: initial.mode });
   let modelUnconfirmed = false;
   let pullingNext = false;
+  let queryClosed = false;
+  const inputClosed = () => queryClosed || messages.done;
   const pullNextMessage = () => {
     if (pullingNext) {
       logger.logger.debug("[claudeRemote] Already waiting for the next message");
       return;
     }
+    if (inputClosed()) {
+      logger.logger.debug("[claudeRemote] Input closed; the next message belongs to the next launch");
+      return;
+    }
     pullingNext = true;
     opts.nextMessage().then(async (pulled) => {
       let next = withoutRetiredModel(pulled);
@@ -1642,18 +1692,37 @@ async function claudeRemote(opts) {
         messages.end();
         return;
       }
+      const handBack = (message) => {
+        pullingNext = false;
+        logger.logger.debug("[claudeRemote] Query input closed before the pulled message was sent; handing it back to the launcher");
+        if (opts.onUndeliveredMessage) opts.onUndeliveredMessage(message);
+        else logger.logger.warn("[claudeRemote] Pulled message could not be delivered and no owner took it back");
+      };
+      if (inputClosed()) {
+        handBack(next);
+        return;
+      }
       if (modelUnconfirmed || needsModelSwitch(mode.model, next.mode.model)) {
         try {
-          await withTimeout(response.setModel(modelTarget(next.mode.model)), SET_MODEL_TIMEOUT_MS, "set_model");
+          const target = await liveModelTarget(response, modelTarget(next.mode.model));
+          await withTimeout(response.setModel(target), SET_MODEL_TIMEOUT_MS, "set_model");
           modelUnconfirmed = false;
-          logger.logger.debug(`[claudeRemote] Model switched to ${modelTarget(next.mode.model) ?? "default"}`);
+          logger.logger.debug(`[claudeRemote] Model switched to ${target ?? "default"}`);
         } catch (e) {
           logger.logger.debug(`[claudeRemote] setModel failed: ${e instanceof Error ? e.message : String(e)}`);
+          if (inputClosed()) {
+            handBack(next);
+            return;
+          }
           opts.onCompletionEvent?.(modelSwitchFailureNotice(next.mode.model, e));
           if (e instanceof TimeoutError) modelUnconfirmed = true;
           next = { ...next, mode: { ...next.mode, model: mode.model } };
         }
       }
+      if (inputClosed()) {
+        handBack(next);
+        return;
+      }
       mode = next.mode;
       updateThinking(true);
       turn.pushed();
@@ -1773,6 +1842,12 @@ async function claudeRemote(opts) {
             permissionMode: systemInit.permissionMode
           });
         }
+        if (opts.onRunFacts) {
+          const onRunFacts = opts.onRunFacts;
+          void readClaudeRunFacts(response).then((facts) => {
+            if (facts) onRunFacts(facts);
+          });
+        }
         if (systemInit.session_id) {
           logger.logger.debug(`[claudeRemote] Waiting for session file to be written to disk: ${systemInit.session_id}`);
           const projectDir = path.getProjectPath(opts.path);
@@ -1833,6 +1908,7 @@ async function claudeRemote(opts) {
     }
   } finally {
     updateThinking(false);
+    queryClosed = true;
     if (cliCapabilities.has(MSG_LIFECYCLE_CAPABILITY)) {
       const unconfirmed = commandTracker.takeUnconfirmed();
       if (unconfirmed.length > 0) {
@@ -3045,6 +3121,23 @@ function applyClaudeSdkMetadata(current, update) {
     ...update.modelIsDefault && update.model ? { defaultModelCode: update.model } : {}
   };
 }
+function applyClaudeRunFacts(current, facts) {
+  let next = current;
+  if (facts.configuredModel !== void 0 && current.configuredModel !== facts.configuredModel) {
+    next = { ...next, configuredModel: facts.configuredModel };
+  }
+  if (facts.effort !== void 0) {
+    if (facts.effort === null) {
+      if (next.currentThoughtLevelCode !== void 0) {
+        const { currentThoughtLevelCode: _dropped, ...rest } = next;
+        next = rest;
+      }
+    } else if (next.currentThoughtLevelCode !== facts.effort) {
+      next = { ...next, currentThoughtLevelCode: facts.effort };
+    }
+  }
+  return next;
+}
 
 const INTERRUPT_TIMEOUT_MS = 8e3;
 function createTurnSteeringController(opts = {}) {
@@ -4141,6 +4234,10 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
             const parked = modeGate.takeParked();
             if (parked) {
               permissionHandler.handleModeChange(parked.mode.permissionMode);
+              if (parked.finalized) {
+                if (typeof parked.message === "string") onPromptFinalized?.(parked.message);
+                return parked;
+              }
               if (typeof parked.message === "string") return { ...parked, message: await finalize(parked.message) };
               return parked;
             }
@@ -4203,6 +4300,11 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
             session.client.updateMetadata((currentMetadata) => applyClaudeSdkMetadata(currentMetadata, metadata));
             if (metadata.permissionMode) onEffectivePermissionMode?.(metadata.permissionMode);
           },
+          onRunFacts: (facts) => {
+            const current = session.client.getMetadata();
+            if (current && applyClaudeRunFacts(current, facts) === current) return;
+            session.client.updateMetadata((currentMetadata) => applyClaudeRunFacts(currentMetadata, facts));
+          },
           onQueryReady: (q) => {
             runtimeControls.setQuery(q);
             backgroundTasks.reset();
@@ -4267,13 +4369,32 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
             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 });
+              modeGate.park({ message: plan.redeliver.payload.message, mode: plan.redeliver.payload.mode, uuid: plan.redeliver.uuid, finalized: true });
             }
             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");
             }
           },
+          // B-853: the Query's input closed while this message was in
+          // hand — it never reached Claude Code. Run it first in the
+          // next launch (it was pulled before anything still queued);
+          // only when that slot is taken does the web get a tombstone
+          // it can put back and resend, never silence. Leaving remote
+          // mode is the user's stop (`aborted`); otherwise the Query
+          // was replaced before it took the message (`restarted`).
+          onUndeliveredMessage: (message) => {
+            const parked = planUndeliveredMessage(message, { parkFree: !modeGate.hasParked, exiting: exitReason !== null });
+            if (parked) {
+              logger.logger.debug("[remote]: pulled message missed its Query; replaying it in the next launch");
+              modeGate.park(parked);
+            } else if (message.uuid) {
+              logger.logger.debug(`[remote]: pulled message ${message.uuid} missed its Query and cannot be replayed`);
+              session.client.sendQueueCancelReason([message.uuid], exitReason !== null ? "aborted" : "restarted");
+            } else {
+              logger.logger.warn("[remote]: pulled message missed its Query and carries no uuid to tombstone");
+            }
+          },
           onCommandsDropped: (uuids) => {
             logger.logger.debug(`[remote]: ${uuids.length} user message(s) never read before the turn ended`);
             session.client.sendQueueCancelReason(uuids, "aborted");
@@ -4367,6 +4488,11 @@ async function claudeRemoteLauncher(session, onPermissionModeChange, onEffective
         modeGate.reset();
       }
     }
+    const stranded = modeGate.takeParked();
+    if (stranded?.uuid) {
+      logger.logger.debug(`[remote]: leaving remote mode with parked message ${stranded.uuid}; tombstoning it`);
+      session.client.sendQueueCancelReason([stranded.uuid], "aborted");
+    }
   } finally {
     session.client.off("message", observeSessionRecord);
     rewindReconciler.dispose();
@@ -4419,7 +4545,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-Jm5oQX5Z.cjs'); });
+        const { claudeLocalLauncher } = await Promise.resolve().then(function () { return require('./claudeLocalLauncher-DOsL6HFY.cjs'); });
         const result = await claudeLocalLauncher(session);
         switch (result.type) {
           case "switch":
@@ -4760,7 +4886,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-B81qV_F_.cjs'); });
+    const { query } = await Promise.resolve().then(function () { return require('./index-Dg2NAF_-.cjs'); });
     return runSideQuestion(query, input);
   });
   const run = async (input, live) => {