happy-imou-cloud 2.0.19 → 2.0.21

package/dist/{BaseReasoningProcessor-CTaamD5D.cjs → BaseReasoningProcessor-0nj-PMFc.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-D0VIxWJC.cjs');
-var api = require('./api-DmpNsXS1.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DZ1sXUOg.cjs');
+var index = require('./index-CgVjDJpt.cjs');
+var api = require('./api-MGlKcEf3.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cs_INk4A.cjs');
 var node_events = require('node:events');
 var node_crypto = require('node:crypto');
 

package/dist/{BaseReasoningProcessor-pY3tfQ0E.mjs → BaseReasoningProcessor-DnVC7liC.mjs}

@@ -1,6 +1,6 @@
-import { p as publishSessionRegistration } from './index-BkAY8k_1.mjs';
-import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-B922KGF8.mjs';
-import { c as createSessionMetadata } from './registerKillSessionHandler-BqeqMcNV.mjs';
+import { p as publishSessionRegistration } from './index-CHXCgpwi.mjs';
+import { s as startOfflineReconnection, c as configuration, i as isAuthenticationRequiredError, l as logger } from './api-DJe9WP9M.mjs';
+import { c as createSessionMetadata } from './registerKillSessionHandler-DsHTZDsU.mjs';
 import { EventEmitter } from 'node:events';
 import { randomUUID } from 'node:crypto';
 

package/dist/{ProviderSelectionHandler-CYs2k-z1.cjs → ProviderSelectionHandler-Bafuy28L.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var api = require('./api-DmpNsXS1.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DZ1sXUOg.cjs');
+var api = require('./api-MGlKcEf3.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cs_INk4A.cjs');
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{ProviderSelectionHandler-C8pLBbE4.mjs → ProviderSelectionHandler-R-2r7ItM.mjs}

@@ -1,5 +1,5 @@
-import { l as logger } from './api-B922KGF8.mjs';
-import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-BqeqMcNV.mjs';
+import { l as logger } from './api-DJe9WP9M.mjs';
+import { g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, a as INTERACTION_TIMED_OUT_ERROR } from './registerKillSessionHandler-DsHTZDsU.mjs';
 
 async function runModeLoop(opts) {
   let currentMode = opts.startingMode;

package/dist/{api-B922KGF8.mjs → api-DJe9WP9M.mjs}

@@ -16,7 +16,7 @@ import { spawn } from 'node:child_process';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.0.19";
+var version = "2.0.21";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -430,7 +430,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await import('./persistence-BfGHkCeJ.mjs');
+      const { readDaemonState } = await import('./persistence-CkP90vEt.mjs');
       const state = await readDaemonState();
       if (!state) {
         return logs;
@@ -564,6 +564,77 @@ function decrypt(key, variant, data) {
   }
 }
 
+const HAPPY_ORG_REPEAT_THRESHOLD = 3;
+const HAPPY_ORG_TURN_REPORT_TAG = "HAPPY_TURN_REPORT";
+const HappyOrgInterventionTypeSchema = z.enum([
+  "none",
+  "review_needed",
+  "blocker",
+  "decision_needed"
+]);
+const HappyOrgTurnStatusSchema = z.enum([
+  "task_complete",
+  "turn_aborted"
+]);
+const HappyOrgTaskContextSchema = z.object({
+  taskId: z.string().min(1),
+  organizationId: z.string().min(1),
+  memberAgentId: z.string().min(1),
+  supervisorAgentId: z.string().min(1)
+});
+const HappyOrgTaskControlSchema = z.object({
+  action: z.enum(["terminate", "reopen"]),
+  reason: z.string().min(1).optional().nullable(),
+  newContext: z.string().min(1).optional().nullable(),
+  newDecision: z.string().min(1).optional().nullable(),
+  newResource: z.string().min(1).optional().nullable()
+});
+const HappyOrgMessageMetaSchema = z.object({
+  taskContext: HappyOrgTaskContextSchema.optional(),
+  control: HappyOrgTaskControlSchema.optional()
+});
+z.object({
+  summary: z.string().optional().nullable(),
+  interventionType: HappyOrgInterventionTypeSchema.optional().nullable(),
+  blockerCode: z.string().optional().nullable(),
+  decisionNeeded: z.string().optional().nullable(),
+  targetArtifact: z.string().optional().nullable()
+});
+const HappyOrgTurnReportSchema = HappyOrgTaskContextSchema.extend({
+  turnStatus: HappyOrgTurnStatusSchema,
+  interventionType: HappyOrgInterventionTypeSchema,
+  summary: z.string(),
+  blockerCode: z.string().nullable(),
+  decisionNeeded: z.string().nullable(),
+  targetArtifact: z.string().nullable(),
+  repeatFingerprint: z.string().nullable()
+});
+const HappyOrgRepeatEntrySchema = z.object({
+  count: z.number().int().nonnegative(),
+  lastSeenAt: z.number().int().nonnegative()
+});
+const HappyOrgRuntimeStateSchema = z.object({
+  status: z.enum(["active", "terminated"]),
+  reason: z.string().optional().nullable(),
+  terminatedAt: z.number().int().nonnegative().optional(),
+  reopenedAt: z.number().int().nonnegative().optional()
+});
+const HappyOrgTaskOwnershipSchema = z.object({
+  ownerAgentId: z.string().min(1),
+  ownerRunId: z.string().min(1),
+  claimedAt: z.number().int().nonnegative()
+});
+z.object({
+  taskContext: HappyOrgTaskContextSchema.optional(),
+  runtime: HappyOrgRuntimeStateSchema.optional(),
+  activeOwner: HappyOrgTaskOwnershipSchema.nullish(),
+  repeat: z.object({
+    threshold: z.number().int().positive(),
+    fingerprints: z.record(z.string(), HappyOrgRepeatEntrySchema)
+  }).optional(),
+  lastTurnReport: HappyOrgTurnReportSchema.optional()
+});
+
 const SessionRuntimeIndexSchema = z.object({
   machineId: z.string().nullish(),
   hostPid: z.number().int().nullish(),
@@ -789,8 +860,9 @@ const MessageMetaSchema = z.object({
   // Append to system prompt for this message (null = reset)
   allowedTools: z.array(z.string()).nullable().optional(),
   // Allowed tools for this message (null = reset)
-  disallowedTools: z.array(z.string()).nullable().optional()
+  disallowedTools: z.array(z.string()).nullable().optional(),
   // Disallowed tools for this message (null = reset)
+  happyOrg: HappyOrgMessageMetaSchema.optional()
 });
 z.object({
   session: z.object({
@@ -2381,6 +2453,7 @@ class ApiSessionClient extends EventEmitter {
       case "task_started":
       case "task_complete":
       case "turn_aborted":
+      case "turn-report":
         return true;
       default:
         return false;
@@ -3540,4 +3613,4 @@ var api = /*#__PURE__*/Object.freeze({
   ApiClient: ApiClient
 });
 
-export { ApiClient as A, HAPPY_CLOUD_DAEMON_PORT as H, SigningBootstrapRequiredError as S, ApiSessionClient as a, connectionState as b, configuration as c, backoff as d, encodeBase64 as e, delay as f, AsyncLock as g, buildAuthenticatedHeaders as h, isAuthenticationRequiredError as i, SIGNING_BOOTSTRAP_REQUIRED_MESSAGE as j, encodeBase64Url as k, logger as l, buildClientHeaders as m, decodeBase64 as n, HeadTailPreviewBuffer as o, packageJson as p, getLatestDaemonLog as q, api as r, startOfflineReconnection as s };
+export { ApiClient as A, HAPPY_ORG_TURN_REPORT_TAG as H, SigningBootstrapRequiredError as S, ApiSessionClient as a, connectionState as b, configuration as c, HAPPY_ORG_REPEAT_THRESHOLD as d, encodeBase64 as e, backoff as f, delay as g, AsyncLock as h, isAuthenticationRequiredError as i, buildAuthenticatedHeaders as j, SIGNING_BOOTSTRAP_REQUIRED_MESSAGE as k, logger as l, encodeBase64Url as m, buildClientHeaders as n, decodeBase64 as o, packageJson as p, HAPPY_CLOUD_DAEMON_PORT as q, HeadTailPreviewBuffer as r, startOfflineReconnection as s, getLatestDaemonLog as t, api as u };

package/dist/{api-DmpNsXS1.cjs → api-MGlKcEf3.cjs}

@@ -18,7 +18,7 @@ var node_child_process = require('node:child_process');
 var expoServerSdk = require('expo-server-sdk');
 
 var name = "happy-imou-cloud";
-var version = "2.0.19";
+var version = "2.0.21";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -432,7 +432,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-ZZDZ6dl9.cjs'); });
+      const { readDaemonState } = await Promise.resolve().then(function () { return require('./persistence-DLFUNI9q.cjs'); });
       const state = await readDaemonState();
       if (!state) {
         return logs;
@@ -566,6 +566,77 @@ function decrypt(key, variant, data) {
   }
 }
 
+const HAPPY_ORG_REPEAT_THRESHOLD = 3;
+const HAPPY_ORG_TURN_REPORT_TAG = "HAPPY_TURN_REPORT";
+const HappyOrgInterventionTypeSchema = z.z.enum([
+  "none",
+  "review_needed",
+  "blocker",
+  "decision_needed"
+]);
+const HappyOrgTurnStatusSchema = z.z.enum([
+  "task_complete",
+  "turn_aborted"
+]);
+const HappyOrgTaskContextSchema = z.z.object({
+  taskId: z.z.string().min(1),
+  organizationId: z.z.string().min(1),
+  memberAgentId: z.z.string().min(1),
+  supervisorAgentId: z.z.string().min(1)
+});
+const HappyOrgTaskControlSchema = z.z.object({
+  action: z.z.enum(["terminate", "reopen"]),
+  reason: z.z.string().min(1).optional().nullable(),
+  newContext: z.z.string().min(1).optional().nullable(),
+  newDecision: z.z.string().min(1).optional().nullable(),
+  newResource: z.z.string().min(1).optional().nullable()
+});
+const HappyOrgMessageMetaSchema = z.z.object({
+  taskContext: HappyOrgTaskContextSchema.optional(),
+  control: HappyOrgTaskControlSchema.optional()
+});
+z.z.object({
+  summary: z.z.string().optional().nullable(),
+  interventionType: HappyOrgInterventionTypeSchema.optional().nullable(),
+  blockerCode: z.z.string().optional().nullable(),
+  decisionNeeded: z.z.string().optional().nullable(),
+  targetArtifact: z.z.string().optional().nullable()
+});
+const HappyOrgTurnReportSchema = HappyOrgTaskContextSchema.extend({
+  turnStatus: HappyOrgTurnStatusSchema,
+  interventionType: HappyOrgInterventionTypeSchema,
+  summary: z.z.string(),
+  blockerCode: z.z.string().nullable(),
+  decisionNeeded: z.z.string().nullable(),
+  targetArtifact: z.z.string().nullable(),
+  repeatFingerprint: z.z.string().nullable()
+});
+const HappyOrgRepeatEntrySchema = z.z.object({
+  count: z.z.number().int().nonnegative(),
+  lastSeenAt: z.z.number().int().nonnegative()
+});
+const HappyOrgRuntimeStateSchema = z.z.object({
+  status: z.z.enum(["active", "terminated"]),
+  reason: z.z.string().optional().nullable(),
+  terminatedAt: z.z.number().int().nonnegative().optional(),
+  reopenedAt: z.z.number().int().nonnegative().optional()
+});
+const HappyOrgTaskOwnershipSchema = z.z.object({
+  ownerAgentId: z.z.string().min(1),
+  ownerRunId: z.z.string().min(1),
+  claimedAt: z.z.number().int().nonnegative()
+});
+z.z.object({
+  taskContext: HappyOrgTaskContextSchema.optional(),
+  runtime: HappyOrgRuntimeStateSchema.optional(),
+  activeOwner: HappyOrgTaskOwnershipSchema.nullish(),
+  repeat: z.z.object({
+    threshold: z.z.number().int().positive(),
+    fingerprints: z.z.record(z.z.string(), HappyOrgRepeatEntrySchema)
+  }).optional(),
+  lastTurnReport: HappyOrgTurnReportSchema.optional()
+});
+
 const SessionRuntimeIndexSchema = z.z.object({
   machineId: z.z.string().nullish(),
   hostPid: z.z.number().int().nullish(),
@@ -791,8 +862,9 @@ const MessageMetaSchema = z.z.object({
   // Append to system prompt for this message (null = reset)
   allowedTools: z.z.array(z.z.string()).nullable().optional(),
   // Allowed tools for this message (null = reset)
-  disallowedTools: z.z.array(z.z.string()).nullable().optional()
+  disallowedTools: z.z.array(z.z.string()).nullable().optional(),
   // Disallowed tools for this message (null = reset)
+  happyOrg: HappyOrgMessageMetaSchema.optional()
 });
 z.z.object({
   session: z.z.object({
@@ -2383,6 +2455,7 @@ class ApiSessionClient extends node_events.EventEmitter {
       case "task_started":
       case "task_complete":
       case "turn_aborted":
+      case "turn-report":
         return true;
       default:
         return false;
@@ -3546,6 +3619,8 @@ exports.ApiClient = ApiClient;
 exports.ApiSessionClient = ApiSessionClient;
 exports.AsyncLock = AsyncLock;
 exports.HAPPY_CLOUD_DAEMON_PORT = HAPPY_CLOUD_DAEMON_PORT;
+exports.HAPPY_ORG_REPEAT_THRESHOLD = HAPPY_ORG_REPEAT_THRESHOLD;
+exports.HAPPY_ORG_TURN_REPORT_TAG = HAPPY_ORG_TURN_REPORT_TAG;
 exports.HeadTailPreviewBuffer = HeadTailPreviewBuffer;
 exports.SIGNING_BOOTSTRAP_REQUIRED_MESSAGE = SIGNING_BOOTSTRAP_REQUIRED_MESSAGE;
 exports.SigningBootstrapRequiredError = SigningBootstrapRequiredError;

package/dist/{command-uX614XS4.mjs → command-CfyFnMv2.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-BkAY8k_1.mjs';
+import { c as createDefaultRuntimeShell } from './index-CHXCgpwi.mjs';
 import 'chalk';
-import './api-B922KGF8.mjs';
+import './api-DJe9WP9M.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';
@@ -16,7 +16,7 @@ import 'crypto';
 import 'path';
 import 'node:child_process';
 import 'expo-server-sdk';
-import './persistence-BfGHkCeJ.mjs';
+import './persistence-CkP90vEt.mjs';
 import 'node:fs/promises';
 import 'os';
 import 'tmp';

package/dist/{command-B4L9Deq_.cjs → command-DAlFmWmr.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-D0VIxWJC.cjs');
+var index = require('./index-CgVjDJpt.cjs');
 require('chalk');
-require('./api-DmpNsXS1.cjs');
+require('./api-MGlKcEf3.cjs');
 require('axios');
 require('fs');
 require('node:fs');
@@ -18,7 +18,7 @@ require('crypto');
 require('path');
 require('node:child_process');
 require('expo-server-sdk');
-require('./persistence-ZZDZ6dl9.cjs');
+require('./persistence-DLFUNI9q.cjs');
 require('node:fs/promises');
 require('os');
 require('tmp');

package/dist/{index-BkAY8k_1.mjs → index-CHXCgpwi.mjs}

@@ -1,6 +1,6 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
-import { l as logger, e as encodeBase64, c as configuration, h as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, j as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, k as encodeBase64Url, f as delay, m as buildClientHeaders, n as decodeBase64, H as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, o as HeadTailPreviewBuffer, q as getLatestDaemonLog } from './api-B922KGF8.mjs';
-import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-BfGHkCeJ.mjs';
+import { l as logger, e as encodeBase64, c as configuration, j as buildAuthenticatedHeaders, S as SigningBootstrapRequiredError, k as SIGNING_BOOTSTRAP_REQUIRED_MESSAGE, m as encodeBase64Url, g as delay, n as buildClientHeaders, o as decodeBase64, q as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, A as ApiClient, r as HeadTailPreviewBuffer, t as getLatestDaemonLog } from './api-DJe9WP9M.mjs';
+import { writeCredentialsLegacy, writeCredentialsDataKey, readCredentials, readSettings, updateSettings, readDaemonState, clearDaemonState, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-CkP90vEt.mjs';
 import { z } from 'zod';
 import fs, { writeFile as writeFile$1, rename, unlink as unlink$1 } from 'fs/promises';
 import os, { homedir } from 'os';
@@ -5210,6 +5210,12 @@ function renderToolOutput(accumulator) {
   }
   return accumulator.preview.render("tool output");
 }
+function formatToolCallTimeoutLimit(timeoutMs) {
+  if (timeoutMs < 1e3) {
+    return `${timeoutMs}ms`;
+  }
+  return `${(timeoutMs / 1e3).toFixed(Number.isInteger(timeoutMs / 1e3) ? 0 : 1)}s`;
+}
 function isRecord$1(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -5405,14 +5411,36 @@ function startToolCall(toolCallId, toolKind, update, ctx, source) {
   if (!ctx.toolCallTimeouts.has(toolCallId)) {
     const timeout = setTimeout(() => {
       const duration = formatDuration(ctx.toolCallStartTimes.get(toolCallId));
-      logger.debug(`[AcpBackend] \u23F1\uFE0F Tool call TIMEOUT (from ${source}): ${toolCallId} (${toolKind}) after ${(timeoutMs / 1e3).toFixed(0)}s - Duration: ${duration}, removing from active set`);
+      const timeoutLabel = formatToolCallTimeoutLimit(timeoutMs);
+      const timeoutDetail = `Tool call ${realToolName} timed out after ${timeoutLabel}`;
+      logger.debug(`[AcpBackend] \u23F1\uFE0F Tool call TIMEOUT (from ${source}): ${toolCallId} (${toolKind}) after ${timeoutLabel} - Duration: ${duration}, failing current turn`);
       ctx.activeToolCalls.delete(toolCallId);
       ctx.toolCallStartTimes.delete(toolCallId);
       ctx.toolCallTimeouts.delete(toolCallId);
-      if (ctx.activeToolCalls.size === 0) {
-        logger.debug("[AcpBackend] No more active tool calls after timeout, emitting idle status");
-        ctx.emitIdleStatus();
-      }
+      ctx.clearIdleTimeout();
+      const streamedOutput = renderToolOutput(ctx.toolCallOutputs.get(toolCallId));
+      ctx.toolCallOutputs.delete(toolCallId);
+      ctx.emit({
+        type: "tool-result",
+        toolName: realToolName,
+        result: streamedOutput ? {
+          stdout: streamedOutput,
+          error: timeoutDetail,
+          status: "failed",
+          timedOut: true
+        } : {
+          error: timeoutDetail,
+          status: "failed",
+          timedOut: true
+        },
+        callId: toolCallId
+      });
+      ctx.emit({
+        type: "status",
+        status: "error",
+        detail: timeoutDetail
+      });
+      ctx.failPendingResponseWait(new Error(timeoutDetail));
     }, timeoutMs);
     ctx.toolCallTimeouts.set(toolCallId, timeout);
     logger.debug(`[AcpBackend] \u23F1\uFE0F Set timeout for ${toolCallId}: ${(timeoutMs / 1e3).toFixed(0)}s${isInvestigation ? " (investigation tool)" : ""}`);
@@ -6681,6 +6709,7 @@ ${recentStderrExcerpt}`);
       toolCallCountSincePrompt: this.toolCallCountSincePrompt,
       emit: (msg) => this.emit(msg),
       emitIdleStatus: () => this.emitIdleStatus(),
+      failPendingResponseWait: (error) => this.failPendingResponseWait(error),
       clearIdleTimeout: () => {
         if (this.idleTimeout) {
           clearTimeout(this.idleTimeout);
@@ -7443,6 +7472,9 @@ function dedupePaths(paths, platform) {
   }
   return unique;
 }
+function getPathDelimiter(platform) {
+  return platform === "win32" ? ";" : ":";
+}
 function resolveCodexShimPath({
   platform = process.platform,
   exists = existsSync,
@@ -7520,6 +7552,7 @@ function resolveBundledCodexToolPathDirs(options = {}) {
 }
 function buildCodexAcpEnv(overrides = {}, options = {}) {
   const platform = options.platform ?? process.platform;
+  const pathDelimiter = getPathDelimiter(platform);
   const env = {
     ...process.env,
     ...overrides
@@ -7527,14 +7560,14 @@ function buildCodexAcpEnv(overrides = {}, options = {}) {
   const pathKey = resolvePathEnvKey(env);
   const alternatePathKey = pathKey === "PATH" ? "Path" : "PATH";
   const currentPathValue = env[pathKey] ?? env[alternatePathKey] ?? "";
-  const currentPathEntries = currentPathValue.split(delimiter).filter(Boolean);
+  const currentPathEntries = currentPathValue.split(pathDelimiter).filter(Boolean);
   const codexToolDirs = resolveBundledCodexToolPathDirs(options);
   const mergedPathEntries = dedupePaths(
     [...codexToolDirs, ...currentPathEntries],
     platform
   );
   if (mergedPathEntries.length > 0) {
-    env[pathKey] = mergedPathEntries.join(delimiter);
+    env[pathKey] = mergedPathEntries.join(pathDelimiter);
   }
   delete env[alternatePathKey];
   const stringEnvEntries = [];
@@ -8941,11 +8974,11 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await import('./runClaude-CVBty_g7.mjs');
+    const { runClaude } = await import('./runClaude-DAQAEmHe.mjs');
     await runClaude(opts.credentials, opts.claudeOptions ?? {});
   },
   codex: async (opts) => {
-    const { runCodex } = await import('./runCodex-jA1hK-nj.mjs');
+    const { runCodex } = await import('./runCodex-B2UpSn82.mjs');
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -8954,7 +8987,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await import('./runGemini-BqKLrnid.mjs');
+    const { runGemini } = await import('./runGemini-BBUmH1Qh.mjs');
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -9030,7 +9063,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await import('./command-uX614XS4.mjs');
+      const { renderRuntimeProviders } = await import('./command-CfyFnMv2.mjs');
       console.log(renderRuntimeProviders());
       return;
     }
@@ -9208,8 +9241,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await import('./persistence-BfGHkCeJ.mjs');
-        const { ApiClient: ApiClient2 } = await import('./api-B922KGF8.mjs').then(function (n) { return n.r; });
+        const { readCredentials: readCredentials2 } = await import('./persistence-CkP90vEt.mjs');
+        const { ApiClient: ApiClient2 } = await import('./api-DJe9WP9M.mjs').then(function (n) { return n.u; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();

package/dist/{index-D0VIxWJC.cjs → index-CgVjDJpt.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
 var chalk = require('chalk');
-var api = require('./api-DmpNsXS1.cjs');
-var persistence = require('./persistence-ZZDZ6dl9.cjs');
+var api = require('./api-MGlKcEf3.cjs');
+var persistence = require('./persistence-DLFUNI9q.cjs');
 var z = require('zod');
 var fs$2 = require('fs/promises');
 var os$1 = require('os');
@@ -72,7 +72,7 @@ async function openBrowser(url) {
   }
 }
 
-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-D0VIxWJC.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-CgVjDJpt.cjs', document.baseURI).href)));
 const QRCode = require$1("qrcode-terminal/vendor/QRCode");
 const QRErrorCorrectLevel = require$1("qrcode-terminal/vendor/QRCode/QRErrorCorrectLevel");
 const pendingTempFiles = /* @__PURE__ */ new Set();
@@ -695,7 +695,7 @@ function setupCleanupHandlers() {
   });
 }
 
-const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-D0VIxWJC.cjs', document.baseURI).href))));
+const __dirname$2 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CgVjDJpt.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$2, "..");
   return path;
@@ -5232,6 +5232,12 @@ function renderToolOutput(accumulator) {
   }
   return accumulator.preview.render("tool output");
 }
+function formatToolCallTimeoutLimit(timeoutMs) {
+  if (timeoutMs < 1e3) {
+    return `${timeoutMs}ms`;
+  }
+  return `${(timeoutMs / 1e3).toFixed(Number.isInteger(timeoutMs / 1e3) ? 0 : 1)}s`;
+}
 function isRecord$1(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -5427,14 +5433,36 @@ function startToolCall(toolCallId, toolKind, update, ctx, source) {
   if (!ctx.toolCallTimeouts.has(toolCallId)) {
     const timeout = setTimeout(() => {
       const duration = formatDuration(ctx.toolCallStartTimes.get(toolCallId));
-      api.logger.debug(`[AcpBackend] \u23F1\uFE0F Tool call TIMEOUT (from ${source}): ${toolCallId} (${toolKind}) after ${(timeoutMs / 1e3).toFixed(0)}s - Duration: ${duration}, removing from active set`);
+      const timeoutLabel = formatToolCallTimeoutLimit(timeoutMs);
+      const timeoutDetail = `Tool call ${realToolName} timed out after ${timeoutLabel}`;
+      api.logger.debug(`[AcpBackend] \u23F1\uFE0F Tool call TIMEOUT (from ${source}): ${toolCallId} (${toolKind}) after ${timeoutLabel} - Duration: ${duration}, failing current turn`);
       ctx.activeToolCalls.delete(toolCallId);
       ctx.toolCallStartTimes.delete(toolCallId);
       ctx.toolCallTimeouts.delete(toolCallId);
-      if (ctx.activeToolCalls.size === 0) {
-        api.logger.debug("[AcpBackend] No more active tool calls after timeout, emitting idle status");
-        ctx.emitIdleStatus();
-      }
+      ctx.clearIdleTimeout();
+      const streamedOutput = renderToolOutput(ctx.toolCallOutputs.get(toolCallId));
+      ctx.toolCallOutputs.delete(toolCallId);
+      ctx.emit({
+        type: "tool-result",
+        toolName: realToolName,
+        result: streamedOutput ? {
+          stdout: streamedOutput,
+          error: timeoutDetail,
+          status: "failed",
+          timedOut: true
+        } : {
+          error: timeoutDetail,
+          status: "failed",
+          timedOut: true
+        },
+        callId: toolCallId
+      });
+      ctx.emit({
+        type: "status",
+        status: "error",
+        detail: timeoutDetail
+      });
+      ctx.failPendingResponseWait(new Error(timeoutDetail));
     }, timeoutMs);
     ctx.toolCallTimeouts.set(toolCallId, timeout);
     api.logger.debug(`[AcpBackend] \u23F1\uFE0F Set timeout for ${toolCallId}: ${(timeoutMs / 1e3).toFixed(0)}s${isInvestigation ? " (investigation tool)" : ""}`);
@@ -6703,6 +6731,7 @@ ${recentStderrExcerpt}`);
       toolCallCountSincePrompt: this.toolCallCountSincePrompt,
       emit: (msg) => this.emit(msg),
       emitIdleStatus: () => this.emitIdleStatus(),
+      failPendingResponseWait: (error) => this.failPendingResponseWait(error),
       clearIdleTimeout: () => {
         if (this.idleTimeout) {
           clearTimeout(this.idleTimeout);
@@ -7465,6 +7494,9 @@ function dedupePaths(paths, platform) {
   }
   return unique;
 }
+function getPathDelimiter(platform) {
+  return platform === "win32" ? ";" : ":";
+}
 function resolveCodexShimPath({
   platform = process.platform,
   exists = fs.existsSync,
@@ -7542,6 +7574,7 @@ function resolveBundledCodexToolPathDirs(options = {}) {
 }
 function buildCodexAcpEnv(overrides = {}, options = {}) {
   const platform = options.platform ?? process.platform;
+  const pathDelimiter = getPathDelimiter(platform);
   const env = {
     ...process.env,
     ...overrides
@@ -7549,14 +7582,14 @@ function buildCodexAcpEnv(overrides = {}, options = {}) {
   const pathKey = resolvePathEnvKey(env);
   const alternatePathKey = pathKey === "PATH" ? "Path" : "PATH";
   const currentPathValue = env[pathKey] ?? env[alternatePathKey] ?? "";
-  const currentPathEntries = currentPathValue.split(path.delimiter).filter(Boolean);
+  const currentPathEntries = currentPathValue.split(pathDelimiter).filter(Boolean);
   const codexToolDirs = resolveBundledCodexToolPathDirs(options);
   const mergedPathEntries = dedupePaths(
     [...codexToolDirs, ...currentPathEntries],
     platform
   );
   if (mergedPathEntries.length > 0) {
-    env[pathKey] = mergedPathEntries.join(path.delimiter);
+    env[pathKey] = mergedPathEntries.join(pathDelimiter);
   }
   delete env[alternatePathKey];
   const stringEnvEntries = [];
@@ -7712,7 +7745,7 @@ class AbortError extends Error {
   }
 }
 
-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-D0VIxWJC.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-CgVjDJpt.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion() {
   try {
@@ -8963,11 +8996,11 @@ var launch = /*#__PURE__*/Object.freeze({
 
 const unifiedProviderExecutors = {
   claude: async (opts) => {
-    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-taQoQffg.cjs'); });
+    const { runClaude } = await Promise.resolve().then(function () { return require('./runClaude-BGSgcyUp.cjs'); });
     await runClaude(opts.credentials, opts.claudeOptions ?? {});
   },
   codex: async (opts) => {
-    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-JcA8vuC7.cjs'); });
+    const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-earICaxw.cjs'); });
     await runCodex({
       credentials: opts.credentials,
       startedBy: opts.startedBy,
@@ -8976,7 +9009,7 @@ const unifiedProviderExecutors = {
     });
   },
   gemini: async (opts) => {
-    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DZ0x4eaa.cjs'); });
+    const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-D5RAIaR0.cjs'); });
     await runGemini({
       credentials: opts.credentials,
       startedBy: opts.startedBy
@@ -9052,7 +9085,7 @@ function shouldRunMainClaudeFlow(opts) {
     return;
   } else if (subcommand === "runtime") {
     if (args[1] === "providers") {
-      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-B4L9Deq_.cjs'); });
+      const { renderRuntimeProviders } = await Promise.resolve().then(function () { return require('./command-DAlFmWmr.cjs'); });
       console.log(renderRuntimeProviders());
       return;
     }
@@ -9230,8 +9263,8 @@ function shouldRunMainClaudeFlow(opts) {
       const projectId = args[3];
       try {
         const { saveGoogleCloudProjectToConfig } = await Promise.resolve().then(function () { return config; });
-        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-ZZDZ6dl9.cjs'); });
-        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-DmpNsXS1.cjs'); }).then(function (n) { return n.api; });
+        const { readCredentials: readCredentials2 } = await Promise.resolve().then(function () { return require('./persistence-DLFUNI9q.cjs'); });
+        const { ApiClient: ApiClient2 } = await Promise.resolve().then(function () { return require('./api-MGlKcEf3.cjs'); }).then(function (n) { return n.api; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();