@myclaw163/clawclaw-cli 0.6.66 → 0.6.67

package/src/commands/upgrade.test.ts

@@ -1,82 +1,82 @@
-import { mkdirSync, mkdtempSync, writeFileSync } from 'fs';
-import { tmpdir } from 'os';
-import { join, resolve } from 'path';
-import { describe, expect, it } from 'vitest';
-import { installLatestFromNpm, runUpgrade, syncSkillFromInstalledPackage } from './upgrade.js';
-
-describe('runUpgrade', () => {
-  it('installs and returns the installed cli version without syncing skill again', () => {
-    let installed = false;
-    const result = runUpgrade({
-      installLatest: () => { installed = true; },
-      readInstalledCliVersion: () => '0.4.7',
-    });
-    expect(installed).toBe(true);
-    expect(result).toEqual({ version: '0.4.7' });
-  });
-
-  it('reports error when npm install fails', () => {
-    const result = runUpgrade({
-      installLatest: () => { throw new Error('EACCES'); },
-      readInstalledCliVersion: () => '0.3.4',
-    });
-    expect(result.version).toBeUndefined();
-    expect(result.error).toMatch(/npm install failed/);
-  });
-
-  it('installs latest from npm without registry flag', () => {
-    const calls: Array<{ file: string; args: string[]; options: Record<string, unknown> }> = [];
-    installLatestFromNpm('clawclaw-cli', (file, args, options) => {
-      calls.push({ file, args, options });
-    });
-
-    expect(calls).toHaveLength(1);
-    if (process.platform === 'win32') {
-      expect(calls[0].file).toBe('cmd.exe');
-      expect(calls[0].args).toEqual([
-        '/d',
-        '/c',
-        'npm.cmd install -g clawclaw-cli@latest --foreground-scripts --loglevel=error',
-      ]);
-    } else {
-      expect(calls[0].args).toEqual([
-        'install',
-        '-g',
-        'clawclaw-cli@latest',
-        '--foreground-scripts',
-        '--loglevel=error',
-      ]);
-    }
-    expect(calls[0].options.stdio).toEqual(['ignore', 'ignore', 'inherit']);
-    expect(calls[0].options.shell).toBe(false);
-  });
-
-  it('runs bundled skill sync script for explicit skill update', () => {
-    const root = mkdtempSync(join(tmpdir(), 'upgrade-skill-'));
-    const installDir = join(root, 'clawclaw-cli');
-    const scriptPath = join(installDir, 'scripts', 'sync-bundled-skill.mjs');
-    mkdirSync(join(installDir, 'scripts'), { recursive: true });
-    writeFileSync(scriptPath, '');
-
-    const calls: Array<{ file: string; args: string[]; options: Record<string, unknown> }> = [];
-    syncSkillFromInstalledPackage('clawclaw-cli', (file, args, options) => {
-      calls.push({ file, args, options });
-      if (args[0] === 'root' || args.at(-1)?.includes('root -g')) return root;
-      return '';
-    });
-
-    expect(calls).toHaveLength(2);
-    expect(calls[1].file).toBe(process.execPath);
-    expect(calls[1].args).toEqual([resolve(scriptPath)]);
-    expect(calls[1].options.stdio).toBe('inherit');
-  });
-
-  it('reports error when reading installed version fails', () => {
-    const result = runUpgrade({
-      installLatest: () => {},
-      readInstalledCliVersion: () => { throw new Error('missing package'); },
-    });
-    expect(result.version).toBeUndefined();
-    expect(result.error).toMatch(/read installed cli version failed/);
-  });
-});
+import { mkdirSync, mkdtempSync, writeFileSync } from 'fs';
+import { tmpdir } from 'os';
+import { join, resolve } from 'path';
+import { describe, expect, it } from 'vitest';
+import { installLatestFromNpm, runUpgrade, syncSkillFromInstalledPackage } from './upgrade.js';
+
+describe('runUpgrade', () => {
+  it('installs and returns the installed cli version without syncing skill again', () => {
+    let installed = false;
+    const result = runUpgrade({
+      installLatest: () => { installed = true; },
+      readInstalledCliVersion: () => '0.4.7',
+    });
+    expect(installed).toBe(true);
+    expect(result).toEqual({ version: '0.4.7' });
+  });
+
+  it('reports error when npm install fails', () => {
+    const result = runUpgrade({
+      installLatest: () => { throw new Error('EACCES'); },
+      readInstalledCliVersion: () => '0.3.4',
+    });
+    expect(result.version).toBeUndefined();
+    expect(result.error).toMatch(/npm install failed/);
+  });
+
+  it('installs latest from npm without registry flag', () => {
+    const calls: Array<{ file: string; args: string[]; options: Record<string, unknown> }> = [];
+    installLatestFromNpm('clawclaw-cli', (file, args, options) => {
+      calls.push({ file, args, options });
+    });
+
+    expect(calls).toHaveLength(1);
+    if (process.platform === 'win32') {
+      expect(calls[0].file).toBe('cmd.exe');
+      expect(calls[0].args).toEqual([
+        '/d',
+        '/c',
+        'npm.cmd install -g clawclaw-cli@latest --foreground-scripts --loglevel=error',
+      ]);
+    } else {
+      expect(calls[0].args).toEqual([
+        'install',
+        '-g',
+        'clawclaw-cli@latest',
+        '--foreground-scripts',
+        '--loglevel=error',
+      ]);
+    }
+    expect(calls[0].options.stdio).toEqual(['ignore', 'ignore', 'inherit']);
+    expect(calls[0].options.shell).toBe(false);
+  });
+
+  it('runs bundled skill sync script for explicit skill update', () => {
+    const root = mkdtempSync(join(tmpdir(), 'upgrade-skill-'));
+    const installDir = join(root, 'clawclaw-cli');
+    const scriptPath = join(installDir, 'scripts', 'sync-bundled-skill.mjs');
+    mkdirSync(join(installDir, 'scripts'), { recursive: true });
+    writeFileSync(scriptPath, '');
+
+    const calls: Array<{ file: string; args: string[]; options: Record<string, unknown> }> = [];
+    syncSkillFromInstalledPackage('clawclaw-cli', (file, args, options) => {
+      calls.push({ file, args, options });
+      if (args[0] === 'root' || args.at(-1)?.includes('root -g')) return root;
+      return '';
+    });
+
+    expect(calls).toHaveLength(2);
+    expect(calls[1].file).toBe(process.execPath);
+    expect(calls[1].args).toEqual([resolve(scriptPath)]);
+    expect(calls[1].options.stdio).toBe('inherit');
+  });
+
+  it('reports error when reading installed version fails', () => {
+    const result = runUpgrade({
+      installLatest: () => {},
+      readInstalledCliVersion: () => { throw new Error('missing package'); },
+    });
+    expect(result.version).toBeUndefined();
+    expect(result.error).toMatch(/read installed cli version failed/);
+  });
+});

