very-happy-cli 0.2.78 → 0.2.80

package/dist/{index-DdOYA0qe.mjs → index-D9OFwx0T.mjs}

@@ -1,10 +1,10 @@
-import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-CDngyx5G.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-CDngyx5G.mjs';
-import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-Clmu74iY.mjs';
-import { A as AcpSessionManager } from './AcpSessionManager-Dcq8dl4l.mjs';
+import { D as DefaultTransport, A as AcpBackend } from './AcpBackend-DBJGqMwR.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-DBJGqMwR.mjs';
+import { h as connectionState, A as ApiClient, i as readSettings, j as encodeBase64, l as logger, p as projectPath } from './types-B2DG32ua.mjs';
+import { A as AcpSessionManager } from './AcpSessionManager-DcWebwii.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-w0zkr6EM.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-DoLyKWEW.mjs';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
 import 'axios';

package/dist/{index-w0zkr6EM.mjs → index-DoLyKWEW.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, f as packageJson, i as readSettings, v as readCredentials, x as credentialRelayProblem, y as deriveLocalCliUpdateSummary, j as encodeBase64, z as updateSettings, B as encodeBase64Url, C as decodeBase64, D as writeCredentialsLegacy, E as writeCredentialsDataKey, F as readCredentialsForConfiguredRelay, G as encrypt, r as readPersistedSessions, H as getLocalHappyAgentCredentialPath, J as readLocalHappyAgentCredentials, K as decryptWithDataKey, L as decryptLegacy, M as extractCompleteLines, N as decideBackfill, O as parseTerminalHookPayload, P as decideMirrorBinding, Q as persistSession, S as MIRROR_BACKFILL_LINES_DEFAULT, T as mirrorLineKey, U as mirrorLocalId, V as detectResumeSupport, W as detectCLIAvailability, X as acquireDaemonLock, Y as summarizeSpawnSessionForLog, Z as deletePersistedSessions, _ as decrypt, $ as writeDaemonState, A as ApiClient, a0 as fetchCliUpdateState, a1 as resolveCliUpdateCheckInterval, a2 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a3 as releaseDaemonLock, a4 as isValidSessionId, a5 as listVhTerminals, a6 as isValidTerminalId, a7 as readVhTerminal, a8 as sendToVhTerminal, h as connectionState, a9 as startOfflineReconnection, aa as clearCredentials, ab as clearMachineId, k as ensurePrivateDirectorySync, w as writePrivateFileSync, ac as SandboxConfigSchema, b as createEnvelope, ad as CodexAppServerClient, ae as getLatestDaemonLog } from './types-Clmu74iY.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, f as packageJson, i as readSettings, v as readCredentials, x as credentialRelayProblem, y as deriveLocalCliUpdateSummary, j as encodeBase64, z as updateSettings, B as encodeBase64Url, C as decodeBase64, D as writeCredentialsLegacy, E as writeCredentialsDataKey, F as readCredentialsForConfiguredRelay, G as encrypt, r as readPersistedSessions, H as getLocalHappyAgentCredentialPath, J as readLocalHappyAgentCredentials, K as decryptWithDataKey, L as decryptLegacy, M as extractCompleteLines, N as decideBackfill, O as parseTerminalHookPayload, P as decideMirrorBinding, Q as persistSession, S as MIRROR_BACKFILL_LINES_DEFAULT, T as mirrorLineKey, U as mirrorLocalId, V as detectResumeSupport, W as detectCLIAvailability, X as acquireDaemonLock, Y as summarizeSpawnSessionForLog, Z as deletePersistedSessions, _ as decrypt, $ as writeDaemonState, A as ApiClient, a0 as fetchCliUpdateState, a1 as resolveCliUpdateCheckInterval, a2 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a3 as releaseDaemonLock, a4 as isValidSessionId, a5 as listVhTerminals, a6 as isValidTerminalId, a7 as readVhTerminal, a8 as sendToVhTerminal, h as connectionState, a9 as startOfflineReconnection, aa as clearCredentials, ab as clearMachineId, k as ensurePrivateDirectorySync, w as writePrivateFileSync, ac as SandboxConfigSchema, b as createEnvelope, ad as CodexAppServerClient, ae as getLatestDaemonLog } from './types-B2DG32ua.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, isAbsolute, normalize, sep, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -1489,6 +1489,7 @@ function query(params) {
     fallbackModel: opts?.fallbackModel,
     maxTurns: opts?.maxTurns,
     permissionMode: opts?.permissionMode,
+    allowDangerouslySkipPermissions: opts?.permissionMode === "bypassPermissions",
     allowedTools: opts?.allowedTools,
     disallowedTools: opts?.disallowedTools,
     mcpServers: opts?.mcpServers,
@@ -1507,11 +1508,18 @@ function query(params) {
     settingSources: ["user", "project", "local"],
     strictMcpConfig: opts?.strictMcpConfig,
     sessionId: void 0,
-    effort: opts?.effort
+    effort: opts?.effort,
+    onElicitation: opts?.onElicitation,
+    onUserDialog: opts?.onUserDialog,
+    supportedDialogKinds: opts?.onUserDialog ? opts.supportedDialogKinds : void 0
   };
   if (opts?.abort) {
     const controller = new AbortController();
-    opts.abort.addEventListener("abort", () => controller.abort(), { once: true });
+    if (opts.abort.aborted) {
+      controller.abort(opts.abort.reason);
+    } else {
+      opts.abort.addEventListener("abort", () => controller.abort(opts.abort?.reason), { once: true });
+    }
     sdkOptions.abortController = controller;
   }
   const env = {};
@@ -1864,6 +1872,9 @@ async function claudeRemote(opts) {
     disallowedTools: initial.mode.disallowedTools,
     effort: initial.mode.effort,
     canCallTool: (toolName, input, options) => opts.canCallTool(toolName, input, mode, options),
+    onElicitation: opts.onElicitation,
+    onUserDialog: opts.onUserDialog,
+    supportedDialogKinds: opts.onUserDialog ? ["refusal_fallback_prompt"] : void 0,
     abort: opts.signal,
     settingsPath: opts.hookSettingsPath
   };
@@ -1929,13 +1940,14 @@ async function claudeRemote(opts) {
         updateThinking(false);
         logger.debug("[claudeRemote] Result received");
         if (isCompactCommand) {
-          logger.debug("[claudeRemote] Compaction completed");
+          const compactSucceeded = message.subtype === "success";
+          logger.debug(`[claudeRemote] Compaction ${compactSucceeded ? "completed" : "failed"}`);
           if (opts.onCompletionEvent) {
-            opts.onCompletionEvent("Compaction completed");
+            opts.onCompletionEvent(message.subtype === "success" ? "Compaction completed" : `Compaction failed: ${message.errors?.join("\n") || message.subtype}`);
           }
           isCompactCommand = false;
         }
-        opts.onReady();
+        opts.onReady(message);
         opts.nextMessage().then((next) => {
           if (!next) {
             messages.end();
@@ -1983,6 +1995,16 @@ function getToolDescriptor(toolName) {
   return { edit: false, exitPlan: false, dangerous: false };
 }
 
+function elicitationContent(input) {
+  if (!input) return void 0;
+  const content = {};
+  for (const [key, value] of Object.entries(input)) {
+    if (typeof value === "string" || typeof value === "number" && Number.isFinite(value) || typeof value === "boolean" || Array.isArray(value) && value.every((item) => typeof item === "string")) {
+      content[key] = value;
+    }
+  }
+  return content;
+}
 class PermissionHandler {
   responses = /* @__PURE__ */ new Map();
   pendingRequests = /* @__PURE__ */ new Map();
@@ -2017,19 +2039,7 @@ class PermissionHandler {
   /**
    * Handler response
    */
-  handlePermissionResponse(response, pending) {
-    if (response.allowTools && response.allowTools.length > 0) {
-      response.allowTools.forEach((tool) => {
-        if (tool.startsWith("Bash(") || tool === "Bash") {
-          this.parseBashPermission(tool);
-        } else {
-          this.allowedTools.add(tool);
-        }
-      });
-    }
-    if (response.mode) {
-      this.permissionMode = response.mode;
-    }
+  async handlePermissionResponse(response, pending) {
     if (pending.toolName === "exit_plan_mode" || pending.toolName === "ExitPlanMode") {
       logger.debug("Plan mode result received", {
         approved: response.approved,
@@ -2041,10 +2051,14 @@ 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`);
-        if (this.setPermissionModeCallback) {
-          this.setPermissionModeCallback(newMode).catch((err) => {
-            logger.debug("Failed to set permission mode via SDK:", err);
-          });
+        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 };
         }
         this.permissionMode = newMode;
         pending.resolve({ behavior: "allow", updatedInput: pending.input || {} });
@@ -2052,11 +2066,36 @@ class PermissionHandler {
         pending.resolve({ behavior: "deny", message: response.reason || "Plan rejected" });
       }
     } else {
+      if (response.approved && response.mode) {
+        try {
+          if (!this.setPermissionModeCallback) throw new Error("permission mode updater unavailable");
+          await this.setPermissionModeCallback(response.mode);
+          this.permissionMode = response.mode;
+        } catch (err) {
+          const reason = `Failed to switch permission mode: ${err instanceof Error ? err.message : String(err)}`;
+          pending.resolve({ behavior: "deny", message: reason });
+          return { ...response, approved: false, reason };
+        }
+      }
+      if (response.approved && !pending.suggestions?.length && response.allowTools?.length) {
+        response.allowTools.forEach((tool) => {
+          if (tool.startsWith("Bash(") || tool === "Bash") {
+            this.parseBashPermission(tool);
+          } else {
+            this.allowedTools.add(tool);
+          }
+        });
+      }
       const originalInput = pending.input || {};
       const updatedInput = response.updatedInput ? { ...originalInput, ...response.updatedInput } : originalInput;
-      const result = response.approved ? { behavior: "allow", updatedInput } : { behavior: "deny", message: response.reason || `The user doesn't want to proceed with this tool use. The tool use was rejected (eg. if it was a file edit, the new_string was NOT written to the file). STOP what you are doing and wait for the user to tell you how to proceed.` };
+      const result = response.approved ? {
+        behavior: "allow",
+        updatedInput,
+        ...response.decision === "approved_for_session" && pending.suggestions?.length ? { updatedPermissions: pending.suggestions } : {}
+      } : { behavior: "deny", message: response.reason || `The user doesn't want to proceed with this tool use. The tool use was rejected (eg. if it was a file edit, the new_string was NOT written to the file). STOP what you are doing and wait for the user to tell you how to proceed.` };
       pending.resolve(result);
     }
+    return response;
   }
   /**
    * Creates the canCallTool callback for the SDK.
@@ -2065,7 +2104,7 @@ class PermissionHandler {
   handleToolCall = async (toolName, input, mode, options) => {
     const toolCallId = options.toolUseID;
     if (toolName === "AskUserQuestion") {
-      return this.handlePermissionRequest(toolCallId, toolName, input, options.signal);
+      return this.handlePermissionRequest(toolCallId, toolName, input, options.signal, options.suggestions);
     }
     if (toolName === "Bash") {
       const inputObj = input;
@@ -2084,7 +2123,7 @@ class PermissionHandler {
     }
     const descriptor = getToolDescriptor(toolName);
     if (descriptor.exitPlan) {
-      return this.handlePermissionRequest(toolCallId, toolName, input, options.signal);
+      return this.handlePermissionRequest(toolCallId, toolName, input, options.signal, options.suggestions);
     }
     if (this.permissionMode === "bypassPermissions") {
       return { behavior: "allow", updatedInput: input };
@@ -2095,19 +2134,25 @@ class PermissionHandler {
     if (this.permissionMode === "plan" && !descriptor.dangerous) {
       return { behavior: "allow", updatedInput: input };
     }
-    return this.handlePermissionRequest(toolCallId, toolName, input, options.signal);
+    return this.handlePermissionRequest(toolCallId, toolName, input, options.signal, options.suggestions);
   };
   /**
    * Handles individual permission requests
    */
-  async handlePermissionRequest(id, toolName, input, signal) {
+  async handlePermissionRequest(id, toolName, input, signal, suggestions) {
     return new Promise((resolve, reject) => {
+      if (signal.aborted) {
+        reject(new Error("Permission request aborted", { cause: signal.reason }));
+        return;
+      }
       const abortHandler = () => {
         this.pendingRequests.delete(id);
+        this.cancelRequestInAgentState(id, "Permission request aborted");
         reject(new Error("Permission request aborted"));
       };
       signal.addEventListener("abort", abortHandler, { once: true });
       this.pendingRequests.set(id, {
+        kind: "tool",
         resolve: (result) => {
           signal.removeEventListener("abort", abortHandler);
           resolve(result);
@@ -2117,7 +2162,8 @@ class PermissionHandler {
           reject(error);
         },
         toolName,
-        input
+        input,
+        suggestions
       });
       if (this.onPermissionRequestCallback) {
         this.onPermissionRequestCallback(id);
@@ -2140,7 +2186,9 @@ class PermissionHandler {
           [id]: {
             tool: toolName,
             arguments: input,
-            createdAt: Date.now()
+            createdAt: Date.now(),
+            kind: "tool",
+            ...suggestions?.length ? { permissionSuggestions: suggestions } : {}
           }
         }
       }));
@@ -2149,6 +2197,98 @@ class PermissionHandler {
       logger.debug(`Permission request sent for tool call ${id}: ${toolName}`);
     });
   }
+  handleElicitation = async (request, options) => {
+    return this.handleInteractionRequest(options.requestId, "elicitation", request, options.signal);
+  };
+  handleUserDialog = async (request, options) => {
+    if (request.dialogKind !== "refusal_fallback_prompt") {
+      return { behavior: "cancelled" };
+    }
+    return this.handleInteractionRequest(options.requestId, "user_dialog", request, options.signal);
+  };
+  handleInteractionRequest(id, kind, request, signal) {
+    return new Promise((resolve, reject) => {
+      if (signal.aborted) {
+        reject(new Error("Interaction request aborted", { cause: signal.reason }));
+        return;
+      }
+      const abortHandler = () => {
+        this.pendingRequests.delete(id);
+        this.cancelRequestInAgentState(id, "Interaction request aborted");
+        reject(new Error("Interaction request aborted", { cause: signal.reason }));
+      };
+      signal.addEventListener("abort", abortHandler, { once: true });
+      const finishResolve = (value) => {
+        signal.removeEventListener("abort", abortHandler);
+        resolve(value);
+      };
+      const finishReject = (error) => {
+        signal.removeEventListener("abort", abortHandler);
+        reject(error);
+      };
+      if (kind === "elicitation") {
+        this.pendingRequests.set(id, {
+          kind,
+          request,
+          resolve: finishResolve,
+          reject: finishReject
+        });
+      } else {
+        this.pendingRequests.set(id, {
+          kind,
+          request,
+          resolve: finishResolve,
+          reject: finishReject
+        });
+      }
+      const tool = "AskUserQuestion";
+      this.publishRequest(id, tool, request, kind);
+    });
+  }
+  publishRequest(id, tool, args, kind) {
+    this.session.api.push().sendSessionNotification({
+      kind: "permission",
+      metadata: this.session.client.getMetadata(),
+      data: {
+        sessionId: this.session.client.sessionId,
+        requestId: id,
+        tool,
+        type: "permission_request",
+        provider: "claude"
+      }
+    });
+    this.session.client.updateAgentState((currentState) => ({
+      ...currentState,
+      requests: {
+        ...currentState.requests,
+        [id]: { tool, arguments: args, createdAt: Date.now(), kind }
+      }
+    }));
+    this.session.notificationProducer?.permissionRequest(tool);
+    this.session.reportEventToDaemon("needs_input");
+    logger.debug(`${kind} request sent: ${id}`);
+  }
+  cancelRequestInAgentState(id, reason) {
+    this.session.client.updateAgentState((currentState) => {
+      const request = currentState.requests?.[id];
+      if (!request) return currentState;
+      const requests = { ...currentState.requests };
+      delete requests[id];
+      return {
+        ...currentState,
+        requests,
+        completedRequests: {
+          ...currentState.completedRequests,
+          [id]: {
+            ...request,
+            completedAt: Date.now(),
+            status: "canceled",
+            reason
+          }
+        }
+      };
+    });
+  }
   /**
    * Parses Bash permission strings into literal and prefix sets
    */
@@ -2229,9 +2369,16 @@ class PermissionHandler {
         logger.debug("Permission request not found or already resolved");
         return;
       }
-      this.responses.set(id, { ...message, receivedAt: Date.now() });
       this.pendingRequests.delete(id);
-      this.handlePermissionResponse(message, pending);
+      let effectiveResponse = message;
+      if (pending.kind === "tool") {
+        effectiveResponse = await this.handlePermissionResponse(message, pending);
+        this.responses.set(id, { ...effectiveResponse, receivedAt: Date.now() });
+      } else if (pending.kind === "elicitation") {
+        pending.resolve(message.approved ? { action: "accept", content: elicitationContent(message.updatedInput) } : { action: message.decision === "abort" ? "cancel" : "decline" });
+      } else {
+        pending.resolve(message.approved ? { behavior: "completed", result: message.updatedInput?.result ?? "retry_fallback" } : { behavior: "cancelled" });
+      }
       this.session.client.updateAgentState((currentState) => {
         const request = currentState.requests?.[id];
         if (!request) return currentState;
@@ -2245,10 +2392,11 @@ class PermissionHandler {
             [id]: {
               ...request,
               completedAt: Date.now(),
-              status: message.approved ? "approved" : "denied",
-              reason: message.reason,
-              mode: message.mode,
-              allowTools: message.allowTools
+              status: effectiveResponse.approved ? "approved" : "denied",
+              reason: effectiveResponse.reason,
+              mode: effectiveResponse.mode,
+              decision: effectiveResponse.decision,
+              allowedTools: effectiveResponse.allowTools
             }
           }
         };
@@ -2469,7 +2617,8 @@ class SDKToLogConverter {
           // Assistant messages often have additional fields
           requestId: assistantMsg.requestId,
           ...assistantMsg.isCompactSummary ? { isCompactSummary: true } : {},
-          ...assistantMsg.parent_tool_use_id ? { parent_tool_use_id: assistantMsg.parent_tool_use_id } : {}
+          ...assistantMsg.parent_tool_use_id ? { parent_tool_use_id: assistantMsg.parent_tool_use_id } : {},
+          ...assistantMsg.error ? { error: assistantMsg.error } : {}
         };
         break;
       }
@@ -2500,17 +2649,28 @@ class SDKToLogConverter {
           total_cost_usd: resultMsg.total_cost_usd,
           duration_ms: resultMsg.duration_ms,
           num_turns: resultMsg.num_turns,
-          usage: resultMsg.usage
+          usage: resultMsg.usage,
+          ..."errors" in resultMsg ? { errors: resultMsg.errors } : {},
+          ..."terminal_reason" in resultMsg && resultMsg.terminal_reason ? { terminal_reason: resultMsg.terminal_reason } : {}
         };
         break;
       }
-      default:
-        logMessage = {
-          ...baseFields,
-          ...sdkMessage,
-          type: sdkMessage.type
-          // Override type last to ensure it's set
-        };
+      // These SDK lifecycle/advisory frames are intentionally not part
+      // of the persisted Claude transcript. Enumerating them keeps SDK
+      // upgrades type-visible instead of silently passing new frames
+      // through as conversation messages.
+      case "stream_event":
+      case "tool_progress":
+      case "auth_status":
+      case "tool_use_summary":
+      case "rate_limit_event":
+      case "prompt_suggestion":
+      case "conversation_reset":
+        return null;
+      default: {
+        const exhaustive = sdkMessage;
+        return exhaustive;
+      }
     }
     if (logMessage && logMessage.type !== "summary" && logMessage.type !== "result") {
       this.lastUuid = uuid;
@@ -2806,6 +2966,17 @@ async function cleanupStdinAfterInk(opts) {
   }
 }
 
+function applyClaudeResultLifecycle(result, callbacks) {
+  if (result && result.subtype !== "success") {
+    const error = result.errors?.filter(Boolean).join("\n").trim() || result.subtype;
+    callbacks.closeFailed(error);
+    callbacks.onFailed(error);
+    return;
+  }
+  callbacks.closeCompleted();
+  callbacks.onCompleted();
+}
+
 async function claudeRemoteLauncher(session) {
   logger.debug("[claudeRemoteLauncher] Starting remote launcher");
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -3018,6 +3189,8 @@ async function claudeRemoteLauncher(session) {
           hookSettingsPath: session.hookSettingsPath,
           jsRuntime: session.jsRuntime,
           canCallTool: permissionHandler.handleToolCall,
+          onElicitation: permissionHandler.handleElicitation,
+          onUserDialog: permissionHandler.handleUserDialog,
           isAborted: (toolCallId) => {
             return permissionHandler.isAborted(toolCallId);
           },
@@ -3106,21 +3279,27 @@ async function claudeRemoteLauncher(session) {
             logger.debug("[remote]: Session reset");
             session.clearSessionId();
           },
-          onReady: () => {
-            session.client.closeClaudeSessionTurn("completed");
-            const idle = !pending && session.queue.size() === 0;
-            session.onTurnEnd(idle);
-            if (idle) {
-              session.api.push().sendSessionNotification({
-                kind: "done",
-                metadata: session.client.getMetadata(),
-                data: {
-                  sessionId: session.client.sessionId,
-                  type: "ready",
-                  provider: "claude"
+          onReady: (result) => {
+            applyClaudeResultLifecycle(result, {
+              closeCompleted: () => session.client.closeClaudeSessionTurn("completed"),
+              closeFailed: (error) => session.client.closeClaudeSessionTurn("failed", { error }),
+              onFailed: (error) => session.onSessionError(error),
+              onCompleted: () => {
+                const idle = !pending && session.queue.size() === 0;
+                session.onTurnEnd(idle);
+                if (idle) {
+                  session.api.push().sendSessionNotification({
+                    kind: "done",
+                    metadata: session.client.getMetadata(),
+                    data: {
+                      sessionId: session.client.sessionId,
+                      type: "ready",
+                      provider: "claude"
+                    }
+                  });
                 }
-              });
-            }
+              }
+            });
           },
           signal: abortController.signal
         });
@@ -12983,7 +13162,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-DFmjn6EQ.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-D48YflmS.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -13000,7 +13179,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-Da-94Ejo.mjs');
+      const { handleSpawnCommand } = await import('./spawn-DWf78N7k.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13012,7 +13191,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-pX36Sd4p.mjs');
+      const { handleSendCommand } = await import('./send-DJWwqdS_.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -13118,9 +13297,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-Co1Tpb5e.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-Clmu74iY.mjs').then(function (n) { return n.af; });
-        const { ApiClient: ApiClient2 } = await import('./types-Clmu74iY.mjs').then(function (n) { return n.ag; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-DHUFJkEr.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./types-B2DG32ua.mjs').then(function (n) { return n.af; });
+        const { ApiClient: ApiClient2 } = await import('./types-B2DG32ua.mjs').then(function (n) { return n.ag; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -13151,7 +13330,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-Co1Tpb5e.mjs');
+        const { readGeminiLocalConfig } = await import('./config-DHUFJkEr.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -13191,7 +13370,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-DEZ0neEl.mjs');
+      const { runGemini } = await import('./runGemini-Cnvz6a6J.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -13213,7 +13392,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-DdOYA0qe.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-D9OFwx0T.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -13253,7 +13432,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-DyJQFzoX.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-Cpxdqf9Z.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -13304,7 +13483,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-nlZLEkmO.mjs');
+      const { handleMcpCommand } = await import('./mcp-DnO0vHep.mjs');
       await handleMcpCommand();
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-CuvhWx_d.cjs');
-require('./types-Dua2iF5S.cjs');
+require('./index-CdmSlaUU.cjs');
+require('./types-DL98ZceN.cjs');
 require('zod');
 require('node:child_process');
 require('node:os');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-w0zkr6EM.mjs';
-import './types-Clmu74iY.mjs';
+import './index-DoLyKWEW.mjs';
+import './types-B2DG32ua.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:os';

package/dist/{installTerminalHooks-DFmjn6EQ.mjs → installTerminalHooks-D48YflmS.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-Clmu74iY.mjs';
-import { t as tmuxSupportsSessionEnv } from './index-w0zkr6EM.mjs';
+import { p as projectPath } from './types-B2DG32ua.mjs';
+import { t as tmuxSupportsSessionEnv } from './index-DoLyKWEW.mjs';
 import 'axios';
 import 'node:util';
 import 'node:fs/promises';

package/dist/{installTerminalHooks-nXjKPP3D.cjs → installTerminalHooks-RgJOM2ds.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-Dua2iF5S.cjs');
-var index = require('./index-CuvhWx_d.cjs');
+var persistence = require('./types-DL98ZceN.cjs');
+var index = require('./index-CdmSlaUU.cjs');
 require('axios');
 require('node:util');
 require('node:fs/promises');

package/dist/lib.cjs

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