happy-imou-cloud 2.0.4 → 2.0.5

package/dist/{runCodex-DgKKw3IU.mjs → runCodex-DT7g4MPm.mjs}

@@ -1,11 +1,12 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-CIHTNilH.mjs';
-import { readSettings } from './persistence-sLEqV8vk.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate, i as initialMachineMetadata, n as notifyDaemonSessionStarted } from './index-vNYxNqVZ.mjs';
-import { B as BasePermissionHandler, g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, b as INTERACTION_TIMED_OUT_ERROR, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-Di1yEMMv.mjs';
-import { h as hashObject, a as MessageBuffer, r as registerKillSessionHandler, M as MessageQueue2 } from './registerKillSessionHandler-uVHqIC4h.mjs';
+import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-DoHt-HyL.mjs';
+import { readSettings } from './persistence-QqeBvUxX.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate, i as initialMachineMetadata, n as notifyDaemonSessionStarted } from './index-C5wR2qKT.mjs';
+import { B as BasePermissionHandler, g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, b as INTERACTION_TIMED_OUT_ERROR, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-bFVTvf3Q.mjs';
+import { h as hashObject, a as MessageBuffer, r as registerKillSessionHandler, M as MessageQueue2 } from './registerKillSessionHandler-CC9zGBPE.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useStdout, useInput, Box, Text, render } from 'ink';
+import { attachToolHappierMetaV2, resolveCanonicalToolNameV2, inferToolResultError } from 'happy-protocol';
 import 'axios';
 import 'chalk';
 import 'fs';
@@ -950,21 +951,28 @@ async function codexRemoteLauncher(session) {
         }
         case "tool-call": {
           const toolArgs = msg.args ? truncateDisplayMessage(msg.args, 100) : "";
+          const canonicalToolName = resolveCanonicalToolNameV2(msg.toolName);
           messageBuffer.addMessage(
             `Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}` : ""}`,
             "tool"
           );
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: msg.toolName,
+            name: canonicalToolName,
             callId: msg.callId,
-            input: msg.args,
+            input: attachToolHappierMetaV2(msg.args, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: msg.toolName,
+              canonicalToolName
+            }),
             id: randomUUID()
           });
           return;
         }
         case "tool-result": {
-          const isError = msg.result && typeof msg.result === "object" && "error" in msg.result;
+          const isError = inferToolResultError(msg.result);
           const resultText = truncateDisplayMessage(msg.result, 200) || (isError ? "Unknown error" : "");
           messageBuffer.addMessage(
             `${isError ? "Error:" : "Result:"} ${resultText}`.trim(),
@@ -973,7 +981,13 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.callId,
-            output: msg.result,
+            output: attachToolHappierMetaV2(msg.result, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: msg.toolName,
+              canonicalToolName: resolveCanonicalToolNameV2(msg.toolName)
+            }),
             id: randomUUID(),
             isError
           });
@@ -996,7 +1010,7 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "terminal-output",
             data: terminalOutput,
-            callId: randomUUID()
+            callId: msg.callId ?? randomUUID()
           });
           return;
         }
@@ -1014,11 +1028,19 @@ async function codexRemoteLauncher(session) {
         case "exec-approval-request": {
           const { call_id, type, ...inputs } = msg;
           messageBuffer.addMessage(`Exec approval requested: ${call_id}`, "tool");
+          const rawToolName = "CodexBash";
+          const canonicalToolName = resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: "CodexBash",
+            name: canonicalToolName,
             callId: call_id,
-            input: inputs,
+            input: attachToolHappierMetaV2(inputs, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName,
+              canonicalToolName
+            }),
             id: randomUUID()
           });
           return;
@@ -1027,14 +1049,22 @@ async function codexRemoteLauncher(session) {
           const changeCount = Object.keys(msg.changes || {}).length;
           const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
           messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
+          const rawToolName = "CodexPatch";
+          const canonicalToolName = resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
-            name: "CodexPatch",
+            name: canonicalToolName,
             callId: msg.call_id,
-            input: {
+            input: attachToolHappierMetaV2({
               auto_approved: msg.auto_approved,
               changes: msg.changes
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName,
+              canonicalToolName
+            }),
             id: randomUUID()
           });
           return;
@@ -1048,11 +1078,17 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.call_id,
-            output: {
+            output: attachToolHappierMetaV2({
               stdout: msg.stdout,
               stderr: msg.stderr,
               success: msg.success
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "codex",
+              rawToolName: "CodexPatch",
+              canonicalToolName: resolveCanonicalToolNameV2("CodexPatch")
+            }),
             id: randomUUID(),
             isError: !msg.success
           });

package/dist/{runGemini-CM1v3I24.mjs → runGemini-CmY5386l.mjs}

@@ -1,11 +1,12 @@
 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, i as isAuthenticationRequiredError } from './api-CIHTNilH.mjs';
-import { readSettings } from './persistence-sLEqV8vk.mjs';
-import { B as BasePermissionHandler, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-Di1yEMMv.mjs';
-import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-vNYxNqVZ.mjs';
-import { M as MessageQueue2, h as hashObject, a as MessageBuffer, r as registerKillSessionHandler } from './registerKillSessionHandler-uVHqIC4h.mjs';
+import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-DoHt-HyL.mjs';
+import { readSettings } from './persistence-QqeBvUxX.mjs';
+import { B as BasePermissionHandler, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-bFVTvf3Q.mjs';
+import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, g as getInitialGeminiModel, r as readGeminiLocalConfig, G as GEMINI_MODEL_ENV, s as saveGeminiModelToConfig, a as createGeminiBackend, b as stopCaffeinate } from './index-C5wR2qKT.mjs';
+import { M as MessageQueue2, h as hashObject, a as MessageBuffer, r as registerKillSessionHandler } from './registerKillSessionHandler-CC9zGBPE.mjs';
+import { attachToolHappierMetaV2, resolveCanonicalToolNameV2, inferToolResultError } from 'happy-protocol';
 import 'axios';
 import 'chalk';
 import 'fs';
@@ -948,17 +949,24 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           if (isInvestigationTool && msg.args && typeof msg.args === "object" && "objective" in msg.args) {
             logger.debug(`[gemini] \u{1F50D} Investigation objective: ${String(msg.args.objective).substring(0, 150)}...`);
           }
+          const canonicalToolName = resolveCanonicalToolNameV2(msg.toolName);
           messageBuffer.addMessage(`Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}${toolArgs.length >= 100 ? "..." : ""}` : ""}`, "tool");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
-            name: msg.toolName,
+            name: canonicalToolName,
             callId: msg.callId,
-            input: msg.args,
+            input: attachToolHappierMetaV2(msg.args, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: msg.toolName,
+              canonicalToolName
+            }),
             id: randomUUID()
           });
           break;
         case "tool-result":
