happy-imou-cloud 2.0.20 → 2.0.21

package/dist/{runGemini-uVHDcJ09.mjs → runGemini-BBUmH1Qh.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, b as connectionState, A as ApiClient } from './api-DJe9WP9M.mjs';
+import { B as BasePermissionHandler, C as ConversationHistory$1, e as ensureManagedProviderMachine, M as MissingMachineIdError, s as syncControlledByUserState, b as MessageQueue2, h as hashObject, r as resolveHappyOrgQueuedTurn, d as MessageBuffer, f as registerKillSessionHandler, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, k as closeProviderSession, l as launchRuntimeHandleWithFactoryResult, m as inferToolResultError, n as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-DsHTZDsU.mjs';
+import { g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-CHXCgpwi.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DnVC7liC.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-CkP90vEt.mjs';
 import 'open';
 import 'chalk';
 import 'fs';
@@ -511,12 +511,32 @@ async function runGemini(opts) {
   await syncControlledByUserState(session, false);
   const messageQueue = new MessageQueue2((mode) => 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) => {
+    const happyOrgResult = resolveHappyOrgQueuedTurn({
+      metadata: session.getMetadataSnapshot(),
+      message
+    });
+    if (happyOrgResult.nextMetadata) {
+      session.updateMetadata(() => happyOrgResult.nextMetadata);
+    }
+    if (happyOrgResult.blocked) {
+      if (happyOrgResult.statusMessage) {
+        session.sendSessionEvent({ type: "message", message: happyOrgResult.statusMessage });
+      }
+      return;
+    }
     let messagePermissionMode = currentPermissionMode;
     if (message.meta?.permissionMode) {
       const validModes = ["default", "read-only", "safe-yolo", "yolo"];
@@ -560,8 +580,9 @@ async function runGemini(opts) {
     const mode = {
       permissionMode: messagePermissionMode || "default",
       model: messageModel,
-      originalUserMessage
+      originalUserMessage,
       // Store original message separately
+      happyOrg: happyOrgResult.queuedTurn
     };
     messageQueue.push(fullPrompt, mode);
     conversationHistory.addUserMessage(originalUserMessage);
@@ -712,8 +733,10 @@ async function runGemini(opts) {
   };
   let accumulatedResponse = "";
   let isResponseInProgress = false;
+  let currentResponseMessageId = null;
   let hadToolCallInTurn = false;
   let taskStartedSent = false;
+  let currentHappyOrgTurn = null;
   const disposeRuntimeHandle = async () => {
     if (!runtimeHandle) {
       return;
@@ -728,6 +751,13 @@ async function runGemini(opts) {
       logger.debug("[Gemini] Error disposing runtime session:", error);
     }
   };
+  const emitTurnReport = (report) => {
+    session.sendAgentMessage("gemini", {
+      type: "turn-report",
+      id: randomUUID(),
+      report
+    });
+  };
   function setupGeminiMessageHandler(activeRuntimeHandle) {
     const forwardAgentMessage = (agentMessage) => {
       forwardAgentMessageToProviderSession(agentMessage, {
@@ -742,11 +772,15 @@ async function runGemini(opts) {
           if (msg.textDelta) {
             if (!isResponseInProgress) {
               messageBuffer.removeLastMessage("system");
-              messageBuffer.addMessage(msg.textDelta, "assistant");
+              currentResponseMessageId = messageBuffer.addMessage(msg.textDelta, "assistant");
               isResponseInProgress = true;
               logger.debug(`[gemini] Started new response, first chunk length: ${msg.textDelta.length}`);
             } else {
-              messageBuffer.updateLastMessage(msg.textDelta, "assistant");
+              if (currentResponseMessageId) {
+                messageBuffer.updateMessage(currentResponseMessageId, msg.textDelta);
+              } else {
+                currentResponseMessageId = messageBuffer.addMessage(msg.textDelta, "assistant");
+              }
               logger.debug(`[gemini] Updated response, chunk length: ${msg.textDelta.length}, total accumulated: ${accumulatedResponse.length + msg.textDelta.length}`);
             }
             accumulatedResponse += msg.textDelta;
@@ -780,6 +814,7 @@ async function runGemini(opts) {
             session.keepAlive(thinking, "remote");
             accumulatedResponse = "";
             isResponseInProgress = false;
+            currentResponseMessageId = null;
             let errorMessage = "Unknown error";
             if (msg.detail) {
               if (typeof msg.detail === "object") {
@@ -985,6 +1020,8 @@ 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";
+      currentHappyOrgTurn = message.mode.happyOrg ?? null;
       try {
         let activeHandle = runtimeHandle;
         if (!activeHandle) {
@@ -1003,6 +1040,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         }
         accumulatedResponse = "";
         isResponseInProgress = false;
+        currentResponseMessageId = null;
         hadToolCallInTurn = false;
         taskStartedSent = false;
         let promptToSend = message.message;
@@ -1011,6 +1049,9 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           promptToSend = historyContext + promptToSend;
           logger.debug(`[gemini] Injected conversation history context (${historyContext.length} chars)`);
         }
+        if (message.mode.happyOrg) {
+          promptToSend = buildHappyOrgTurnPrompt(promptToSend, message.mode.happyOrg);
+        }
         logger.debug(`[gemini] Sending prompt to Gemini (length: ${promptToSend.length}): ${promptToSend.substring(0, 100)}...`);
         logger.debug(`[gemini] Full prompt: ${promptToSend}`);
         const MAX_RETRIES = 3;
@@ -1060,6 +1101,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         logger.debug("[gemini] Error in gemini session:", error);
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (isAbortError) {
+          turnStatus = "turn_aborted";
           messageBuffer.addMessage("Aborted by user", "status");
           session.sendSessionEvent({ type: "message", message: "Aborted by user" });
         } else {
@@ -1108,6 +1150,26 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();
+        const finalizedTurn = 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) {
+          messageBuffer.addMessage(finalizedTurn.terminateMessage, "status");
+          session.sendSessionEvent({ type: "message", message: finalizedTurn.terminateMessage });
+        }
+        accumulatedResponse = finalizedTurn.cleanedText;
+        if (currentResponseMessageId && finalizedTurn.cleanedText.trim()) {
+          messageBuffer.updateMessage(currentResponseMessageId, finalizedTurn.cleanedText, { mode: "replace" });
+        }
         if (accumulatedResponse.trim()) {
           const { text: messageText, options } = parseOptionsFromText(accumulatedResponse);
           conversationHistory.addAssistantMessage(messageText);
@@ -1136,6 +1198,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         });
         hadToolCallInTurn = false;
         taskStartedSent = false;
+        currentResponseMessageId = null;
+        currentHappyOrgTurn = null;
         thinking = false;
         session.keepAlive(thinking, "remote");
         emitReadyIfIdle();

package/dist/{runGemini-UKpRbyNY.cjs → runGemini-D5RAIaR0.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-MGlKcEf3.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cs_INk4A.cjs');
+var index = require('./index-CgVjDJpt.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-0nj-PMFc.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-DLFUNI9q.cjs');
 require('open');
 require('chalk');
 require('fs');
@@ -513,12 +513,32 @@ 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) => {
+    const happyOrgResult = registerKillSessionHandler.resolveHappyOrgQueuedTurn({
+      metadata: session.getMetadataSnapshot(),
+      message
+    });
+    if (happyOrgResult.nextMetadata) {
+      session.updateMetadata(() => happyOrgResult.nextMetadata);
+    }
+    if (happyOrgResult.blocked) {
+      if (happyOrgResult.statusMessage) {
+        session.sendSessionEvent({ type: "message", message: happyOrgResult.statusMessage });
+      }
+      return;
+    }
     let messagePermissionMode = currentPermissionMode;
     if (message.meta?.permissionMode) {
       const validModes = ["default", "read-only", "safe-yolo", "yolo"];
@@ -562,8 +582,9 @@ async function runGemini(opts) {
     const mode = {
       permissionMode: messagePermissionMode || "default",
       model: messageModel,
-      originalUserMessage
+      originalUserMessage,
       // Store original message separately
+      happyOrg: happyOrgResult.queuedTurn
     };
     messageQueue.push(fullPrompt, mode);
     conversationHistory.addUserMessage(originalUserMessage);
@@ -714,8 +735,10 @@ async function runGemini(opts) {
   };
   let accumulatedResponse = "";
   let isResponseInProgress = false;
+  let currentResponseMessageId = null;
   let hadToolCallInTurn = false;
   let taskStartedSent = false;
+  let currentHappyOrgTurn = null;
   const disposeRuntimeHandle = async () => {
     if (!runtimeHandle) {
       return;
@@ -730,6 +753,13 @@ async function runGemini(opts) {
       api.logger.debug("[Gemini] Error disposing runtime session:", error);
     }
   };
+  const emitTurnReport = (report) => {
+    session.sendAgentMessage("gemini", {
+      type: "turn-report",
+      id: node_crypto.randomUUID(),
+      report
+    });
+  };
   function setupGeminiMessageHandler(activeRuntimeHandle) {
     const forwardAgentMessage = (agentMessage) => {
       registerKillSessionHandler.forwardAgentMessageToProviderSession(agentMessage, {
@@ -744,11 +774,15 @@ async function runGemini(opts) {
           if (msg.textDelta) {
             if (!isResponseInProgress) {
               messageBuffer.removeLastMessage("system");
-              messageBuffer.addMessage(msg.textDelta, "assistant");
+              currentResponseMessageId = messageBuffer.addMessage(msg.textDelta, "assistant");
               isResponseInProgress = true;
               api.logger.debug(`[gemini] Started new response, first chunk length: ${msg.textDelta.length}`);
             } else {
-              messageBuffer.updateLastMessage(msg.textDelta, "assistant");
+              if (currentResponseMessageId) {
+                messageBuffer.updateMessage(currentResponseMessageId, msg.textDelta);
+              } else {
+                currentResponseMessageId = messageBuffer.addMessage(msg.textDelta, "assistant");
+              }
               api.logger.debug(`[gemini] Updated response, chunk length: ${msg.textDelta.length}, total accumulated: ${accumulatedResponse.length + msg.textDelta.length}`);
             }
             accumulatedResponse += msg.textDelta;
@@ -782,6 +816,7 @@ async function runGemini(opts) {
             session.keepAlive(thinking, "remote");
             accumulatedResponse = "";
             isResponseInProgress = false;
+            currentResponseMessageId = null;
             let errorMessage = "Unknown error";
             if (msg.detail) {
               if (typeof msg.detail === "object") {
@@ -987,6 +1022,8 @@ 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";
+      currentHappyOrgTurn = message.mode.happyOrg ?? null;
       try {
         let activeHandle = runtimeHandle;
         if (!activeHandle) {
@@ -1005,6 +1042,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         }
         accumulatedResponse = "";
         isResponseInProgress = false;
+        currentResponseMessageId = null;
         hadToolCallInTurn = false;
         taskStartedSent = false;
         let promptToSend = message.message;
@@ -1013,6 +1051,9 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           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);
+        }
         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;
@@ -1062,6 +1103,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         api.logger.debug("[gemini] Error in gemini session:", error);
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (isAbortError) {
+          turnStatus = "turn_aborted";
           messageBuffer.addMessage("Aborted by user", "status");
           session.sendSessionEvent({ type: "message", message: "Aborted by user" });
         } else {
@@ -1110,6 +1152,26 @@ 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) {
+          messageBuffer.addMessage(finalizedTurn.terminateMessage, "status");
+          session.sendSessionEvent({ type: "message", message: finalizedTurn.terminateMessage });
+        }
+        accumulatedResponse = finalizedTurn.cleanedText;
+        if (currentResponseMessageId && finalizedTurn.cleanedText.trim()) {
+          messageBuffer.updateMessage(currentResponseMessageId, finalizedTurn.cleanedText, { mode: "replace" });
+        }
         if (accumulatedResponse.trim()) {
           const { text: messageText, options } = parseOptionsFromText(accumulatedResponse);
           conversationHistory.addAssistantMessage(messageText);
@@ -1138,6 +1200,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         });
         hadToolCallInTurn = false;
         taskStartedSent = false;
+        currentResponseMessageId = null;
+        currentHappyOrgTurn = null;
         thinking = false;
         session.keepAlive(thinking, "remote");
         emitReadyIfIdle();

package/package.json

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

package/scripts/release-smoke.mjs

@@ -166,9 +166,9 @@ function shouldRunProviderSmoke(provider) {
   return process.env[`HAPPY_SMOKE_${provider.toUpperCase()}`] === '1';
 }
 
-function shouldSkipPackedInstallVerification() {
-  return process.env.npm_lifecycle_event === 'prepublishOnly';
-}
+function shouldSkipPackedInstallVerification() {
+  return process.env.npm_lifecycle_event === 'prepublishOnly';
+}
 
 function main() {
   const tsc = resolveTool('tsc', 'typescript');