happy-imou-cloud 2.1.47 → 2.1.49

package/dist/{runCodex-Dx3osc7U.mjs → runCodex-BbgLVjb9.mjs}

@@ -1,6 +1,6 @@
-import { p as preserveSessionRuntimeMetadata, l as logger, h as hashObject, d as AssistantMessageStream, b as connectionState, A as ApiClient } from './api-D3vYIva3.mjs';
-import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, h as finalizeHappyOrgTurnWithBusinessAck, i as buildTurnResultPushNotification, c as registerKillSessionHandler, j as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, t as createSessionTranscriptInkRenderer, k as extractPermissionRequestPushContext, m as buildPermissionPushNotification, n as renderTerminalOutputPreview, p as prepareTerminalOutputForForwarding, o as inferToolResultError, q as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-OhhMUuCQ.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, A as AcpBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as resolveCodexExecutable, j as shouldUseShellForCodex, F as Future, k as readManagedSessionTag, l as resolveManagedSessionTag } from './index-Cp1I5I3U.mjs';
+import { p as preserveSessionRuntimeMetadata, l as logger, h as hashObject, d as AssistantMessageStream, b as connectionState, A as ApiClient } from './api-DnqaNvyV.mjs';
+import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, h as finalizeHappyOrgTurnWithBusinessAck, i as buildTurnResultPushNotification, c as registerKillSessionHandler, j as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, t as createSessionTranscriptInkRenderer, k as extractPermissionRequestPushContext, m as buildPermissionPushNotification, n as renderTerminalOutputPreview, p as prepareTerminalOutputForForwarding, o as inferToolResultError, q as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-DLDg2EES.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, A as AcpBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as resolveCodexExecutable, j as shouldUseShellForCodex, F as Future, k as readManagedSessionTag, l as resolveManagedSessionTag } from './index-7Z93BoVn.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
@@ -24,8 +24,8 @@ 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-DzYObYrV.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-KXIi0QF_.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-DIYidT13.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-CAVeOdyo.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';
@@ -610,7 +610,13 @@ function extractFirstRelevantStderrLine(stderrText) {
   return lines[0] ?? null;
 }
 function looksLikeUpstreamApiError(searchableLower) {
-  return searchableLower.includes("upstream") || searchableLower.includes("rate limit") || searchableLower.includes("429") || searchableLower.includes("quota") || searchableLower.includes("insufficient_quota") || searchableLower.includes("unauthorized") || searchableLower.includes("forbidden");
+  return searchableLower.includes("upstream") || searchableLower.includes("rate limit") || searchableLower.includes("429") || searchableLower.includes("503") || searchableLower.includes("service unavailable") || searchableLower.includes("temporarily unavailable") || searchableLower.includes("quota") || searchableLower.includes("insufficient_quota") || searchableLower.includes("unauthorized") || searchableLower.includes("forbidden");
+}
+function appendCodexAuthScopeHint(message, searchableLower) {
+  if (!searchableLower.includes("api.responses.write") && !searchableLower.includes("missing scopes") && !searchableLower.includes("insufficient permissions")) {
+    return message;
+  }
+  return `${message} Happy hint: the Codex credential used by this process cannot call the OpenAI Responses API. Use an OpenAI key/OAuth login with api.responses.write, or remove restricted OPENAI_API_KEY values from the daemon/profile environment and restart the Happy daemon.`;
 }
 function extractLocalProcessExit(error) {
   const record = typeof error === "object" && error !== null ? error : null;
@@ -711,12 +717,14 @@ function normalizeCodexBackendError(error) {
   }
   if (typeof record?.message === "string" && record.message.trim().toLowerCase() === "internal error" && dataText) {
     if (looksLikeUpstreamApiError(dataText.toLowerCase())) {
-      return prefix ? `Codex upstream API error ${prefix} ${dataText}` : `Codex upstream API error: ${dataText}`;
+      const message = prefix ? `Codex upstream API error ${prefix} ${dataText}` : `Codex upstream API error: ${dataText}`;
+      return appendCodexAuthScopeHint(message, dataText.toLowerCase());
     }
     return prefix ? `${prefix} ${dataText}` : dataText;
   }
   if (looksLikeUpstreamApiError(searchableLower) && text) {
-    return prefix ? `Codex upstream API error ${prefix} ${text}` : `Codex upstream API error: ${text}`;
+    const message = prefix ? `Codex upstream API error ${prefix} ${text}` : `Codex upstream API error: ${text}`;
+    return appendCodexAuthScopeHint(message, searchableLower);
   }
   if (error instanceof Error && text) {
     return text;
@@ -753,6 +761,12 @@ function hasRenderableToolPayload(value) {
   }
   return true;
 }
+function isUserCancellationStop(detail) {
+  if (typeof detail !== "string") {
+    return false;
+  }
+  return /cancelled by user|canceled by user/i.test(detail);
+}
 function getCodexSwitchToLocalUnavailableMessage() {
   return "Codex local mode requires an attached interactive terminal. Staying in remote mode.";
 }
@@ -1029,6 +1043,9 @@ async function codexRemoteLauncher(session) {
           }
           if (msg.status === "idle" || msg.status === "stopped") {
             reasoningProcessor.completeCurrent();
+            if (msg.status === "stopped" && isUserCancellationStop(msg.detail)) {
+              return;
+            }
             if (msg.status === "stopped" && !turnInFlight && !shouldSwitchToLocal) {
               void recoverUnexpectedRuntimeStop(msg.detail);
             }
@@ -1204,6 +1221,10 @@ async function codexRemoteLauncher(session) {
   };
   async function handleAbort() {
     logger.debug("[Codex] Abort requested - stopping current task");
+    if (!turnInFlight) {
+      logger.debug("[Codex] Abort requested while no Codex turn is active; ignoring");
+      return;
+    }
     try {
       abortActiveTurn();
     } catch (error) {
@@ -1892,6 +1913,50 @@ function installFatalProcessHandlers(options) {
   };
 }
 
+function normalizeResumeSessionId(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function normalizeCodexArgsForHappy(options) {
+  const sourceArgs = options.codexArgs ?? [];
+  const codexArgs = [];
+  let resumeSessionId = normalizeResumeSessionId(options.resumeSessionId);
+  for (let index = 0; index < sourceArgs.length; index += 1) {
+    const arg = sourceArgs[index];
+    if (arg === "--resume") {
+      const nextArg = sourceArgs[index + 1];
+      const normalizedNextArg = normalizeResumeSessionId(nextArg);
+      if (!normalizedNextArg || nextArg?.startsWith("-")) {
+        throw new Error("Codex --resume requires a provider session id when used through Happy.");
+      }
+      resumeSessionId ??= normalizedNextArg;
+      index += 1;
+      continue;
+    }
+    if (arg.startsWith("--resume=")) {
+      const normalizedValue = normalizeResumeSessionId(arg.slice("--resume=".length));
+      if (!normalizedValue) {
+        throw new Error("Codex --resume requires a provider session id when used through Happy.");
+      }
+      resumeSessionId ??= normalizedValue;
+      continue;
+    }
+    if (index === 0 && arg === "resume") {
+      const nextArg = sourceArgs[index + 1];
+      const normalizedNextArg = normalizeResumeSessionId(nextArg);
+      if (normalizedNextArg && !nextArg?.startsWith("-")) {
+        resumeSessionId ??= normalizedNextArg;
+        index += 1;
+        continue;
+      }
+    }
+    codexArgs.push(arg);
+  }
+  return {
+    codexArgs,
+    resumeSessionId
+  };
+}
+
 function resolveInitialCodexPermissionMode(opts) {
   if (opts.permissionMode) {
     return opts.permissionMode;
@@ -1927,6 +1992,10 @@ function resolveIncomingCodexPermissionMode(opts) {
   };
 }
 async function runCodex(opts) {
+  const normalizedArgs = normalizeCodexArgsForHappy({
+    codexArgs: opts.codexArgs,
+    resumeSessionId: opts.resumeSessionId
+  });
   const managedSessionTag = opts.startedBy === "daemon" ? readManagedSessionTag() : null;
   const sessionTag = managedSessionTag ?? resolveManagedSessionTag(
     opts.startedBy === "daemon" ? process.env : {}
@@ -1937,7 +2006,7 @@ async function runCodex(opts) {
     permissionMode: opts.permissionMode,
     startedBy: opts.startedBy,
     startingMode: requestedStartingMode,
-    codexArgs: opts.codexArgs
+    codexArgs: normalizedArgs.codexArgs
   });
   const preserveCurrentPermissionModeForRemoteDefault = opts.startedBy === "daemon" && requestedStartingMode === "remote";
   if (opts.startedBy === "daemon" && requestedStartingMode === "local") {
@@ -2033,10 +2102,10 @@ async function runCodex(opts) {
     path: metadata.path,
     logPath: logger.logFilePath,
     startupRolePrompt: happyOrgStartupBinding?.identityPrompt ?? null,
-    sessionId: null,
+    sessionId: normalizedArgs.resumeSessionId,
     mode: requestedStartingMode,
     messageQueue,
-    codexArgs: opts.codexArgs,
+    codexArgs: normalizedArgs.codexArgs,
     protocolDescriptor,
     protocolStateSources: userScopedObserver ? [userScopedObserver] : [],
     userObserver: userScopedObserver,

package/dist/{runCodex-B-t0yy4k.cjs → runCodex-jUU6U2tZ.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var persistence = require('./api-CVuTajTL.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-8C_Wrgor.cjs');
-var index = require('./index-CyW9A7hx.cjs');
+var persistence = require('./api-D7nAeZi7.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CfCya6si.cjs');
+var index = require('./index-xa1kwZoj.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
@@ -26,8 +26,8 @@ require('tweetnacl');
 require('open');
 var React = require('react');
 var ink = require('ink');
-var ProviderSelectionHandler = require('./ProviderSelectionHandler-CJLlwlAu.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-CBbzF7oj.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-BJJc7qOR.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-Dn9NcoHz.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -612,7 +612,13 @@ function extractFirstRelevantStderrLine(stderrText) {
   return lines[0] ?? null;
 }
 function looksLikeUpstreamApiError(searchableLower) {
-  return searchableLower.includes("upstream") || searchableLower.includes("rate limit") || searchableLower.includes("429") || searchableLower.includes("quota") || searchableLower.includes("insufficient_quota") || searchableLower.includes("unauthorized") || searchableLower.includes("forbidden");
+  return searchableLower.includes("upstream") || searchableLower.includes("rate limit") || searchableLower.includes("429") || searchableLower.includes("503") || searchableLower.includes("service unavailable") || searchableLower.includes("temporarily unavailable") || searchableLower.includes("quota") || searchableLower.includes("insufficient_quota") || searchableLower.includes("unauthorized") || searchableLower.includes("forbidden");
+}
+function appendCodexAuthScopeHint(message, searchableLower) {
+  if (!searchableLower.includes("api.responses.write") && !searchableLower.includes("missing scopes") && !searchableLower.includes("insufficient permissions")) {
+    return message;
+  }
+  return `${message} Happy hint: the Codex credential used by this process cannot call the OpenAI Responses API. Use an OpenAI key/OAuth login with api.responses.write, or remove restricted OPENAI_API_KEY values from the daemon/profile environment and restart the Happy daemon.`;
 }
 function extractLocalProcessExit(error) {
   const record = typeof error === "object" && error !== null ? error : null;
@@ -713,12 +719,14 @@ function normalizeCodexBackendError(error) {
   }
   if (typeof record?.message === "string" && record.message.trim().toLowerCase() === "internal error" && dataText) {
     if (looksLikeUpstreamApiError(dataText.toLowerCase())) {
-      return prefix ? `Codex upstream API error ${prefix} ${dataText}` : `Codex upstream API error: ${dataText}`;
+      const message = prefix ? `Codex upstream API error ${prefix} ${dataText}` : `Codex upstream API error: ${dataText}`;
+      return appendCodexAuthScopeHint(message, dataText.toLowerCase());
     }
     return prefix ? `${prefix} ${dataText}` : dataText;
   }
   if (looksLikeUpstreamApiError(searchableLower) && text) {
-    return prefix ? `Codex upstream API error ${prefix} ${text}` : `Codex upstream API error: ${text}`;
+    const message = prefix ? `Codex upstream API error ${prefix} ${text}` : `Codex upstream API error: ${text}`;
+    return appendCodexAuthScopeHint(message, searchableLower);
   }
   if (error instanceof Error && text) {
     return text;
@@ -755,6 +763,12 @@ function hasRenderableToolPayload(value) {
   }
   return true;
 }
+function isUserCancellationStop(detail) {
+  if (typeof detail !== "string") {
+    return false;
+  }
+  return /cancelled by user|canceled by user/i.test(detail);
+}
 function getCodexSwitchToLocalUnavailableMessage() {
   return "Codex local mode requires an attached interactive terminal. Staying in remote mode.";
 }
@@ -1031,6 +1045,9 @@ async function codexRemoteLauncher(session) {
           }
           if (msg.status === "idle" || msg.status === "stopped") {
             reasoningProcessor.completeCurrent();
+            if (msg.status === "stopped" && isUserCancellationStop(msg.detail)) {
+              return;
+            }
             if (msg.status === "stopped" && !turnInFlight && !shouldSwitchToLocal) {
               void recoverUnexpectedRuntimeStop(msg.detail);
             }
@@ -1206,6 +1223,10 @@ async function codexRemoteLauncher(session) {
   };
   async function handleAbort() {
     persistence.logger.debug("[Codex] Abort requested - stopping current task");
+    if (!turnInFlight) {
+      persistence.logger.debug("[Codex] Abort requested while no Codex turn is active; ignoring");
+      return;
+    }
     try {
       abortActiveTurn();
     } catch (error) {
@@ -1894,6 +1915,50 @@ function installFatalProcessHandlers(options) {
   };
 }
 
+function normalizeResumeSessionId(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function normalizeCodexArgsForHappy(options) {
+  const sourceArgs = options.codexArgs ?? [];
+  const codexArgs = [];
+  let resumeSessionId = normalizeResumeSessionId(options.resumeSessionId);
+  for (let index = 0; index < sourceArgs.length; index += 1) {
+    const arg = sourceArgs[index];
+    if (arg === "--resume") {
+      const nextArg = sourceArgs[index + 1];
+      const normalizedNextArg = normalizeResumeSessionId(nextArg);
+      if (!normalizedNextArg || nextArg?.startsWith("-")) {
+        throw new Error("Codex --resume requires a provider session id when used through Happy.");
+      }
+      resumeSessionId ??= normalizedNextArg;
+      index += 1;
+      continue;
+    }
+    if (arg.startsWith("--resume=")) {
+      const normalizedValue = normalizeResumeSessionId(arg.slice("--resume=".length));
+      if (!normalizedValue) {
+        throw new Error("Codex --resume requires a provider session id when used through Happy.");
+      }
+      resumeSessionId ??= normalizedValue;
+      continue;
+    }
+    if (index === 0 && arg === "resume") {
+      const nextArg = sourceArgs[index + 1];
+      const normalizedNextArg = normalizeResumeSessionId(nextArg);
+      if (normalizedNextArg && !nextArg?.startsWith("-")) {
+        resumeSessionId ??= normalizedNextArg;
+        index += 1;
+        continue;
+      }
+    }
+    codexArgs.push(arg);
+  }
+  return {
+    codexArgs,
+    resumeSessionId
+  };
+}
+
 function resolveInitialCodexPermissionMode(opts) {
   if (opts.permissionMode) {
     return opts.permissionMode;
@@ -1929,6 +1994,10 @@ function resolveIncomingCodexPermissionMode(opts) {
   };
 }
 async function runCodex(opts) {
+  const normalizedArgs = normalizeCodexArgsForHappy({
+    codexArgs: opts.codexArgs,
+    resumeSessionId: opts.resumeSessionId
+  });
   const managedSessionTag = opts.startedBy === "daemon" ? index.readManagedSessionTag() : null;
   const sessionTag = managedSessionTag ?? index.resolveManagedSessionTag(
     opts.startedBy === "daemon" ? process.env : {}
@@ -1939,7 +2008,7 @@ async function runCodex(opts) {
     permissionMode: opts.permissionMode,
     startedBy: opts.startedBy,
     startingMode: requestedStartingMode,
-    codexArgs: opts.codexArgs
+    codexArgs: normalizedArgs.codexArgs
   });
   const preserveCurrentPermissionModeForRemoteDefault = opts.startedBy === "daemon" && requestedStartingMode === "remote";
   if (opts.startedBy === "daemon" && requestedStartingMode === "local") {
@@ -2035,10 +2104,10 @@ async function runCodex(opts) {
     path: metadata.path,
     logPath: persistence.logger.logFilePath,
     startupRolePrompt: happyOrgStartupBinding?.identityPrompt ?? null,
-    sessionId: null,
+    sessionId: normalizedArgs.resumeSessionId,
     mode: requestedStartingMode,
     messageQueue,
-    codexArgs: opts.codexArgs,
+    codexArgs: normalizedArgs.codexArgs,
     protocolDescriptor,
     protocolStateSources: userScopedObserver ? [userScopedObserver] : [],
     userObserver: userScopedObserver,

package/dist/{runGemini-DZ5-uzB9.cjs → runGemini-C0NT8MHK.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var persistence = require('./api-CVuTajTL.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-8C_Wrgor.cjs');
-var index = require('./index-CyW9A7hx.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-CBbzF7oj.cjs');
+var persistence = require('./api-D7nAeZi7.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CfCya6si.cjs');
+var index = require('./index-xa1kwZoj.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-Dn9NcoHz.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');

package/dist/{runGemini-CnJ75Q--.mjs → runGemini-DcwNsudA.mjs}

@@ -1,10 +1,10 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient, h as hashObject, d as AssistantMessageStream } from './api-D3vYIva3.mjs';
-import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, h as finalizeHappyOrgTurnWithBusinessAck, i as buildTurnResultPushNotification, j as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, k as extractPermissionRequestPushContext, m as buildPermissionPushNotification, n as renderTerminalOutputPreview, p as prepareTerminalOutputForForwarding, o as inferToolResultError, q as forwardAgentMessageToProviderSession, t as createSessionTranscriptInkRenderer } from './registerKillSessionHandler-OhhMUuCQ.mjs';
-import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, b as closeProviderSession, s as saveGeminiModelToConfig, d as createGeminiBackend, e as stopCaffeinate } from './index-Cp1I5I3U.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-KXIi0QF_.mjs';
+import { l as logger, b as connectionState, A as ApiClient, h as hashObject, d as AssistantMessageStream } from './api-DnqaNvyV.mjs';
+import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, h as finalizeHappyOrgTurnWithBusinessAck, i as buildTurnResultPushNotification, j as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, k as extractPermissionRequestPushContext, m as buildPermissionPushNotification, n as renderTerminalOutputPreview, p as prepareTerminalOutputForForwarding, o as inferToolResultError, q as forwardAgentMessageToProviderSession, t as createSessionTranscriptInkRenderer } from './registerKillSessionHandler-DLDg2EES.mjs';
+import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, b as closeProviderSession, s as saveGeminiModelToConfig, d as createGeminiBackend, e as stopCaffeinate } from './index-7Z93BoVn.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-CAVeOdyo.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.1.47",
+  "version": "2.1.49",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",