very-happy-cli 0.2.132 → 0.2.134

package/dist/{AcpBackend-BNMLGtST.mjs → AcpBackend-B8KEjDwF.mjs}

@@ -1,8 +1,8 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger, p as packageJson } from './limits-C9aXkP7U.mjs';
-import { d as contentLogMetadata, e as errorLogMetadata, h as delay } from './types-CA-c2NH7.mjs';
+import { l as logger, p as packageJson } from './limits-BGeIBBE3.mjs';
+import { d as contentLogMetadata, e as errorLogMetadata, h as delay } from './types-Cq-tvv9t.mjs';
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {
@@ -1357,7 +1357,7 @@ class AcpBackend {
     }
     try {
       await this.connection.cancel({ sessionId: this.acpSessionId });
-      this.emit({ type: "status", status: "stopped", detail: "Cancelled by user" });
+      this.emit({ type: "status", status: "idle", detail: "Cancelled by user" });
     } catch (error) {
       logger.debug("[AcpBackend] Error cancelling:", errorLogMetadata(error));
     }

package/dist/{AcpBackend--EnHZRC4.cjs → AcpBackend-CeNp7tgD.cjs}

@@ -3,8 +3,8 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var persistence = require('./limits-DLlsV71c.cjs');
-var api = require('./types-B15E2OVy.cjs');
+var persistence = require('./limits-D6kiAfXJ.cjs');
+var api = require('./types-Dabm17Ln.cjs');
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {
@@ -1359,7 +1359,7 @@ class AcpBackend {
     }
     try {
       await this.connection.cancel({ sessionId: this.acpSessionId });
-      this.emit({ type: "status", status: "stopped", detail: "Cancelled by user" });
+      this.emit({ type: "status", status: "idle", detail: "Cancelled by user" });
     } catch (error) {
       persistence.logger.debug("[AcpBackend] Error cancelling:", api.errorLogMetadata(error));
     }

package/dist/{AcpSessionManager-RoOyx5KI.cjs → AcpSessionManager-Bu1d05bx.cjs}

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

package/dist/{AcpSessionManager-BF5JZYCC.mjs → AcpSessionManager-KlDZbEmZ.mjs}

@@ -1,5 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
-import { s as streamKeyOf, c as createEnvelope } from './types-CA-c2NH7.mjs';
+import { s as streamKeyOf, c as createEnvelope } from './types-Cq-tvv9t.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };

package/dist/{agentGuidance-DeOIgOhh.mjs → agentGuidance-CPG5Cr5T.mjs}

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { randomUUID } from 'node:crypto';
-import { n as normalizeHttpEndpoint, c as configuration, g as readSettings, r as readPersistedSessions, d as readCredentialsForConfiguredRelay } from './limits-C9aXkP7U.mjs';
+import { n as normalizeHttpEndpoint, c as configuration, g as readSettings, r as readPersistedSessions, d as readCredentialsForConfiguredRelay } from './limits-BGeIBBE3.mjs';
 import { open, mkdir, rename, unlink } from 'node:fs/promises';
 import { constants } from 'node:fs';
 import { isAbsolute, join, dirname } from 'node:path';

package/dist/{agentGuidance-R9MH5Cd5.cjs → agentGuidance-Cg8Lha39.cjs}

@@ -2,7 +2,7 @@
 
 var z = require('zod');
 var node_crypto = require('node:crypto');
-var persistence = require('./limits-DLlsV71c.cjs');
+var persistence = require('./limits-D6kiAfXJ.cjs');
 var promises = require('node:fs/promises');
 var node_fs = require('node:fs');
 var path = require('node:path');

package/dist/codex/happyMcpStdioBridge.cjs

@@ -1,12 +1,12 @@
 'use strict';
 
-var agentGuidance = require('../agentGuidance-R9MH5Cd5.cjs');
+var agentGuidance = require('../agentGuidance-Cg8Lha39.cjs');
 var mcp_js = require('@modelcontextprotocol/sdk/server/mcp.js');
 var stdio_js = require('@modelcontextprotocol/sdk/server/stdio.js');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var streamableHttp_js = require('@modelcontextprotocol/sdk/client/streamableHttp.js');
 var z = require('zod');
-var persistence = require('../limits-DLlsV71c.cjs');
+var persistence = require('../limits-D6kiAfXJ.cjs');
 require('node:crypto');
 require('node:fs/promises');
 require('node:fs');

package/dist/codex/happyMcpStdioBridge.mjs

@@ -1,10 +1,10 @@
-import { P as PREVIEW_TOOL_NAME, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, r as registerTeamsTools } from '../agentGuidance-DeOIgOhh.mjs';
+import { P as PREVIEW_TOOL_NAME, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, r as registerTeamsTools } from '../agentGuidance-CPG5Cr5T.mjs';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { z } from 'zod';
-import { C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION } from '../limits-C9aXkP7U.mjs';
+import { C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION } from '../limits-BGeIBBE3.mjs';
 import 'node:crypto';
 import 'node:fs/promises';
 import 'node:fs';

package/dist/{config-CkmssSRu.cjs → config-C3e90AIH.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('./limits-DLlsV71c.cjs');
-var index = require('./index-Dn7s2iaT.cjs');
+var persistence = require('./limits-D6kiAfXJ.cjs');
+var index = require('./index-B1plzL9M.cjs');
 require('node:fs/promises');
 require('node:fs');
 require('node:os');
@@ -15,7 +15,7 @@ require('node:crypto');
 require('tweetnacl');
 require('chalk');
 require('node:util');
-require('./types-B15E2OVy.cjs');
+require('./types-Dabm17Ln.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
@@ -30,7 +30,7 @@ require('node-pty');
 require('node:readline');
 require('@anthropic-ai/sandbox-runtime');
 require('expo-server-sdk');
-require('./agentGuidance-R9MH5Cd5.cjs');
+require('./agentGuidance-Cg8Lha39.cjs');
 require('ink');
 require('react');
 require('@anthropic-ai/claude-agent-sdk');

package/dist/{config-ClCkJ1a_.mjs → config-C4gWfnJX.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 './limits-C9aXkP7U.mjs';
-import { j as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-D1gHXtkw.mjs';
+import { l as logger } from './limits-BGeIBBE3.mjs';
+import { j as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './index-BqUOj1zK.mjs';
 import 'node:fs/promises';
 import 'node:fs';
 import 'node:os';
@@ -13,7 +13,7 @@ import 'node:crypto';
 import 'tweetnacl';
 import 'chalk';
 import 'node:util';
-import './types-CA-c2NH7.mjs';
+import './types-Cq-tvv9t.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';
@@ -28,7 +28,7 @@ import 'node-pty';
 import 'node:readline';
 import '@anthropic-ai/sandbox-runtime';
 import 'expo-server-sdk';
-import './agentGuidance-DeOIgOhh.mjs';
+import './agentGuidance-CPG5Cr5T.mjs';
 import 'ink';
 import 'react';
 import '@anthropic-ai/claude-agent-sdk';

package/dist/{index-Dn7s2iaT.cjs → index-B1plzL9M.cjs}

@@ -3,13 +3,13 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var api = require('./types-B15E2OVy.cjs');
-var persistence = require('./limits-DLlsV71c.cjs');
+var api = require('./types-Dabm17Ln.cjs');
+var persistence = require('./limits-D6kiAfXJ.cjs');
 var spawn = require('cross-spawn');
 var path = require('node:path');
 var node_readline = require('node:readline');
 var node_fs = require('node:fs');
-var agentGuidance = require('./agentGuidance-R9MH5Cd5.cjs');
+var agentGuidance = require('./agentGuidance-Cg8Lha39.cjs');
 var promises = require('node:fs/promises');
 var fs = require('fs/promises');
 var ink = require('ink');
@@ -7524,27 +7524,31 @@ function createUpdateController(deps) {
   let policy = null;
   let outcome = null;
   let running = false;
+  let manualVersion = null;
   let operation = null;
   let blocked = false;
   let handoverHold;
   let lastPublished = "";
   const now = deps.now ?? Date.now;
+  function validManualTarget(next, version) {
+    return version === next.recommendedVersion && Number.isFinite(next.checkedAt) && now() - next.checkedAt <= 65 * 6e4 && next.checkedAt <= now() + 6e4 && api.compareExactVersions(next.currentVersion, version) === -1 && (!next.minimumVersion || [0, 1].includes(api.compareExactVersions(version, next.minimumVersion) ?? -1));
+  }
   function publish(state, version, detail) {
     if (!policy) return;
-    const fingerprint = JSON.stringify([policy.checkedAt, state, version, detail]);
+    const fingerprint = JSON.stringify([policy.checkedAt, state, version, detail, manualVersion]);
     if (fingerprint === lastPublished) return;
     lastPublished = fingerprint;
-    outcome = { state, version, detail, at: now() };
-    deps.publish({ ...policy, retrySupported: !blocked, handoverHold, autoUpdate: outcome });
+    outcome = { state, version, detail, at: now(), ...manualVersion ? { source: "manual" } : {} };
+    deps.publish({ ...policy, retrySupported: !blocked, manualUpdateSupported: !blocked, handoverHold, autoUpdate: outcome });
   }
   async function evaluate() {
     if (!policy || running) return;
-    const target = policy.autoUpdateVersion ?? null;
+    const target = manualVersion ?? policy.autoUpdateVersion ?? null;
     if (outcome?.version === target && ["failed", "installed"].includes(outcome.state)) {
-      const fingerprint = JSON.stringify([policy.checkedAt, outcome.state, outcome.version, outcome.detail]);
+      const fingerprint = JSON.stringify([policy.checkedAt, outcome.state, outcome.version, outcome.detail, manualVersion]);
       if (fingerprint !== lastPublished) {
         lastPublished = fingerprint;
-        deps.publish({ ...policy, retrySupported: !blocked, handoverHold, autoUpdate: outcome });
+        deps.publish({ ...policy, retrySupported: !blocked, manualUpdateSupported: !blocked, handoverHold, autoUpdate: outcome });
       }
       return;
     }
@@ -7552,7 +7556,7 @@ function createUpdateController(deps) {
       publish("policy_stale", target);
       return;
     }
-    if (!await deps.enabled()) {
+    if (!manualVersion && !await deps.enabled()) {
       publish("disabled", target);
       return;
     }
@@ -7605,6 +7609,7 @@ function createUpdateController(deps) {
     try {
       const next = await deps.policy();
       if (!next) return;
+      if (manualVersion && !validManualTarget(next, manualVersion)) manualVersion = null;
       policy = next;
       await evaluate();
     } finally {
@@ -7619,10 +7624,10 @@ function createUpdateController(deps) {
     operation = "retry";
     try {
       const next = await deps.policy();
-      if (!next || next.autoUpdateVersion !== version || now() - next.checkedAt > 65 * 6e4) {
+      if (!next || (manualVersion ? !validManualTarget(next, version) : next.autoUpdateVersion !== version || now() - next.checkedAt > 65 * 6e4)) {
         return { error: "update_policy_changed_or_unavailable" };
       }
-      if (!await deps.enabled()) return { error: "auto_update_disabled" };
+      if (!manualVersion && !await deps.enabled()) return { error: "auto_update_disabled" };
       policy = next;
       outcome = null;
       handoverHold = null;
@@ -7635,6 +7640,37 @@ function createUpdateController(deps) {
       operation = null;
     }
   }
+  async function request(version) {
+    if (operation || blocked) return { error: blocked ? "manual_recovery_required" : "update_in_progress" };
+    operation = "request";
+    try {
+      const next = await deps.policy();
+      if (next && manualVersion && !validManualTarget(next, manualVersion)) {
+        manualVersion = null;
+        policy = next;
+        publish("policy_stale", null);
+      }
+      if (!next || typeof version !== "string" || !validManualTarget(next, version)) {
+        return { error: "update_policy_changed_or_unavailable" };
+      }
+      if (outcome?.version === version && (outcome.state === "installed" || manualVersion === version && outcome.state === "waiting_idle")) {
+        policy = next;
+        publish(outcome.state, version, outcome.detail);
+        return { accepted: true };
+      }
+      policy = next;
+      manualVersion = version;
+      outcome = null;
+      handoverHold = null;
+      publish("waiting_idle", version);
+      setTimeout(() => {
+        void tick().catch(() => publish("policy_stale", version));
+      }, 0);
+      return { accepted: true };
+    } finally {
+      operation = null;
+    }
+  }
   async function withHandover(task) {
     if (operation || blocked) return;
     operation = "handover";
@@ -7646,9 +7682,9 @@ function createUpdateController(deps) {
   }
   function holdHandover(reason) {
     handoverHold = { reason, at: now() };
-    publish("failed", policy?.autoUpdateVersion ?? null, "handover_preflight_failed");
+    publish("failed", manualVersion ?? policy?.autoUpdateVersion ?? null, "handover_preflight_failed");
   }
-  return { refresh, retry, tick, withHandover, holdHandover, isRunning: () => running };
+  return { refresh, retry, request, tick, withHandover, holdHandover, isRunning: () => running };
 }
 
 const CLAUDE_KEYCHAIN_SERVICE_PREFIX = "Claude Code";
@@ -7714,7 +7750,7 @@ function parseJsonObject(text) {
     return null;
   }
 }
-function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Dn7s2iaT.cjs', document.baseURI).href))).resolve(s)) {
+function resolveSdkClaudeBinary(platform = process.platform, arch = process.arch, resolver = (s) => node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-B1plzL9M.cjs', document.baseURI).href))).resolve(s)) {
   const platformArch = `${platform}-${arch}`;
   const candidates = [
     `@anthropic-ai/claude-agent-sdk-${platformArch}/claude`,
@@ -10945,6 +10981,7 @@ async function startDaemon() {
       }
     });
     apiMachine.setCliUpdateRetryHandler(updateController.retry);
+    apiMachine.setCliUpdateRequestHandler(updateController.request);
     const refreshCliUpdate = () => updateController.refresh().catch((error) => {
       persistence.logger.debug("[DAEMON RUN] CLI update policy check failed:", error);
     });
@@ -12003,7 +12040,7 @@ function cleanupHookSettingsFile(filepath) {
   }
 }
 
-function registerKillSessionHandler(rpcHandlerManager, killThisHappy, archiveEvents) {
+function registerKillSessionHandler(rpcHandlerManager, killThisHappy, archiveEvents, options) {
   let terminationStarted = false;
   const terminateOnce = () => {
     if (terminationStarted) return;
@@ -12011,6 +12048,10 @@ function registerKillSessionHandler(rpcHandlerManager, killThisHappy, archiveEve
     void killThisHappy();
   };
   archiveEvents.on("archived", terminateOnce);
+  if (options?.processSignals) {
+    process.on("SIGTERM", terminateOnce);
+    process.on("SIGINT", terminateOnce);
+  }
   rpcHandlerManager.registerHandler("killSession", async () => {
     persistence.logger.debug("Kill session request received");
     terminateOnce();
@@ -12019,6 +12060,13 @@ function registerKillSessionHandler(rpcHandlerManager, killThisHappy, archiveEve
       message: "Killing happy-cli process"
     };
   });
+  return () => {
+    archiveEvents.off?.("archived", terminateOnce);
+    if (options?.processSignals) {
+      process.off("SIGTERM", terminateOnce);
+      process.off("SIGINT", terminateOnce);
+    }
+  };
 }
 
 const SIDE_QUESTION_SYSTEM_PROMPT = [
@@ -12133,7 +12181,7 @@ function registerSideQuestionHandler(rpc, deps) {
   const retainMs = deps.retainMs ?? SIDE_QUESTION_RETAIN_MS;
   const maxRunMs = deps.maxRunMs ?? SIDE_QUESTION_MAX_RUN_MS;
   const run = deps.run ?? (async (input) => {
-    const { query } = await Promise.resolve().then(function () { return require('./index-Bqg6yo5s.cjs'); });
+    const { query } = await Promise.resolve().then(function () { return require('./index-CX-zp3FH.cjs'); });
     return runSideQuestion(query, input);
   });
   const slots = /* @__PURE__ */ new Map();
@@ -12235,7 +12283,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-Dn7s2iaT.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-B1plzL9M.cjs', document.baseURI).href)));
     const utilsPath = path.resolve(path.join(api.projectPath(), "scripts", "claude_version_utils.cjs"));
     const { getClaudeCliPath } = require$1(utilsPath);
     const path$1 = getClaudeCliPath();
@@ -14453,9 +14501,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-Dn7s2iaT.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-B1plzL9M.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-Dn7s2iaT.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-B1plzL9M.cjs', document.baseURI).href)));
 const PRISMA_QUERY_ENGINE_FILES = {
   "arm64-darwin": "libquery_engine-darwin-arm64.dylib.node",
   "x64-darwin": "libquery_engine-darwin.dylib.node",
@@ -16612,7 +16660,7 @@ async function runCodex(opts) {
     }
   };
   session.rpcHandlerManager.registerHandler("abort", handleAbort);
-  registerKillSessionHandler(session.rpcHandlerManager, handleKillSession, session);
+  const disposeTermination = registerKillSessionHandler(session.rpcHandlerManager, handleKillSession, session, { processSignals: true });
   const messageBuffer = new MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
@@ -16948,6 +16996,7 @@ async function runCodex(opts) {
       }
     }
   } finally {
+    disposeTermination?.();
     persistence.logger.debug("[codex]: Final cleanup start");
     logActiveHandles("cleanup-start");
     if (reconnectionHandle) {
@@ -17150,7 +17199,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-CPZ3vVn8.cjs'); });
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await Promise.resolve().then(function () { return require('./installTerminalHooks-DPmEaHg2.cjs'); });
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -17167,7 +17216,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-Dmfbot5k.cjs'); });
+      const { handleSpawnCommand } = await Promise.resolve().then(function () { return require('./spawn-gha6nGx-.cjs'); });
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17179,7 +17228,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "sessions") {
     try {
-      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-BBc8L8qf.cjs'); });
+      const { handleSessionsCommand } = await Promise.resolve().then(function () { return require('./sessions-DyC5Attg.cjs'); });
       await handleSessionsCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17191,7 +17240,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-gH1vJ0iv.cjs'); });
+      const { handleSendCommand } = await Promise.resolve().then(function () { return require('./send-Bo6iKuXr.cjs'); });
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17297,9 +17346,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-CkmssSRu.cjs'); });
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./limits-DLlsV71c.cjs'); }).then(function (n) { return n.persistence; });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-B15E2OVy.cjs'); }).then(function (n) { return n.api; });
+        const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return require('./config-C3e90AIH.cjs'); });
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await Promise.resolve().then(function () { return require('./limits-D6kiAfXJ.cjs'); }).then(function (n) { return n.persistence; });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./types-Dabm17Ln.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -17330,7 +17379,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-CkmssSRu.cjs'); });
+        const { readGeminiLocalConfig } = await Promise.resolve().then(function () { return require('./config-C3e90AIH.cjs'); });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -17370,7 +17419,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-Cx1YcK2o.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-BPPnulIk.cjs'); });
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -17400,7 +17449,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
     };
     try {
-      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-CjopZZg3.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-jqG8CV0c.cjs'); });
       const parsed = parsePiRunnerArgs(args.slice(1));
       const resolved = resolveAcpAgentConfig(["pi", ...parsed.passthrough]);
       const { credentials } = await authAndSetupMachineIfNeeded();
@@ -17428,7 +17477,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-CjopZZg3.cjs'); });
+      const { runAcp, resolveAcpAgentConfig } = await Promise.resolve().then(function () { return require('./index-jqG8CV0c.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -17468,7 +17517,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-I4sGAQf1.cjs'); });
+      const { runOpenClaw } = await Promise.resolve().then(function () { return require('./runOpenClaw-BB3Ivt1S.cjs'); });
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -17519,7 +17568,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "todo") {
     try {
-      const { handleTodoCommand } = await Promise.resolve().then(function () { return require('./todo-DOi6svw9.cjs'); });
+      const { handleTodoCommand } = await Promise.resolve().then(function () { return require('./todo-BaNaNZ8c.cjs'); });
       await handleTodoCommand(args.slice(1));
     } catch (error) {
       console.error(JSON.stringify({ error: error instanceof Error ? error.message : "Todo command failed" }));
@@ -17528,7 +17577,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "teams") {
     try {
-      const { handleTeamsCommand } = await Promise.resolve().then(function () { return require('./teams-DtXQYmEK.cjs'); });
+      const { handleTeamsCommand } = await Promise.resolve().then(function () { return require('./teams-BbzWNV9e.cjs'); });
       await handleTeamsCommand(args.slice(1));
     } catch (error) {
       console.error(error instanceof Error ? error.message : "Teams command failed");
@@ -17537,7 +17586,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-DHkYfENQ.cjs'); });
+      const { handleMcpCommand } = await Promise.resolve().then(function () { return require('./mcp-DGZmUpuZ.cjs'); });
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/{index-DdbU8FmA.mjs → index-B6UvB88K.mjs}

@@ -1,9 +1,9 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-BNMLGtST.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-BNMLGtST.mjs';
-import { c as configuration, g as readSettings, i as encodeBase64, l as logger } from './limits-C9aXkP7U.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-BF5JZYCC.mjs';
-import { f as connectionState, A as ApiClient, p as projectPath, g as BUILTIN_TODO_DISCOVERY } from './types-CA-c2NH7.mjs';
-import { P as PI_TEAMS_EXTENSION, n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, z as StreamRelay, x as MessageQueue2, B as hashObject, C as startHappyServer, E as registerAgentAttachmentDownloads, F as TitleGenerator, y as registerKillSessionHandler, H as CLAUDE_ATTACHMENT_KINDS, I as stageClaudeAttachments, J as appendStagedAttachmentsToPrompt, K as BasePermissionHandler, L as writeSessionModeFile, N as normalizeAcpPermissionMode, O as removeSessionModeFile } from './index-D1gHXtkw.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-B8KEjDwF.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-B8KEjDwF.mjs';
+import { c as configuration, g as readSettings, i as encodeBase64, l as logger } from './limits-BGeIBBE3.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-KlDZbEmZ.mjs';
+import { f as connectionState, A as ApiClient, p as projectPath, g as BUILTIN_TODO_DISCOVERY } from './types-Cq-tvv9t.mjs';
+import { P as PI_TEAMS_EXTENSION, n as initialMachineMetadata, o as createSessionMetadata, u as setupOfflineReconnection, v as notifyDaemonSessionStarted, z as StreamRelay, x as MessageQueue2, B as hashObject, C as startHappyServer, E as registerAgentAttachmentDownloads, F as TitleGenerator, y as registerKillSessionHandler, H as CLAUDE_ATTACHMENT_KINDS, I as stageClaudeAttachments, J as appendStagedAttachmentsToPrompt, K as BasePermissionHandler, L as writeSessionModeFile, N as normalizeAcpPermissionMode, O as removeSessionModeFile } from './index-BqUOj1zK.mjs';
 import { mkdir, chmod, writeFile, rename } from 'node:fs/promises';
 import { randomUUID } from 'node:crypto';
 import { join } from 'node:path';
@@ -32,7 +32,7 @@ import 'fs';
 import 'node:readline';
 import '@anthropic-ai/sandbox-runtime';
 import 'expo-server-sdk';
-import './agentGuidance-DeOIgOhh.mjs';
+import './agentGuidance-CPG5Cr5T.mjs';
 import 'ink';
 import 'react';
 import '@anthropic-ai/claude-agent-sdk';
@@ -749,6 +749,7 @@ async function runAcp(opts) {
   let shouldExit = false;
   let abortController = new AbortController();
   let pendingTurn = null;
+  let turnCancelled = false;
   const clearPendingTurn = (error) => {
     if (!pendingTurn) {
       return;
@@ -1094,6 +1095,7 @@ async function runAcp(opts) {
     session.keepAlive(thinking, "remote");
   }, 2e3);
   async function handleAbort() {
+    turnCancelled = thinking;
     try {
       if (acpSessionId) {
         await backend.cancel(acpSessionId);
@@ -1123,12 +1125,12 @@ async function runAcp(opts) {
       return { mode };
     }
   );
-  registerKillSessionHandler(session.rpcHandlerManager, async () => {
+  const disposeTermination = registerKillSessionHandler(session.rpcHandlerManager, async () => {
     shouldExit = true;
     messageQueue.close();
     clearPendingTurn(new Error("Session terminated"));
     await handleAbort();
-  }, session);
+  }, session, { processSignals: true });
   try {
     const started = await backend.startSession();
     acpSessionId = started.sessionId;
@@ -1174,8 +1176,11 @@ async function runAcp(opts) {
       }
       logAcp("incoming", `Incoming prompt: ${formatUnknownForConsole(batch.message, ACP_EVENT_PREVIEW_CHARS)}`);
       sendEnvelopes(sessionManager.startTurn());
+      turnCancelled = false;
       setThinking(true);
       const turnEnded = waitForTurnEnd();
+      void turnEnded.catch(() => {
+      });
       try {
         if (typeof batch.mode.permissionMode === "string" && batch.mode.permissionMode.length > 0) {
           await switchPermissionModeIfRequested(batch.mode.permissionMode);
@@ -1195,7 +1200,7 @@ ${BUILTIN_TODO_DISCOVERY}`;
         await backend.sendPrompt(acpSessionId, appendStagedAttachmentsToPrompt(prompt, staged), attachments);
         todoDiscoverySent = true;
         await turnEnded;
-        sendEnvelopes(sessionManager.endTurn("completed"));
+        sendEnvelopes(sessionManager.endTurn(turnCancelled ? "cancelled" : "completed"));
         streamRelay.endTurn();
         setThinking(false);
         session.sendSessionEvent({ type: "ready" });
@@ -1214,6 +1219,7 @@ ${BUILTIN_TODO_DISCOVERY}`;
       }
     }
   } finally {
+    disposeTermination?.();
     setThinking(false);
     clearInterval(keepAliveInterval);
     streamRelay.endTurn();