happy-imou-cloud 2.0.20 → 2.0.21

package/dist/{runClaude-BMv-eao6.mjs → runClaude-DAQAEmHe.mjs}

@@ -1,8 +1,8 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, d as backoff, f as delay, g as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-_Y2kzqZL.mjs';
+import { l as logger, f as backoff, g as delay, h as AsyncLock, c as configuration, s as startOfflineReconnection, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-DJe9WP9M.mjs';
 import 'cross-spawn';
 import '@agentclientprotocol/sdk';
-import { j as getProjectPath, F as Future, k as claudeLocal, E as ExitCodeError, l as trimIdent, m as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, n as claudeCheckSession, e as projectPath, o as mapToClaudeMode, P as PushableAsyncIterable, q as query, A as AbortError, b as stopCaffeinate, p as publishSessionRegistration, u as getEnvironmentInfo, w as startCaffeinate } from './index-Bg4KLXYY.mjs';
+import { j as getProjectPath, F as Future, k as claudeLocal, E as ExitCodeError, l as trimIdent, m as createClaudeBackend, f as formatDisplayMessage, t as truncateDisplayMessage, n as claudeCheckSession, e as projectPath, o as mapToClaudeMode, P as PushableAsyncIterable, q as query, A as AbortError, b as stopCaffeinate, p as publishSessionRegistration, u as getEnvironmentInfo, w as startCaffeinate } from './index-CHXCgpwi.mjs';
 import 'ps-list';
 import 'fs';
 import 'path';
@@ -13,7 +13,7 @@ import { dirname, basename, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { execSync } from 'node:child_process';
 import 'node:readline';
-import './persistence-BCkHc68b.mjs';
+import './persistence-CkP90vEt.mjs';
 import { readFile } from 'node:fs/promises';
 import { stat, watch, access } from 'fs/promises';
 import 'crypto';
@@ -24,9 +24,9 @@ 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 { c as createKeepAliveController, P as ProviderSelectionHandler, r as runModeLoop } from './ProviderSelectionHandler-R-2r7ItM.mjs';
 import { R as RawJSONLinesSchema } from './types-CiliQpqS.mjs';
-import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, w as waitForResponseCompleteWithAbort, l as launchRuntimeHandleWithFactoryResult, j as forwardAgentMessageToProviderSession, s as syncControlledByUserState, e as ensureManagedProviderMachine, M as MissingMachineIdError, c as createSessionMetadata, b as MessageQueue2, h as hashObject, r as registerKillSessionHandler, f as closeProviderSession } from './registerKillSessionHandler-DJMH-gar.mjs';
+import { B as BasePermissionHandler, d as MessageBuffer, C as ConversationHistory$1, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, l as launchRuntimeHandleWithFactoryResult, n as forwardAgentMessageToProviderSession, s as syncControlledByUserState, r as resolveHappyOrgQueuedTurn, e as ensureManagedProviderMachine, M as MissingMachineIdError, c as createSessionMetadata, b as MessageQueue2, h as hashObject, f as registerKillSessionHandler, k as closeProviderSession } from './registerKillSessionHandler-DsHTZDsU.mjs';
 import 'socket.io-client';
 import 'expo-server-sdk';
 import { isDeepStrictEqual } from 'node:util';
@@ -1038,6 +1038,13 @@ async function claudeAcpRemoteLauncher(session) {
       message
     });
   };