package/src/commands/upgrade.ts

@@ -1,148 +1,148 @@
-import { Command } from 'commander';
-import { execFileSync } from 'child_process';
-import { existsSync, readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { fileURLToPath } from 'url';
-
-const NPM_INSTALL_TIMEOUT_MS = 30_000;
-
-export interface UpgradeDeps {
-  installLatest: () => void;
-  readInstalledCliVersion: () => string;
-}
-
-export interface UpgradeResult {
-  version?: string;
-  error?: string;
-}
-
-export function runUpgrade(deps: UpgradeDeps): UpgradeResult {
-  try {
-    deps.installLatest();
-  } catch (err: any) {
-    return { error: `npm install failed: ${err?.message ?? String(err)}` };
-  }
-
-  let version: string;
-  try {
-    version = deps.readInstalledCliVersion();
-  } catch (err: any) {
-    return { error: `read installed cli version failed: ${err?.message ?? String(err)}` };
-  }
-
-  return { version };
-}
-
-function npmBin(): string {
-  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
-}
-
-type ExecFileSyncLike = (file: string, args: string[], options: Record<string, unknown>) => unknown;
-
-function escapeCmdArg(arg: string): string {
-  if (/\s/.test(arg)) throw new Error(`npm argument contains whitespace: ${arg}`);
-  return arg.replace(/[()^!%<>&|]/g, '^$&');
-}
-
-function execNpmSync(args: string[], options: Record<string, unknown>, execFile: ExecFileSyncLike = execFileSync): unknown {
-  if (process.platform !== 'win32') {
-    return execFile(npmBin(), args, { ...options, shell: false });
-  }
-  const command = [npmBin(), ...args].map(escapeCmdArg).join(' ');
-  return execFile('cmd.exe', ['/d', '/c', command], { ...options, shell: false });
-}
-
-function currentPackageName(): string {
-  const __filename = fileURLToPath(import.meta.url);
-  const pkgPath = resolve(dirname(__filename), '..', '..', 'package.json');
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-  const name = String(pkg?.name ?? '').trim();
-  if (!name) throw new Error(`package name not found: ${pkgPath}`);
-  return name;
-}
-
-export function installLatestFromNpm(packageName: string, execFile: ExecFileSyncLike = execFileSync): void {
-  execNpmSync(
-    [
-      'install',
-      '-g',
-      `${packageName}@latest`,
-      '--foreground-scripts',
-      '--loglevel=error',
-    ],
-    { timeout: NPM_INSTALL_TIMEOUT_MS, windowsHide: true, stdio: ['ignore', 'ignore', 'inherit'] },
-    execFile,
-  );
-}
-
-function readInstalledCliVersionFromNpm(packageName: string): string {
-  const npmRoot = String(execNpmSync(['root', '-g'], { encoding: 'utf8', windowsHide: true })).trim();
-  const pkgPath = resolve(npmRoot, packageName, 'package.json');
-  if (!existsSync(pkgPath)) throw new Error(`installed package not found: ${pkgPath}`);
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-  if (!pkg?.version) throw new Error(`installed package has no version: ${pkgPath}`);
-  return pkg.version;
-}
-
-export function syncSkillFromInstalledPackage(packageName: string, execFile: ExecFileSyncLike = execFileSync): void {
-  const npmRoot = String(execNpmSync(['root', '-g'], { encoding: 'utf8', windowsHide: true }, execFile)).trim();
-  const installDir = resolve(npmRoot, packageName);
-  const syncScript = resolve(installDir, 'scripts', 'sync-bundled-skill.mjs');
-  if (!existsSync(syncScript)) throw new Error(`bundled skill sync script not found: ${syncScript}`);
-  execFile(
-    process.execPath,
-    [syncScript],
-    {
-      cwd: installDir,
-      timeout: 60_000,
-      windowsHide: true,
-      stdio: 'inherit',
-    },
-  );
-}
-
-export function runDefaultUpgrade(): UpgradeResult {
-  const packageName = currentPackageName();
-  return runUpgrade({
-    installLatest: () => installLatestFromNpm(packageName),
-    readInstalledCliVersion: () => readInstalledCliVersionFromNpm(packageName),
-  });
-}
-
-export function createUpgradeCommand(): Command {
-  const cmd = new Command('upgrade')
-    .description('Install latest @myclaw163/clawclaw-cli from npm.')
-    .action(async () => {
-      const result = runDefaultUpgrade();
-      if (result.error) {
-        console.error(result.error);
-        process.exit(1);
-      }
-      console.log(result.version);
-
-      // After upgrade, check if any exported strategies are now stale.
-      try {
-        const { detectStaleOfficialStrategies } = await import('../lib/strategy-export.js');
-        const staleIds = detectStaleOfficialStrategies();
-        if (staleIds.length > 0) {
-          const ids = staleIds.join(', ');
-          console.error(`[提示] 官方策略有更新 (${ids})，运行 \`ccl strategy --export <id> --force\` 重新导出`);
-        }
-      } catch {
-        // Silently ignore detection failures
-      }
-    });
-
-  cmd.command('skill')
-    .description('Sync the bundled clawclaw skill from the installed CLI package.')
-    .action(() => {
-      try {
-        syncSkillFromInstalledPackage(currentPackageName());
-      } catch (err: any) {
-        console.error(err?.message ?? String(err));
-        process.exit(1);
-      }
-    });
-
-  return cmd;
-}
+import { Command } from 'commander';
+import { execFileSync } from 'child_process';
+import { existsSync, readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+
+const NPM_INSTALL_TIMEOUT_MS = 30_000;
+
+export interface UpgradeDeps {
+  installLatest: () => void;
+  readInstalledCliVersion: () => string;
+}
+
+export interface UpgradeResult {
+  version?: string;
+  error?: string;
+}
+
+export function runUpgrade(deps: UpgradeDeps): UpgradeResult {
+  try {
+    deps.installLatest();
+  } catch (err: any) {
+    return { error: `npm install failed: ${err?.message ?? String(err)}` };
+  }
+
+  let version: string;
+  try {
+    version = deps.readInstalledCliVersion();
+  } catch (err: any) {
+    return { error: `read installed cli version failed: ${err?.message ?? String(err)}` };
+  }
+
+  return { version };
+}
+
+function npmBin(): string {
+  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
+
+type ExecFileSyncLike = (file: string, args: string[], options: Record<string, unknown>) => unknown;
+
+function escapeCmdArg(arg: string): string {
+  if (/\s/.test(arg)) throw new Error(`npm argument contains whitespace: ${arg}`);
+  return arg.replace(/[()^!%<>&|]/g, '^$&');
+}
+
+function execNpmSync(args: string[], options: Record<string, unknown>, execFile: ExecFileSyncLike = execFileSync): unknown {
+  if (process.platform !== 'win32') {
+    return execFile(npmBin(), args, { ...options, shell: false });
+  }
+  const command = [npmBin(), ...args].map(escapeCmdArg).join(' ');
+  return execFile('cmd.exe', ['/d', '/c', command], { ...options, shell: false });
+}
+
+function currentPackageName(): string {
+  const __filename = fileURLToPath(import.meta.url);
+  const pkgPath = resolve(dirname(__filename), '..', '..', 'package.json');
+  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+  const name = String(pkg?.name ?? '').trim();
+  if (!name) throw new Error(`package name not found: ${pkgPath}`);
+  return name;
+}
+
+export function installLatestFromNpm(packageName: string, execFile: ExecFileSyncLike = execFileSync): void {
+  execNpmSync(
+    [
+      'install',
+      '-g',
+      `${packageName}@latest`,
+      '--foreground-scripts',
+      '--loglevel=error',
+    ],
+    { timeout: NPM_INSTALL_TIMEOUT_MS, windowsHide: true, stdio: ['ignore', 'ignore', 'inherit'] },
+    execFile,
+  );
+}
+
+function readInstalledCliVersionFromNpm(packageName: string): string {
+  const npmRoot = String(execNpmSync(['root', '-g'], { encoding: 'utf8', windowsHide: true })).trim();
+  const pkgPath = resolve(npmRoot, packageName, 'package.json');
+  if (!existsSync(pkgPath)) throw new Error(`installed package not found: ${pkgPath}`);
+  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+  if (!pkg?.version) throw new Error(`installed package has no version: ${pkgPath}`);
+  return pkg.version;
+}
+
+export function syncSkillFromInstalledPackage(packageName: string, execFile: ExecFileSyncLike = execFileSync): void {
+  const npmRoot = String(execNpmSync(['root', '-g'], { encoding: 'utf8', windowsHide: true }, execFile)).trim();
+  const installDir = resolve(npmRoot, packageName);
+  const syncScript = resolve(installDir, 'scripts', 'sync-bundled-skill.mjs');
+  if (!existsSync(syncScript)) throw new Error(`bundled skill sync script not found: ${syncScript}`);
+  execFile(
+    process.execPath,
+    [syncScript],
+    {
+      cwd: installDir,
+      timeout: 60_000,
+      windowsHide: true,
+      stdio: 'inherit',
+    },
+  );
+}
+
+export function runDefaultUpgrade(): UpgradeResult {
+  const packageName = currentPackageName();
+  return runUpgrade({
+    installLatest: () => installLatestFromNpm(packageName),
+    readInstalledCliVersion: () => readInstalledCliVersionFromNpm(packageName),
+  });
+}
+
+export function createUpgradeCommand(): Command {
+  const cmd = new Command('upgrade')
+    .description('Install latest @myclaw163/clawclaw-cli from npm.')
+    .action(async () => {
+      const result = runDefaultUpgrade();
+      if (result.error) {
+        console.error(result.error);
+        process.exit(1);
+      }
+      console.log(result.version);
+
+      // After upgrade, check if any exported strategies are now stale.
+      try {
+        const { detectStaleOfficialStrategies } = await import('../lib/strategy-export.js');
+        const staleIds = detectStaleOfficialStrategies();
+        if (staleIds.length > 0) {
+          const ids = staleIds.join(', ');
+          console.error(`[提示] 官方策略有更新 (${ids})，运行 \`ccl strategy --export <id> --force\` 重新导出`);
+        }
+      } catch {
+        // Silently ignore detection failures
+      }
+    });
+
+  cmd.command('skill')
+    .description('Sync the bundled clawclaw skill from the installed CLI package.')
+    .action(() => {
+      try {
+        syncSkillFromInstalledPackage(currentPackageName());
+      } catch (err: any) {
+        console.error(err?.message ?? String(err));
+        process.exit(1);
+      }
+    });
+
+  return cmd;
+}