happy-imou-cloud 2.0.4 → 2.0.6

package/dist/{runGemini-CM1v3I24.mjs → runGemini-DDSR8BtO.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-Emo3rSZH.mjs';
+import { readSettings } from './persistence-Blm1hTQA.mjs';
+import { B as BasePermissionHandler, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-1EzrE03x.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-Dh8UTgm4.mjs';
+import { M as MessageQueue2, h as hashObject, a as MessageBuffer, r as registerKillSessionHandler } from './registerKillSessionHandler-Bm7E-03E.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",
@@ -59,7 +59,7 @@
     "dev:local-server": "yarn build && tsx --env-file .env.dev-local-server src/index.ts",
     "dev:integration-test-env": "yarn build && tsx --env-file .env.integration-test src/index.ts",
     "// ==== Release ====": "",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "yarn release:smoke",
     "release": "yarn install && release-it",
     "release:smoke": "node ./scripts/release-smoke.mjs",
     "// ==== Dev/Stable Variant Management ====": "",
@@ -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",

package/scripts/release-smoke.mjs

@@ -33,6 +33,10 @@ function main() {
   runStep('unit runtime suite', 'yarn', [
     'vitest',
     'run',
+    'src/agent/acp/AcpBackend.startup.test.ts',
+    'src/agent/acp/acpSpawn.test.ts',
+    'src/agent/acp/createAcpFilteredStdoutReadable.multiline.test.ts',
+    'src/agent/acp/killProcessTree.test.ts',
     'src/runtime/executeProvider.test.ts',
     'src/runtime/command.test.ts',
     'src/runtime/launch.test.ts',