+  const emitTurnReport = (report) => {
+    session.client.sendAgentMessage("claude", {
+      type: "turn-report",
+      id: randomUUID(),
+      report
+    });
+  };
   const resetTurnState = () => {
     accumulatedResponse = "";
     isResponseInProgress = false;
@@ -1046,13 +1053,16 @@ async function claudeAcpRemoteLauncher(session) {
     currentThinkingMessageId = null;
     session.onThinkingChange(false);
   };
-  const emitFinalAssistantMessage = () => {
-    const finalMessage = accumulatedResponse.trim();
+  const emitFinalAssistantMessage = (finalMessageText) => {
+    const finalMessage = (finalMessageText ?? accumulatedResponse).trim();
     if (!finalMessage) {
       accumulatedResponse = "";
       isResponseInProgress = false;
       return;
     }
+    if (currentAssistantMessageId) {
+      messageBuffer.updateMessage(currentAssistantMessageId, finalMessage, { mode: "replace" });
+    }
     conversationHistory.addAssistantMessage(finalMessage);
     session.client.sendAgentMessage("claude", {
       type: "message",
@@ -1364,6 +1374,7 @@ ${systemPrompt}` : systemPrompt,
       permissionHandler.setPermissionMode(message.mode.permissionMode);
       messageBuffer.addMessage(message.message, "user");
       let shouldClearHistoryAfterTurn = false;
+      let turnStatus = "task_complete";
       try {
         const activeRuntimeHandle = runtimeHandle ?? await createRuntimeHandle(message.mode);
         let promptToSend = message.message;
@@ -1374,6 +1385,9 @@ ${systemPrompt}` : systemPrompt,
           promptToSend = historyContext + promptToSend;
           logger.debug(`[ClaudeACP] Injected conversation history context (${historyContext.length} chars)`);
         }
+        if (message.mode.happyOrg) {
+          promptToSend = buildHappyOrgTurnPrompt(promptToSend, message.mode.happyOrg);
+        }
         if (specialCommand.type === "compact") {
           emitStatusMessage("Compaction started");
         }
@@ -1387,6 +1401,7 @@ ${systemPrompt}` : systemPrompt,
         const isAbortError = error instanceof Error && error.name === "AbortError";
         const isExpectedInterruption = isAbortError || abortController.signal.aborted || shouldExit;
         if (isExpectedInterruption) {
+          turnStatus = "turn_aborted";
           session.client.sendAgentMessage("claude", {
             type: "turn_aborted",
             id: randomUUID()
@@ -1403,7 +1418,23 @@ ${systemPrompt}` : systemPrompt,
           currentModeHash = null;
         }
       } finally {
-        emitFinalAssistantMessage();
+        const finalizedTurn = finalizeHappyOrgTurn({
+          metadata: session.client.getMetadataSnapshot?.() ?? null,
+          queuedTurn: message.mode.happyOrg,
+          responseText: accumulatedResponse,
+          turnStatus
+        });
+        if (finalizedTurn.nextMetadata && typeof session.client.updateMetadata === "function") {
+          session.client.updateMetadata(() => finalizedTurn.nextMetadata);
+        }
+        if (finalizedTurn.report) {
+          emitTurnReport(finalizedTurn.report);
+        }
+        if (finalizedTurn.terminateMessage) {
+          emitStatusMessage(finalizedTurn.terminateMessage);
+        }
+        accumulatedResponse = finalizedTurn.cleanedText;
+        emitFinalAssistantMessage(finalizedTurn.cleanedText);
         if (shouldClearHistoryAfterTurn) {
           conversationHistory.clear();
           emitStatusMessage("Compaction completed");
@@ -3128,8 +3159,28 @@ function resolveClaudeQueuedMessage(message, currentState) {
 function bindClaudeUserMessageQueue(opts) {
   let currentState = { ...opts.initialState };
   opts.session.onUserMessage((message) => {
+    const happyOrgResult = opts.happyOrg ? 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);
+      }
+      logger.debugLargeJson("[claude] User message blocked by Happy Org runtime:", message);
+      return;
+    }
     const { nextState, queuedMessage } = resolveClaudeQueuedMessage(message, currentState);
     currentState = nextState;
+    queuedMessage.mode.happyOrg = happyOrgResult.queuedTurn;
     if (queuedMessage.isolate) {
       logger.debug(`[claude] Queuing isolated special command: ${queuedMessage.specialCommand}`);
       opts.messageQueue.pushIsolateAndClear(queuedMessage.text, queuedMessage.mode);
@@ -3234,7 +3285,14 @@ async function runClaude(credentials, options = {}) {
     customSystemPrompt: mode.customSystemPrompt,
     appendSystemPrompt: mode.appendSystemPrompt,
     allowedTools: mode.allowedTools,
-    disallowedTools: mode.disallowedTools
+    disallowedTools: mode.disallowedTools,
+    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
   }));
   bindClaudeUserMessageQueue({
     session,
@@ -3242,6 +3300,11 @@ async function runClaude(credentials, options = {}) {
     initialState: {
       permissionMode: options.permissionMode,
       model: options.model
+    },
+    happyOrg: {
+      getMetadata: () => session.getMetadataSnapshot(),
+      updateMetadata: (handler) => session.updateMetadata(handler),
+      emitStatusMessage: (message) => session.sendSessionEvent({ type: "message", message })
     }
   });
   const cleanup = async () => {

package/dist/{runCodex-DwnLnXWK.mjs → runCodex-B2UpSn82.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, b as connectionState, A as ApiClient } from './api-DJe9WP9M.mjs';
+import { B as BasePermissionHandler, h as hashObject, d as MessageBuffer, C as ConversationHistory$1, i as buildHappyOrgTurnPrompt, w as waitForResponseCompleteWithAbort, j as finalizeHappyOrgTurn, f as registerKillSessionHandler, l as launchRuntimeHandleWithFactoryResult, m as inferToolResultError, n as forwardAgentMessageToProviderSession, k as closeProviderSession, e as ensureManagedProviderMachine, M as MissingMachineIdError, b as MessageQueue2, r as resolveHappyOrgQueuedTurn, s as syncControlledByUserState } from './registerKillSessionHandler-DsHTZDsU.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate } from './index-CHXCgpwi.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-CkP90vEt.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, r as runModeLoop } from './ProviderSelectionHandler-R-2r7ItM.mjs';
+import { B as BaseReasoningProcessor, b as bootstrapManagedProviderSession } from './BaseReasoningProcessor-DnVC7liC.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/{runCodex-DyNSDN6X.cjs → runCodex-earICaxw.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
 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 api = require('./api-MGlKcEf3.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-Cs_INk4A.cjs');
+var index = require('./index-CgVjDJpt.cjs');
 require('cross-spawn');
 require('@agentclientprotocol/sdk');
 require('ps-list');
@@ -16,7 +16,7 @@ require('node:path');
 require('node:os');
 require('node:child_process');
 require('node:readline');
-require('./persistence-D5uolhHo.cjs');
+require('./persistence-DLFUNI9q.cjs');
 require('node:fs/promises');
 require('fs/promises');
 require('crypto');
@@ -27,8 +27,8 @@ require('tweetnacl');
 require('open');
 var React = require('react');
 var ink = require('ink');
-var ProviderSelectionHandler = require('./ProviderSelectionHandler-DUBEXkmo.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-B9z785Pi.cjs');
+var ProviderSelectionHandler = require('./ProviderSelectionHandler-Bafuy28L.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-0nj-PMFc.cjs');
 require('zod');
 require('socket.io-client');
 require('expo-server-sdk');
@@ -488,7 +488,16 @@ function resolveCodexAcpExecutionMode(mode) {
   };
 }
 function getCodexExecutionFingerprint(mode) {
-  return registerKillSessionHandler.hashObject(resolveCodexAcpExecutionMode(mode));
+  return registerKillSessionHandler.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) {
@@ -567,6 +576,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 registerKillSessionHandler.ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
@@ -599,6 +609,7 @@ async function codexRemoteLauncher(session) {
     shouldCommitAccumulatedResponse = false;
     currentAssistantMessageId = null;
     currentThinkingMessageId = null;
+    currentHappyOrgTurn = null;
     session.onThinkingChange(false);
   };
   const abortActiveTurn = () => {
@@ -638,6 +649,13 @@ async function codexRemoteLauncher(session) {
       id: node_crypto.randomUUID()
     });
   };
+  const emitTurnReport = (report) => {
+    session.runtimeSession.sendCodexMessage({
+      type: "turn-report",
+      id: node_crypto.randomUUID(),
+      report
+    });
+  };
   const handleUnexpectedRuntimeStop = (detail) => {
     if (shouldExit || fatalRuntimeStopError) {
       return;
@@ -660,17 +678,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: node_crypto.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;
@@ -970,6 +1004,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;
@@ -984,6 +1020,9 @@ async function codexRemoteLauncher(session) {
           promptToSend = historyContext + promptToSend;
           api.logger.debug(`[Codex] Injected conversation history context (${historyContext.length} chars)`);
         }
+        if (message.mode.happyOrg) {
+          promptToSend = registerKillSessionHandler.buildHappyOrgTurnPrompt(promptToSend, message.mode.happyOrg);
+        }
         conversationHistory.addUserMessage(message.message);
         await activeRuntimeHandle.sendPrompt(promptToSend);
         await registerKillSessionHandler.waitForResponseCompleteWithAbort(activeRuntimeHandle.backend, turnSignal);
@@ -995,6 +1034,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: node_crypto.randomUUID()
@@ -1011,8 +1051,24 @@ async function codexRemoteLauncher(session) {
         }
       } finally {
         turnInFlight = false;
+        const finalizedTurn = registerKillSessionHandler.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({
@@ -1177,6 +1233,19 @@ async function runCodex(opts) {
   let currentPermissionMode = initialPermissionMode;
   let currentModel;
   sessionClient.onUserMessage((message) => {
+    const happyOrgResult = registerKillSessionHandler.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) {
@@ -1195,7 +1264,8 @@ async function runCodex(opts) {
     }
     messageQueue.push(message.content.text, {
       permissionMode: permissionResolution.resolvedPermissionMode,
-      model: messageModel
+      model: messageModel,
+      happyOrg: happyOrgResult.queuedTurn
     });
   });
   codexSession = new CodexSession({