happy-imou-cloud 2.1.4 → 2.1.6

package/dist/{registerKillSessionHandler-71xCO8e_.cjs → registerKillSessionHandler-3ytO-yBI.cjs}

@@ -1,11 +1,9 @@
 'use strict';
 
-var index = require('./index-D1BP-fEm.cjs');
-var persistence = require('./persistence-EDmI-c8T.cjs');
-var os = require('node:os');
-var path = require('node:path');
-var api = require('./api-B6ESNpGB.cjs');
+var index = require('./index-DA-K28E3.cjs');
+var persistence = require('./persistence-CKgPuZRR.cjs');
 var node_crypto = require('node:crypto');
+var api = require('./api-CvtU4DI-.cjs');
 var crypto = require('crypto');
 require('axios');
 require('node:events');
@@ -37,30 +35,6 @@ async function ensureManagedProviderMachine(opts) {
   return machineId;
 }
 
-function createSessionMetadata(opts) {
-  const state = {
-    controlledByUser: false
-  };
-  const metadata = {
-    path: process.cwd(),
-    host: os.hostname(),
-    version: api.packageJson.version,
-    os: os.platform(),
-    machineId: opts.machineId,
-    homeDir: os.homedir(),
-    happyHomeDir: api.configuration.happyCloudHomeDir,
-    happyLibDir: index.projectPath(),
-    happyToolsDir: path.resolve(index.projectPath(), "tools", "unpacked"),
-    startedFromDaemon: opts.startedBy === "daemon",
-    hostPid: process.pid,
-    startedBy: opts.startedBy || "terminal",
-    lifecycleState: "running",
-    lifecycleStateSince: Date.now(),
-    flavor: opts.flavor
-  };
-  return { state, metadata };
-}
-
 async function launchRuntimeHandleWithFactoryResult(opts) {
   const shell = opts.shell ?? new index.RuntimeShell();
   let factoryResult;
@@ -116,6 +90,62 @@ function attachToolHappierMetaV2(value, meta) {
   };
 }
 
+const DISPLAY_FRIENDLY_TOOL_FIELDS = ["stdout", "stderr", "output", "text", "message", "detail", "reason", "data"];
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function stripInternalToolMeta(value) {
+  if (!isRecord(value)) {
+    return value;
+  }
+  const {
+    _happier: _ignoredHappier,
+    _happy: _ignoredHappy,
+    ...rest
+  } = value;
+  return rest;
+}
+function extractNestedTextContent(value) {
+  if (typeof value === "string") {
+    return value.trim().length > 0 ? value : null;
+  }
+  if (Array.isArray(value)) {
+    const parts = value.map((item) => extractNestedTextContent(item)).filter((item) => typeof item === "string" && item.length > 0);
+    return parts.length > 0 ? parts.join("\n") : null;
+  }
+  if (!isRecord(value)) {
+    return null;
+  }
+  if (typeof value.text === "string" && value.text.trim().length > 0) {
+    return value.text;
+  }
+  if ("content" in value) {
+    return extractNestedTextContent(value.content);
+  }
+  return null;
+}
+function normalizeCodexToolInput(value) {
+  return stripInternalToolMeta(value);
+}
+function normalizeCodexToolOutput(value) {
+  const sanitized = stripInternalToolMeta(value);
+  if (!isRecord(sanitized)) {
+    return sanitized;
+  }
+  const hasDisplayFriendlyField = DISPLAY_FRIENDLY_TOOL_FIELDS.some((field) => field in sanitized);
+  if (hasDisplayFriendlyField || !("content" in sanitized)) {
+    return sanitized;
+  }
+  const flattenedText = extractNestedTextContent(sanitized.content);
+  if (!flattenedText) {
+    return sanitized;
+  }
+  const { content: _content, ...rest } = sanitized;
+  return {
+    ...rest,
+    text: flattenedText
+  };
+}
 function getDefaultExecToolName(provider) {
   switch (provider) {
     case "claude":
@@ -146,6 +176,14 @@ function attachToolMeta(provider, rawToolName, value) {
     canonicalToolName
   });
 }
