happy-imou-cloud 2.0.22 → 2.1.0

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

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-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');
+var api = require('./api-Bd-MnOS4.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-D9kwxy6B.cjs');
+var index = require('./index-BQmJ4NAa.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-C9mH8EVn.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-yVTbf_Ng.cjs');
+require('./persistence-BL06LLVz.cjs');
 require('open');
 require('chalk');
 require('fs');
@@ -432,6 +432,93 @@ class ConversationHistory extends registerKillSessionHandler.ConversationHistory
   }
 }
 
+const GEMINI_PERMISSION_MODES = [
+  "default",
+  "read-only",
+  "safe-yolo",
+  "yolo"
+];
+function isGeminiPermissionMode(value) {
+  return typeof value === "string" && GEMINI_PERMISSION_MODES.includes(value);
+}
+function hasMetaOverride(message, key) {
+  return Object.prototype.hasOwnProperty.call(message.meta ?? {}, key);
+}
+function resolveGeminiQueuedMessage(message, currentState) {
+  const previousState = { ...currentState };
+  const currentPermissionMode = isGeminiPermissionMode(currentState.permissionMode) ? currentState.permissionMode : void 0;
+  let permissionMode = currentPermissionMode;
+  let invalidPermissionMode = null;
+  if (hasMetaOverride(message, "permissionMode")) {
+    if (isGeminiPermissionMode(message.meta?.permissionMode)) {
+      permissionMode = message.meta.permissionMode;
+    } else if (message.meta?.permissionMode) {
+      invalidPermissionMode = String(message.meta.permissionMode);
+    }
+  }
+  const hasModelOverride = hasMetaOverride(message, "model");
+  const model = hasModelOverride ? message.meta?.model || void 0 : currentState.model;
+  const originalUserMessage = message.content.text;
+  let queuedText = originalUserMessage;
+  const isFirstMessage = currentState.isFirstMessage ?? true;
+  let nextIsFirstMessage = isFirstMessage;
+  if (isFirstMessage && message.meta?.appendSystemPrompt) {
+    queuedText = `${message.meta.appendSystemPrompt}
+
+${originalUserMessage}`;
+    nextIsFirstMessage = false;
+  }
+  const nextState = {
+    permissionMode: permissionMode ?? "default",
+    model,
+    isFirstMessage: nextIsFirstMessage
+  };
+  return {
+    previousState,
+    nextState,
+    invalidPermissionMode,
+    hasModelOverride,
+    queuedMessage: {
+      text: queuedText,
+      mode: {
+        permissionMode: nextState.permissionMode ?? "default",
+        model,
+        originalUserMessage
+      }
+    }
+  };
+}
+function bindGeminiUserMessageQueue(opts) {
+  let currentState = { ...opts.initialState };
+  opts.session.onUserMessage((message) => {
+    const happyOrgResult = opts.happyOrg ? registerKillSessionHandler.resolveHappyOrgQueuedTurn({
+      metadata: opts.happyOrg.getMetadata(),
+      message
+    }) : {
+      nextMetadata: null,
+      queuedTurn: null,
+      blocked: false,
+      statusMessage: void 0
+    };
+    if (opts.happyOrg && happyOrgResult.nextMetadata) {
+      opts.happyOrg.updateMetadata(() => happyOrgResult.nextMetadata);
+    }
+    if (happyOrgResult.blocked) {
+      if (happyOrgResult.statusMessage) {
+        opts.happyOrg?.emitStatusMessage(happyOrgResult.statusMessage);
+      }
+      api.logger.debugLargeJson("[gemini] User message blocked by Happy Org runtime:", message);
+      return;
+    }
+    const resolution = resolveGeminiQueuedMessage(message, currentState);
+    currentState = resolution.nextState;
+    resolution.queuedMessage.mode.happyOrg = happyOrgResult.queuedTurn;
+    opts.onResolvedMessage?.(resolution);
+    opts.messageQueue.push(resolution.queuedMessage.text, resolution.queuedMessage.mode);
+    api.logger.debugLargeJson("[gemini] User message queued:", message);
+  });
+}
+
 async function runGemini(opts) {
   const sessionTag = node_crypto.randomUUID();
   api.connectionState.setBackend("Gemini");
@@ -513,67 +600,21 @@ async function runGemini(opts) {
   await registerKillSessionHandler.syncControlledByUserState(session, false);
   const messageQueue = new registerKillSessionHandler.MessageQueue2((mode) => registerKillSessionHandler.hashObject({
     permissionMode: mode.permissionMode,
-    model: mode.model
+    model: mode.model,
+    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
   }));
   const conversationHistory = new ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
-  let currentPermissionMode = void 0;
-  let currentModel = void 0;
-  session.onUserMessage((message) => {
-    let messagePermissionMode = currentPermissionMode;
-    if (message.meta?.permissionMode) {
-      const validModes = ["default", "read-only", "safe-yolo", "yolo"];
-      if (validModes.includes(message.meta.permissionMode)) {
-        messagePermissionMode = message.meta.permissionMode;
-        currentPermissionMode = messagePermissionMode;
-        updatePermissionMode(messagePermissionMode);
-        api.logger.debug(`[Gemini] Permission mode updated from user message to: ${currentPermissionMode}`);
-      } else {
-        api.logger.debug(`[Gemini] Invalid permission mode received: ${message.meta.permissionMode}`);
-      }
-    } else {
-      api.logger.debug(`[Gemini] User message received with no permission mode override, using current: ${currentPermissionMode ?? "default (effective)"}`);
-    }
-    if (currentPermissionMode === void 0) {
-      currentPermissionMode = "default";
-      updatePermissionMode("default");
-    }
-    let messageModel = currentModel;
-    if (message.meta?.hasOwnProperty("model")) {
-      if (message.meta.model === null) {
-        messageModel = void 0;
-        currentModel = void 0;
-      } else if (message.meta.model) {
-        const previousModel = currentModel;
-        messageModel = message.meta.model;
-        currentModel = messageModel;
-        if (previousModel !== messageModel) {
-          updateDisplayedModel(messageModel, true);
-          messageBuffer.addMessage(`Model changed to: ${messageModel}`, "system");
-          api.logger.debug(`[Gemini] Model changed from ${previousModel} to ${messageModel}`);
-        }
-      }
-    }
-    const originalUserMessage = message.content.text;
-    let fullPrompt = originalUserMessage;
-    if (isFirstMessage && message.meta?.appendSystemPrompt) {
-      fullPrompt = message.meta.appendSystemPrompt + "\n\n" + originalUserMessage;
-      isFirstMessage = false;
-    }
-    const mode = {
-      permissionMode: messagePermissionMode || "default",
-      model: messageModel,
-      originalUserMessage
-      // Store original message separately
-    };
-    messageQueue.push(fullPrompt, mode);
-    conversationHistory.addUserMessage(originalUserMessage);
-  });
   let thinking = false;
   session.keepAlive(thinking, "remote");
   const keepAliveInterval = setInterval(() => {
     session.keepAlive(thinking, "remote");
   }, 2e3);
-  let isFirstMessage = true;
   const sendReady = () => {
     session.sendSessionEvent({ type: "ready" });
     try {
@@ -606,12 +647,18 @@ async function runGemini(opts) {
   let shouldExit = false;
   let runtimeHandle = null;
   let unsubscribeRuntimeMessages = null;
+  let handleQueuedUserMessage = null;
+  let emitGeminiStatusMessage = null;
+  let turnAbortedSent = false;
   async function handleAbort() {
     api.logger.debug("[Gemini] Abort requested - stopping current task");
-    session.sendAgentMessage("gemini", {
-      type: "turn_aborted",
-      id: node_crypto.randomUUID()
-    });
+    if (!turnAbortedSent) {
+      session.sendAgentMessage("gemini", {
+        type: "turn_aborted",
+        id: node_crypto.randomUUID()
+      });
+      turnAbortedSent = true;
+    }
     reasoningProcessor.abort();
     diffProcessor.reset();
     try {
@@ -672,6 +719,10 @@ async function runGemini(opts) {
       api.logger.debug(`[gemini] Model unchanged, skipping update message`);
     }
   };
+  emitGeminiStatusMessage = (message) => {
+    messageBuffer.addMessage(message, "status");
+    session.sendSessionEvent({ type: "message", message });
+  };
   if (hasTTY) {
     console.clear();
     const DisplayComponent = () => {
@@ -712,6 +763,41 @@ async function runGemini(opts) {
   const updatePermissionMode = (mode) => {
     permissionHandler.setPermissionMode(mode);
   };
+  handleQueuedUserMessage = ({ previousState, nextState, invalidPermissionMode, hasModelOverride }) => {
+    if (invalidPermissionMode) {
+      api.logger.debug(`[Gemini] Invalid permission mode received: ${invalidPermissionMode}`);
+    } else if (nextState.permissionMode) {
+      api.logger.debug(`[Gemini] Permission mode resolved to: ${nextState.permissionMode}`);
+    }
+    updatePermissionMode(nextState.permissionMode ?? "default");
+    if (hasModelOverride && nextState.model && previousState.model !== nextState.model) {
+      updateDisplayedModel(nextState.model, true);
+      messageBuffer.addMessage(`Model changed to: ${nextState.model}`, "system");
+      api.logger.debug(`[Gemini] Model changed from ${previousState.model} to ${nextState.model}`);
+    }
+  };
+  bindGeminiUserMessageQueue({
+    session,
+    messageQueue,
+    initialState: {},
+    happyOrg: {
+      getMetadata: () => session.getMetadataSnapshot?.() ?? metadata,
+      updateMetadata: (handler) => session.updateMetadata(handler),
+      emitStatusMessage: (message) => {
+        emitGeminiStatusMessage?.(message);
+      }
+    },
+    onResolvedMessage: (resolution) => {
+      handleQueuedUserMessage?.(resolution);
+    }
+  });
+  const emitTurnReport = (report) => {
+    session.sendAgentMessage("gemini", {
+      type: "turn-report",
+      id: node_crypto.randomUUID(),
+      report
+    });
+  };
   let accumulatedResponse = "";
   let isResponseInProgress = false;
   let hadToolCallInTurn = false;
@@ -759,10 +845,13 @@ async function runGemini(opts) {
           api.logger.debug(`[gemini] Status changed: ${msg.status}${statusDetail ? ` - ${statusDetail}` : ""}`);
           if (msg.status === "error") {
             api.logger.debug(`[gemini] \u26A0\uFE0F Error status received: ${statusDetail || "Unknown error"}`);
-            session.sendAgentMessage("gemini", {
-              type: "turn_aborted",
-              id: node_crypto.randomUUID()
-            });
+            if (!turnAbortedSent) {
+              session.sendAgentMessage("gemini", {
+                type: "turn_aborted",
+                id: node_crypto.randomUUID()
+              });
+              turnAbortedSent = true;
+            }
           }
           if (msg.status === "running") {
             thinking = true;
@@ -987,6 +1076,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       const userMessageToShow = message.mode?.originalUserMessage || message.message;
       messageBuffer.addMessage(userMessageToShow, "user");
       isProcessingMessage = true;
+      let turnStatus = "task_complete";
       try {
         let activeHandle = runtimeHandle;
         if (!activeHandle) {
@@ -1007,12 +1097,17 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         isResponseInProgress = false;
         hadToolCallInTurn = false;
         taskStartedSent = false;
+        turnAbortedSent = false;
         let promptToSend = message.message;
         if (injectHistoryContext && conversationHistory.hasHistory()) {
           const historyContext = conversationHistory.getContextForNewSession();
           promptToSend = historyContext + promptToSend;
           api.logger.debug(`[gemini] Injected conversation history context (${historyContext.length} chars)`);
         }
+        if (message.mode.happyOrg) {
+          promptToSend = registerKillSessionHandler.buildHappyOrgTurnPrompt(promptToSend, message.mode.happyOrg);
+        }
+        conversationHistory.addUserMessage(userMessageToShow);
         api.logger.debug(`[gemini] Sending prompt to Gemini (length: ${promptToSend.length}): ${promptToSend.substring(0, 100)}...`);
         api.logger.debug(`[gemini] Full prompt: ${promptToSend}`);
         const MAX_RETRIES = 3;
@@ -1022,7 +1117,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           try {
             await activeHandle.sendPrompt(promptToSend);
             api.logger.debug("[gemini] Prompt sent successfully");
-            await registerKillSessionHandler.waitForResponseCompleteWithAbort(activeHandle.backend, abortController.signal, 12e4);
+            await registerKillSessionHandler.waitForResponseCompleteWithAbort(activeHandle.backend, abortController.signal, 10 * 6e4);
             api.logger.debug("[gemini] Response complete");
             break;
           } catch (promptError) {
@@ -1061,6 +1156,14 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       } catch (error) {
         api.logger.debug("[gemini] Error in gemini session:", error);
         const isAbortError = error instanceof Error && error.name === "AbortError";
+        turnStatus = "turn_aborted";
+        if (!turnAbortedSent) {
+          session.sendAgentMessage("gemini", {
+            type: "turn_aborted",
+            id: node_crypto.randomUUID()
+          });
+          turnAbortedSent = true;
+        }
         if (isAbortError) {
           messageBuffer.addMessage("Aborted by user", "status");
           session.sendSessionEvent({ type: "message", message: "Aborted by user" });
@@ -1073,8 +1176,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             const errorMessage = errObj.message || errObj.error?.message || "";
             const errorString = String(error);
             if (errorCode === 404 || errorDetails.includes("notFound") || errorDetails.includes("404") || errorMessage.includes("not found") || errorMessage.includes("404")) {
-              const currentModel2 = displayedModel || "gemini-2.5-pro";
-              errorMsg = `Model "${currentModel2}" not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite`;
+              const currentModel = displayedModel || "gemini-2.5-pro";
+              errorMsg = `Model "${currentModel}" not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite`;
             } else if (errorCode === -32603 || errorDetails.includes("empty response") || errorDetails.includes("Model stream ended")) {
               errorMsg = "Gemini API returned empty response after retries. This is a temporary issue - please try again.";
             } else if (errorCode === 429 || errorDetails.includes("429") || errorMessage.includes("429") || errorString.includes("429") || errorDetails.includes("rateLimitExceeded") || errorDetails.includes("RESOURCE_EXHAUSTED") || errorMessage.includes("Rate limit exceeded") || errorMessage.includes("Resource exhausted") || errorString.includes("rateLimitExceeded") || errorString.includes("RESOURCE_EXHAUSTED")) {
@@ -1110,6 +1213,22 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();
+        const finalizedTurn = registerKillSessionHandler.finalizeHappyOrgTurn({
+          metadata: session.getMetadataSnapshot?.() ?? null,
+          queuedTurn: message.mode.happyOrg,
+          responseText: accumulatedResponse,
+          turnStatus
+        });
+        if (finalizedTurn.nextMetadata && typeof session.updateMetadata === "function") {
+          session.updateMetadata(() => finalizedTurn.nextMetadata);
+        }
+        if (finalizedTurn.report) {
+          emitTurnReport(finalizedTurn.report);
+        }
+        if (finalizedTurn.terminateMessage) {
+          emitGeminiStatusMessage?.(finalizedTurn.terminateMessage);
+        }
+        accumulatedResponse = finalizedTurn.cleanedText;
         if (accumulatedResponse.trim()) {
           const { text: messageText, options } = parseOptionsFromText(accumulatedResponse);
           conversationHistory.addAssistantMessage(messageText);
@@ -1153,7 +1272,9 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       reconnectionHandle.cancel();
     }
     try {
-      await registerKillSessionHandler.closeProviderSession(session);
+      await registerKillSessionHandler.closeProviderSession(session, {
+        archiveOnClose: true
+      });
     } catch (e) {
       api.logger.debug("[gemini]: Error while closing session", e);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.0.22",
+  "version": "2.1.0",
   "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 专属开发脚本应优先放在这里。