happy-imou-cloud 2.1.1 → 2.1.2

package/scripts/ensureAcpSdkCompat.mjs

@@ -1,173 +1,171 @@
-#!/usr/bin/env node
-
 import { copyFileSync, existsSync, mkdirSync } from 'node:fs';
-import { dirname, resolve, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const here = dirname(fileURLToPath(import.meta.url));
-const defaultPackageRoot = resolve(here, '..');
-const defaultWorkspaceRoot = resolve(defaultPackageRoot, '..', '..');
-
-function getRepairTargets(packageRoot, workspaceRoot) {
-  return [
-    {
-      name: '@agentclientprotocol/sdk schema',
-      targetPackageDir: join(packageRoot, 'node_modules', '@agentclientprotocol', 'sdk'),
-      targetBaseDir: 'dist/schema',
-      sentinelFile: 'dist/acp.js',
-      requiredRuntimeFiles: [
-        'index.js',
-        'types.gen.js',
-        'zod.gen.js',
-      ],
-      optionalTypeFiles: [
-        'index.d.ts',
-        'types.gen.d.ts',
-        'zod.gen.d.ts',
-      ],
-      sourceBaseDirs: [
-        join(workspaceRoot, 'node_modules', '@agentclientprotocol', 'sdk', 'dist', 'schema'),
-        join(packageRoot, 'compat', 'acp-sdk-schema'),
-      ],
-    },
-    {
-      name: 'ink cursor hooks',
-      targetPackageDir: join(packageRoot, 'node_modules', 'ink'),
-      targetBaseDir: 'build',
-      sentinelFile: 'build/index.js',
-      requiredRuntimeFiles: [
-        'components/Cursor.js',
-        'components/CursorContext.js',
-        'components/ErrorBoundary.js',
-        'hooks/use-cursor.js',
-      ],
-      optionalTypeFiles: [
-        'components/Cursor.d.ts',
-        'components/CursorContext.d.ts',
-        'components/ErrorBoundary.d.ts',
-        'hooks/use-cursor.d.ts',
-      ],
-      sourceBaseDirs: [
-        join(workspaceRoot, 'node_modules', 'ink', 'build'),
-        join(packageRoot, 'compat', 'ink-build'),
-      ],
-    },
-  ];
-}
-
-function isDirectExecution() {
-  return process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url);
-}
-
-function hasAllFiles(directory, files) {
-  return files.every((file) => existsSync(join(directory, file)));
-}
-
-function copyMissingFiles(sourceDir, targetDir, files) {
-  let copied = 0;
-
-  for (const file of files) {
-    const sourceFile = join(sourceDir, file);
-    const targetFile = join(targetDir, file);
-
-    if (!existsSync(sourceFile) || existsSync(targetFile)) {
-      continue;
-    }
-
-    mkdirSync(dirname(targetFile), { recursive: true });
-    copyFileSync(sourceFile, targetFile);
-    copied += 1;
-  }
-
-  return copied;
-}
-
-export function ensureAcpSdkCompat(options = {}) {
-  const packageRoot = resolve(options.packageRoot ?? defaultPackageRoot);
-  const workspaceRoot = resolve(options.workspaceRoot ?? defaultWorkspaceRoot);
-  const targetOverrides = Array.isArray(options.targets) ? options.targets : null;
-  const repairTargets = targetOverrides ?? getRepairTargets(packageRoot, workspaceRoot);
-  const results = [];
-
-  for (const target of repairTargets) {
-    const targetPackageDir = resolve(target.targetPackageDir);
-    const targetBaseDir = join(targetPackageDir, target.targetBaseDir);
-    const sentinelFile = join(targetPackageDir, target.sentinelFile);
-
-    if (!existsSync(sentinelFile)) {
-      results.push({
-        name: target.name,
-        checked: false,
-        repaired: false,
-        reason: 'target-package-missing',
-        targetBaseDir,
-      });
-      continue;
-    }
-
-    if (hasAllFiles(targetBaseDir, target.requiredRuntimeFiles)) {
-      results.push({
-        name: target.name,
-        checked: true,
-        repaired: false,
-        reason: 'already-valid',
-        targetBaseDir,
-      });
-      continue;
-    }
-
-    const sourceBaseDir = target.sourceBaseDirs.find((candidate) => hasAllFiles(candidate, target.requiredRuntimeFiles));
-    if (!sourceBaseDir) {
-      throw new Error(
-        `[runtime-compat] Missing ${target.requiredRuntimeFiles.join(', ')} under ${targetBaseDir}, and no repair source is available for ${target.name}.`,
-      );
-    }
-
-    mkdirSync(targetBaseDir, { recursive: true });
-
-    const copiedRuntimeFiles = copyMissingFiles(sourceBaseDir, targetBaseDir, target.requiredRuntimeFiles);
-    const typeSourceBaseDir = target.sourceBaseDirs.find((candidate) => hasAllFiles(candidate, target.optionalTypeFiles));
-    const copiedTypeFiles = typeSourceBaseDir
-      ? copyMissingFiles(typeSourceBaseDir, targetBaseDir, target.optionalTypeFiles)
-      : 0;
-
-    if (!hasAllFiles(targetBaseDir, target.requiredRuntimeFiles)) {
-      throw new Error(
-        `[runtime-compat] Repair source ${sourceBaseDir} did not restore ${target.requiredRuntimeFiles.join(', ')} into ${targetBaseDir}.`,
-      );
-    }
-
-    results.push({
-      name: target.name,
-      checked: true,
-      repaired: copiedRuntimeFiles > 0 || copiedTypeFiles > 0,
-      reason: 'repaired',
-      copiedRuntimeFiles,
-      copiedTypeFiles,
-      sourceBaseDir,
-      targetBaseDir,
-    });
-  }
-
-  const repairedTargets = results.filter((result) => result.repaired);
-  const checkedTargets = results.filter((result) => result.checked);
-
-  return {
-    checked: checkedTargets.length > 0,
-    repaired: repairedTargets.length > 0,
-    reason: repairedTargets.length > 0 ? 'repaired' : 'already-valid',
-    results,
-  };
-}
-
-if (isDirectExecution()) {
-  const result = ensureAcpSdkCompat();
-
-  if (result.repaired) {
-    for (const target of result.results.filter((entry) => entry.repaired)) {
-      console.log(`[runtime-compat] Restored ${target.name} from ${target.sourceBaseDir} -> ${target.targetBaseDir}`);
-    }
-  } else {
-    console.log(`[runtime-compat] ${result.reason}`);
-  }
-}
+import { dirname, resolve, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const defaultPackageRoot = resolve(here, '..');
+const defaultWorkspaceRoot = resolve(defaultPackageRoot, '..', '..');
+
+function getRepairTargets(packageRoot, workspaceRoot) {
+  return [
+    {
+      name: '@agentclientprotocol/sdk schema',
+      targetPackageDir: join(packageRoot, 'node_modules', '@agentclientprotocol', 'sdk'),
+      targetBaseDir: 'dist/schema',
+      sentinelFile: 'dist/acp.js',
+      requiredRuntimeFiles: [
+        'index.js',
+        'types.gen.js',
+        'zod.gen.js',
+      ],
+      optionalTypeFiles: [
+        'index.d.ts',
+        'types.gen.d.ts',
+        'zod.gen.d.ts',
+      ],
+      sourceBaseDirs: [
+        join(workspaceRoot, 'node_modules', '@agentclientprotocol', 'sdk', 'dist', 'schema'),
+        join(packageRoot, 'compat', 'acp-sdk-schema'),
+      ],
+    },
+    {
+      name: 'ink cursor hooks',
+      targetPackageDir: join(packageRoot, 'node_modules', 'ink'),
+      targetBaseDir: 'build',
+      sentinelFile: 'build/index.js',
+      requiredRuntimeFiles: [
+        'components/Cursor.js',
+        'components/CursorContext.js',
+        'components/ErrorBoundary.js',
+        'hooks/use-cursor.js',
+      ],
+      optionalTypeFiles: [
+        'components/Cursor.d.ts',
+        'components/CursorContext.d.ts',
+        'components/ErrorBoundary.d.ts',
+        'hooks/use-cursor.d.ts',
+      ],
+      sourceBaseDirs: [
+        join(workspaceRoot, 'node_modules', 'ink', 'build'),
+        join(packageRoot, 'compat', 'ink-build'),
+      ],
+    },
+  ];
+}
+
+function isDirectExecution() {
+  return process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url);
+}
+
+function hasAllFiles(directory, files) {
+  return files.every((file) => existsSync(join(directory, file)));
+}
+
+function copyMissingFiles(sourceDir, targetDir, files) {
+  let copied = 0;
+
+  for (const file of files) {
+    const sourceFile = join(sourceDir, file);
+    const targetFile = join(targetDir, file);
+
+    if (!existsSync(sourceFile) || existsSync(targetFile)) {
+      continue;
+    }
+
+    mkdirSync(dirname(targetFile), { recursive: true });
+    copyFileSync(sourceFile, targetFile);
+    copied += 1;
+  }
+
+  return copied;
+}
+
+export function ensureAcpSdkCompat(options = {}) {
+  const packageRoot = resolve(options.packageRoot ?? defaultPackageRoot);
+  const workspaceRoot = resolve(options.workspaceRoot ?? defaultWorkspaceRoot);
+  const targetOverrides = Array.isArray(options.targets) ? options.targets : null;
+  const repairTargets = targetOverrides ?? getRepairTargets(packageRoot, workspaceRoot);
+  const results = [];
+
+  for (const target of repairTargets) {
+    const targetPackageDir = resolve(target.targetPackageDir);
+    const targetBaseDir = join(targetPackageDir, target.targetBaseDir);
+    const sentinelFile = join(targetPackageDir, target.sentinelFile);
+
+    if (!existsSync(sentinelFile)) {
+      results.push({
+        name: target.name,
+        checked: false,
+        repaired: false,
+        reason: 'target-package-missing',
+        targetBaseDir,
+      });
+      continue;
+    }
+
+    if (hasAllFiles(targetBaseDir, target.requiredRuntimeFiles)) {
+      results.push({
+        name: target.name,
+        checked: true,
+        repaired: false,
+        reason: 'already-valid',
+        targetBaseDir,
+      });
+      continue;
+    }
+
+    const sourceBaseDir = target.sourceBaseDirs.find((candidate) => hasAllFiles(candidate, target.requiredRuntimeFiles));
+    if (!sourceBaseDir) {
+      throw new Error(
+        `[runtime-compat] Missing ${target.requiredRuntimeFiles.join(', ')} under ${targetBaseDir}, and no repair source is available for ${target.name}.`,
+      );
+    }
+
+    mkdirSync(targetBaseDir, { recursive: true });
+
+    const copiedRuntimeFiles = copyMissingFiles(sourceBaseDir, targetBaseDir, target.requiredRuntimeFiles);
+    const typeSourceBaseDir = target.sourceBaseDirs.find((candidate) => hasAllFiles(candidate, target.optionalTypeFiles));
+    const copiedTypeFiles = typeSourceBaseDir
+      ? copyMissingFiles(typeSourceBaseDir, targetBaseDir, target.optionalTypeFiles)
+      : 0;
+
+    if (!hasAllFiles(targetBaseDir, target.requiredRuntimeFiles)) {
+      throw new Error(
+        `[runtime-compat] Repair source ${sourceBaseDir} did not restore ${target.requiredRuntimeFiles.join(', ')} into ${targetBaseDir}.`,
+      );
+    }
+
+    results.push({
+      name: target.name,
+      checked: true,
+      repaired: copiedRuntimeFiles > 0 || copiedTypeFiles > 0,
+      reason: 'repaired',
+      copiedRuntimeFiles,
+      copiedTypeFiles,
+      sourceBaseDir,
+      targetBaseDir,
+    });
+  }
+
+  const repairedTargets = results.filter((result) => result.repaired);
+  const checkedTargets = results.filter((result) => result.checked);
+
+  return {
+    checked: checkedTargets.length > 0,
+    repaired: repairedTargets.length > 0,
+    reason: repairedTargets.length > 0 ? 'repaired' : 'already-valid',
+    results,
+  };
+}
+
+if (isDirectExecution()) {
+  const result = ensureAcpSdkCompat();
+
+  if (result.repaired) {
+    for (const target of result.results.filter((entry) => entry.repaired)) {
+      console.log(`[runtime-compat] Restored ${target.name} from ${target.sourceBaseDir} -> ${target.targetBaseDir}`);
+    }
+  } else {
+    console.log(`[runtime-compat] ${result.reason}`);
+  }
+}

