happy-imou-cloud 2.1.39 → 2.1.40

package/dist/{runGemini-3jkfOtlr.mjs → runGemini-BDorYx-I.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-wcqkneTg.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, j as buildTurnResultPushNotification, k as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, m as extractPermissionRequestPushContext, n as buildPermissionPushNotification, o as renderTerminalOutputPreview, p as inferToolResultError, q as forwardAgentMessageToProviderSession } from './registerKillSessionHandler-Buc97BEh.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-B9mt95QV.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-Cbp6sIDm.mjs';
+import { l as logger, b as connectionState, A as ApiClient, d as AssistantMessageStream } from './api-BEKN9moW.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, j as buildTurnResultPushNotification, k as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, m as extractPermissionRequestPushContext, n as buildPermissionPushNotification, o as renderTerminalOutputPreview, p as inferToolResultError, q as forwardAgentMessageToProviderSession } from './registerKillSessionHandler--KMYjyvz.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-CNIT6feF.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-e-2bxjFB.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
 import 'ps-list';
@@ -690,6 +690,7 @@ async function runGemini(opts) {
   let currentModeHash = null;
   let unexpectedRuntimeStopRecovery = null;
   let readyAlreadySent = false;
+  let currentHappyOrgTurn = null;
   async function handleAbort() {
     logger.debug("[Gemini] Abort requested - stopping current task");
     if (!turnAbortedSent) {
@@ -701,6 +702,7 @@ async function runGemini(opts) {
     }
     reasoningProcessor.abort();
     diffProcessor.reset();
+    assistantMessageStream.reset();
     try {
       abortController.abort();
       messageQueue.reset();
@@ -840,20 +842,72 @@ async function runGemini(opts) {
     });
   };
   let accumulatedResponse = "";
+  let currentAssistantStreamStartLength = 0;
   let isResponseInProgress = false;
   let hadToolCallInTurn = false;
   let taskStartedSent = false;
+  const assistantMessageStream = new AssistantMessageStream();
   const resetTurnState = () => {
     reasoningProcessor.abort();
     diffProcessor.reset();
     accumulatedResponse = "";
+    currentAssistantStreamStartLength = 0;
     isResponseInProgress = false;
     hadToolCallInTurn = false;
     taskStartedSent = false;
     turnAbortedSent = false;
+    currentHappyOrgTurn = null;
+    assistantMessageStream.reset();
     thinking = false;
     session.keepAlive(thinking, "remote");
   };
+  const emitAssistantMessageDelta = (text) => {
+    if (currentHappyOrgTurn) {
+      return false;
+    }
+    if (!text.trim()) {
+      return false;
+    }
+    if (!assistantMessageStream.hasActive()) {
+      currentAssistantStreamStartLength = accumulatedResponse.length - text.length;
+    }
+    const stream = assistantMessageStream.delta();
+    session.sendAgentMessage("gemini", {
+      type: "message",
+      message: text,
+      id: stream.messageId,
+      ...stream
+    });
+    return true;
+  };
+  const buildAssistantMessageCommit = (message) => {
+    if (!assistantMessageStream.hasActive()) {
+      return {
+        type: "message",
+        message,
+        id: randomUUID()
+      };
+    }
+    const stream = assistantMessageStream.commit();
+    return {
+      type: "message",
+      message: message.slice(currentAssistantStreamStartLength),
+      id: stream.messageId,
+      ...stream
+    };
+  };
+  const commitActiveAssistantMessageStream = () => {
+    if (!assistantMessageStream.hasActive()) {
+      return false;
+    }
+    const messagePayload = buildAssistantMessageCommit(accumulatedResponse);
+    if (!messagePayload.message.trim()) {
+      return false;
+    }
+    session.sendAgentMessage("gemini", messagePayload);
+    currentAssistantStreamStartLength = accumulatedResponse.length;
+    return true;
+  };
   const disposeRuntimeHandle = async () => {
     if (!runtimeHandle) {
       return;
@@ -921,6 +975,7 @@ async function runGemini(opts) {
               logger.debug(`[gemini] Updated response, chunk length: ${msg.textDelta.length}, total accumulated: ${accumulatedResponse.length + msg.textDelta.length}`);
             }
             accumulatedResponse += msg.textDelta;
+            emitAssistantMessageDelta(msg.textDelta);
           }
           break;
         case "status":
@@ -977,9 +1032,11 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
               type: "message",
               message: `Error: ${errorMessage}`
             });
+            assistantMessageStream.reset();
           }
           break;
         case "tool-call":