-          const isError = Boolean(msg.result && typeof msg.result === "object" && "error" in msg.result);
+          const isError = inferToolResultError(msg.result);
           const resultText = typeof msg.result === "string" ? msg.result.substring(0, 200) : JSON.stringify(msg.result).substring(0, 200);
           const truncatedResult = resultText + (typeof msg.result === "string" && msg.result.length > 200 ? "..." : "");
           const resultSize = typeof msg.result === "string" ? msg.result.length : JSON.stringify(msg.result).length;
@@ -979,7 +987,13 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "tool-result",
             callId: msg.callId,
-            output: msg.result,
+            output: attachToolHappierMetaV2(msg.result, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: msg.toolName,
+              canonicalToolName: resolveCanonicalToolNameV2(msg.toolName)
+            }),
             id: randomUUID(),
             isError
           });
@@ -1009,7 +1023,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "terminal-output",
             data: msg.data,
-            callId: msg.callId || randomUUID()
+            callId: msg.callId ?? randomUUID()
           });
           break;
         case "permission-request":
@@ -1028,12 +1042,18 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           const { call_id, type, ...inputs } = execApprovalMsg;
           logger.debug(`[gemini] Exec approval request received: ${callId}`);
           messageBuffer.addMessage(`Exec approval requested: ${callId}`, "tool");
+          const execCanonicalToolName = resolveCanonicalToolNameV2("GeminiBash");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
-            name: "GeminiBash",
-            // Similar to Codex's CodexBash
+            name: execCanonicalToolName,
             callId,
-            input: inputs,
+            input: attachToolHappierMetaV2(inputs, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: "GeminiBash",
+              canonicalToolName: execCanonicalToolName
+            }),
             id: randomUUID()
           });
           break;
@@ -1045,15 +1065,21 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
           messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
           logger.debug(`[gemini] Patch apply begin: ${patchCallId}, files: ${changeCount}`);
+          const patchCanonicalToolName = resolveCanonicalToolNameV2("GeminiPatch");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
-            name: "GeminiPatch",
-            // Similar to Codex's CodexPatch
+            name: patchCanonicalToolName,
             callId: patchCallId,
-            input: {
+            input: attachToolHappierMetaV2({
               auto_approved,
               changes
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: "GeminiPatch",
+              canonicalToolName: patchCanonicalToolName
+            }),
             id: randomUUID()
           });
           break;
@@ -1072,11 +1098,17 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "tool-result",
             callId: patchEndCallId,
-            output: {
+            output: attachToolHappierMetaV2({
               stdout,
               stderr,
               success
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: "GeminiPatch",
+              canonicalToolName: resolveCanonicalToolNameV2("GeminiPatch")
+            }),
             id: randomUUID(),
             isError: !success
           });