package/scripts/release-smoke.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { fileURLToPath } from 'node:url';
-import { dirname, join, resolve } from 'node:path';
-import { ensureAcpSdkCompat } from './ensureAcpSdkCompat.mjs';
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { fileURLToPath } from 'node:url';
+import { dirname, join, resolve } from 'node:path';
+import { ensureAcpSdkCompat } from './ensureAcpSdkCompat.mjs';
 
 const here = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(here, '..');
@@ -106,10 +106,10 @@ 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-'));
-  const packOutputDir = join(tempRoot, 'pack');
-  let tarballPath = null;
+function verifyPackedInstall() {
+  const tempRoot = mkdtempSync(join(tmpdir(), 'happy-cli-release-smoke-'));
+  const packOutputDir = join(tempRoot, 'pack');
+  let tarballPath = null;
 
   try {
     mkdirSync(packOutputDir, { recursive: true });
@@ -144,25 +144,25 @@ function verifyPackedInstall() {
       cwd: tempRoot,
     });
 
-    runStep('run packed cli help', 'node', [
-      join(tempRoot, 'node_modules', 'happy-imou-cloud', 'bin', 'happy-cloud.mjs'),
-      '--help',
-    ], {
-      cwd: tempRoot,
-    });
-
-    runStep('run packed cli auth status', 'node', [
-      join(tempRoot, 'node_modules', 'happy-imou-cloud', 'bin', 'happy-cloud.mjs'),
-      'auth',
-      'status',
-    ], {
-      cwd: tempRoot,
-      env: {
-        ...process.env,
-        HAPPY_CLOUD_HOME_DIR: join(tempRoot, '.happy-cloud'),
-      },
-    });
-  } finally {
+    runStep('run packed cli help', 'node', [
+      join(tempRoot, 'node_modules', 'happy-imou-cloud', 'bin', 'happy-cloud.mjs'),
+      '--help',
+    ], {
+      cwd: tempRoot,
+    });
+
+    runStep('run packed cli auth status', 'node', [
+      join(tempRoot, 'node_modules', 'happy-imou-cloud', 'bin', 'happy-cloud.mjs'),
+      'auth',
+      'status',
+    ], {
+      cwd: tempRoot,
+      env: {
+        ...process.env,
+        HAPPY_CLOUD_HOME_DIR: join(tempRoot, '.happy-cloud'),
+      },
+    });
+  } finally {
     if (tarballPath) {
       try {
         unlinkSync(tarballPath);
@@ -183,12 +183,12 @@ function shouldSkipPackedInstallVerification() {
   return process.env.npm_lifecycle_event === 'prepublishOnly';
 }
 
-function main() {
-  const tsc = resolveTool('tsc', 'typescript');
-  const vitest = resolveTool('vitest', 'vitest');
-
-  ensureAcpSdkCompat();
-  runToolStep('typecheck', tsc, ['--noEmit']);
+function main() {
+  const tsc = resolveTool('tsc', 'typescript');
+  const vitest = resolveTool('vitest', 'vitest');
+
+  ensureAcpSdkCompat();
+  runToolStep('typecheck', tsc, ['--noEmit']);
   runToolStep('unit runtime suite', vitest, [
     'run',
     '--testTimeout',
@@ -224,14 +224,17 @@ function main() {
     'src/runtime/RuntimeShell.test.ts',
     'src/runtime/createDefaultRuntimeShell.test.ts',
     'src/agent/claude/ClaudeCodeBackend.test.ts',
+    'src/happyOrg/runtime.test.ts',
     'src/claude/loop.test.ts',
     'src/claude/claudeAcpRemoteLauncher.test.ts',
+    'src/claude/userMessageQueue.test.ts',
     'src/claude/utils/acpPermissionHandler.test.ts',
     'src/codex/__tests__/runCodex.lifecycle.test.ts',
     'src/codex/__tests__/runtimeSession.test.ts',
     'src/codex/__tests__/selectionHandler.test.ts',
     'src/codex/__tests__/codexRemoteLauncher.acpOnly.test.ts',
     'src/codex/__tests__/codexRemoteLauncher.startupError.test.ts',
+    'src/gemini/userMessageQueue.test.ts',
     'src/security/signedTransport.test.ts',
     'src/agent/initializeAgents.test.ts',
     'src/agent/factories/factories.test.ts',