happy-imou-cloud 2.1.48 → 2.1.49

package/dist/{runCodex-DqzdgDwZ.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-CSjP-Z3Y.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-BHu-3hZQ.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-BzsBo3_Z.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-vgZ2egD_.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-CM3JbXUC.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';
@@ -1913,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;
@@ -1948,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 : {}
@@ -1958,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") {
@@ -2054,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-CdgrZK7P.cjs → runCodex-jUU6U2tZ.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var persistence = require('./api-eaGKJjMt.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CLCYBgZX.cjs');
-var index = require('./index-C8X1VlHZ.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-BHKIBw4t.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-CKtDfihV.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-BJJc7qOR.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-Dn9NcoHz.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -1915,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;
@@ -1950,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 : {}
@@ -1960,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") {
@@ -2056,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-BE05R24D.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-eaGKJjMt.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CLCYBgZX.cjs');
-var index = require('./index-C8X1VlHZ.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-CKtDfihV.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-UZuiKe59.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-CSjP-Z3Y.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-BHu-3hZQ.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-BzsBo3_Z.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-CM3JbXUC.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.48",
+  "version": "2.1.49",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",