happy-imou-cloud 2.1.39 → 2.1.41

package/dist/{runClaude-CwXQwmgw.cjs → runClaude-mIFO7YxF.cjs}

@@ -1,10 +1,10 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var persistence = require('./api-BoeZDGwx.cjs');
+var persistence = require('./api-C_Tnx4UG.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
-var index = require('./index-Cgor8CE7.cjs');
+var index = require('./index-Dh0qGrEd.cjs');
 require('ps-list');
 require('fs');
 require('path');
@@ -25,9 +25,9 @@ require('tweetnacl');
 require('open');
 var React = require('react');
 var ink = require('ink');
-var ProviderSelectionHandler = require('./ProviderSelectionHandler-B22eXuym.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-4nuTd8AP.cjs');
 var types = require('./types-DVk3crez.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DtXhn2Cd.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Bkh8uLhC.cjs');
 require('socket.io-client');
 require('expo-server-sdk');
 var node_util = require('node:util');
@@ -1000,6 +1000,7 @@ async function claudeAcpRemoteLauncher(session) {
   let currentModeHash = null;
   let pending = null;
   let accumulatedResponse = "";
+  let currentAssistantStreamStartLength = 0;
   let accumulatedThinking = "";
   let isResponseInProgress = false;
   let taskStartedSent = false;
@@ -1008,6 +1009,8 @@ async function claudeAcpRemoteLauncher(session) {
   let shouldInjectHistoryOnNextSession = false;
   let unexpectedRuntimeStopRecovery = null;
   let readyAlreadySent = false;
+  let currentHappyOrgTurn = null;
+  const assistantMessageStream = new persistence.AssistantMessageStream();
   const permissionHandler = new ClaudeAcpPermissionHandler(session.client);
   const selectionHandler = new ProviderSelectionHandler.ProviderSelectionHandler(session.client, "Claude");
   const conversationHistory = new registerKillSessionHandler.ConversationHistory({
@@ -1059,13 +1062,35 @@ async function claudeAcpRemoteLauncher(session) {
   };
   const resetTurnState = () => {
     accumulatedResponse = "";
+    currentAssistantStreamStartLength = 0;
     accumulatedThinking = "";
     isResponseInProgress = false;
     taskStartedSent = false;
     currentAssistantMessageId = null;
     currentThinkingMessageId = null;
+    currentHappyOrgTurn = null;
+    assistantMessageStream.reset();
     session.onThinkingChange(false);
   };
+  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.client.sendAgentMessage("claude", {
+      type: "message",
+      message: text,
+      id: stream.messageId,
+      ...stream
+    });
+    return true;
+  };
   const emitPendingThinkingMessage = () => {
     const thinking = accumulatedThinking.trim();
     if (!thinking) {
@@ -1083,15 +1108,19 @@ async function claudeAcpRemoteLauncher(session) {
     if (!finalMessage) {
       accumulatedResponse = "";
       isResponseInProgress = false;
+      assistantMessageStream.reset();
       return;
     }
     if (currentAssistantMessageId) {
       messageBuffer.updateMessage(currentAssistantMessageId, finalMessage, { mode: "replace" });
     }
     conversationHistory.addAssistantMessage(finalMessage);
+    const hadActiveStream = assistantMessageStream.hasActive();
+    const stream = hadActiveStream ? assistantMessageStream.commit() : null;
     session.client.sendAgentMessage("claude", {
       type: "message",
-      message: finalMessage
+      message: hadActiveStream ? finalMessage.slice(currentAssistantStreamStartLength) : finalMessage,
+      ...stream ? { id: stream.messageId, ...stream } : {}
     });
     session.client.sendClaudeSessionMessage({
       type: "assistant",
@@ -1109,8 +1138,29 @@ async function claudeAcpRemoteLauncher(session) {
       }
     });
     accumulatedResponse = "";
+    currentAssistantStreamStartLength = 0;
     isResponseInProgress = false;
   };
+  const commitActiveAssistantMessageStream = () => {
+    if (!assistantMessageStream.hasActive()) {
+      return false;
+    }
+    const finalMessage = accumulatedResponse.trim();
+    if (!finalMessage) {
+      assistantMessageStream.reset();
+      currentAssistantStreamStartLength = accumulatedResponse.length;
+      return false;
+    }
+    const stream = assistantMessageStream.commit();
+    session.client.sendAgentMessage("claude", {
+      type: "message",
+      message: finalMessage.slice(currentAssistantStreamStartLength),
+      id: stream.messageId,
+      ...stream
+    });
+    currentAssistantStreamStartLength = accumulatedResponse.length;
+    return true;
+  };
   const disposeRuntimeHandle = async () => {
     if (!runtimeHandle) {
       return;
@@ -1188,6 +1238,7 @@ async function claudeAcpRemoteLauncher(session) {
             }
           }
           accumulatedResponse += text;
+          emitAssistantMessageDelta(text);
           return;
         }
         case "status": {
@@ -1220,6 +1271,7 @@ async function claudeAcpRemoteLauncher(session) {
           return;
         }
         case "tool-call": {
+          commitActiveAssistantMessageStream();
           emitPendingThinkingMessage();
           const toolArgs = index.truncateDisplayMessage(msg.args, 100);
           messageBuffer.addMessage(
@@ -1330,6 +1382,7 @@ ${systemPrompt}` : systemPrompt,
   const abortActiveTurn = async () => {
     const activeController = rotateAbortController();
     activeController.abort();
+    assistantMessageStream.reset();
     session.onThinkingChange(false);
     if (runtimeHandle) {
       await runtimeHandle.cancel().catch((error) => {
@@ -1443,6 +1496,7 @@ ${systemPrompt}` : systemPrompt,
       let turnStatus = "task_complete";
       try {
         turnInFlight = true;
+        currentHappyOrgTurn = message.mode.happyOrg ?? null;
         const activeRuntimeHandle = runtimeHandle ?? await createRuntimeHandle(message.mode);
         let promptToSend = message.message;
         if (shouldInjectHistoryOnNextSession && conversationHistory.hasHistory()) {

package/dist/{runCodex-DqAddhDE.mjs → runCodex-DAc6flez.mjs}

@@ -1,6 +1,6 @@
-import { p as preserveSessionRuntimeMetadata, l as logger, b as connectionState, A as ApiClient } from './api-wcqkneTg.mjs';
-import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, j as buildTurnResultPushNotification, c as registerKillSessionHandler, k as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, m as extractPermissionRequestPushContext, n as buildPermissionPushNotification, o as renderTerminalOutputPreview, p as inferToolResultError, q as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-Buc97BEh.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-B9mt95QV.mjs';
+import { p as preserveSessionRuntimeMetadata, l as logger, d as AssistantMessageStream, b as connectionState, A as ApiClient } from './api-CwNEbJBM.mjs';
+import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, f as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, i as finalizeHappyOrgTurnWithBusinessAck, j as buildTurnResultPushNotification, c as registerKillSessionHandler, k as buildReadyPushNotification, l as launchRuntimeHandleWithFactoryResult, m as extractPermissionRequestPushContext, n as buildPermissionPushNotification, o as renderTerminalOutputPreview, p as inferToolResultError, q as forwardAgentMessageToProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-6JloVYkb.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-D5m2Duxd.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-DrSgStLw.mjs';
-import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-Cbp6sIDm.mjs';
+import { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-CmeZ92yO.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-Dica2zdX.mjs';
 import 'zod';
 import 'socket.io-client';
 import 'expo-server-sdk';
@@ -706,6 +706,7 @@ async function codexRemoteLauncher(session) {
   let readyAlreadySent = false;
   let accumulatedResponse = "";
   let emittedResponseLength = 0;
+  let currentAssistantStreamStartLength = 0;
   let isResponseInProgress = false;
   let taskStartedSent = false;
   let shouldInjectHistoryOnNextSession = false;
@@ -715,6 +716,7 @@ async function codexRemoteLauncher(session) {
   let currentThinkingMessageId = null;
   let currentHappyOrgTurn = null;
   let unexpectedRuntimeStopRecovery = null;
+  const assistantMessageStream = new AssistantMessageStream();
   const permissionHandler = new CodexPermissionHandler(session.client);
   const selectionHandler = new CodexSelectionHandler(session.client);
   const conversationHistory = new ConversationHistory$1({ maxMessages: 20, maxCharacters: 5e4 });
@@ -750,18 +752,21 @@ async function codexRemoteLauncher(session) {
     reasoningProcessor.abort();
     accumulatedResponse = "";
     emittedResponseLength = 0;
+    currentAssistantStreamStartLength = 0;
     isResponseInProgress = false;
     taskStartedSent = false;
     shouldCommitAccumulatedResponse = false;
     currentAssistantMessageId = null;
     currentThinkingMessageId = null;
     currentHappyOrgTurn = null;
+    assistantMessageStream.reset();
     session.onThinkingChange(false);
   };
   const abortActiveTurn = () => {
     const activeController = rotateAbortController();
     activeController.abort();
     reasoningProcessor.abort();
+    assistantMessageStream.reset();
     session.onThinkingChange(false);
     if (runtimeHandle) {
       void runtimeHandle.cancel().catch((error) => {
@@ -794,6 +799,7 @@ async function codexRemoteLauncher(session) {
       message,
       id: randomUUID()
     });
+    assistantMessageStream.reset();
   };
   const emitTurnReport = (report) => {
     session.runtimeSession.sendCodexMessage({
@@ -865,18 +871,37 @@ async function codexRemoteLauncher(session) {
     if (currentHappyOrgTurn && !opts?.force) {
       return false;
     }
-    const nextMessage = accumulatedResponse.slice(emittedResponseLength);
+    const hadActiveStream = assistantMessageStream.hasActive();
+    if (!opts?.force && !hadActiveStream) {
+      currentAssistantStreamStartLength = emittedResponseLength;
+    }
+    const nextMessage = opts?.force && hadActiveStream ? accumulatedResponse.slice(currentAssistantStreamStartLength) : opts?.force ? accumulatedResponse : accumulatedResponse.slice(emittedResponseLength);
     if (!nextMessage.trim()) {
+      if (opts?.force) {
+        assistantMessageStream.reset();
+        currentAssistantStreamStartLength = emittedResponseLength;
+      }
       return false;
     }
+    const stream = opts?.force ? assistantMessageStream.commit() : assistantMessageStream.delta();
     session.runtimeSession.sendCodexMessage({
       type: "message",
       message: nextMessage,
-      id: randomUUID()
+      id: stream.messageId,
+      ...stream
     });
     emittedResponseLength = accumulatedResponse.length;
+    if (opts?.force) {
+      currentAssistantStreamStartLength = emittedResponseLength;
+    }
     return true;
   };
+  const commitActiveAssistantMessageStream = () => {
+    if (!assistantMessageStream.hasActive()) {
+      return false;
+    }
+    return emitPendingAssistantMessageDelta({ force: true });
+  };
   const setupRuntimeMessageHandler = (activeRuntimeHandle) => {
     const forwardAgentMessage = (agentMessage) => {
       forwardAgentMessageToProviderSession(agentMessage, {
@@ -907,6 +932,7 @@ async function codexRemoteLauncher(session) {
             }
           }
           accumulatedResponse += text;
+          emitPendingAssistantMessageDelta();
           return;
         }
         case "status": {
@@ -940,7 +966,7 @@ async function codexRemoteLauncher(session) {
           return;
         }
         case "tool-call": {
-          emitPendingAssistantMessageDelta();
+          commitActiveAssistantMessageStream();
           const toolArgs = hasRenderableToolPayload(msg.args) ? truncateDisplayMessage(msg.args, 100) : "";
           messageBuffer.addMessage(
             `Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}` : ""}`,

package/dist/{runCodex-BkB_YKhV.cjs → runCodex-cNuxGshy.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var persistence = require('./api-BoeZDGwx.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-DtXhn2Cd.cjs');
-var index = require('./index-Cgor8CE7.cjs');
+var persistence = require('./api-C_Tnx4UG.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Bkh8uLhC.cjs');
+var index = require('./index-Dh0qGrEd.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-B22eXuym.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-BUTolvO5.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-4nuTd8AP.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DAPsauUX.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -708,6 +708,7 @@ async function codexRemoteLauncher(session) {
   let readyAlreadySent = false;
   let accumulatedResponse = "";
   let emittedResponseLength = 0;
+  let currentAssistantStreamStartLength = 0;
   let isResponseInProgress = false;
   let taskStartedSent = false;
   let shouldInjectHistoryOnNextSession = false;
@@ -717,6 +718,7 @@ async function codexRemoteLauncher(session) {
   let currentThinkingMessageId = null;
   let currentHappyOrgTurn = null;
   let unexpectedRuntimeStopRecovery = null;
+  const assistantMessageStream = new persistence.AssistantMessageStream();
   const permissionHandler = new CodexPermissionHandler(session.client);
   const selectionHandler = new CodexSelectionHandler(session.client);
   const conversationHistory = new registerKillSessionHandler.ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
@@ -752,18 +754,21 @@ async function codexRemoteLauncher(session) {
     reasoningProcessor.abort();
     accumulatedResponse = "";
     emittedResponseLength = 0;
+    currentAssistantStreamStartLength = 0;
     isResponseInProgress = false;
     taskStartedSent = false;
     shouldCommitAccumulatedResponse = false;
     currentAssistantMessageId = null;
     currentThinkingMessageId = null;
     currentHappyOrgTurn = null;
+    assistantMessageStream.reset();
     session.onThinkingChange(false);
   };
   const abortActiveTurn = () => {
     const activeController = rotateAbortController();
     activeController.abort();
     reasoningProcessor.abort();
+    assistantMessageStream.reset();
     session.onThinkingChange(false);
     if (runtimeHandle) {
       void runtimeHandle.cancel().catch((error) => {
@@ -796,6 +801,7 @@ async function codexRemoteLauncher(session) {
       message,
       id: node_crypto.randomUUID()
     });
+    assistantMessageStream.reset();
   };
   const emitTurnReport = (report) => {
     session.runtimeSession.sendCodexMessage({
@@ -867,18 +873,37 @@ async function codexRemoteLauncher(session) {
     if (currentHappyOrgTurn && !opts?.force) {
       return false;
     }
-    const nextMessage = accumulatedResponse.slice(emittedResponseLength);
+    const hadActiveStream = assistantMessageStream.hasActive();
+    if (!opts?.force && !hadActiveStream) {
+      currentAssistantStreamStartLength = emittedResponseLength;
+    }
+    const nextMessage = opts?.force && hadActiveStream ? accumulatedResponse.slice(currentAssistantStreamStartLength) : opts?.force ? accumulatedResponse : accumulatedResponse.slice(emittedResponseLength);
     if (!nextMessage.trim()) {
+      if (opts?.force) {
+        assistantMessageStream.reset();
+        currentAssistantStreamStartLength = emittedResponseLength;
+      }
       return false;
     }
+    const stream = opts?.force ? assistantMessageStream.commit() : assistantMessageStream.delta();
     session.runtimeSession.sendCodexMessage({
       type: "message",
       message: nextMessage,
-      id: node_crypto.randomUUID()
+      id: stream.messageId,
+      ...stream
     });
     emittedResponseLength = accumulatedResponse.length;
+    if (opts?.force) {
+      currentAssistantStreamStartLength = emittedResponseLength;
+    }
     return true;
   };
+  const commitActiveAssistantMessageStream = () => {
+    if (!assistantMessageStream.hasActive()) {
+      return false;
+    }
+    return emitPendingAssistantMessageDelta({ force: true });
+  };
   const setupRuntimeMessageHandler = (activeRuntimeHandle) => {
     const forwardAgentMessage = (agentMessage) => {
       registerKillSessionHandler.forwardAgentMessageToProviderSession(agentMessage, {
@@ -909,6 +934,7 @@ async function codexRemoteLauncher(session) {
             }
           }
           accumulatedResponse += text;
+          emitPendingAssistantMessageDelta();
           return;
         }
         case "status": {
@@ -942,7 +968,7 @@ async function codexRemoteLauncher(session) {
           return;
         }
         case "tool-call": {
-          emitPendingAssistantMessageDelta();
+          commitActiveAssistantMessageStream();
           const toolArgs = hasRenderableToolPayload(msg.args) ? index.truncateDisplayMessage(msg.args, 100) : "";
           messageBuffer.addMessage(
             `Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}` : ""}`,

package/dist/{runGemini-3jkfOtlr.mjs → runGemini-DdXj8ltI.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-CwNEbJBM.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-6JloVYkb.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-D5m2Duxd.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-Dica2zdX.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) {