happy-imou-cloud 2.0.20 → 2.0.22

package/dist/{runCodex-DwnLnXWK.mjs → runCodex-BzZ0jODI.mjs}

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient } from './api-_Y2kzqZL.mjs';
-import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, w as waitForResponseCompleteWithAbort, r as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, i as inferToolResultError, j as forwardAgentMessageToProviderSession, f as closeProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, s as syncControlledByUserState } from './registerKillSessionHandler-DJMH-gar.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate } from './index-Bg4KLXYY.mjs';
+import { l as logger, f as connectionState, A as ApiClient } from './api-DrijKeDb.mjs';
+import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, w as waitForResponseCompleteWithAbort, r as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, i as inferToolResultError, j as forwardAgentMessageToProviderSession, f as closeProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, s as syncControlledByUserState } from './registerKillSessionHandler-CHEj7UjN.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate } from './index-BIki80pQ.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';
@@ -14,7 +14,7 @@ import 'node:path';
 import 'node:os';
 import 'node:child_process';
 import 'node:readline';
-import './persistence-BCkHc68b.mjs';
+import './persistence-C3NBdZdz.mjs';
 import 'node:fs/promises';
 import 'fs/promises';
 import 'crypto';
@@ -25,8 +25,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-s79sTquD.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-iTk5q5Vy.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, b as buildHappyOrgTurnPrompt, f as finalizeHappyOrgTurn, r as runModeLoop, a as resolveHappyOrgQueuedTurn } from './ProviderSelectionHandler-BjLyIfSR.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-mIqqngd3.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';
@@ -486,7 +486,16 @@ function resolveCodexAcpExecutionMode(mode) {
   };
 }
 function getCodexExecutionFingerprint(mode) {
-  return hashObject(resolveCodexAcpExecutionMode(mode));
+  return hashObject({
+    ...resolveCodexAcpExecutionMode(mode),
+    happyOrg: mode.happyOrg ? {
+      taskId: mode.happyOrg.context.taskId,
+      organizationId: mode.happyOrg.context.organizationId,
+      memberAgentId: mode.happyOrg.context.memberAgentId,
+      supervisorAgentId: mode.happyOrg.context.supervisorAgentId,
+      reopenContext: mode.happyOrg.reopenContext ?? null
+    } : null
+  });
 }
 
 function normalizeCodexBackendError(error) {
@@ -565,6 +574,7 @@ async function codexRemoteLauncher(session) {
   let currentAssistantMessageId = null;
   let currentThinkingMessageId = null;
   let fatalRuntimeStopError = null;
+  let currentHappyOrgTurn = null;
   const permissionHandler = new CodexPermissionHandler(session.client);
   const selectionHandler = new CodexSelectionHandler(session.client);
   const conversationHistory = new ConversationHistory$1({ maxMessages: 20, maxCharacters: 5e4 });
@@ -597,6 +607,7 @@ async function codexRemoteLauncher(session) {
     shouldCommitAccumulatedResponse = false;
     currentAssistantMessageId = null;
     currentThinkingMessageId = null;
+    currentHappyOrgTurn = null;
     session.onThinkingChange(false);
   };
   const abortActiveTurn = () => {
@@ -636,6 +647,13 @@ async function codexRemoteLauncher(session) {
       id: randomUUID()
     });
   };
+  const emitTurnReport = (report) => {
+    session.runtimeSession.sendCodexMessage({
+      type: "turn-report",
+      id: randomUUID(),
+      report
+    });
+  };
   const handleUnexpectedRuntimeStop = (detail) => {
     if (shouldExit || fatalRuntimeStopError) {
       return;
@@ -658,17 +676,33 @@ async function codexRemoteLauncher(session) {
     }
     emitStatusMessage(reason);
   };
-  const emitFinalAssistantMessage = () => {
-    if (!accumulatedResponse.trim()) {
+  const emitFinalAssistantMessage = (finalMessageText) => {
+    const finalMessage = (finalMessageText ?? accumulatedResponse).trim();
+    if (!finalMessage) {
       return;
     }
-    conversationHistory.addAssistantMessage(accumulatedResponse);
-    emitPendingAssistantMessageDelta();
+    if (currentAssistantMessageId) {
+      messageBuffer.updateMessage(currentAssistantMessageId, finalMessage, { mode: "replace" });
+    }
+    conversationHistory.addAssistantMessage(finalMessage);
+    if (currentHappyOrgTurn) {
+      session.runtimeSession.sendCodexMessage({
+        type: "message",
+        message: finalMessage,
+        id: randomUUID()
+      });
+    } else {
+      accumulatedResponse = finalMessage;
+      emitPendingAssistantMessageDelta({ force: true });
+    }
     accumulatedResponse = "";
     emittedResponseLength = 0;
     isResponseInProgress = false;
   };
-  const emitPendingAssistantMessageDelta = () => {
+  const emitPendingAssistantMessageDelta = (opts) => {
+    if (currentHappyOrgTurn && !opts?.force) {
+      return false;
+    }
     const nextMessage = accumulatedResponse.slice(emittedResponseLength);
     if (!nextMessage.trim()) {
       return false;
@@ -968,6 +1002,8 @@ async function codexRemoteLauncher(session) {
       readyAlreadySent = false;
       messageBuffer.addMessage(message.message, "user");
       const turnSignal = abortController.signal;
+      let turnStatus = "task_complete";
+      currentHappyOrgTurn = message.mode.happyOrg ?? null;
       try {
         turnInFlight = true;
         shouldCommitAccumulatedResponse = false;
@@ -982,6 +1018,9 @@ async function codexRemoteLauncher(session) {
           promptToSend = historyContext + promptToSend;
           logger.debug(`[Codex] Injected conversation history context (${historyContext.length} chars)`);
         }
+        if (message.mode.happyOrg) {
+          promptToSend = buildHappyOrgTurnPrompt(promptToSend, message.mode.happyOrg);
+        }
         conversationHistory.addUserMessage(message.message);
         await activeRuntimeHandle.sendPrompt(promptToSend);
         await waitForResponseCompleteWithAbort(activeRuntimeHandle.backend, turnSignal);
@@ -993,6 +1032,7 @@ async function codexRemoteLauncher(session) {
         const isAbortError = error instanceof Error && error.name === "AbortError";
         const isExpectedInterruption = isAbortError || turnSignal.aborted || shouldExit;
         if (isExpectedInterruption) {
+          turnStatus = "turn_aborted";
           session.runtimeSession.sendCodexMessage({
             type: "turn_aborted",
             id: randomUUID()
@@ -1009,8 +1049,24 @@ async function codexRemoteLauncher(session) {
         }
       } finally {
         turnInFlight = false;
+        const finalizedTurn = finalizeHappyOrgTurn({
+          metadata: session.runtimeSession.getMetadataSnapshot?.() ?? null,
+          queuedTurn: message.mode.happyOrg,
+          responseText: accumulatedResponse,
+          turnStatus
+        });
+        if (finalizedTurn.nextMetadata && typeof session.runtimeSession.updateMetadata === "function") {
+          session.runtimeSession.updateMetadata(() => finalizedTurn.nextMetadata);
+        }
+        if (finalizedTurn.report) {
+          emitTurnReport(finalizedTurn.report);
+        }
+        if (finalizedTurn.terminateMessage) {
+          emitStatusMessage(finalizedTurn.terminateMessage);
+        }
+        accumulatedResponse = finalizedTurn.cleanedText;
         if (shouldCommitAccumulatedResponse) {
-          emitFinalAssistantMessage();
+          emitFinalAssistantMessage(finalizedTurn.cleanedText);
         }
         if (!shouldExit) {
           session.runtimeSession.sendCodexMessage({
@@ -1175,6 +1231,19 @@ async function runCodex(opts) {
   let currentPermissionMode = initialPermissionMode;
   let currentModel;
   sessionClient.onUserMessage((message) => {
+    const happyOrgResult = resolveHappyOrgQueuedTurn({
+      metadata: sessionClient.getMetadataSnapshot?.() ?? metadata,
+      message
+    });
+    if (happyOrgResult.nextMetadata) {
+      sessionClient.updateMetadata(() => happyOrgResult.nextMetadata);
+    }
+    if (happyOrgResult.blocked) {
+      if (happyOrgResult.statusMessage) {
+        sessionClient.sendSessionEvent({ type: "message", message: happyOrgResult.statusMessage });
+      }
+      return;
+    }
     const previousPermissionMode = currentPermissionMode;
     let messagePermissionMode = previousPermissionMode;
     if (message.meta?.permissionMode) {
@@ -1193,7 +1262,8 @@ async function runCodex(opts) {
     }
     messageQueue.push(message.content.text, {
       permissionMode: permissionResolution.resolvedPermissionMode,
-      model: messageModel
+      model: messageModel,
+      happyOrg: happyOrgResult.queuedTurn
     });
   });
   codexSession = new CodexSession({

package/dist/{runGemini-UKpRbyNY.cjs → runGemini-1gJRE8oT.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var api = require('./api-BKnzORe4.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-BMUE5Oaj.cjs');
-var index = require('./index-0TIyXMQu.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-B9z785Pi.cjs');
+var api = require('./api-DP-RQUao.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-QmBN446A.cjs');
+var index = require('./index-CqCEZDFi.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-CJVv1aNR.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');
@@ -17,7 +17,7 @@ require('node:child_process');
 require('node:readline');
 require('tweetnacl');
 require('axios');
-require('./persistence-D5uolhHo.cjs');
+require('./persistence-yVTbf_Ng.cjs');
 require('open');
 require('chalk');
 require('fs');

package/dist/{runGemini-uVHDcJ09.mjs → runGemini-Bx2SYAyG.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-_Y2kzqZL.mjs';
-import { B as BasePermissionHandler, C as ConversationHistory$1, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, d as MessageBuffer, r as registerKillSessionHandler, w as waitForResponseCompleteWithAbort, f as closeProviderSession, l as launchRuntimeHandleWithFactoryResult, i as inferToolResultError, j as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-DJMH-gar.mjs';
-import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-Bg4KLXYY.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-iTk5q5Vy.mjs';
+import { l as logger, f as connectionState, A as ApiClient } from './api-DrijKeDb.mjs';
+import { B as BasePermissionHandler, C as ConversationHistory$1, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, d as MessageBuffer, r as registerKillSessionHandler, w as waitForResponseCompleteWithAbort, f as closeProviderSession, l as launchRuntimeHandleWithFactoryResult, i as inferToolResultError, j as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-CHEj7UjN.mjs';
+import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-BIki80pQ.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-mIqqngd3.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';
@@ -15,7 +15,7 @@ import 'node:child_process';
 import 'node:readline';
 import 'tweetnacl';
 import 'axios';
-import './persistence-BCkHc68b.mjs';
+import './persistence-C3NBdZdz.mjs';
 import 'open';
 import 'chalk';
 import 'fs';

package/package.json

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

package/scripts/build.mjs

@@ -1,66 +1,66 @@
-#!/usr/bin/env node
-
-import { spawnSync } from 'node:child_process';
-import { existsSync, readFileSync, rmSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const here = dirname(fileURLToPath(import.meta.url));
-const packageRoot = resolve(here, '..');
-const workspaceRoot = resolve(packageRoot, '..', '..');
-const packageJson = JSON.parse(readFileSync(resolve(packageRoot, 'package.json'), 'utf8'));
-
-function resolveTool(binName, packageSpecs) {
-  const suffix = process.platform === 'win32' ? '.cmd' : '';
-  const packageLocalBin = resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`);
-  const workspaceLocalBin = resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`);
-
-  if (existsSync(packageLocalBin)) {
-    return {
-      command: packageLocalBin,
-      prefixArgs: [],
-    };
-  }
-
-  if (existsSync(workspaceLocalBin)) {
-    return {
-      command: workspaceLocalBin,
-      prefixArgs: [],
-    };
-  }
-
-  return {
-    command: 'npx',
-    prefixArgs: ['-y', ...packageSpecs.flatMap((packageSpec) => ['-p', packageSpec]), binName],
-  };
-}
-
-function runStep(name, command, args) {
-  console.log(`\n[build] ${name}`);
-  console.log(`> ${command} ${args.join(' ')}`);
-
-  const result = spawnSync(command, args, {
-    cwd: packageRoot,
-    stdio: 'inherit',
-    shell: process.platform === 'win32',
-    env: process.env,
-  });
-
-  if (result.status !== 0) {
-    throw new Error(`[build] Step failed: ${name}`);
-  }
-}
-
-function runTool(name, tool, args) {
-  runStep(name, tool.command, [...tool.prefixArgs, ...args]);
-}
-
-const tsc = resolveTool('tsc', [`typescript@${packageJson.devDependencies.typescript}`]);
-const pkgroll = resolveTool('pkgroll', [
-  `pkgroll@${packageJson.devDependencies.pkgroll}`,
-  `typescript@${packageJson.devDependencies.typescript}`,
-]);
-
-rmSync(resolve(packageRoot, 'dist'), { recursive: true, force: true });
-runTool('typecheck', tsc, ['--noEmit']);
-runTool('bundle', pkgroll, []);
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process';
+import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const packageRoot = resolve(here, '..');
+const workspaceRoot = resolve(packageRoot, '..', '..');
+const packageJson = JSON.parse(readFileSync(resolve(packageRoot, 'package.json'), 'utf8'));
+
+function resolveTool(binName, packageSpecs) {
+  const suffix = process.platform === 'win32' ? '.cmd' : '';
+  const packageLocalBin = resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`);
+  const workspaceLocalBin = resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`);
+
+  if (existsSync(packageLocalBin)) {
+    return {
+      command: packageLocalBin,
+      prefixArgs: [],
+    };
+  }
+
+  if (existsSync(workspaceLocalBin)) {
+    return {
+      command: workspaceLocalBin,
+      prefixArgs: [],
+    };
+  }
+
+  return {
+    command: 'npx',
+    prefixArgs: ['-y', ...packageSpecs.flatMap((packageSpec) => ['-p', packageSpec]), binName],
+  };
+}
+
+function runStep(name, command, args) {
+  console.log(`\n[build] ${name}`);
+  console.log(`> ${command} ${args.join(' ')}`);
+
+  const result = spawnSync(command, args, {
+    cwd: packageRoot,
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+    env: process.env,
+  });
+
+  if (result.status !== 0) {
+    throw new Error(`[build] Step failed: ${name}`);
+  }
+}
+
+function runTool(name, tool, args) {
+  runStep(name, tool.command, [...tool.prefixArgs, ...args]);
+}
+
+const tsc = resolveTool('tsc', [`typescript@${packageJson.devDependencies.typescript}`]);
+const pkgroll = resolveTool('pkgroll', [
+  `pkgroll@${packageJson.devDependencies.pkgroll}`,
+  `typescript@${packageJson.devDependencies.typescript}`,
+]);
+
+rmSync(resolve(packageRoot, 'dist'), { recursive: true, force: true });
+runTool('typecheck', tsc, ['--noEmit']);
+runTool('bundle', pkgroll, []);

package/scripts/devtools/README.md

@@ -1,9 +1,9 @@
-# CLI Devtools
-
-这组脚本用于 CLI 本地开发辅助。
-
-当前包含：
-
-- mock credentials 生成器
-
-新增 CLI 专属开发脚本应优先放在这里。
+# CLI Devtools
+
+这组脚本用于 CLI 本地开发辅助。
+
+当前包含：
+
+- mock credentials 生成器
+
+新增 CLI 专属开发脚本应优先放在这里。