happy-imou-cloud 2.0.7 → 2.0.8

package/dist/{runGemini-ChwjLmhI.cjs → runGemini-CDyhCucw.cjs}

@@ -3,12 +3,11 @@
 var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
-var api = require('./api-Dwkm7s_E.cjs');
-var persistence = require('./persistence-hbhwAYIV.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-DphULXS-.cjs');
-var index = require('./index-CfqxEoyl.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-D1ouN10n.cjs');
-var happyProtocol = require('happy-protocol');
+var api = require('./api-CN-WqYd_.cjs');
+var persistence = require('./persistence-DBGkO8gB.cjs');
+var names = require('./names-BnV67N_O.cjs');
+var index = require('./index-DM6z3aeG.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CYc0SIjF.cjs');
 require('axios');
 require('chalk');
 require('fs');
@@ -185,7 +184,7 @@ const GeminiDisplay = ({ messageBuffer, logPath, currentModel, onExit }) => {
   ));
 };
 
-class GeminiPermissionHandler extends BaseReasoningProcessor.BasePermissionHandler {
+class GeminiPermissionHandler extends names.BasePermissionHandler {
   currentPermissionMode = "default";
   constructor(session) {
     super(session);
@@ -270,7 +269,7 @@ class GeminiPermissionHandler extends BaseReasoningProcessor.BasePermissionHandl
   }
 }
 
-class GeminiReasoningProcessor extends BaseReasoningProcessor.BaseReasoningProcessor {
+class GeminiReasoningProcessor extends names.BaseReasoningProcessor {
   getToolName() {
     return "GeminiReasoning";
   }
@@ -601,7 +600,7 @@ async function runGemini(opts) {
   } catch (error) {
     api.logger.debug("[Gemini] Failed to fetch cloud token:", error);
   }
-  const { state, metadata } = BaseReasoningProcessor.createSessionMetadata({
+  const { state, metadata } = names.createSessionMetadata({
     flavor: "gemini",
     machineId,
     startedBy: opts.startedBy
@@ -629,7 +628,7 @@ async function runGemini(opts) {
       pendingSessionSwap = null;
     }
   };
-  const { session: initialSession, reconnectionHandle } = BaseReasoningProcessor.setupOfflineReconnection({
+  const { session: initialSession, reconnectionHandle } = names.setupOfflineReconnection({
     api: api$1,
     sessionTag,
     metadata,
@@ -951,13 +950,13 @@ 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);
+          const canonicalToolName = names.resolveCanonicalToolNameV2(msg.toolName);
           messageBuffer.addMessage(`Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}${toolArgs.length >= 100 ? "..." : ""}` : ""}`, "tool");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
             name: canonicalToolName,
             callId: msg.callId,
-            input: happyProtocol.attachToolHappierMetaV2(msg.args, {
+            input: names.attachToolHappierMetaV2(msg.args, {
               v: 2,
               protocol: "acp",
               provider: "gemini",
@@ -968,7 +967,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           });
           break;
         case "tool-result":
-          const isError = happyProtocol.inferToolResultError(msg.result);
+          const isError = names.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;
@@ -989,12 +988,12 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "tool-result",
             callId: msg.callId,
-            output: happyProtocol.attachToolHappierMetaV2(msg.result, {
+            output: names.attachToolHappierMetaV2(msg.result, {
               v: 2,
               protocol: "acp",
               provider: "gemini",
               rawToolName: msg.toolName,
-              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2(msg.toolName)
+              canonicalToolName: names.resolveCanonicalToolNameV2(msg.toolName)
             }),
             id: node_crypto.randomUUID(),
             isError
@@ -1044,12 +1043,12 @@ 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");
+          const execCanonicalToolName = names.resolveCanonicalToolNameV2("GeminiBash");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
             name: execCanonicalToolName,
             callId,
-            input: happyProtocol.attachToolHappierMetaV2(inputs, {
+            input: names.attachToolHappierMetaV2(inputs, {
               v: 2,
               protocol: "acp",
               provider: "gemini",
@@ -1067,12 +1066,12 @@ 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");
+          const patchCanonicalToolName = names.resolveCanonicalToolNameV2("GeminiPatch");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
             name: patchCanonicalToolName,
             callId: patchCallId,
-            input: happyProtocol.attachToolHappierMetaV2({
+            input: names.attachToolHappierMetaV2({
               auto_approved,
               changes
             }, {
@@ -1100,7 +1099,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           session.sendAgentMessage("gemini", {
             type: "tool-result",
             callId: patchEndCallId,
-            output: happyProtocol.attachToolHappierMetaV2({
+            output: names.attachToolHappierMetaV2({
               stdout,
               stderr,
               success
@@ -1109,7 +1108,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
               protocol: "acp",
               provider: "gemini",
               rawToolName: "GeminiPatch",
-              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2("GeminiPatch")
+              canonicalToolName: names.resolveCanonicalToolNameV2("GeminiPatch")
             }),
             id: node_crypto.randomUUID(),
             isError: !success

package/dist/{runGemini-BRO6A2jm.mjs → runGemini-DqowSR2w.mjs}

@@ -1,12 +1,11 @@
 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-dwwHBzLc.mjs';
-import { readSettings } from './persistence-Dg-rxY2a.mjs';
-import { B as BasePermissionHandler, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-ClrT-x-H.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-HyqLXzw-.mjs';
-import { M as MessageQueue2, h as hashObject, a as MessageBuffer, r as registerKillSessionHandler } from './registerKillSessionHandler-BAvk4GYO.mjs';
-import { attachToolHappierMetaV2, resolveCanonicalToolNameV2, inferToolResultError } from 'happy-protocol';
+import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-D-uiH_TF.mjs';
+import { readSettings } from './persistence-DiNg1DPF.mjs';
+import { B as BasePermissionHandler, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection, b as attachToolHappierMetaV2, r as resolveCanonicalToolNameV2, i as inferToolResultError } from './names-BjEof0E2.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-DhheEtRl.mjs';
+import { M as MessageQueue2, h as hashObject, a as MessageBuffer, r as registerKillSessionHandler } from './registerKillSessionHandler-Cu9rHGsI.mjs';
 import 'axios';
 import 'chalk';
 import 'fs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-imou-cloud",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI",
   "author": "long.zhu",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "// ==== TypeScript & Build ====": "",
     "why do we need to build before running tests / dev?": "We need the binary to be built so we run daemon commands which directly run the binary - we don't want them to go out of sync or have custom spawn logic depending how we started happy",
     "typecheck": "tsc --noEmit",
-    "build": "shx rm -rf dist && npx tsc --noEmit && pkgroll",
+    "build": "node ./scripts/build.mjs",
     "// ==== Testing ====": "",
     "test": "yarn build && vitest run",
     "test:integration": "yarn build && vitest run --config vitest.integration.config.ts",
@@ -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": "yarn release:smoke",
+    "prepublishOnly": "yarn release:smoke",
     "release": "yarn install && release-it",
     "release:smoke": "node ./scripts/release-smoke.mjs",
     "// ==== Dev/Stable Variant Management ====": "",
@@ -99,7 +99,6 @@
     "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/build.mjs

@@ -0,0 +1,66 @@
+#!/usr/bin/env node
+
+import { spawnSync } from 'node:child_process';
+import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const packageRoot = resolve(here, '..');
+const workspaceRoot = resolve(packageRoot, '..', '..');
+const packageJson = JSON.parse(readFileSync(resolve(packageRoot, 'package.json'), 'utf8'));
+
+function resolveTool(binName, packageSpecs) {
+  const suffix = process.platform === 'win32' ? '.cmd' : '';
+  const packageLocalBin = resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`);
+  const workspaceLocalBin = resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`);
+
+  if (existsSync(packageLocalBin)) {
+    return {
+      command: packageLocalBin,
+      prefixArgs: [],
+    };
+  }
+
+  if (existsSync(workspaceLocalBin)) {
+    return {
+      command: workspaceLocalBin,
+      prefixArgs: [],
+    };
+  }
+
+  return {
+    command: 'npx',
+    prefixArgs: ['-y', ...packageSpecs.flatMap((packageSpec) => ['-p', packageSpec]), binName],
+  };
+}
+
+function runStep(name, command, args) {
+  console.log(`\n[build] ${name}`);
+  console.log(`> ${command} ${args.join(' ')}`);
+
+  const result = spawnSync(command, args, {
+    cwd: packageRoot,
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+    env: process.env,
+  });
+
+  if (result.status !== 0) {
+    throw new Error(`[build] Step failed: ${name}`);
+  }
+}
+
+function runTool(name, tool, args) {
+  runStep(name, tool.command, [...tool.prefixArgs, ...args]);
+}
+
+const tsc = resolveTool('tsc', [`typescript@${packageJson.devDependencies.typescript}`]);
+const pkgroll = resolveTool('pkgroll', [
+  `pkgroll@${packageJson.devDependencies.pkgroll}`,
+  `typescript@${packageJson.devDependencies.typescript}`,
+]);
+
+rmSync(resolve(packageRoot, 'dist'), { recursive: true, force: true });
+runTool('typecheck', tsc, ['--noEmit']);
+runTool('bundle', pkgroll, []);

package/scripts/release-smoke.mjs

@@ -1,66 +1,202 @@
 #!/usr/bin/env node
 
 import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
 import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
+import { dirname, join, resolve } from 'node:path';
 
 const here = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(here, '..');
+const workspaceRoot = resolve(packageRoot, '..', '..');
+const packageJson = JSON.parse(readFileSync(resolve(packageRoot, 'package.json'), 'utf8'));
+
+function resolveTool(binName, packageName) {
+  const suffix = process.platform === 'win32' ? '.cmd' : '';
+  const packageLocalBin = resolve(packageRoot, 'node_modules', '.bin', `${binName}${suffix}`);
+  const workspaceLocalBin = resolve(workspaceRoot, 'node_modules', '.bin', `${binName}${suffix}`);
+
+  if (existsSync(packageLocalBin)) {
+    return {
+      command: packageLocalBin,
+      prefixArgs: [],
+    };
+  }
+
+  if (existsSync(workspaceLocalBin)) {
+    return {
+      command: workspaceLocalBin,
+      prefixArgs: [],
+    };
+  }
+
+  const version =
+    packageJson.devDependencies?.[packageName]
+    ?? packageJson.dependencies?.[packageName];
+
+  return {
+    command: 'npx',
+    prefixArgs: ['-y', '-p', `${packageName}@${version}`, binName],
+  };
+}
+
+function shouldUseShell(command) {
+  if (process.platform !== 'win32') {
+    return false;
+  }
+
+  return !/\.exe$/i.test(command);
+}
 
 function runStep(name, command, args, options = {}) {
   console.log(`\n[release-smoke] ${name}`);
   console.log(`> ${command} ${args.join(' ')}`);
-
+
   const result = spawnSync(command, args, {
     cwd: packageRoot,
     stdio: 'inherit',
-    shell: process.platform === 'win32',
-    env: process.env,
+    shell: shouldUseShell(command),
+    env: {
+      ...process.env,
+      NODE_ENV: 'development',
+      YARN_PRODUCTION: 'false',
+      npm_config_production: 'false',
+    },
+    ...options,
+  });
+
+  if (result.status !== 0) {
+    throw new Error(`[release-smoke] Step failed: ${name}`);
+  }
+}
+
+function runStepCapture(name, command, args, options = {}) {
+  console.log(`\n[release-smoke] ${name}`);
+  console.log(`> ${command} ${args.join(' ')}`);
+
+  const result = spawnSync(command, args, {
+    cwd: packageRoot,
+    stdio: 'pipe',
+    encoding: 'utf8',
+    shell: shouldUseShell(command),
+    env: {
+      ...process.env,
+      NODE_ENV: 'development',
+      YARN_PRODUCTION: 'false',
+      npm_config_production: 'false',
+    },
     ...options,
   });
 
   if (result.status !== 0) {
+    if (result.stdout) {
+      process.stdout.write(result.stdout);
+    }
+    if (result.stderr) {
+      process.stderr.write(result.stderr);
+    }
     throw new Error(`[release-smoke] Step failed: ${name}`);
   }
+
+  return result.stdout;
 }
 
-function shouldRunProviderSmoke(provider) {
-  return process.env[`HAPPY_SMOKE_${provider.toUpperCase()}`] === '1';
+function runToolStep(name, tool, args, options = {}) {
+  runStep(name, tool.command, [...tool.prefixArgs, ...args], options);
 }
 
+function verifyPackedInstall() {
+  const tempRoot = mkdtempSync(join(tmpdir(), 'happy-cli-release-smoke-'));
+  let tarballPath = null;
+
+  try {
+    const packOutput = runStepCapture('pack tarball', 'npm', ['pack', '--json', '--ignore-scripts']);
+    const packResult = JSON.parse(packOutput);
+    const tarballFile = Array.isArray(packResult) ? packResult[0]?.filename : null;
+
+    if (typeof tarballFile !== 'string' || tarballFile.length === 0) {
+      throw new Error('[release-smoke] npm pack did not return a tarball filename');
+    }
+
+    tarballPath = resolve(packageRoot, tarballFile);
+
+    writeFileSync(
+      join(tempRoot, 'package.json'),
+      JSON.stringify({ private: true, name: 'happy-cli-release-smoke' }, null, 2)
+    );
+
+    runStep('install packed tarball', 'npm', [
+      'install',
+      '--ignore-scripts',
+      '--no-audit',
+      '--fund=false',
+      tarballPath,
+    ], {
+      cwd: tempRoot,
+    });
+
+    runStep('run packed cli help', 'node', [
+      join(tempRoot, 'node_modules', 'happy-imou-cloud', 'bin', 'happy-cloud.mjs'),
+      '--help',
+    ], {
+      cwd: tempRoot,
+    });
+  } finally {
+    if (tarballPath) {
+      try {
+        unlinkSync(tarballPath);
+      } catch {}
+    }
+
+    try {
+      rmSync(tempRoot, { recursive: true, force: true });
+    } catch {}
+  }
+}
+
+function shouldRunProviderSmoke(provider) {
+  return process.env[`HAPPY_SMOKE_${provider.toUpperCase()}`] === '1';
+}
+
 function main() {
-  runStep('typecheck', 'yarn', ['tsc', '--noEmit']);
-  runStep('unit runtime suite', 'yarn', [
-    'vitest',
+  const tsc = resolveTool('tsc', 'typescript');
+  const vitest = resolveTool('vitest', 'vitest');
+
+  runToolStep('typecheck', tsc, ['--noEmit']);
+  runToolStep('unit runtime suite', vitest, [
     'run',
+    'src/agent/acp/AcpBackend.test.ts',
     'src/agent/acp/AcpBackend.startup.test.ts',
+    'src/agent/acp/AcpBackend.waitForResponseComplete.test.ts',
+    'src/agent/acp/AcpBackend.initDelay.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',
-    'src/runtime/RuntimeShell.test.ts',
-    'src/runtime/createDefaultRuntimeShell.test.ts',
-    'src/security/signedTransport.test.ts',
-    'src/agent/initializeAgents.test.ts',
-    'src/agent/factories/factories.test.ts',
-    'src/packageContract.test.ts',
+    'src/runtime/executeProvider.test.ts',
+    'src/runtime/command.test.ts',
+    'src/runtime/launch.test.ts',
+    'src/runtime/RuntimeShell.test.ts',
+    'src/runtime/createDefaultRuntimeShell.test.ts',
+    'src/security/signedTransport.test.ts',
+    'src/agent/initializeAgents.test.ts',
+    'src/agent/factories/factories.test.ts',
+    'src/packageContract.test.ts',
   ]);
   runStep('build', 'yarn', ['build']);
-  runStep('runtime providers', 'yarn', ['tsx', 'src/index.ts', 'runtime', 'providers']);
-  runStep('help', 'yarn', ['tsx', 'src/index.ts', '--help']);
+  runStep('runtime providers', 'node', ['./bin/happy-cloud.mjs', 'runtime', 'providers']);
+  runStep('help', 'node', ['./bin/happy-cloud.mjs', '--help']);
+  verifyPackedInstall();
 
   if (shouldRunProviderSmoke('cursor')) {
-    runStep('cursor smoke', 'yarn', ['tsx', 'src/index.ts', 'cursor', 'release smoke']);
+    runStep('cursor smoke', 'node', ['./bin/happy-cloud.mjs', 'cursor', 'release smoke']);
   }
 }
-
-try {
-  main();
-  console.log('\n[release-smoke] All required steps passed');
-} catch (error) {
-  const message = error instanceof Error ? error.message : String(error);
-  console.error(`\n${message}`);
-  process.exit(1);
-}
+
+try {
+  main();
+  console.log('\n[release-smoke] All required steps passed');
+} catch (error) {
+  const message = error instanceof Error ? error.message : String(error);
+  console.error(`\n${message}`);
+  process.exit(1);
+}