+function prepareToolInput(provider, rawToolName, value) {
+  const enriched = attachToolMeta(provider, rawToolName, value);
+  return provider === "codex" ? normalizeCodexToolInput(enriched) : enriched;
+}
+function prepareToolOutput(provider, rawToolName, value) {
+  const enriched = attachToolMeta(provider, rawToolName, value);
+  return provider === "codex" ? normalizeCodexToolOutput(enriched) : enriched;
+}
 function forwardAgentMessageToProviderSession(msg, options) {
   const createId = options.createId ?? node_crypto.randomUUID;
   const toolResultType = options.toolResultType ?? "tool-result";
@@ -155,7 +193,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: index.resolveCanonicalToolNameV2(msg.toolName),
         callId: msg.callId,
-        input: attachToolMeta(options.provider, msg.toolName, msg.args),
+        input: prepareToolInput(options.provider, msg.toolName, msg.args),
         id: createId()
       });
       return true;
@@ -164,7 +202,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
       options.send({
         type: toolResultType,
         callId: msg.callId,
-        output: attachToolMeta(options.provider, msg.toolName, msg.result),
+        output: prepareToolOutput(options.provider, msg.toolName, msg.result),
         id: createId(),
         isError: inferToolResultError(msg.result)
       });
@@ -206,7 +244,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: index.resolveCanonicalToolNameV2(rawToolName),
         callId: call_id,
-        input: attachToolMeta(options.provider, rawToolName, inputs),
+        input: prepareToolInput(options.provider, rawToolName, inputs),
         id: createId()
       });
       return true;
@@ -217,7 +255,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: index.resolveCanonicalToolNameV2(rawToolName),
         callId: msg.call_id,
