very-happy-cli 0.2.84 → 0.2.85

package/dist/{AcpBackend-DxoxNKOM.cjs → AcpBackend-B1l_WyZy.cjs}

@@ -3,7 +3,7 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var persistence = require('./types-Dudpkl_i.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */

package/dist/{AcpBackend-BgOEcqMG.mjs → AcpBackend-CDclNgxu.mjs}

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger, d as contentLogMetadata, e as errorLogMetadata, f as packageJson, g as delay } from './types-Bv1nc9M1.mjs';
+import { l as logger, d as contentLogMetadata, e as errorLogMetadata, f as packageJson, g as delay } from './types-CkUHjxKz.mjs';
 
 const DEFAULT_TIMEOUTS = {
   /** Default initialization timeout: 60 seconds */

package/dist/{AcpSessionManager-Ba9ON7eK.mjs → AcpSessionManager-PCdfo4gz.mjs}

@@ -1,5 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
-import { b as createEnvelope } from './types-Bv1nc9M1.mjs';
+import { b as createEnvelope } from './types-CkUHjxKz.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{AcpSessionManager-_bG1kjZz.cjs → AcpSessionManager-dVX0uTo8.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var cuid2 = require('@paralleldrive/cuid2');
-var persistence = require('./types-Dudpkl_i.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{config-Dv2kzos6.cjs → config-Ce5hbWlg.cjs}

@@ -4,8 +4,8 @@ var fs = require('fs');
 var path = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var persistence = require('./types-Dudpkl_i.cjs');
-var index = require('./index-B8UoTir2.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/{config-CQjk8rce.mjs → config-DDsvmCxL.mjs}

@@ -2,8 +2,8 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
-import { l as logger } from './types-Bv1nc9M1.mjs';
-import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-Cnb_eI7Q.mjs';
+import { l as logger } from './types-CkUHjxKz.mjs';
+import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-DVKieWPR.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{index-Cc2VYKqa.mjs → index-CCQ2mqkA.mjs}

@@ -1,10 +1,10 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-BgOEcqMG.mjs';
-export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-BgOEcqMG.mjs';
-import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-Bv1nc9M1.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-Ba9ON7eK.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-CDclNgxu.mjs';
+export { a as DEFAULT_IDLE_TIMEOUT_MS, b as DEFAULT_TOOL_CALL_TIMEOUT_MS, e as extractErrorDetail, f as formatDuration, c as formatDurationMinutes, h as handleAgentMessageChunk, d as handleAgentThoughtChunk, g as handleLegacyMessageChunk, i as handlePlanUpdate, j as handleThinkingUpdate, k as handleToolCall, l as handleToolCallUpdate, p as parseArgsFromContent } from './AcpBackend-CDclNgxu.mjs';
+import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-CkUHjxKz.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-PCdfo4gz.mjs';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, f as startHappyServer, r as registerKillSessionHandler, B as BasePermissionHandler } from './index-Cnb_eI7Q.mjs';
+import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, f as startHappyServer, r as registerKillSessionHandler, B as BasePermissionHandler } from './index-DVKieWPR.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
 import 'axios';

package/dist/{index-B8UoTir2.cjs → index-DUcWAKZ0.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var persistence = require('./types-Dudpkl_i.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -286,6 +286,8 @@ class Session {
   hadAssistantOutputThisTurn = false;
   /** Last assistant text snippet seen this turn, used as the reply_done body. */
   lastAssistantSnippet;
+  /** Live remote-query input sink. Absent in local mode and between SDK queries. */
+  steerHandler = null;
   /** Callbacks to be notified when session ID is found/changed */
   sessionFoundCallbacks = [];
   /** Keep alive interval reference for cleanup */
@@ -326,8 +328,22 @@ class Session {
   cleanup = () => {
     clearInterval(this.keepAliveInterval);
     this.sessionFoundCallbacks = [];
+    this.steerHandler = null;
     persistence.logger.debug("[Session] Cleaned up resources");
   };
+  /** Register the current remote query's Steer sink; null removes it. */
+  setSteerHandler = (handler) => {
+    this.steerHandler = handler;
+  };
+  /**
+   * Attempt same-turn delivery. A stale Web "working" snapshot must never
+   * lose a message: once the turn is no longer thinking, return false and
+   * let runClaude fall back to the ordinary next-turn queue.
+   */
+  trySteer = async (input) => {
+    if (!this.thinking || !this.steerHandler) return false;
+    return this.steerHandler(input);
+  };
   onThinkingChange = (thinking) => {
     if (thinking && !this.thinking) {
       this.hadAssistantOutputThisTurn = false;
@@ -1916,6 +1932,7 @@ async function claudeRemote(opts) {
   messages.push({
     type: "user",
     parent_tool_use_id: null,
+    origin: { kind: "human" },
     message: {
       role: "user",
       content: initial.message
@@ -1930,6 +1947,16 @@ async function claudeRemote(opts) {
       setPermissionMode: (mode2) => response.setPermissionMode(mode2),
       interrupt: async () => {
         await response.interrupt();
+      },
+      steer: (message, nextMode) => {
+        mode = nextMode;
+        messages.push({
+          type: "user",
+          parent_tool_use_id: null,
+          priority: "now",
+          origin: { kind: "human" },
+          message: { role: "user", content: message }
+        });
       }
     });
   }
@@ -1982,7 +2009,13 @@ async function claudeRemote(opts) {
             messages.end();
           } else {
             mode = next.mode;
-            messages.push({ type: "user", parent_tool_use_id: null, message: { role: "user", content: next.message } });
+            updateThinking(true);
+            messages.push({
+              type: "user",
+              parent_tool_use_id: null,
+              origin: { kind: "human" },
+              message: { role: "user", content: next.message }
+            });
           }
         }).catch(() => {
           messages.end();
@@ -2079,16 +2112,7 @@ class PermissionHandler {
       });
       if (response.approved) {
         const newMode = response.mode && ["default", "acceptEdits", "bypassPermissions"].includes(response.mode) ? response.mode : "default";
-        persistence.logger.debug(`Plan approved - switching to ${newMode} mode and allowing ExitPlanMode`);
-        try {
-          if (!this.setPermissionModeCallback) throw new Error("permission mode updater unavailable");
-          await this.setPermissionModeCallback(newMode);
-        } catch (err) {
-          const reason = `Failed to switch permission mode: ${err instanceof Error ? err.message : String(err)}`;
-          persistence.logger.debug(reason);
-          pending.resolve({ behavior: "deny", message: reason });
-          return { ...response, approved: false, reason };
-        }
+        persistence.logger.debug(`Plan approved - allowing ExitPlanMode with ${newMode} as the local follow-up mode`);
         this.permissionMode = newMode;
         pending.resolve({ behavior: "allow", updatedInput: pending.input || {} });
       } else {
@@ -2548,6 +2572,50 @@ function formatClaudeMessageForInk(message, messageBuffer, onAssistantResult) {
   }
 }
 
+const INTERRUPT_SENTINEL = /^\[Request interrupted by user(?: for tool use)?\]$/i;
+const EDE_DIAGNOSTIC_PREFIX = "[ede_diagnostic]";
+const SDK_ERROR_PREFIX = "Claude Code returned an error result:";
+function textBlocks(content) {
+  if (!Array.isArray(content) || content.length === 0) return null;
+  const texts = [];
+  for (const block of content) {
+    if (!block || typeof block !== "object" || block.type !== "text") {
+      return null;
+    }
+    const text = block.text;
+    if (typeof text !== "string") return null;
+    texts.push(text.trim());
+  }
+  return texts;
+}
+function isClaudeInterruptSentinelContent(content) {
+  if (typeof content === "string") {
+    return INTERRUPT_SENTINEL.test(content.trim());
+  }
+  const texts = textBlocks(content);
+  return texts !== null && texts.length > 0 && texts.every((text) => INTERRUPT_SENTINEL.test(text));
+}
+function resultErrors(value) {
+  if (!value || typeof value !== "object") return [];
+  const errors = value.errors;
+  if (!Array.isArray(errors) || errors.length === 0 || errors.some((error) => typeof error !== "string")) {
+    return [];
+  }
+  return errors.map((error) => error.trim()).filter(Boolean);
+}
+function isClaudeEdeOnlyResult(value) {
+  const errors = resultErrors(value);
+  return errors.length > 0 && errors.every((error) => error.startsWith(EDE_DIAGNOSTIC_PREFIX));
+}
+function isClaudeEdeOnlySdkError(error) {
+  if (!(error instanceof Error)) return false;
+  const message = error.message.trim();
+  if (!message.startsWith(SDK_ERROR_PREFIX)) return false;
+  const payload = message.slice(SDK_ERROR_PREFIX.length).trim();
+  const entries = payload.split(/[;\n]+/).map((entry) => entry.trim()).filter(Boolean);
+  return entries.length > 0 && entries.every((entry) => entry.startsWith(EDE_DIAGNOSTIC_PREFIX));
+}
+
 function getGitBranch(cwd) {
   try {
     const branch = node_child_process.execSync("git rev-parse --abbrev-ref HEAD", {
@@ -2566,6 +2634,7 @@ class SDKToLogConverter {
   context;
   responses;
   sidechainLastUUID = /* @__PURE__ */ new Map();
+  sawInterruptSentinel = false;
   constructor(context, responses) {
     this.context = {
       ...context,
@@ -2588,6 +2657,10 @@ class SDKToLogConverter {
     this.lastUuid = null;
     this.context.parentUuid = null;
   }
+  /** Drop per-query markers that must never leak into the next SDK query. */
+  resetTransientState() {
+    this.sawInterruptSentinel = false;
+  }
   /**
    * Convert SDK message to log format
    */
@@ -2617,6 +2690,10 @@ class SDKToLogConverter {
     switch (sdkMessage.type) {
       case "user": {
         const userMsg = sdkMessage;
+        if (isClaudeInterruptSentinelContent(userMsg.message.content)) {
+          this.sawInterruptSentinel = true;
+          return null;
+        }
         const meta = userMsg.isSynthetic === true || userMsg.isMeta === true;
         logMessage = {
           ...baseFields,
@@ -2669,6 +2746,8 @@ class SDKToLogConverter {
       }
       case "result": {
         const resultMsg = sdkMessage;
+        const interrupted = this.sawInterruptSentinel || isClaudeEdeOnlyResult(resultMsg);
+        this.sawInterruptSentinel = false;
         logMessage = {
           ...baseFields,
           type: "result",
@@ -2680,7 +2759,8 @@ class SDKToLogConverter {
           num_turns: resultMsg.num_turns,
           usage: resultMsg.usage,
           ..."errors" in resultMsg ? { errors: resultMsg.errors } : {},
-          ..."terminal_reason" in resultMsg && resultMsg.terminal_reason ? { terminal_reason: resultMsg.terminal_reason } : {}
+          ..."terminal_reason" in resultMsg && resultMsg.terminal_reason ? { terminal_reason: resultMsg.terminal_reason } : {},
+          ...interrupted ? { interrupted: true } : {}
         };
         break;
       }
@@ -3196,6 +3276,10 @@ async function claudeRemoteLauncher(session) {
   let ongoingToolCalls = /* @__PURE__ */ new Map();
   let notifiedQuestionToolCalls = /* @__PURE__ */ new Set();
   function onMessage(message) {
+    if (message.type === "user" && isClaudeInterruptSentinelContent(message.message.content)) {
+      sdkToLogConverter.convert(message);
+      return;
+    }
     formatClaudeMessageForInk(message, messageBuffer);
     if (message.type === "assistant") {
       let umessage = message;
@@ -3394,6 +3478,21 @@ async function claudeRemoteLauncher(session) {
           },
           onQueryReady: (q) => {
             turnSteering.setInterrupt(q.interrupt);
+            session.setSteerHandler(async (input) => {
+              const expectedHash = session.queue.modeHasher(input.mode);
+              if (!modeHash || expectedHash !== modeHash) return false;
+              let message = input.message;
+              if (input.attachments?.length) {
+                const staged = await stageClaudeAttachments(input.attachments, {
+                  happyHomeDir: persistence.configuration.happyHomeDir,
+                  sessionId: session.client.sessionId
+                });
+                message = appendStagedAttachmentsToPrompt(input.message, staged);
+              }
+              if (!session.thinking || modeHash !== expectedHash) return false;
+              q.steer(message, input.mode);
+              return true;
+            });
             permissionHandler.setPermissionModeUpdater(async (mode2) => {
               await q.setPermissionMode(mode2);
             });
@@ -3446,6 +3545,10 @@ async function claudeRemoteLauncher(session) {
       } catch (e) {
         persistence.logger.debug("[remote]: launch error", e);
         if (!exitReason) {
+          if (isClaudeEdeOnlySdkError(e)) {
+            session.client.closeClaudeSessionTurn("cancelled");
+            continue;
+          }
           session.client.closeClaudeSessionTurn("failed");
           session.client.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
           session.onSessionError(e instanceof Error ? e.message : "Process exited unexpectedly");
@@ -3453,6 +3556,8 @@ async function claudeRemoteLauncher(session) {
         }
       } finally {
         turnSteering.reset();
+        session.setSteerHandler(null);
+        sdkToLogConverter.resetTransientState();
         persistence.logger.debug("[remote]: launch finally");
         for (let [toolCallId, { parentToolCallId }] of ongoingToolCalls) {
           const converted = sdkToLogConverter.generateInterruptedToolResult(toolCallId, parentToolCallId);
@@ -8569,7 +8674,7 @@ const MAX_TITLE_CHARS = 60;
 const GENERATION_TIMEOUT_MS = 3e4;
 function resolveClaudeBinary() {
   try {
-    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-B8UoTir2.cjs', document.baseURI).href)));
+    const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DUcWAKZ0.cjs', document.baseURI).href)));
     const utilsPath = path.resolve(path.join(persistence.projectPath(), "scripts", "claude_version_utils.cjs"));
     const { getClaudeCliPath } = require$1(utilsPath);
     const path$1 = getClaudeCliPath();
@@ -9026,6 +9131,7 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
+    capabilities: ["claude-steer-v1"],
     sandbox: sandboxConfig?.enabled ? sandboxConfig : null,
     dangerouslySkipPermissions,
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
@@ -9479,6 +9585,21 @@ async function runClaude(credentials, options = {}) {
       disallowedTools: messageDisallowedTools,
       effort: messageEffort
     };
+    if (message.meta?.delivery === "steer" && currentRunMode === "remote") {
+      const accepted = await currentSession?.trySteer({
+        message: message.content.text,
+        mode: enhancedMode,
+        attachments: attachmentsForThisMessage
+      }) === true;
+      if (accepted) {
+        persistence.logger.debug("User message steered into current turn:", {
+          ...persistence.contentLogMetadata(message.content.text),
+          attachmentCount: attachmentsForThisMessage?.length ?? 0
+        });
+        return;
+      }
+      persistence.logger.debug("[start] Steer arrived without a compatible live turn; falling back to queue");
+    }
     messageQueue.push(message.content.text, enhancedMode, attachmentsForThisMessage, message.localKey);
     persistence.logger.debug("User message pushed to queue:", {
       ...persistence.contentLogMetadata(message.content.text),
@@ -10697,9 +10818,9 @@ function resolveLocalSignupBootstrap(configuredMode, configuredInviteCodes, gene
   };
 }
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-B8UoTir2.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DUcWAKZ0.cjs', document.baseURI).href)));
 const __dirname$1 = path.dirname(__filename$1);
-const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-B8UoTir2.cjs', document.baseURI).href)));
+const require_ = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DUcWAKZ0.cjs', document.baseURI).href)));
 const PRISMA_QUERY_ENGINE_FILES = {
   "arm64-darwin": "libquery_engine-darwin-arm64.dylib.node",
   "x64-darwin": "libquery_engine-darwin.dylib.node",
@@ -13311,7 +13432,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     process.exit(0);
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-mk1QIEvp.cjs'); });
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-hcCRjxNy.cjs'); });
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -13328,7 +13449,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-Cm52jfN6.cjs'); });
+      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-Kklokpjz.cjs'); });
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13340,7 +13461,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-DZIY545W.cjs'); });
+      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-iDuDd7yC.cjs'); });
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13446,9 +13567,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-Dv2kzos6.cjs'); });
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-Dudpkl_i.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-Dudpkl_i.cjs'); }).then(function (n) { return n.api; });
+        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-Ce5hbWlg.cjs'); });
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./types-DJGEti9c.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-DJGEti9c.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -13479,7 +13600,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-Dv2kzos6.cjs'); });
+        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-Ce5hbWlg.cjs'); });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -13519,7 +13640,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-Cf_FQOrg.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-U5JI6rsK.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -13541,7 +13662,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-CULwez6o.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-Syfrd3oP.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -13581,7 +13702,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-BlZkYWEQ.cjs'); });
+      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-DJYiIMrs.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -13632,7 +13753,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && args.length === 1) {
     try {
-      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-X7yyQ2d_.cjs'); });
+      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-DGHMyTt-.cjs'); });
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/{index-Cnb_eI7Q.mjs → index-DVKieWPR.mjs}

@@ -1,7 +1,7 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir } from 'node:os';
 import { randomUUID, randomBytes, createHash as createHash$1, timingSafeEqual } from 'node:crypto';
-import { n as readDaemonState, l as logger, c as configuration, o as clearDaemonState, q as getProjectPath, p as projectPath, s as initializeSandbox, t as wrapCommand, d as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, g as delay, u as AsyncLock, v as ensurePrivateDirectory, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, x as hardenPrivateFile, f as packageJson, i as readSettings, y as readCredentials, z as credentialRelayProblem, B as deriveLocalCliUpdateSummary, j as encodeBase64, C as updateSettings, D as encodeBase64Url, E as decodeBase64, F as writeCredentialsLegacy, G as writeCredentialsDataKey, H as readCredentialsForConfiguredRelay, J as encrypt, r as readPersistedSessions, K as getLocalHappyAgentCredentialPath, L as readLocalHappyAgentCredentials, N as decryptWithDataKey, O as decryptLegacy, P as extractCompleteLines, Q as decideBackfill, S as parseTerminalHookPayload, T as decideMirrorBinding, U as persistSession, V as MIRROR_BACKFILL_LINES_DEFAULT, W as mirrorLineKey, X as mirrorLocalId, Y as detectResumeSupport, Z as detectCLIAvailability, _ as acquireDaemonLock, $ as summarizeSpawnSessionForLog, a0 as deletePersistedSessions, a1 as decrypt, a2 as writeDaemonState, A as ApiClient, a3 as fetchCliUpdateState, a4 as resolveCliUpdateCheckInterval, a5 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a6 as releaseDaemonLock, a7 as isValidSessionId, a8 as listVhTerminals, a9 as isValidTerminalId, aa as readVhTerminal, ab as sendToVhTerminal, h as connectionState, ac as startOfflineReconnection, ad as clearCredentials, ae as clearMachineId, k as ensurePrivateDirectorySync, w as writePrivateFileSync, af as SandboxConfigSchema, b as createEnvelope, ag as CodexAppServerClient, ah as getLatestDaemonLog } from './types-Bv1nc9M1.mjs';
+import { n as readDaemonState, l as logger, c as configuration, o as clearDaemonState, q as getProjectPath, p as projectPath, s as initializeSandbox, t as wrapCommand, d as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, g as delay, u as AsyncLock, v as ensurePrivateDirectory, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, x as hardenPrivateFile, f as packageJson, i as readSettings, y as readCredentials, z as credentialRelayProblem, B as deriveLocalCliUpdateSummary, j as encodeBase64, C as updateSettings, D as encodeBase64Url, E as decodeBase64, F as writeCredentialsLegacy, G as writeCredentialsDataKey, H as readCredentialsForConfiguredRelay, J as encrypt, r as readPersistedSessions, K as getLocalHappyAgentCredentialPath, L as readLocalHappyAgentCredentials, N as decryptWithDataKey, O as decryptLegacy, P as extractCompleteLines, Q as decideBackfill, S as parseTerminalHookPayload, T as decideMirrorBinding, U as persistSession, V as MIRROR_BACKFILL_LINES_DEFAULT, W as mirrorLineKey, X as mirrorLocalId, Y as detectResumeSupport, Z as detectCLIAvailability, _ as acquireDaemonLock, $ as summarizeSpawnSessionForLog, a0 as deletePersistedSessions, a1 as decrypt, a2 as writeDaemonState, A as ApiClient, a3 as fetchCliUpdateState, a4 as resolveCliUpdateCheckInterval, a5 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a6 as releaseDaemonLock, a7 as isValidSessionId, a8 as listVhTerminals, a9 as isValidTerminalId, aa as readVhTerminal, ab as sendToVhTerminal, h as connectionState, ac as startOfflineReconnection, ad as clearCredentials, ae as clearMachineId, k as ensurePrivateDirectorySync, w as writePrivateFileSync, af as SandboxConfigSchema, b as createEnvelope, ag as CodexAppServerClient, ah as getLatestDaemonLog } from './types-CkUHjxKz.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, basename, isAbsolute, normalize, sep, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -264,6 +264,8 @@ class Session {
   hadAssistantOutputThisTurn = false;
   /** Last assistant text snippet seen this turn, used as the reply_done body. */
   lastAssistantSnippet;
+  /** Live remote-query input sink. Absent in local mode and between SDK queries. */
+  steerHandler = null;
   /** Callbacks to be notified when session ID is found/changed */
   sessionFoundCallbacks = [];
   /** Keep alive interval reference for cleanup */
@@ -304,8 +306,22 @@ class Session {
   cleanup = () => {
     clearInterval(this.keepAliveInterval);
     this.sessionFoundCallbacks = [];
+    this.steerHandler = null;
     logger.debug("[Session] Cleaned up resources");
   };
+  /** Register the current remote query's Steer sink; null removes it. */
+  setSteerHandler = (handler) => {
+    this.steerHandler = handler;
+  };
+  /**
+   * Attempt same-turn delivery. A stale Web "working" snapshot must never
+   * lose a message: once the turn is no longer thinking, return false and
+   * let runClaude fall back to the ordinary next-turn queue.
+   */
+  trySteer = async (input) => {
+    if (!this.thinking || !this.steerHandler) return false;
+    return this.steerHandler(input);
+  };
   onThinkingChange = (thinking) => {
     if (thinking && !this.thinking) {
       this.hadAssistantOutputThisTurn = false;
@@ -1894,6 +1910,7 @@ async function claudeRemote(opts) {
   messages.push({
     type: "user",
     parent_tool_use_id: null,
+    origin: { kind: "human" },
     message: {
       role: "user",
       content: initial.message
@@ -1908,6 +1925,16 @@ async function claudeRemote(opts) {
       setPermissionMode: (mode2) => response.setPermissionMode(mode2),
       interrupt: async () => {
         await response.interrupt();
+      },
+      steer: (message, nextMode) => {
+        mode = nextMode;
+        messages.push({
+          type: "user",
+          parent_tool_use_id: null,
+          priority: "now",
+          origin: { kind: "human" },
+          message: { role: "user", content: message }
+        });
       }
     });
   }
@@ -1960,7 +1987,13 @@ async function claudeRemote(opts) {
             messages.end();
           } else {
             mode = next.mode;
-            messages.push({ type: "user", parent_tool_use_id: null, message: { role: "user", content: next.message } });
+            updateThinking(true);
+            messages.push({
+              type: "user",
+              parent_tool_use_id: null,
+              origin: { kind: "human" },
+              message: { role: "user", content: next.message }
+            });
           }
         }).catch(() => {
           messages.end();
@@ -2057,16 +2090,7 @@ class PermissionHandler {
       });
       if (response.approved) {
         const newMode = response.mode && ["default", "acceptEdits", "bypassPermissions"].includes(response.mode) ? response.mode : "default";
-        logger.debug(`Plan approved - switching to ${newMode} mode and allowing ExitPlanMode`);
-        try {
-          if (!this.setPermissionModeCallback) throw new Error("permission mode updater unavailable");
-          await this.setPermissionModeCallback(newMode);
-        } catch (err) {
-          const reason = `Failed to switch permission mode: ${err instanceof Error ? err.message : String(err)}`;
-          logger.debug(reason);
-          pending.resolve({ behavior: "deny", message: reason });
-          return { ...response, approved: false, reason };
-        }
+        logger.debug(`Plan approved - allowing ExitPlanMode with ${newMode} as the local follow-up mode`);
         this.permissionMode = newMode;
         pending.resolve({ behavior: "allow", updatedInput: pending.input || {} });
       } else {
@@ -2526,6 +2550,50 @@ function formatClaudeMessageForInk(message, messageBuffer, onAssistantResult) {
   }
 }
 
+const INTERRUPT_SENTINEL = /^\[Request interrupted by user(?: for tool use)?\]$/i;
+const EDE_DIAGNOSTIC_PREFIX = "[ede_diagnostic]";
+const SDK_ERROR_PREFIX = "Claude Code returned an error result:";
+function textBlocks(content) {
+  if (!Array.isArray(content) || content.length === 0) return null;
+  const texts = [];
+  for (const block of content) {
+    if (!block || typeof block !== "object" || block.type !== "text") {
+      return null;
+    }
+    const text = block.text;
+    if (typeof text !== "string") return null;
+    texts.push(text.trim());
+  }
+  return texts;
+}
+function isClaudeInterruptSentinelContent(content) {
+  if (typeof content === "string") {
+    return INTERRUPT_SENTINEL.test(content.trim());
+  }
+  const texts = textBlocks(content);
+  return texts !== null && texts.length > 0 && texts.every((text) => INTERRUPT_SENTINEL.test(text));
+}
+function resultErrors(value) {
+  if (!value || typeof value !== "object") return [];
+  const errors = value.errors;
+  if (!Array.isArray(errors) || errors.length === 0 || errors.some((error) => typeof error !== "string")) {
+    return [];
+  }
+  return errors.map((error) => error.trim()).filter(Boolean);
+}
+function isClaudeEdeOnlyResult(value) {
+  const errors = resultErrors(value);
+  return errors.length > 0 && errors.every((error) => error.startsWith(EDE_DIAGNOSTIC_PREFIX));
+}
+function isClaudeEdeOnlySdkError(error) {
+  if (!(error instanceof Error)) return false;
+  const message = error.message.trim();
+  if (!message.startsWith(SDK_ERROR_PREFIX)) return false;
+  const payload = message.slice(SDK_ERROR_PREFIX.length).trim();
+  const entries = payload.split(/[;\n]+/).map((entry) => entry.trim()).filter(Boolean);
+  return entries.length > 0 && entries.every((entry) => entry.startsWith(EDE_DIAGNOSTIC_PREFIX));
+}
+
 function getGitBranch(cwd) {
   try {
     const branch = execSync("git rev-parse --abbrev-ref HEAD", {
@@ -2544,6 +2612,7 @@ class SDKToLogConverter {
   context;
   responses;
   sidechainLastUUID = /* @__PURE__ */ new Map();
+  sawInterruptSentinel = false;
   constructor(context, responses) {
     this.context = {
       ...context,
@@ -2566,6 +2635,10 @@ class SDKToLogConverter {
     this.lastUuid = null;
     this.context.parentUuid = null;
   }
+  /** Drop per-query markers that must never leak into the next SDK query. */
+  resetTransientState() {
+    this.sawInterruptSentinel = false;
+  }
   /**
    * Convert SDK message to log format
    */
@@ -2595,6 +2668,10 @@ class SDKToLogConverter {
     switch (sdkMessage.type) {
       case "user": {
         const userMsg = sdkMessage;
+        if (isClaudeInterruptSentinelContent(userMsg.message.content)) {
+          this.sawInterruptSentinel = true;
+          return null;
+        }
         const meta = userMsg.isSynthetic === true || userMsg.isMeta === true;
         logMessage = {
           ...baseFields,
@@ -2647,6 +2724,8 @@ class SDKToLogConverter {
       }
       case "result": {
         const resultMsg = sdkMessage;
+        const interrupted = this.sawInterruptSentinel || isClaudeEdeOnlyResult(resultMsg);
+        this.sawInterruptSentinel = false;
         logMessage = {
           ...baseFields,
           type: "result",
@@ -2658,7 +2737,8 @@ class SDKToLogConverter {
           num_turns: resultMsg.num_turns,
           usage: resultMsg.usage,
           ..."errors" in resultMsg ? { errors: resultMsg.errors } : {},
-          ..."terminal_reason" in resultMsg && resultMsg.terminal_reason ? { terminal_reason: resultMsg.terminal_reason } : {}
+          ..."terminal_reason" in resultMsg && resultMsg.terminal_reason ? { terminal_reason: resultMsg.terminal_reason } : {},
+          ...interrupted ? { interrupted: true } : {}
         };
         break;
       }
@@ -3174,6 +3254,10 @@ async function claudeRemoteLauncher(session) {
   let ongoingToolCalls = /* @__PURE__ */ new Map();
   let notifiedQuestionToolCalls = /* @__PURE__ */ new Set();
   function onMessage(message) {
+    if (message.type === "user" && isClaudeInterruptSentinelContent(message.message.content)) {
+      sdkToLogConverter.convert(message);
+      return;
+    }
     formatClaudeMessageForInk(message, messageBuffer);
     if (message.type === "assistant") {
       let umessage = message;
@@ -3372,6 +3456,21 @@ async function claudeRemoteLauncher(session) {
           },
           onQueryReady: (q) => {
             turnSteering.setInterrupt(q.interrupt);
+            session.setSteerHandler(async (input) => {
+              const expectedHash = session.queue.modeHasher(input.mode);
+              if (!modeHash || expectedHash !== modeHash) return false;
+              let message = input.message;
+              if (input.attachments?.length) {
+                const staged = await stageClaudeAttachments(input.attachments, {
+                  happyHomeDir: configuration.happyHomeDir,
+                  sessionId: session.client.sessionId
+                });
+                message = appendStagedAttachmentsToPrompt(input.message, staged);
+              }
+              if (!session.thinking || modeHash !== expectedHash) return false;
+              q.steer(message, input.mode);
+              return true;
+            });
             permissionHandler.setPermissionModeUpdater(async (mode2) => {
               await q.setPermissionMode(mode2);
             });
@@ -3424,6 +3523,10 @@ async function claudeRemoteLauncher(session) {
       } catch (e) {
         logger.debug("[remote]: launch error", e);
         if (!exitReason) {
+          if (isClaudeEdeOnlySdkError(e)) {
+            session.client.closeClaudeSessionTurn("cancelled");
+            continue;
+          }
           session.client.closeClaudeSessionTurn("failed");
           session.client.sendSessionEvent({ type: "message", message: "Process exited unexpectedly" });
           session.onSessionError(e instanceof Error ? e.message : "Process exited unexpectedly");
@@ -3431,6 +3534,8 @@ async function claudeRemoteLauncher(session) {
         }
       } finally {
         turnSteering.reset();
+        session.setSteerHandler(null);
+        sdkToLogConverter.resetTransientState();
         logger.debug("[remote]: launch finally");
         for (let [toolCallId, { parentToolCallId }] of ongoingToolCalls) {
           const converted = sdkToLogConverter.generateInterruptedToolResult(toolCallId, parentToolCallId);
@@ -9004,6 +9109,7 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
+    capabilities: ["claude-steer-v1"],
     sandbox: sandboxConfig?.enabled ? sandboxConfig : null,
     dangerouslySkipPermissions,
     ...forkedFromSessionId ? { parentSessionId: forkedFromSessionId } : {},
@@ -9457,6 +9563,21 @@ async function runClaude(credentials, options = {}) {
       disallowedTools: messageDisallowedTools,
       effort: messageEffort
     };
+    if (message.meta?.delivery === "steer" && currentRunMode === "remote") {
+      const accepted = await currentSession?.trySteer({
+        message: message.content.text,
+        mode: enhancedMode,
+        attachments: attachmentsForThisMessage
+      }) === true;
+      if (accepted) {
+        logger.debug("User message steered into current turn:", {
+          ...contentLogMetadata(message.content.text),
+          attachmentCount: attachmentsForThisMessage?.length ?? 0
+        });
+        return;
+      }
+      logger.debug("[start] Steer arrived without a compatible live turn; falling back to queue");
+    }
     messageQueue.push(message.content.text, enhancedMode, attachmentsForThisMessage, message.localKey);
     logger.debug("User message pushed to queue:", {
       ...contentLogMetadata(message.content.text),
@@ -13289,7 +13410,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     process.exit(0);
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-C-8Vuwlu.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-BMTBsCfi.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -13306,7 +13427,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await import('./spawn-hjPuTkvH.mjs');
+      const { handleSpawnCommand } = await import('./spawn-DPz_3Q6B.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13318,7 +13439,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await import('./send-C6-E03t-.mjs');
+      const { handleSendCommand } = await import('./send-AIDeVBON.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13424,9 +13545,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await import('./config-CQjk8rce.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-Bv1nc9M1.mjs').then(function (n) { return n.ai; });
-        const { ApiClient: ApiClient2 } = await import('./types-Bv1nc9M1.mjs').then(function (n) { return n.aj; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-DDsvmCxL.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-CkUHjxKz.mjs').then(function (n) { return n.ai; });
+        const { ApiClient: ApiClient2 } = await import('./types-CkUHjxKz.mjs').then(function (n) { return n.aj; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -13457,7 +13578,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await import('./config-CQjk8rce.mjs');
+        const { readGeminiLocalConfig } = await import('./config-DDsvmCxL.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -13497,7 +13618,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-Nig1hb70.mjs');
+      const { runGemini } = await import('./runGemini-CUpp6u-S.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -13519,7 +13640,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-Cc2VYKqa.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-CCQ2mqkA.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -13559,7 +13680,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await import('./runOpenClaw-DllszOSy.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-BHR7emaO.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -13610,7 +13731,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && args.length === 1) {
     try {
-      const { handleMcpCommand } = await import('./mcp-BZba259A.mjs');
+      const { handleMcpCommand } = await import('./mcp-C2bERsV2.mjs');
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/{index-CULwez6o.cjs → index-Syfrd3oP.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-DxoxNKOM.cjs');
-var persistence = require('./types-Dudpkl_i.cjs');
-var AcpSessionManager = require('./AcpSessionManager-_bG1kjZz.cjs');
+var AcpBackend = require('./AcpBackend-B1l_WyZy.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
+var AcpSessionManager = require('./AcpSessionManager-dVX0uTo8.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var index = require('./index-B8UoTir2.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
 require('node:child_process');
 require('@agentclientprotocol/sdk');
 require('axios');

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-B8UoTir2.cjs');
-require('./types-Dudpkl_i.cjs');
+require('./index-DUcWAKZ0.cjs');
+require('./types-DJGEti9c.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-Cnb_eI7Q.mjs';
-import './types-Bv1nc9M1.mjs';
+import './index-DVKieWPR.mjs';
+import './types-CkUHjxKz.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/{installTerminalHooks-C-8Vuwlu.mjs → installTerminalHooks-BMTBsCfi.mjs}

@@ -3,8 +3,8 @@ import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { spawnSync } from 'node:child_process';
 import chalk from 'chalk';
-import { p as projectPath } from './types-Bv1nc9M1.mjs';
-import { t as tmuxSupportsSessionEnv } from './index-Cnb_eI7Q.mjs';
+import { p as projectPath } from './types-CkUHjxKz.mjs';
+import { t as tmuxSupportsSessionEnv } from './index-DVKieWPR.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs/promises';

package/dist/{installTerminalHooks-mk1QIEvp.cjs → installTerminalHooks-hcCRjxNy.cjs}

@@ -5,8 +5,8 @@ var path = require('node:path');
 var os = require('node:os');
 var node_child_process = require('node:child_process');
 var chalk = require('chalk');
-var persistence = require('./types-Dudpkl_i.cjs');
-var index = require('./index-B8UoTir2.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
 require('axios');
 require('node:util');
 require('node:fs/promises');

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var persistence = require('./types-Dudpkl_i.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/lib.d.cts

@@ -347,6 +347,10 @@ declare const UserMessageSchema: z$1.ZodObject<{
         appendSystemPrompt: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
         allowedTools: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodArray<z$1.ZodString>>>;
         disallowedTools: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodArray<z$1.ZodString>>>;
+        delivery: z$1.ZodOptional<z$1.ZodEnum<{
+            queue: "queue";
+            steer: "steer";
+        }>>;
     }, z$1.core.$strip>>;
 }, z$1.core.$strip>;
 type UserMessage = z$1.infer<typeof UserMessageSchema>;
@@ -431,6 +435,8 @@ type Metadata = {
     attachmentKinds?: string[];
     /** Pending user messages can be canceled by stable transport id. */
     queueCancellation?: boolean;
+    /** Explicit feature negotiation; old CLIs omit this field. */
+    capabilities?: string[];
     homeDir: string;
     happyHomeDir: string;
     happyLibDir: string;

package/dist/lib.d.mts

@@ -347,6 +347,10 @@ declare const UserMessageSchema: z$1.ZodObject<{
         appendSystemPrompt: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodString>>;
         allowedTools: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodArray<z$1.ZodString>>>;
         disallowedTools: z$1.ZodOptional<z$1.ZodNullable<z$1.ZodArray<z$1.ZodString>>>;
+        delivery: z$1.ZodOptional<z$1.ZodEnum<{
+            queue: "queue";
+            steer: "steer";
+        }>>;
     }, z$1.core.$strip>>;
 }, z$1.core.$strip>;
 type UserMessage = z$1.infer<typeof UserMessageSchema>;
@@ -431,6 +435,8 @@ type Metadata = {
     attachmentKinds?: string[];
     /** Pending user messages can be canceled by stable transport id. */
     queueCancellation?: boolean;
+    /** Explicit feature negotiation; old CLIs omit this field. */
+    capabilities?: string[];
     homeDir: string;
     happyHomeDir: string;
     happyLibDir: string;

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-Bv1nc9M1.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-CkUHjxKz.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{mcp-BZba259A.mjs → mcp-C2bERsV2.mjs}

@@ -1,9 +1,9 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
-import { p as pushClipboardViaDaemon } from './index-Cnb_eI7Q.mjs';
+import { p as pushClipboardViaDaemon } from './index-DVKieWPR.mjs';
 import { C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION, c as CLIPBOARD_MAX_BYTES } from './limits-CwFb5S2b.mjs';
-import { l as logger } from './types-Bv1nc9M1.mjs';
+import { l as logger } from './types-CkUHjxKz.mjs';
 import 'chalk';
 import 'node:os';
 import 'node:crypto';

package/dist/{mcp-X7yyQ2d_.cjs → mcp-DGHMyTt-.cjs}

@@ -3,9 +3,9 @@
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
 var stdio_js = require('@modelcontextprotocol/sdk/server/stdio.js');
 var z = require('zod');
-var index = require('./index-B8UoTir2.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
 var limits = require('./limits-KdWKmwtH.cjs');
-var persistence = require('./types-Dudpkl_i.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
 require('chalk');
 require('node:os');
 require('node:crypto');

package/dist/{runGemini-Nig1hb70.mjs → runGemini-CUpp6u-S.mjs}

@@ -2,10 +2,10 @@ import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
-import { l as logger, h as connectionState, A as ApiClient, i as readSettings, e as errorLogMetadata, j as encodeBase64, p as projectPath, d as contentLogMetadata } from './types-Bv1nc9M1.mjs';
-import { g as GEMINI_API_KEY_ENV, j as GOOGLE_API_KEY_ENV, G as GEMINI_MODEL_ENV, B as BasePermissionHandler, k as BaseReasoningProcessor, i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, l as MessageBuffer, C as CHANGE_TITLE_INSTRUCTION, r as registerKillSessionHandler, f as startHappyServer } from './index-Cnb_eI7Q.mjs';
-import { A as AcpBackend } from './AcpBackend-BgOEcqMG.mjs';
-import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-CQjk8rce.mjs';
+import { l as logger, h as connectionState, A as ApiClient, i as readSettings, e as errorLogMetadata, j as encodeBase64, p as projectPath, d as contentLogMetadata } from './types-CkUHjxKz.mjs';
+import { g as GEMINI_API_KEY_ENV, j as GOOGLE_API_KEY_ENV, G as GEMINI_MODEL_ENV, B as BasePermissionHandler, k as BaseReasoningProcessor, i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, l as MessageBuffer, C as CHANGE_TITLE_INSTRUCTION, r as registerKillSessionHandler, f as startHappyServer } from './index-DVKieWPR.mjs';
+import { A as AcpBackend } from './AcpBackend-CDclNgxu.mjs';
+import { readGeminiLocalConfig, determineGeminiModel, getGeminiModelSource, getInitialGeminiModel, saveGeminiModelToConfig } from './config-DDsvmCxL.mjs';
 import 'axios';
 import 'chalk';
 import 'node:util';

package/dist/{runGemini-Cf_FQOrg.cjs → runGemini-U5JI6rsK.cjs}

@@ -4,10 +4,10 @@ var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var persistence = require('./types-Dudpkl_i.cjs');
-var index = require('./index-B8UoTir2.cjs');
-var AcpBackend = require('./AcpBackend-DxoxNKOM.cjs');
-var config = require('./config-Dv2kzos6.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
+var AcpBackend = require('./AcpBackend-B1l_WyZy.cjs');
+var config = require('./config-Ce5hbWlg.cjs');
 require('axios');
 require('chalk');
 require('node:util');

package/dist/{runOpenClaw-DllszOSy.mjs → runOpenClaw-BHR7emaO.mjs}

@@ -3,9 +3,9 @@ import { execFileSync } from 'node:child_process';
 import os from 'node:os';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { k as ensurePrivateDirectorySync, m as hardenPrivateFileSync, w as writePrivateFileSync, e as errorLogMetadata, d as contentLogMetadata, h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, c as configuration } from './types-Bv1nc9M1.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-Ba9ON7eK.mjs';
-import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, r as registerKillSessionHandler } from './index-Cnb_eI7Q.mjs';
+import { k as ensurePrivateDirectorySync, m as hardenPrivateFileSync, w as writePrivateFileSync, e as errorLogMetadata, d as contentLogMetadata, h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, c as configuration } from './types-CkUHjxKz.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-PCdfo4gz.mjs';
+import { i as initialMachineMetadata, d as createSessionMetadata, e as setupOfflineReconnection, n as notifyDaemonSessionStarted, M as MessageQueue2, r as registerKillSessionHandler } from './index-DVKieWPR.mjs';
 import WebSocket from 'ws';
 import * as ed from '@noble/ed25519';
 import { sha512 } from '@noble/hashes/sha2.js';

package/dist/{runOpenClaw-BlZkYWEQ.cjs → runOpenClaw-DJYiIMrs.cjs}

@@ -5,9 +5,9 @@ var node_child_process = require('node:child_process');
 var os = require('node:os');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var persistence = require('./types-Dudpkl_i.cjs');
-var AcpSessionManager = require('./AcpSessionManager-_bG1kjZz.cjs');
-var index = require('./index-B8UoTir2.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
+var AcpSessionManager = require('./AcpSessionManager-dVX0uTo8.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
 var WebSocket = require('ws');
 var ed = require('@noble/ed25519');
 var sha2_js = require('@noble/hashes/sha2.js');

package/dist/{send-C6-E03t-.mjs → send-AIDeVBON.mjs}

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { r as readPersistedSessions, c as configuration } from './types-Bv1nc9M1.mjs';
-import { b as sendUserMessage, a as sessionWebUrl } from './index-Cnb_eI7Q.mjs';
+import { r as readPersistedSessions, c as configuration } from './types-CkUHjxKz.mjs';
+import { b as sendUserMessage, a as sessionWebUrl } from './index-DVKieWPR.mjs';
 import 'axios';
 import 'node:util';
 import 'node:os';

package/dist/{send-DZIY545W.cjs → send-iDuDd7yC.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var persistence = require('./types-Dudpkl_i.cjs');
-var index = require('./index-B8UoTir2.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
 require('axios');
 require('node:util');
 require('node:os');

package/dist/{spawn-hjPuTkvH.mjs → spawn-DPz_3Q6B.mjs}

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { readFileSync, statSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { c as checkIfDaemonRunningAndCleanupStaleState, s as spawnDaemonSession, a as sessionWebUrl, w as waitForSessionKey, b as sendUserMessage } from './index-Cnb_eI7Q.mjs';
-import { l as logger } from './types-Bv1nc9M1.mjs';
+import { c as checkIfDaemonRunningAndCleanupStaleState, s as spawnDaemonSession, a as sessionWebUrl, w as waitForSessionKey, b as sendUserMessage } from './index-DVKieWPR.mjs';
+import { l as logger } from './types-CkUHjxKz.mjs';
 import 'node:os';
 import 'node:crypto';
 import 'cross-spawn';

package/dist/{spawn-Cm52jfN6.cjs → spawn-Kklokpjz.cjs}

@@ -3,8 +3,8 @@
 var chalk = require('chalk');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var index = require('./index-B8UoTir2.cjs');
-var persistence = require('./types-Dudpkl_i.cjs');
+var index = require('./index-DUcWAKZ0.cjs');
+var persistence = require('./types-DJGEti9c.cjs');
 require('node:os');
 require('node:crypto');
 require('cross-spawn');

package/dist/{types-Bv1nc9M1.mjs → types-CkUHjxKz.mjs}

@@ -29,7 +29,7 @@ import { SandboxManager } from '@anthropic-ai/sandbox-runtime';
 import { Expo } from 'expo-server-sdk';
 
 var name = "very-happy-cli";
-var version = "0.2.84";
+var version = "0.2.85";
 var description = "Remote multi-agent workspace CLI with deep Claude integration, native terminal streaming, and self-hosting.";
 var author = "Kirill Dubovitskiy";
 var contributors = [
@@ -142,12 +142,12 @@ var dependencies = {
 	zod: "^4.0.0"
 };
 var optionalDependencies = {
-	"very-happy-tools-arm64-darwin": "0.2.84",
-	"very-happy-tools-x64-darwin": "0.2.84",
-	"very-happy-tools-arm64-linux": "0.2.84",
-	"very-happy-tools-x64-linux": "0.2.84",
-	"very-happy-tools-arm64-win32": "0.2.84",
-	"very-happy-tools-x64-win32": "0.2.84"
+	"very-happy-tools-arm64-darwin": "0.2.85",
+	"very-happy-tools-x64-darwin": "0.2.85",
+	"very-happy-tools-arm64-linux": "0.2.85",
+	"very-happy-tools-x64-linux": "0.2.85",
+	"very-happy-tools-arm64-win32": "0.2.85",
+	"very-happy-tools-x64-win32": "0.2.85"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -755,6 +755,8 @@ const MessageMetaSchema$1 = z.object({
   appendSystemPrompt: z.string().nullable().optional(),
   allowedTools: z.array(z.string()).nullable().optional(),
   disallowedTools: z.array(z.string()).nullable().optional(),
+  /** Omitted/queue waits for the current turn; steer targets the live turn. */
+  delivery: z.enum(["queue", "steer"]).optional(),
   displayText: z.string().optional()
 });
 const UserMessageSchema$1 = z.object({
@@ -1028,8 +1030,10 @@ const MessageMetaSchema = z$1.object({
   // Append to system prompt for this message (null = reset)
   allowedTools: z$1.array(z$1.string()).nullable().optional(),
   // Allowed tools for this message (null = reset)
-  disallowedTools: z$1.array(z$1.string()).nullable().optional()
+  disallowedTools: z$1.array(z$1.string()).nullable().optional(),
   // Disallowed tools for this message (null = reset)
+  /** Omitted/queue waits for the current turn; steer targets the live turn. */
+  delivery: z$1.enum(["queue", "steer"]).optional()
 });
 z$1.object({
   session: z$1.object({
@@ -2645,7 +2649,7 @@ function mapClaudeLogMessageToSessionEnvelopesInternal(message, state) {
   }
   if (message.type === "result") {
     const raw = message;
-    const status = raw.is_error === true ? "failed" : "completed";
+    const status = raw.interrupted === true ? "cancelled" : raw.is_error === true ? "failed" : "completed";
     const error = status === "failed" ? raw.errors?.filter((item) => typeof item === "string" && item.trim()).join("\n") || state.pendingAssistantError || raw.subtype || "Claude turn failed" : void 0;
     if (status === "failed" && !state.currentTurnId) {
       ensureTurn(state, envelopes);

package/dist/{types-Dudpkl_i.cjs → types-DJGEti9c.cjs}

@@ -51,7 +51,7 @@ var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 var pty__namespace = /*#__PURE__*/_interopNamespaceDefault(pty);
 
 var name = "very-happy-cli";
-var version = "0.2.84";
+var version = "0.2.85";
 var description = "Remote multi-agent workspace CLI with deep Claude integration, native terminal streaming, and self-hosting.";
 var author = "Kirill Dubovitskiy";
 var contributors = [
@@ -164,12 +164,12 @@ var dependencies = {
 	zod: "^4.0.0"
 };
 var optionalDependencies = {
-	"very-happy-tools-arm64-darwin": "0.2.84",
-	"very-happy-tools-x64-darwin": "0.2.84",
-	"very-happy-tools-arm64-linux": "0.2.84",
-	"very-happy-tools-x64-linux": "0.2.84",
-	"very-happy-tools-arm64-win32": "0.2.84",
-	"very-happy-tools-x64-win32": "0.2.84"
+	"very-happy-tools-arm64-darwin": "0.2.85",
+	"very-happy-tools-x64-darwin": "0.2.85",
+	"very-happy-tools-arm64-linux": "0.2.85",
+	"very-happy-tools-x64-linux": "0.2.85",
+	"very-happy-tools-arm64-win32": "0.2.85",
+	"very-happy-tools-x64-win32": "0.2.85"
 };
 var devDependencies = {
 	"@slopus/happy-wire": "workspace:*",
@@ -777,6 +777,8 @@ const MessageMetaSchema$1 = z__namespace.object({
   appendSystemPrompt: z__namespace.string().nullable().optional(),
   allowedTools: z__namespace.array(z__namespace.string()).nullable().optional(),
   disallowedTools: z__namespace.array(z__namespace.string()).nullable().optional(),
+  /** Omitted/queue waits for the current turn; steer targets the live turn. */
+  delivery: z__namespace.enum(["queue", "steer"]).optional(),
   displayText: z__namespace.string().optional()
 });
 const UserMessageSchema$1 = z__namespace.object({
@@ -1050,8 +1052,10 @@ const MessageMetaSchema = z.z.object({
   // Append to system prompt for this message (null = reset)
   allowedTools: z.z.array(z.z.string()).nullable().optional(),
   // Allowed tools for this message (null = reset)
-  disallowedTools: z.z.array(z.z.string()).nullable().optional()
+  disallowedTools: z.z.array(z.z.string()).nullable().optional(),
   // Disallowed tools for this message (null = reset)
+  /** Omitted/queue waits for the current turn; steer targets the live turn. */
+  delivery: z.z.enum(["queue", "steer"]).optional()
 });
 z.z.object({
   session: z.z.object({
@@ -1480,7 +1484,7 @@ class RpcHandlerManager {
   }
 }
 
-const __dirname$1 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-Dudpkl_i.cjs', document.baseURI).href))));
+const __dirname$1 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-DJGEti9c.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -2667,7 +2671,7 @@ function mapClaudeLogMessageToSessionEnvelopesInternal(message, state) {
   }
   if (message.type === "result") {
     const raw = message;
-    const status = raw.is_error === true ? "failed" : "completed";
+    const status = raw.interrupted === true ? "cancelled" : raw.is_error === true ? "failed" : "completed";
     const error = status === "failed" ? raw.errors?.filter((item) => typeof item === "string" && item.trim()).join("\n") || state.pendingAssistantError || raw.subtype || "Claude turn failed" : void 0;
     if (status === "failed" && !state.currentTurnId) {
       ensureTurn(state, envelopes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "very-happy-cli",
-  "version": "0.2.84",
+  "version": "0.2.85",
   "description": "Remote multi-agent workspace CLI with deep Claude integration, native terminal streaming, and self-hosting.",
   "author": "Kirill Dubovitskiy",
   "contributors": [
@@ -113,12 +113,12 @@
     "zod": "^4.0.0"
   },
   "optionalDependencies": {
-    "very-happy-tools-arm64-darwin": "0.2.84",
-    "very-happy-tools-x64-darwin": "0.2.84",
-    "very-happy-tools-arm64-linux": "0.2.84",
-    "very-happy-tools-x64-linux": "0.2.84",
-    "very-happy-tools-arm64-win32": "0.2.84",
-    "very-happy-tools-x64-win32": "0.2.84"
+    "very-happy-tools-arm64-darwin": "0.2.85",
+    "very-happy-tools-x64-darwin": "0.2.85",
+    "very-happy-tools-arm64-linux": "0.2.85",
+    "very-happy-tools-x64-linux": "0.2.85",
+    "very-happy-tools-arm64-win32": "0.2.85",
+    "very-happy-tools-x64-win32": "0.2.85"
   },
   "devDependencies": {
     "@slopus/happy-wire": "workspace:*",