happy-imou-cloud 2.1.21 → 2.1.22

package/dist/{runCodex-C-Pjpbxn.mjs → runCodex-BkfujuLR.mjs}

@@ -1,6 +1,6 @@
-import { p as preserveSessionRuntimeMetadata, l as logger, b as connectionState, A as ApiClient } from './api-DB30ctmX.mjs';
-import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, c as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-beu2g-Qo.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as readManagedSessionTag, j as resolveManagedSessionTag } from './index-krVv4CWK.mjs';
+import { p as preserveSessionRuntimeMetadata, l as logger, b as connectionState, A as ApiClient } from './api-bhF1J82q.mjs';
+import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, c as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-BtPo6LkG.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, h as createCodexBackend, t as truncateDisplayMessage, b as closeProviderSession, e as stopCaffeinate, i as readManagedSessionTag, j as resolveManagedSessionTag } from './index-CEhnCQim.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-DQITIqZK.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DdPnQSmQ.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-DgINCAMh.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-BYNLDM-T.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';
@@ -1246,8 +1246,10 @@ function resolveIncomingCodexPermissionMode(opts) {
   };
 }
 async function runCodex(opts) {
-  const managedSessionTag = readManagedSessionTag();
-  const sessionTag = managedSessionTag ?? resolveManagedSessionTag();
+  const managedSessionTag = opts.startedBy === "daemon" ? readManagedSessionTag() : null;
+  const sessionTag = managedSessionTag ?? resolveManagedSessionTag(
+    opts.startedBy === "daemon" ? process.env : {}
+  );
   connectionState.setBackend("Codex");
   const requestedStartingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
   const initialPermissionMode = resolveInitialCodexPermissionMode({

package/dist/{runCodex-CoqsQ-cb.cjs → runCodex-DIaZ1wGI.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var persistence = require('./api-8xtJZeXZ.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-Cl_er9rg.cjs');
-var index = require('./index-D4A092LJ.cjs');
+var persistence = require('./api-BXGRJ5Kn.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CuP57vY0.cjs');
+var index = require('./index-BNTRi6Uv.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-B5Aq5gA_.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-DxFwO2z9.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-DDzNcWPJ.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-BVdXoFXc.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -1248,8 +1248,10 @@ function resolveIncomingCodexPermissionMode(opts) {
   };
 }
 async function runCodex(opts) {
-  const managedSessionTag = index.readManagedSessionTag();
-  const sessionTag = managedSessionTag ?? index.resolveManagedSessionTag();
+  const managedSessionTag = opts.startedBy === "daemon" ? index.readManagedSessionTag() : null;
+  const sessionTag = managedSessionTag ?? index.resolveManagedSessionTag(
+    opts.startedBy === "daemon" ? process.env : {}
+  );
   persistence.connectionState.setBackend("Codex");
   const requestedStartingMode = opts.startingMode ?? (opts.startedBy === "daemon" ? "remote" : "local");
   const initialPermissionMode = resolveInitialCodexPermissionMode({

package/dist/{runGemini-CIVm6NWC.mjs → runGemini-DcN0Nb3f.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 } from './api-DB30ctmX.mjs';
-import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-beu2g-Qo.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-krVv4CWK.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DdPnQSmQ.mjs';
+import { l as logger, b as connectionState, A as ApiClient } from './api-bhF1J82q.mjs';
+import { B as BasePermissionHandler, C as ConversationHistory$1, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, c as registerKillSessionHandler, d as MessageBuffer, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, l as launchRuntimeHandleWithFactoryResult, j as inferToolResultError, k as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-BtPo6LkG.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-CEhnCQim.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-BYNLDM-T.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';

package/dist/{runGemini-BC_5rNMt.cjs → runGemini-U4GRLlSn.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var persistence = require('./api-8xtJZeXZ.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-Cl_er9rg.cjs');
-var index = require('./index-D4A092LJ.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-DxFwO2z9.cjs');
+var persistence = require('./api-BXGRJ5Kn.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CuP57vY0.cjs');
+var index = require('./index-BNTRi6Uv.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-BVdXoFXc.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');

package/package.json

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

package/scripts/tooling-utils.mjs

@@ -1,167 +1,167 @@
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
-
-function getLocalPackageDirs(packageName, packageRoot, workspaceRoot) {
-  return [
-    resolve(packageRoot, 'node_modules', packageName),
-    resolve(workspaceRoot, 'node_modules', packageName),
-  ];
-}
-
-function getLocalBinPaths(binName, packageRoot, workspaceRoot) {
-  const suffix = process.platform === 'win32' ? '.cmd' : '';
-
-  return [
-    resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`),
-    resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`),
-  ];
-}
-
-function resolveInstalledPackageDir(packageName, packageRoot, workspaceRoot) {
-  return getLocalPackageDirs(packageName, packageRoot, workspaceRoot)
-    .find((candidatePath) => existsSync(candidatePath))
-    ?? null;
-}
-
-export function shouldUseShell(command) {
-  if (process.platform !== 'win32') {
-    return false;
-  }
-
-  return !/\.exe$/i.test(command);
-}
-
-export function resolveTool({
-  binName,
-  packageName,
-  packageRoot,
-  workspaceRoot,
-  packageSpecs,
-  entryCandidates = [],
-}) {
-  for (const packageDir of getLocalPackageDirs(packageName, packageRoot, workspaceRoot)) {
-    for (const entryCandidate of entryCandidates) {
-      const entryPath = resolve(packageDir, entryCandidate);
-
-      if (existsSync(entryPath)) {
-        return {
-          command: process.execPath,
-          prefixArgs: [entryPath],
-        };
-      }
-    }
-  }
-
-  for (const localBinPath of getLocalBinPaths(binName, packageRoot, workspaceRoot)) {
-    if (existsSync(localBinPath)) {
-      return {
-        command: localBinPath,
-        prefixArgs: [],
-      };
-    }
-  }
-
-  return {
-    command: 'npx',
-    prefixArgs: ['-y', ...packageSpecs.flatMap((packageSpec) => ['-p', packageSpec]), binName],
-  };
-}
-
-export function resolvePackageDirWithNpx({
-  packageName,
-  version,
-  packageRoot,
-  env = process.env,
-  spawn = spawnSync,
-}) {
-  const cacheKey = `${packageName.replace(/[@/]/g, '_')}-${version}`;
-  const installRoot = resolve(packageRoot, 'node_modules', '.tool-cache', cacheKey);
-  const installPackagePath = resolve(installRoot, 'node_modules', packageName);
-
-  if (existsSync(installPackagePath)) {
-    return installPackagePath;
-  }
-
-  mkdirSync(installRoot, { recursive: true });
-  writeFileSync(
-    resolve(installRoot, 'package.json'),
-    JSON.stringify(
-      {
-        private: true,
-        name: `happy-cli-tool-cache-${cacheKey}`,
-      },
-      null,
-      2
-    )
-  );
-
-  const commandArgs = [
-    'install',
-    '--no-save',
-    '--ignore-scripts',
-    '--no-package-lock',
-    '--no-audit',
-    '--fund=false',
-    `${packageName}@${version}`,
-  ];
-  const result = spawn('npm', commandArgs, {
-    cwd: installRoot,
-    encoding: 'utf8',
-    shell: shouldUseShell('npm'),
-    env,
-  });
-
-  if (result.status !== 0) {
-    const stderr = result.stderr?.trim();
-    const stdout = result.stdout?.trim();
-    throw new Error(
-      stderr && stderr.length > 0
-        ? stderr
-        : stdout && stdout.length > 0
-          ? stdout
-          : `Failed to install ${packageName}@${version} for local resolution`
-    );
-  }
-
-  if (!existsSync(installPackagePath)) {
-    throw new Error(`Installed package path missing for ${packageName}@${version}`);
-  }
-
-  return installPackagePath;
-}
-
-export function ensurePackageResolvableFromPackageRoot({
-  packageName,
-  version,
-  packageRoot,
-  workspaceRoot,
-  env = process.env,
-  spawn = spawnSync,
-  fallbackResolver = resolvePackageDirWithNpx,
-}) {
-  const linkPath = resolve(packageRoot, 'node_modules', packageName);
-
-  if (existsSync(linkPath)) {
-    return () => {};
-  }
-
-  const localPackageDir = resolveInstalledPackageDir(packageName, packageRoot, workspaceRoot);
-  const targetPath = localPackageDir ?? fallbackResolver({
-    packageName,
-    version,
-    packageRoot,
-    workspaceRoot,
-    env,
-    spawn,
-  });
-
-  mkdirSync(dirname(linkPath), { recursive: true });
-  symlinkSync(targetPath, linkPath, process.platform === 'win32' ? 'junction' : 'dir');
-
-  return () => {
-    try {
-      rmSync(linkPath, { recursive: true, force: true });
-    } catch {}
-  };
-}
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+
+function getLocalPackageDirs(packageName, packageRoot, workspaceRoot) {
+  return [
+    resolve(packageRoot, 'node_modules', packageName),
+    resolve(workspaceRoot, 'node_modules', packageName),
+  ];
+}
+
+function getLocalBinPaths(binName, packageRoot, workspaceRoot) {
+  const suffix = process.platform === 'win32' ? '.cmd' : '';
+
+  return [
+    resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`),
+    resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`),
+  ];
+}
+
+function resolveInstalledPackageDir(packageName, packageRoot, workspaceRoot) {
+  return getLocalPackageDirs(packageName, packageRoot, workspaceRoot)
+    .find((candidatePath) => existsSync(candidatePath))
+    ?? null;
+}
+
+export function shouldUseShell(command) {
+  if (process.platform !== 'win32') {
+    return false;
+  }
+
+  return !/\.exe$/i.test(command);
+}
+
+export function resolveTool({
+  binName,
+  packageName,
+  packageRoot,
+  workspaceRoot,
+  packageSpecs,
+  entryCandidates = [],
+}) {
+  for (const packageDir of getLocalPackageDirs(packageName, packageRoot, workspaceRoot)) {
+    for (const entryCandidate of entryCandidates) {
+      const entryPath = resolve(packageDir, entryCandidate);
+
+      if (existsSync(entryPath)) {
+        return {
+          command: process.execPath,
+          prefixArgs: [entryPath],
+        };
+      }
+    }
+  }
+
+  for (const localBinPath of getLocalBinPaths(binName, packageRoot, workspaceRoot)) {
+    if (existsSync(localBinPath)) {
+      return {
+        command: localBinPath,
+        prefixArgs: [],
+      };
+    }
+  }
+
+  return {
+    command: 'npx',
+    prefixArgs: ['-y', ...packageSpecs.flatMap((packageSpec) => ['-p', packageSpec]), binName],
+  };
+}
+
+export function resolvePackageDirWithNpx({
+  packageName,
+  version,
+  packageRoot,
+  env = process.env,
+  spawn = spawnSync,
+}) {
+  const cacheKey = `${packageName.replace(/[@/]/g, '_')}-${version}`;
+  const installRoot = resolve(packageRoot, 'node_modules', '.tool-cache', cacheKey);
+  const installPackagePath = resolve(installRoot, 'node_modules', packageName);
+
+  if (existsSync(installPackagePath)) {
+    return installPackagePath;
+  }
+
+  mkdirSync(installRoot, { recursive: true });
+  writeFileSync(
+    resolve(installRoot, 'package.json'),
+    JSON.stringify(
+      {
+        private: true,
+        name: `happy-cli-tool-cache-${cacheKey}`,
+      },
+      null,
+      2
+    )
+  );
+
+  const commandArgs = [
+    'install',
+    '--no-save',
+    '--ignore-scripts',
+    '--no-package-lock',
+    '--no-audit',
+    '--fund=false',
+    `${packageName}@${version}`,
+  ];
+  const result = spawn('npm', commandArgs, {
+    cwd: installRoot,
+    encoding: 'utf8',
+    shell: shouldUseShell('npm'),
+    env,
+  });
+
+  if (result.status !== 0) {
+    const stderr = result.stderr?.trim();
+    const stdout = result.stdout?.trim();
+    throw new Error(
+      stderr && stderr.length > 0
+        ? stderr
+        : stdout && stdout.length > 0
+          ? stdout
+          : `Failed to install ${packageName}@${version} for local resolution`
+    );
+  }
+
+  if (!existsSync(installPackagePath)) {
+    throw new Error(`Installed package path missing for ${packageName}@${version}`);
+  }
+
+  return installPackagePath;
+}
+
+export function ensurePackageResolvableFromPackageRoot({
+  packageName,
+  version,
+  packageRoot,
+  workspaceRoot,
+  env = process.env,
+  spawn = spawnSync,
+  fallbackResolver = resolvePackageDirWithNpx,
+}) {
+  const linkPath = resolve(packageRoot, 'node_modules', packageName);
+
+  if (existsSync(linkPath)) {
+    return () => {};
+  }
+
+  const localPackageDir = resolveInstalledPackageDir(packageName, packageRoot, workspaceRoot);
+  const targetPath = localPackageDir ?? fallbackResolver({
+    packageName,
+    version,
+    packageRoot,
+    workspaceRoot,
+    env,
+    spawn,
+  });
+
+  mkdirSync(dirname(linkPath), { recursive: true });
+  symlinkSync(targetPath, linkPath, process.platform === 'win32' ? 'junction' : 'dir');
+
+  return () => {
+    try {
+      rmSync(linkPath, { recursive: true, force: true });
+    } catch {}
+  };
+}