+          commitActiveAssistantMessageStream();
           hadToolCallInTurn = true;
           const toolArgs = msg.args ? JSON.stringify(msg.args).substring(0, 100) : "";
           const isInvestigationTool = msg.toolName === "codebase_investigator" || typeof msg.toolName === "string" && msg.toolName.includes("investigator");
@@ -1204,10 +1261,12 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           throw new Error("Gemini runtime session not started");
         }
         accumulatedResponse = "";
+        currentAssistantStreamStartLength = 0;
         isResponseInProgress = false;
         hadToolCallInTurn = false;
         taskStartedSent = false;
         turnAbortedSent = false;
+        currentHappyOrgTurn = message.mode.happyOrg ?? null;
         let promptToSend = message.message;
         if (shouldInjectHistoryOnNextSession && conversationHistory.hasHistory()) {
           const historyContext = conversationHistory.getContextForNewSession();
@@ -1359,11 +1418,10 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             logger.debug(`[gemini] Warning: Incomplete options block detected`);
           }
           const messagePayload = {
-            type: "message",
-            message: finalMessageText,
-            id: randomUUID(),
+            ...buildAssistantMessageCommit(finalMessageText),
             ...options.length > 0 && { options }
           };
+          currentAssistantStreamStartLength = accumulatedResponse.length;
           logger.debug(`[gemini] Sending complete message to mobile (length: ${finalMessageText.length}): ${finalMessageText.substring(0, 100)}...`);
           session.sendAgentMessage("gemini", messagePayload);
           if (!shouldExit) {

package/dist/{runGemini-B4uXPrue.cjs → runGemini-CQBCnzbz.cjs}

@@ -3,10 +3,10 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var persistence = require('./api-BoeZDGwx.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DtXhn2Cd.cjs');
-var index = require('./index-Cgor8CE7.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-BUTolvO5.cjs');
+var persistence = require('./api-Ixv6TLYP.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CqjocTSr.cjs');
+var index = require('./index-Mvx4hucr.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-C8w4XM-x.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');
@@ -692,6 +692,7 @@ async function runGemini(opts) {
   let currentModeHash = null;
   let unexpectedRuntimeStopRecovery = null;
   let readyAlreadySent = false;
+  let currentHappyOrgTurn = null;
   async function handleAbort() {
     persistence.logger.debug("[Gemini] Abort requested - stopping current task");
     if (!turnAbortedSent) {
@@ -703,6 +704,7 @@ async function runGemini(opts) {
     }
     reasoningProcessor.abort();
     diffProcessor.reset();
+    assistantMessageStream.reset();
     try {
       abortController.abort();
       messageQueue.reset();
@@ -842,20 +844,72 @@ async function runGemini(opts) {
     });
   };
   let accumulatedResponse = "";
+  let currentAssistantStreamStartLength = 0;
   let isResponseInProgress = false;
   let hadToolCallInTurn = false;
   let taskStartedSent = false;
+  const assistantMessageStream = new persistence.AssistantMessageStream();
   const resetTurnState = () => {
     reasoningProcessor.abort();
     diffProcessor.reset();
     accumulatedResponse = "";
+    currentAssistantStreamStartLength = 0;
     isResponseInProgress = false;
     hadToolCallInTurn = false;
     taskStartedSent = false;
     turnAbortedSent = false;
+    currentHappyOrgTurn = null;
+    assistantMessageStream.reset();
     thinking = false;
     session.keepAlive(thinking, "remote");
   };
+  const emitAssistantMessageDelta = (text) => {
+    if (currentHappyOrgTurn) {
+      return false;
+    }
+    if (!text.trim()) {
+      return false;
+    }
+    if (!assistantMessageStream.hasActive()) {
+      currentAssistantStreamStartLength = accumulatedResponse.length - text.length;
+    }
+    const stream = assistantMessageStream.delta();
+    session.sendAgentMessage("gemini", {
+      type: "message",
+      message: text,
+      id: stream.messageId,
+      ...stream
+    });
+    return true;
+  };
+  const buildAssistantMessageCommit = (message) => {
+    if (!assistantMessageStream.hasActive()) {
+      return {
+        type: "message",
+        message,
+        id: node_crypto.randomUUID()
+      };
+    }
+    const stream = assistantMessageStream.commit();
+    return {
+      type: "message",
+      message: message.slice(currentAssistantStreamStartLength),
+      id: stream.messageId,
+      ...stream
+    };
+  };
+  const commitActiveAssistantMessageStream = () => {
+    if (!assistantMessageStream.hasActive()) {
+      return false;
+    }
+    const messagePayload = buildAssistantMessageCommit(accumulatedResponse);
+    if (!messagePayload.message.trim()) {
+      return false;
+    }
+    session.sendAgentMessage("gemini", messagePayload);
+    currentAssistantStreamStartLength = accumulatedResponse.length;
+    return true;
+  };
   const disposeRuntimeHandle = async () => {
     if (!runtimeHandle) {
       return;
@@ -923,6 +977,7 @@ async function runGemini(opts) {
               persistence.logger.debug(`[gemini] Updated response, chunk length: ${msg.textDelta.length}, total accumulated: ${accumulatedResponse.length + msg.textDelta.length}`);
             }
             accumulatedResponse += msg.textDelta;
+            emitAssistantMessageDelta(msg.textDelta);
           }
           break;
         case "status":
@@ -979,9 +1034,11 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
               type: "message",
               message: `Error: ${errorMessage}`
             });
+            assistantMessageStream.reset();
           }
           break;
         case "tool-call":
+          commitActiveAssistantMessageStream();
           hadToolCallInTurn = true;
           const toolArgs = msg.args ? JSON.stringify(msg.args).substring(0, 100) : "";
           const isInvestigationTool = msg.toolName === "codebase_investigator" || typeof msg.toolName === "string" && msg.toolName.includes("investigator");
@@ -1206,10 +1263,12 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           throw new Error("Gemini runtime session not started");
         }
         accumulatedResponse = "";
+        currentAssistantStreamStartLength = 0;
         isResponseInProgress = false;
         hadToolCallInTurn = false;
         taskStartedSent = false;
         turnAbortedSent = false;
+        currentHappyOrgTurn = message.mode.happyOrg ?? null;
         let promptToSend = message.message;
         if (shouldInjectHistoryOnNextSession && conversationHistory.hasHistory()) {
           const historyContext = conversationHistory.getContextForNewSession();
@@ -1361,11 +1420,10 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             persistence.logger.debug(`[gemini] Warning: Incomplete options block detected`);
           }
           const messagePayload = {
-            type: "message",
-            message: finalMessageText,
-            id: node_crypto.randomUUID(),
+            ...buildAssistantMessageCommit(finalMessageText),
             ...options.length > 0 && { options }
           };
+          currentAssistantStreamStartLength = accumulatedResponse.length;
           persistence.logger.debug(`[gemini] Sending complete message to mobile (length: ${finalMessageText.length}): ${finalMessageText.substring(0, 100)}...`);
           session.sendAgentMessage("gemini", messagePayload);
           if (!shouldExit) {

package/package.json

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