package/dist/{runGemini-DUyH311Z.cjs → runGemini-DxjvRmOc.cjs}

@@ -3,11 +3,12 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var api = require('./api-CyJG1mr6.cjs');
-var persistence = require('./persistence-BeFVx6kI.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-DEEfNi5Y.cjs');
-var index = require('./index-1zlH6s7a.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CCxqGFjZ.cjs');
+var api = require('./api-DaqnNHfl.cjs');
+var persistence = require('./persistence-D6Y0604_.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DPVZIJ4n.cjs');
+var index = require('./index-Dc92gnxM.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-C6yXr8ky.cjs');
+var happyProtocol = require('happy-protocol');
 require('axios');
 require('chalk');
 require('fs');
@@ -950,17 +951,24 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           if (isInvestigationTool && msg.args && typeof msg.args === "object" && "objective" in msg.args) {
             api.logger.debug(`[gemini] \u{1F50D} Investigation objective: ${String(msg.args.objective).substring(0, 150)}...`);
           }
+          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(msg.toolName);
           messageBuffer.addMessage(`Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}${toolArgs.length >= 100 ? "..." : ""}` : ""}`, "tool");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
-            name: msg.toolName,
+            name: canonicalToolName,
             callId: msg.callId,
-            input: msg.args,
+            input: happyProtocol.attachToolHappierMetaV2(msg.args, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: msg.toolName,
+              canonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           break;
         case "tool-result":
-          const isError = Boolean(msg.result && typeof msg.result === "object" && "error" in msg.result);
+          const isError = happyProtocol.inferToolResultError(msg.result);
           const resultText = typeof msg.result === "string" ? msg.result.substring(0, 200) : JSON.stringify(msg.result).substring(0, 200);
           const truncatedResult = resultText + (typeof msg.result === "string" && msg.result.length > 200 ? "..." : "");
           const resultSize = typeof msg.result === "string" ? msg.result.length : JSON.stringify(msg.result).length;
@@ -981,7 +989,13 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "tool-result",
             callId: msg.callId,
-            output: msg.result,
+            output: happyProtocol.attachToolHappierMetaV2(msg.result, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: msg.toolName,
+              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2(msg.toolName)
+            }),
             id: node_crypto.randomUUID(),
             isError
           });
@@ -1011,7 +1025,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "terminal-output",
             data: msg.data,
-            callId: msg.callId || node_crypto.randomUUID()
+            callId: msg.callId ?? node_crypto.randomUUID()
           });
           break;
         case "permission-request":
@@ -1030,12 +1044,18 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           const { call_id, type, ...inputs } = execApprovalMsg;
           api.logger.debug(`[gemini] Exec approval request received: ${callId}`);
           messageBuffer.addMessage(`Exec approval requested: ${callId}`, "tool");
+          const execCanonicalToolName = happyProtocol.resolveCanonicalToolNameV2("GeminiBash");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
-            name: "GeminiBash",
-            // Similar to Codex's CodexBash
+            name: execCanonicalToolName,
             callId,
-            input: inputs,
+            input: happyProtocol.attachToolHappierMetaV2(inputs, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: "GeminiBash",
+              canonicalToolName: execCanonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           break;
@@ -1047,15 +1067,21 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
           messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
           api.logger.debug(`[gemini] Patch apply begin: ${patchCallId}, files: ${changeCount}`);
+          const patchCanonicalToolName = happyProtocol.resolveCanonicalToolNameV2("GeminiPatch");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
-            name: "GeminiPatch",
-            // Similar to Codex's CodexPatch
+            name: patchCanonicalToolName,
             callId: patchCallId,
-            input: {
+            input: happyProtocol.attachToolHappierMetaV2({
               auto_approved,
               changes
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: "GeminiPatch",
+              canonicalToolName: patchCanonicalToolName
+            }),
             id: node_crypto.randomUUID()
           });
           break;
@@ -1074,11 +1100,17 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "tool-result",
             callId: patchEndCallId,
-            output: {
+            output: happyProtocol.attachToolHappierMetaV2({
               stdout,
               stderr,
               success
-            },
+            }, {
+              v: 2,
+              protocol: "acp",
+              provider: "gemini",
+              rawToolName: "GeminiPatch",
+              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2("GeminiPatch")
+            }),
             id: node_crypto.randomUUID(),
             isError: !success
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",
@@ -99,6 +99,7 @@
     "expo-server-sdk": "^3.15.0",
     "fastify": "^5.6.2",
     "fastify-type-provider-zod": "4.0.2",
+    "happy-protocol": "0.1.0",
     "http-proxy": "^1.18.1",
     "http-proxy-middleware": "^3.0.5",
     "ink": "^6.5.1",