-        input: attachToolMeta(options.provider, rawToolName, {
+        input: prepareToolInput(options.provider, rawToolName, {
           auto_approved: msg.auto_approved,
           changes: msg.changes
         }),
@@ -230,7 +268,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
       options.send({
         type: toolResultType,
         callId: msg.call_id,
-        output: attachToolMeta(options.provider, rawToolName, {
+        output: prepareToolOutput(options.provider, rawToolName, {
           stdout: msg.stdout,
           stderr: msg.stderr,
           success: msg.success
@@ -254,49 +292,6 @@ function forwardAgentMessageToProviderSession(msg, options) {
   }
 }
 
-async function closeProviderSession(session, opts = {}) {
-  let firstError;
-  const captureError = (error) => {
-    if (firstError === void 0) {
-      firstError = error;
-    }
-  };
-  if (opts.archiveOnClose || opts.archiveReason) {
-    try {
-      session.updateMetadata((currentMetadata) => {
-        const { archiveReason: _existingArchiveReason, ...metadataWithoutArchiveReason } = currentMetadata;
-        return {
-          ...metadataWithoutArchiveReason,
-          lifecycleState: "archived",
-          lifecycleStateSince: Date.now(),
-          archivedBy: opts.archivedBy ?? "cli",
-          ...opts.archiveReason ? { archiveReason: opts.archiveReason } : {}
-        };
-      });
-    } catch (error) {
-      captureError(error);
-    }
-  }
-  try {
-    session.sendSessionDeath();
-  } catch (error) {
-    captureError(error);
-  }
-  try {
-    await session.flush();
-  } catch (error) {
-    captureError(error);
-  }
-  try {
-    await session.close();
-  } catch (error) {
-    captureError(error);
-  }
-  if (firstError !== void 0) {
-    throw firstError;
-  }
-}
-
 function createAbortError() {
   const error = new Error("Operation aborted");
   error.name = "AbortError";
@@ -1602,8 +1597,6 @@ exports.MessageBuffer = MessageBuffer;
 exports.MessageQueue2 = MessageQueue2;
 exports.MissingMachineIdError = MissingMachineIdError;
 exports.buildHappyOrgTurnPrompt = buildHappyOrgTurnPrompt;
-exports.closeProviderSession = closeProviderSession;
-exports.createSessionMetadata = createSessionMetadata;
 exports.ensureManagedProviderMachine = ensureManagedProviderMachine;
 exports.finalizeHappyOrgTurn = finalizeHappyOrgTurn;
 exports.forwardAgentMessageToProviderSession = forwardAgentMessageToProviderSession;

package/dist/{registerKillSessionHandler-DAVhkb-l.mjs → registerKillSessionHandler-DmG1p8l7.mjs}

@@ -1,9 +1,7 @@
-import { i as initialMachineMetadata, e as projectPath, R as RuntimeShell, h as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-D72RMo5Z.mjs';
-import { readSettings } from './persistence-CyFjFOlN.mjs';
-import os from 'node:os';
-import { resolve } from 'node:path';
-import { c as configuration, p as packageJson, H as HAPPY_ORG_TURN_REPORT_TAG, d as HAPPY_ORG_SUMMARY_MAX_LENGTH, f as HAPPY_ORG_REPEAT_THRESHOLD, l as logger } from './api-l8X03rs-.mjs';
+import { k as initialMachineMetadata, R as RuntimeShell, l as resolveCanonicalToolNameV2, f as formatDisplayMessage } from './index-B5e-MA1d.mjs';
+import { readSettings } from './persistence-BsWBBi7E.mjs';
 import { randomUUID } from 'node:crypto';
+import { H as HAPPY_ORG_TURN_REPORT_TAG, d as HAPPY_ORG_SUMMARY_MAX_LENGTH, f as HAPPY_ORG_REPEAT_THRESHOLD, l as logger } from './api-DF9A136-.mjs';
 import { createHash } from 'crypto';
 import 'axios';
 import 'node:events';
@@ -35,30 +33,6 @@ async function ensureManagedProviderMachine(opts) {
   return machineId;
 }
 
-function createSessionMetadata(opts) {
-  const state = {
-    controlledByUser: false
-  };
-  const metadata = {
-    path: process.cwd(),
-    host: os.hostname(),
-    version: packageJson.version,
-    os: os.platform(),
-    machineId: opts.machineId,
-    homeDir: os.homedir(),
-    happyHomeDir: configuration.happyCloudHomeDir,
-    happyLibDir: projectPath(),
-    happyToolsDir: resolve(projectPath(), "tools", "unpacked"),
-    startedFromDaemon: opts.startedBy === "daemon",
-    hostPid: process.pid,
-    startedBy: opts.startedBy || "terminal",
-    lifecycleState: "running",
-    lifecycleStateSince: Date.now(),
-    flavor: opts.flavor
-  };
-  return { state, metadata };
-}
-
 async function launchRuntimeHandleWithFactoryResult(opts) {
   const shell = opts.shell ?? new RuntimeShell();
   let factoryResult;
@@ -114,6 +88,62 @@ function attachToolHappierMetaV2(value, meta) {
   };
 }
 
+const DISPLAY_FRIENDLY_TOOL_FIELDS = ["stdout", "stderr", "output", "text", "message", "detail", "reason", "data"];
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function stripInternalToolMeta(value) {
+  if (!isRecord(value)) {
+    return value;
+  }
+  const {
+    _happier: _ignoredHappier,
+    _happy: _ignoredHappy,
+    ...rest
+  } = value;
+  return rest;
+}
+function extractNestedTextContent(value) {
+  if (typeof value === "string") {
+    return value.trim().length > 0 ? value : null;
+  }
+  if (Array.isArray(value)) {
+    const parts = value.map((item) => extractNestedTextContent(item)).filter((item) => typeof item === "string" && item.length > 0);
+    return parts.length > 0 ? parts.join("\n") : null;
+  }
+  if (!isRecord(value)) {
+    return null;
+  }
+  if (typeof value.text === "string" && value.text.trim().length > 0) {
+    return value.text;
+  }
+  if ("content" in value) {
+    return extractNestedTextContent(value.content);
+  }
+  return null;
+}
+function normalizeCodexToolInput(value) {
+  return stripInternalToolMeta(value);
+}
+function normalizeCodexToolOutput(value) {
+  const sanitized = stripInternalToolMeta(value);
+  if (!isRecord(sanitized)) {
+    return sanitized;
+  }
+  const hasDisplayFriendlyField = DISPLAY_FRIENDLY_TOOL_FIELDS.some((field) => field in sanitized);
+  if (hasDisplayFriendlyField || !("content" in sanitized)) {
+    return sanitized;
+  }
+  const flattenedText = extractNestedTextContent(sanitized.content);
+  if (!flattenedText) {
+    return sanitized;
+  }
+  const { content: _content, ...rest } = sanitized;
+  return {
+    ...rest,
+    text: flattenedText
+  };
+}
 function getDefaultExecToolName(provider) {
   switch (provider) {
     case "claude":
@@ -144,6 +174,14 @@ function attachToolMeta(provider, rawToolName, value) {
     canonicalToolName
   });
 }
+function prepareToolInput(provider, rawToolName, value) {
+  const enriched = attachToolMeta(provider, rawToolName, value);
+  return provider === "codex" ? normalizeCodexToolInput(enriched) : enriched;
+}
+function prepareToolOutput(provider, rawToolName, value) {
+  const enriched = attachToolMeta(provider, rawToolName, value);
+  return provider === "codex" ? normalizeCodexToolOutput(enriched) : enriched;
+}
 function forwardAgentMessageToProviderSession(msg, options) {
   const createId = options.createId ?? randomUUID;
   const toolResultType = options.toolResultType ?? "tool-result";
@@ -153,7 +191,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: resolveCanonicalToolNameV2(msg.toolName),
         callId: msg.callId,
-        input: attachToolMeta(options.provider, msg.toolName, msg.args),
+        input: prepareToolInput(options.provider, msg.toolName, msg.args),
         id: createId()
       });
       return true;
@@ -162,7 +200,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
       options.send({
         type: toolResultType,
         callId: msg.callId,
-        output: attachToolMeta(options.provider, msg.toolName, msg.result),
+        output: prepareToolOutput(options.provider, msg.toolName, msg.result),
         id: createId(),
         isError: inferToolResultError(msg.result)
       });
@@ -204,7 +242,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: resolveCanonicalToolNameV2(rawToolName),
         callId: call_id,
-        input: attachToolMeta(options.provider, rawToolName, inputs),
+        input: prepareToolInput(options.provider, rawToolName, inputs),
         id: createId()
       });
       return true;
@@ -215,7 +253,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
         type: "tool-call",
         name: resolveCanonicalToolNameV2(rawToolName),
         callId: msg.call_id,
-        input: attachToolMeta(options.provider, rawToolName, {
+        input: prepareToolInput(options.provider, rawToolName, {
           auto_approved: msg.auto_approved,
           changes: msg.changes
         }),
@@ -228,7 +266,7 @@ function forwardAgentMessageToProviderSession(msg, options) {
       options.send({
         type: toolResultType,
         callId: msg.call_id,
-        output: attachToolMeta(options.provider, rawToolName, {
+        output: prepareToolOutput(options.provider, rawToolName, {
           stdout: msg.stdout,
           stderr: msg.stderr,
           success: msg.success
@@ -252,49 +290,6 @@ function forwardAgentMessageToProviderSession(msg, options) {
   }
 }
 
-async function closeProviderSession(session, opts = {}) {
-  let firstError;
-  const captureError = (error) => {
-    if (firstError === void 0) {
-      firstError = error;
-    }
-  };
-  if (opts.archiveOnClose || opts.archiveReason) {
-    try {
-      session.updateMetadata((currentMetadata) => {
-        const { archiveReason: _existingArchiveReason, ...metadataWithoutArchiveReason } = currentMetadata;
-        return {
-          ...metadataWithoutArchiveReason,
-          lifecycleState: "archived",
-          lifecycleStateSince: Date.now(),
-          archivedBy: opts.archivedBy ?? "cli",
-          ...opts.archiveReason ? { archiveReason: opts.archiveReason } : {}
-        };
-      });
-    } catch (error) {
-      captureError(error);
-    }
-  }
-  try {
-    session.sendSessionDeath();
-  } catch (error) {
-    captureError(error);
-  }
-  try {
-    await session.flush();
-  } catch (error) {
-    captureError(error);
-  }
-  try {
-    await session.close();
-  } catch (error) {
-    captureError(error);
-  }
-  if (firstError !== void 0) {
-    throw firstError;
-  }
-}
-
 function createAbortError() {
   const error = new Error("Operation aborted");
   error.name = "AbortError";
@@ -1592,4 +1587,4 @@ function registerKillSessionHandler(rpcHandlerManager, killThisHappy) {
   });
 }
 
-export { BasePermissionHandler as B, ConversationHistory$1 as C, INTERACTION_SUPERSEDED_ERROR as I, MissingMachineIdError as M, INTERACTION_TIMED_OUT_ERROR as a, MessageQueue2 as b, createSessionMetadata as c, registerKillSessionHandler as d, ensureManagedProviderMachine as e, MessageBuffer as f, getPendingInteractionTimeoutMs as g, hashObject as h, buildHappyOrgTurnPrompt as i, finalizeHappyOrgTurn as j, closeProviderSession as k, launchRuntimeHandleWithFactoryResult as l, inferToolResultError as m, forwardAgentMessageToProviderSession as n, resolveHappyOrgQueuedTurn as r, syncControlledByUserState as s, waitForResponseCompleteWithAbort as w };
+export { BasePermissionHandler as B, ConversationHistory$1 as C, INTERACTION_SUPERSEDED_ERROR as I, MissingMachineIdError as M, INTERACTION_TIMED_OUT_ERROR as a, MessageQueue2 as b, registerKillSessionHandler as c, MessageBuffer as d, ensureManagedProviderMachine as e, buildHappyOrgTurnPrompt as f, getPendingInteractionTimeoutMs as g, hashObject as h, finalizeHappyOrgTurn as i, inferToolResultError as j, forwardAgentMessageToProviderSession as k, launchRuntimeHandleWithFactoryResult as l, resolveHappyOrgQueuedTurn as r, syncControlledByUserState as s, waitForResponseCompleteWithAbort as w };

package/dist/{runClaude-BRhQLKjh.mjs → runClaude-MF34EsCp.mjs}

@@ -1,8 +1,8 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, g as backoff, h as delay, j as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-l8X03rs-.mjs';
+import { l as logger, g as backoff, h as delay, j as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-DF9A136-.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
-import { j as getProjectPath, F as Future, k as claudeLocal, E as ExitCodeError, l as trimIdent, m as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, n as claudeCheckSession, e as projectPath, o as mapToClaudeMode, P as PushableAsyncIterable, q as query, A as AbortError, b as stopCaffeinate, p as publishSessionRegistration, u as getEnvironmentInfo, w as startCaffeinate } from './index-D72RMo5Z.mjs';
+import { m as getProjectPath, F as Future, n as claudeLocal, E as ExitCodeError, o as trimIdent, q as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, u as claudeCheckSession, w as projectPath, x as mapToClaudeMode, P as PushableAsyncIterable, y as query, A as AbortError, e as stopCaffeinate, p as publishSessionRegistration, z as getEnvironmentInfo, a as createSessionMetadata, B as startCaffeinate, b as closeProviderSession } from './index-B5e-MA1d.mjs';
 import 'ps-list';
 import 'fs';
 import 'path';
@@ -13,7 +13,7 @@ import { dirname, basename, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { execSync } from 'node:child_process';
 import 'node:readline';
-import './persistence-CyFjFOlN.mjs';
+import './persistence-BsWBBi7E.mjs';
 import { readFile } from 'node:fs/promises';
 import { stat, watch, access } from 'fs/promises';
 import 'crypto';
@@ -24,9 +24,9 @@ import 'tweetnacl';
 import 'open';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-CGTnB7ba.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-C3kHFqeq.mjs';
 import { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
-import { B as BasePermissionHandler, f as MessageBuffer, C as ConversationHistory$1, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, n as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, c as createSessionMetadata, b as MessageQueue2, h as hashObject, d as registerKillSessionHandler, k as closeProviderSession } from './registerKillSessionHandler-DAVhkb-l.mjs';
+import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, k as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler } from './registerKillSessionHandler-DmG1p8l7.mjs';
 import 'socket.io-client';
 import 'expo-server-sdk';
 import { isDeepStrictEqual } from 'node:util';
@@ -1401,6 +1401,7 @@ ${systemPrompt}` : systemPrompt,
       permissionHandler.setPermissionMode(message.mode.permissionMode);
       messageBuffer.addMessage(message.message, "user");
       let shouldClearHistoryAfterTurn = false;
+      let shouldCommitAccumulatedResponse = false;
       let turnStatus = "task_complete";
       try {
         turnInFlight = true;
@@ -1422,18 +1423,19 @@ ${systemPrompt}` : systemPrompt,
         conversationHistory.addUserMessage(message.message);
         await activeRuntimeHandle.sendPrompt(promptToSend);
         await waitForResponseCompleteWithAbort(activeRuntimeHandle.backend, abortController.signal);
+        shouldCommitAccumulatedResponse = true;
         shouldInjectHistoryOnNextSession = false;
         shouldClearHistoryAfterTurn = specialCommand.type === "compact";
       } catch (error) {
         logger.warn("[ClaudeACP] Error in Claude ACP session:", error);
         const isAbortError = error instanceof Error && error.name === "AbortError";
         const isExpectedInterruption = isAbortError || abortController.signal.aborted || shouldExit;
+        turnStatus = "turn_aborted";
+        session.client.sendAgentMessage("claude", {
+          type: "turn_aborted",
+          id: randomUUID()
+        });
         if (isExpectedInterruption) {
-          turnStatus = "turn_aborted";
-          session.client.sendAgentMessage("claude", {
-            type: "turn_aborted",
-            id: randomUUID()
-          });
           emitStatusMessage("Aborted by user");
         } else {
           const errorMessage = normalizeClaudeBackendError(error);
@@ -1463,7 +1465,9 @@ ${systemPrompt}` : systemPrompt,
           emitStatusMessage(finalizedTurn.terminateMessage);
         }
         accumulatedResponse = finalizedTurn.cleanedText;
-        emitFinalAssistantMessage(finalizedTurn.cleanedText);
+        if (shouldCommitAccumulatedResponse) {
+          emitFinalAssistantMessage(finalizedTurn.cleanedText);
+        }
         if (shouldClearHistoryAfterTurn) {
           conversationHistory.clear();
           emitStatusMessage("Compaction completed");
@@ -1732,6 +1736,7 @@ class PermissionHandler {
   toolCalls = [];
   responses = /* @__PURE__ */ new Map();
   pendingRequests = /* @__PURE__ */ new Map();
+  pendingToolCallResolutions = /* @__PURE__ */ new Set();
   session;
   allowedTools = /* @__PURE__ */ new Set();
   allowedBashLiterals = /* @__PURE__ */ new Set();
@@ -1811,23 +1816,20 @@ class PermissionHandler {
     if (this.permissionMode === "acceptEdits" && descriptor.edit) {
       return { behavior: "allow", updatedInput: input };
     }
-    let toolCallId = this.resolveToolCallId(toolName, input);
-    if (!toolCallId) {
-      await delay(1e3);
-      toolCallId = this.resolveToolCallId(toolName, input);
-      if (!toolCallId) {
-        throw new Error(`Could not resolve tool call ID for ${toolName}`);
-      }
-    }
+    const toolCallId = await this.waitForToolCallId(toolName, input, options.signal);
     return this.handlePermissionRequest(toolCallId, toolName, input, options.signal);
   };
   /**
    * Handles individual permission requests
    */
   async handlePermissionRequest(id, toolName, input, signal) {
+    if (signal.aborted) {
+      throw new Error("Permission request aborted");
+    }
     return new Promise((resolve, reject) => {
       const abortHandler = () => {
         this.pendingRequests.delete(id);
+        this.moveRequestToCompleted(id, "canceled", "Permission request aborted");
         reject(new Error("Permission request aborted"));
       };
       signal.addEventListener("abort", abortHandler, { once: true });
@@ -1870,6 +1872,31 @@ class PermissionHandler {
       logger.debug(`Permission request sent for tool call ${id}: ${toolName}`);
     });
   }
+  moveRequestToCompleted(id, status, reason, extra = {}) {
+    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,
+            reason,
+            mode: extra.mode,
+            allowTools: extra.allowTools
+          }
+        }
+      };
+    });
+  }
   /**
    * Parses Bash permission strings into literal and prefix sets
    */
@@ -1906,6 +1933,49 @@ class PermissionHandler {
     }
     return null;
   }
+  async waitForToolCallId(toolName, input, signal) {
+    const existingToolCallId = this.resolveToolCallId(toolName, input);
+    if (existingToolCallId) {
+      return existingToolCallId;
+    }
+    if (signal.aborted) {
+      throw new Error("Permission request aborted before tool call was observed");
+    }
+    return new Promise((resolve, reject) => {
+      const pendingResolution = {};
+      const cleanup = () => {
+        signal.removeEventListener("abort", pendingResolution.abortHandler);
+        this.pendingToolCallResolutions.delete(pendingResolution);
+      };
+      pendingResolution.toolName = toolName;
+      pendingResolution.input = input;
+      pendingResolution.resolve = (toolCallId) => {
+        cleanup();
+        resolve(toolCallId);
+      };
+      pendingResolution.reject = (error) => {
+        cleanup();
+        reject(error);
+      };
+      pendingResolution.abortHandler = () => {
+        pendingResolution.reject(new Error("Permission request aborted before tool call was observed"));
+      };
+      this.pendingToolCallResolutions.add(pendingResolution);
+      signal.addEventListener("abort", pendingResolution.abortHandler, { once: true });
+      this.resolvePendingToolCallResolutions();
+    });
+  }
+  resolvePendingToolCallResolutions() {
+    if (this.pendingToolCallResolutions.size === 0) {
+      return;
+    }
+    for (const pending of Array.from(this.pendingToolCallResolutions)) {
+      const toolCallId = this.resolveToolCallId(pending.toolName, pending.input);
+      if (toolCallId) {
+        pending.resolve(toolCallId);
+      }
+    }
+  }
   /**
    * Handles messages to track tool calls
    */
@@ -1923,6 +1993,7 @@ class PermissionHandler {
             });
           }
         }
+        this.resolvePendingToolCallResolutions();
       }
     }
     if (message.type === "user") {
@@ -1961,6 +2032,10 @@ class PermissionHandler {
     this.allowedTools.clear();
     this.allowedBashLiterals.clear();
     this.allowedBashPrefixes.clear();
+    for (const pendingResolution of Array.from(this.pendingToolCallResolutions)) {
+      pendingResolution.reject(new Error("Session reset"));
+    }
+    this.pendingToolCallResolutions.clear();
     for (const [, pending] of this.pendingRequests.entries()) {
       pending.reject(new Error("Session reset"));
     }
@@ -1999,27 +2074,15 @@ class PermissionHandler {
       this.responses.set(id, { ...message, receivedAt: Date.now() });
       this.pendingRequests.delete(id);
       this.handlePermissionResponse(message, pending);
-      this.session.client.updateAgentState((currentState) => {
-        const request = currentState.requests?.[id];
-        if (!request) return currentState;
-        let r = { ...currentState.requests };
-        delete r[id];
-        return {
-          ...currentState,
-          requests: r,
-          completedRequests: {
-            ...currentState.completedRequests,
-            [id]: {
-              ...request,
-              completedAt: Date.now(),
-              status: message.approved ? "approved" : "denied",
-              reason: message.reason,
-              mode: message.mode,
-              allowTools: message.allowTools
-            }
-          }
-        };
-      });
+      this.moveRequestToCompleted(
+        id,
+        message.approved ? "approved" : "denied",
+        message.reason,
+        {
+          mode: message.mode,
+          allowTools: message.allowTools
+        }
+      );
     });
   }
   /**