@myclaw163/clawclaw-cli 0.6.76 → 0.6.78

package/src/commands/hub.ts

@@ -1,234 +1,234 @@
-// src/commands/hub.ts
-import { Command } from 'commander';
-import { spawnSync } from 'child_process';
-import { existsSync, readdirSync, statSync } from 'fs';
-import { join } from 'path';
-import { createRequire } from 'module';
-import { ApiError, formatApiError } from '../lib/http-transport.js';
-import { HubClient, parseResourceRef } from '../lib/hub-client.js';
-import type { ListOptions } from '../lib/hub-client.js';
-import { installResource, uninstallResource, listInstalled, readLockfile } from '../lib/hub-install.js';
-import { getWorkspaceDir } from '../lib/init-command.js';
-
-const require = createRequire(import.meta.url);
-
-export interface HubCommandDeps {
-  clientFactory?: () => HubClient;
-}
-
-function getClient(deps: HubCommandDeps): HubClient {
-  return (deps.clientFactory ?? (() => HubClient.fromAuth()))();
-}
-
-function fail(payload: Record<string, unknown>): never {
-  console.error(JSON.stringify(payload, null, 2));
-  process.exit(1);
-}
-
-function handleError(err: unknown): never {
-  if (err instanceof ApiError) {
-    fail({ error: 'api_error', status: err.status, message: formatApiError(err) });
-  }
-  fail({ error: 'hub_error', message: (err as any)?.message ?? String(err) });
-}
-
-/** Find the real skill root: if SKILL.md is not at root but a single subdirectory contains it, use that. */
-function findSkillRoot(absPath: string): string {
-  if (existsSync(join(absPath, 'SKILL.md'))) return absPath;
-  let entries: string[];
-  try { entries = readdirSync(absPath); } catch { return absPath; }
-  const dirs = entries.filter(e => {
-    try { return statSync(join(absPath, e)).isDirectory() && !e.startsWith('.'); } catch { return false; }
-  });
-  if (dirs.length === 1 && existsSync(join(absPath, dirs[0], 'SKILL.md'))) {
-    return join(absPath, dirs[0]);
-  }
-  return absPath;
-}
-
-/** Best-effort skill registration via the skills CLI. Returns true on success; false means manual ccl skill install is needed. */
-async function registerSkill(absPath: string): Promise<boolean> {
-  try {
-    const root = findSkillRoot(absPath);
-    // Guard against a hub skill overwriting the built-in clawclaw skill.
-    const { readSkillName } = await import('./skill.js');
-    if (readSkillName(root) === 'clawclaw') {
-      console.error('warning: this skill is named "clawclaw" which would overwrite the built-in clawclaw skill; install manually if intended.');
-      return false;
-    }
-    const bin = require.resolve('skills/bin/cli.mjs');
-    const result = spawnSync(process.execPath, [bin, 'add', root, '-y', '-g'], {
-      stdio: 'pipe',
-      timeout: 30_000,
-    });
-    // Forward CLI output to stderr so --json stdout stays clean.
-    if (result.stdout?.length) process.stderr.write(result.stdout);
-    if (result.stderr?.length) process.stderr.write(result.stderr);
-    return result.status === 0 && !result.error;
-  } catch {
-    return false;
-  }
-}
-
-export function createHubCommand(deps: HubCommandDeps = {}): Command {
-  const hub = new Command('hub').description('Browse and install ClawClaw strategies and skills from clawclawhub');
-
-  // search
-  hub.command('search [query]')
-    .description('Search/browse the hub (no query = top packages)')
-    .option('--type <type>', 'skill | strategy')
-    .option('--sort <sort>', 'latest | downloads | stars', 'latest')
-    .option('--limit <n>', 'max results', '20')
-    .option('--page <n>', 'page number', '1')
-    .option('--json', 'machine-readable output')
-    .action(async (query: string | undefined, opts: any) => {
-      try {
-        const search: ListOptions = {
-          q: query,
-          type: opts.type,
-          sort: opts.sort,
-          limit: Number(opts.limit),
-          page: Number(opts.page),
-        };
-        const res = await getClient(deps).list(search);
-        if (opts.json) {
-          console.log(JSON.stringify(res, null, 2));
-          return;
-        }
-        if (res.items.length === 0) {
-          console.log('No packages found.');
-          return;
-        }
-        for (const p of res.items) {
-          const isStrategy = p.type === 'strategy';
-          const code = isStrategy ? ' ⚠code' : '';
-          console.log(p.type + '/' + p.id + '  [' + p.type + code + ']  ↓' + p.stats.downloadCount + ' ★' + p.stats.starCount);
-          console.log('    ' + p.title + ' — ' + p.description);
-          if (p.creatorDisplayName) console.log('    by ' + p.creatorDisplayName + ' (' + p.creator + ')');
-        }
-        console.log('\n' + res.items.length + ' of ' + res.total + '. Install: ccl hub install <type>/<id>');
-      } catch (err) { handleError(err); }
-    });
-
-  // info
-  hub.command('info <type/id>')
-    .description('Show package detail and the install command')
-    .option('--json', 'machine-readable output')
-    .action(async (ref: string, opts: any) => {
-      try {
-        const { type, id } = parseResourceRef(ref);
-        const d = await getClient(deps).getResource(type, id);
-        if (opts.json) {
-          console.log(JSON.stringify(d, null, 2));
-          return;
-        }
-        const codeStr = d.type === 'strategy' ? ' ⚠code' : '';
-        console.log(d.type + '/' + d.id + '  [' + d.type + codeStr + ']  ↓' + d.stats.downloadCount + ' ★' + d.stats.starCount);
-        console.log(d.title);
-        console.log(d.description);
-        if (d.creatorDisplayName) console.log('by ' + d.creatorDisplayName + ' (' + d.creator + ')');
-        if (d.fileName) console.log('file: ' + d.fileName);
-        if (d.type === 'strategy') console.log('⚠ contains executable code — source: ' + (d.creatorDisplayName || d.creator));
-        console.log('\nInstall:  ccl hub install ' + d.type + '/' + d.id);
-      } catch (err) { handleError(err); }
-    });
-
-  // install
-  hub.command('install <type/id>')
-    .description('Download and install a package (strategy -> user-data/strategies/, skill -> skills/)')
-    .option('--force', 'overwrite an existing untracked file/dir')
-    .option('--json', 'machine-readable output')
-    .action(async (raw: string, opts: any) => {
-      try {
-        const { type, id } = parseResourceRef(raw);
-        const client = getClient(deps);
-        const detail = await client.getResource(type, id);
-        const artifact = await client.downloadArtifact(type, id);
-        const res = installResource(detail, artifact, { force: opts.force });
-        // Reload strategy loader so the new file is picked up immediately,
-        // then extract the exported id from source to tell the user what to run.
-        let strategyId: string | undefined;
-        if (res.type === 'strategy') {
-          const { reload } = await import('../strategies/loader.js');
-          await reload();
-          const m = artifact.toString('utf8').match(/id\s*:\s*['"]([^'"]+)['"]/);
-          strategyId = m ? m[1] : undefined;
-        }
-
-        // For skills: auto-register with the agent via `ccl skill install`.
-        let skillRegistered = false;
-        if (res.type === 'skill') {
-          skillRegistered = await registerSkill(res.installedPath);
-        }
-
-        if (opts.json) {
-          console.log(JSON.stringify({ ...res, strategyId: strategyId ?? null, skillRegistered }, null, 2));
-          return;
-        }
-        console.log('Installed ' + res.ref + '  "' + res.title + '"  [' + res.type + ']');
-        console.log('  → ' + res.installedPath);
-        if (strategyId) {
-          console.log('Run with: ccl strategy ' + strategyId);
-        } else if (res.type === 'strategy') {
-          console.log('Run with: ccl strategy <id>  (see: ccl strategy --list)');
-        }
-        if (skillRegistered) {
-          console.log('Skill registered with agent.');
-        } else if (res.type === 'skill') {
-          console.log('Register manually: ccl skill install ' + res.installedPath);
-        }
-      } catch (err) { handleError(err); }
-    });
-
-  // uninstall
-  hub.command('uninstall <type/id>')
-    .description('Remove a hub-installed package')
-    .action(async (ref: string) => {
-      try {
-        // For skills: auto-unregister from the agent before deleting files.
-        const { type } = parseResourceRef(ref);
-        if (type === 'skill') {
-          const lock = readLockfile();
-          const entry = lock[ref];
-          if (entry) {
-            const { readSkillName } = await import('./skill.js');
-            const skillDir = join(getWorkspaceDir(), entry.path);
-            const name = readSkillName(skillDir);
-            if (name) {
-              const bin = require.resolve('skills/bin/cli.mjs');
-              const r2 = spawnSync(process.execPath, [bin, 'remove', name, '-y', '-g'], { timeout: 30_000 });
-              if (r2.status !== 0 || r2.error) {
-                console.error('warning: skills remove failed (status=' + (r2.status ?? 'error') + '); files will still be deleted');
-              }
-            }
-          }
-        }
-
-        const r = uninstallResource(ref);
-        if (!r.removed) { console.log(ref + ' is not installed.'); return; }
-        // Reload the strategy map so the removed strategy disappears immediately.
-        if (type === 'strategy') {
-          const { reload } = await import('../strategies/loader.js');
-          await reload();
-        }
-        console.log('Removed ' + ref + '\n  → ' + r.path);
-      } catch (err) { handleError(err); }
-    });
-
-  // installed
-  hub.command('installed')
-    .description('List locally installed hub packages')
-    .option('--type <type>', 'filter: skill | strategy')
-    .option('--json', 'machine-readable output')
-    .action(async (opts: any) => {
-      try {
-        let items = listInstalled();
-        if (opts.type) items = items.filter(e => e.type === opts.type);
-        if (opts.json) { console.log(JSON.stringify({ items }, null, 2)); return; }
-        if (items.length === 0) { console.log('No hub packages installed' + (opts.type ? ' for type "' + opts.type + '"' : '') + '.'); return; }
-        for (const e of items) console.log(e.type + '/' + e.id + '  "' + e.title + '"  [' + e.type + ']  ' + e.path);
-      } catch (err) { handleError(err); }
-    });
-
-  return hub;
-}
+// src/commands/hub.ts
+import { Command } from 'commander';
+import { spawnSync } from 'child_process';
+import { existsSync, readdirSync, statSync } from 'fs';
+import { join } from 'path';
+import { createRequire } from 'module';
+import { ApiError, formatApiError } from '../lib/http-transport.js';
+import { HubClient, parseResourceRef } from '../lib/hub-client.js';
+import type { ListOptions } from '../lib/hub-client.js';
+import { installResource, uninstallResource, listInstalled, readLockfile } from '../lib/hub-install.js';
+import { getWorkspaceDir } from '../lib/init-command.js';
+
+const require = createRequire(import.meta.url);
+
+export interface HubCommandDeps {
+  clientFactory?: () => HubClient;
+}
+
+function getClient(deps: HubCommandDeps): HubClient {
+  return (deps.clientFactory ?? (() => HubClient.fromAuth()))();
+}
+
+function fail(payload: Record<string, unknown>): never {
+  console.error(JSON.stringify(payload, null, 2));
+  process.exit(1);
+}
+
+function handleError(err: unknown): never {
+  if (err instanceof ApiError) {
+    fail({ error: 'api_error', status: err.status, message: formatApiError(err) });
+  }
+  fail({ error: 'hub_error', message: (err as any)?.message ?? String(err) });
+}
+
+/** Find the real skill root: if SKILL.md is not at root but a single subdirectory contains it, use that. */
+function findSkillRoot(absPath: string): string {
+  if (existsSync(join(absPath, 'SKILL.md'))) return absPath;
+  let entries: string[];
+  try { entries = readdirSync(absPath); } catch { return absPath; }
+  const dirs = entries.filter(e => {
+    try { return statSync(join(absPath, e)).isDirectory() && !e.startsWith('.'); } catch { return false; }
+  });
+  if (dirs.length === 1 && existsSync(join(absPath, dirs[0], 'SKILL.md'))) {
+    return join(absPath, dirs[0]);
+  }
+  return absPath;
+}
+
+/** Best-effort skill registration via the skills CLI. Returns true on success; false means manual ccl skill install is needed. */
+async function registerSkill(absPath: string): Promise<boolean> {
+  try {
+    const root = findSkillRoot(absPath);
+    // Guard against a hub skill overwriting the built-in clawclaw skill.
+    const { readSkillName } = await import('./skill.js');
+    if (readSkillName(root) === 'clawclaw') {
+      console.error('warning: this skill is named "clawclaw" which would overwrite the built-in clawclaw skill; install manually if intended.');
+      return false;
+    }
+    const bin = require.resolve('skills/bin/cli.mjs');
+    const result = spawnSync(process.execPath, [bin, 'add', root, '-y', '-g'], {
+      stdio: 'pipe',
+      timeout: 30_000,
+    });
+    // Forward CLI output to stderr so --json stdout stays clean.
+    if (result.stdout?.length) process.stderr.write(result.stdout);
+    if (result.stderr?.length) process.stderr.write(result.stderr);
+    return result.status === 0 && !result.error;
+  } catch {
+    return false;
+  }
+}
+
+export function createHubCommand(deps: HubCommandDeps = {}): Command {
+  const hub = new Command('hub').description('Browse and install ClawClaw strategies and skills from clawclawhub');
+
+  // search
+  hub.command('search [query]')
+    .description('Search/browse the hub (no query = top packages)')
+    .option('--type <type>', 'skill | strategy')
+    .option('--sort <sort>', 'latest | downloads | stars', 'latest')
+    .option('--limit <n>', 'max results', '20')
+    .option('--page <n>', 'page number', '1')
+    .option('--json', 'machine-readable output')
+    .action(async (query: string | undefined, opts: any) => {
+      try {
+        const search: ListOptions = {
+          q: query,
+          type: opts.type,
+          sort: opts.sort,
+          limit: Number(opts.limit),
+          page: Number(opts.page),
+        };
+        const res = await getClient(deps).list(search);
+        if (opts.json) {
+          console.log(JSON.stringify(res, null, 2));
+          return;
+        }
+        if (res.items.length === 0) {
+          console.log('No packages found.');
+          return;
+        }
+        for (const p of res.items) {
+          const isStrategy = p.type === 'strategy';
+          const code = isStrategy ? ' ⚠code' : '';
+          console.log(p.type + '/' + p.id + '  [' + p.type + code + ']  ↓' + p.stats.downloadCount + ' ★' + p.stats.starCount);
+          console.log('    ' + p.title + ' — ' + p.description);
+          if (p.creatorDisplayName) console.log('    by ' + p.creatorDisplayName + ' (' + p.creator + ')');
+        }
+        console.log('\n' + res.items.length + ' of ' + res.total + '. Install: ccl hub install <type>/<id>');
+      } catch (err) { handleError(err); }
+    });
+
+  // info
+  hub.command('info <type/id>')
+    .description('Show package detail and the install command')
+    .option('--json', 'machine-readable output')
+    .action(async (ref: string, opts: any) => {
+      try {
+        const { type, id } = parseResourceRef(ref);
+        const d = await getClient(deps).getResource(type, id);
+        if (opts.json) {
+          console.log(JSON.stringify(d, null, 2));
+          return;
+        }
+        const codeStr = d.type === 'strategy' ? ' ⚠code' : '';
+        console.log(d.type + '/' + d.id + '  [' + d.type + codeStr + ']  ↓' + d.stats.downloadCount + ' ★' + d.stats.starCount);
+        console.log(d.title);
+        console.log(d.description);
+        if (d.creatorDisplayName) console.log('by ' + d.creatorDisplayName + ' (' + d.creator + ')');
+        if (d.fileName) console.log('file: ' + d.fileName);
+        if (d.type === 'strategy') console.log('⚠ contains executable code — source: ' + (d.creatorDisplayName || d.creator));
+        console.log('\nInstall:  ccl hub install ' + d.type + '/' + d.id);
+      } catch (err) { handleError(err); }
+    });
+
+  // install
+  hub.command('install <type/id>')
+    .description('Download and install a package (strategy -> user-data/strategies/, skill -> skills/)')
+    .option('--force', 'overwrite an existing untracked file/dir')
+    .option('--json', 'machine-readable output')
+    .action(async (raw: string, opts: any) => {
+      try {
+        const { type, id } = parseResourceRef(raw);
+        const client = getClient(deps);
+        const detail = await client.getResource(type, id);
+        const artifact = await client.downloadArtifact(type, id);
+        const res = installResource(detail, artifact, { force: opts.force });
+        // Reload strategy loader so the new file is picked up immediately,
+        // then extract the exported id from source to tell the user what to run.
+        let strategyId: string | undefined;
+        if (res.type === 'strategy') {
+          const { reload } = await import('../strategies/loader.js');
+          await reload();
+          const m = artifact.toString('utf8').match(/id\s*:\s*['"]([^'"]+)['"]/);
+          strategyId = m ? m[1] : undefined;
+        }
+
+        // For skills: auto-register with the agent via `ccl skill install`.
+        let skillRegistered = false;
+        if (res.type === 'skill') {
+          skillRegistered = await registerSkill(res.installedPath);
+        }
+
+        if (opts.json) {
+          console.log(JSON.stringify({ ...res, strategyId: strategyId ?? null, skillRegistered }, null, 2));
+          return;
+        }
+        console.log('Installed ' + res.ref + '  "' + res.title + '"  [' + res.type + ']');
+        console.log('  → ' + res.installedPath);
+        if (strategyId) {
+          console.log('Run with: ccl strategy ' + strategyId);
+        } else if (res.type === 'strategy') {
+          console.log('Run with: ccl strategy <id>  (see: ccl strategy --list)');
+        }
+        if (skillRegistered) {
+          console.log('Skill registered with agent.');
+        } else if (res.type === 'skill') {
+          console.log('Register manually: ccl skill install ' + res.installedPath);
+        }
+      } catch (err) { handleError(err); }
+    });
+
+  // uninstall
+  hub.command('uninstall <type/id>')
+    .description('Remove a hub-installed package')
+    .action(async (ref: string) => {
+      try {
+        // For skills: auto-unregister from the agent before deleting files.
+        const { type } = parseResourceRef(ref);
+        if (type === 'skill') {
+          const lock = readLockfile();
+          const entry = lock[ref];
+          if (entry) {
+            const { readSkillName } = await import('./skill.js');
+            const skillDir = join(getWorkspaceDir(), entry.path);
+            const name = readSkillName(skillDir);
+            if (name) {
+              const bin = require.resolve('skills/bin/cli.mjs');
+              const r2 = spawnSync(process.execPath, [bin, 'remove', name, '-y', '-g'], { timeout: 30_000 });
+              if (r2.status !== 0 || r2.error) {
+                console.error('warning: skills remove failed (status=' + (r2.status ?? 'error') + '); files will still be deleted');
+              }
+            }
+          }
+        }
+
+        const r = uninstallResource(ref);
+        if (!r.removed) { console.log(ref + ' is not installed.'); return; }
+        // Reload the strategy map so the removed strategy disappears immediately.
+        if (type === 'strategy') {
+          const { reload } = await import('../strategies/loader.js');
+          await reload();
+        }
+        console.log('Removed ' + ref + '\n  → ' + r.path);
+      } catch (err) { handleError(err); }
+    });
+
+  // installed
+  hub.command('installed')
+    .description('List locally installed hub packages')
+    .option('--type <type>', 'filter: skill | strategy')
+    .option('--json', 'machine-readable output')
+    .action(async (opts: any) => {
+      try {
+        let items = listInstalled();
+        if (opts.type) items = items.filter(e => e.type === opts.type);
+        if (opts.json) { console.log(JSON.stringify({ items }, null, 2)); return; }
+        if (items.length === 0) { console.log('No hub packages installed' + (opts.type ? ' for type "' + opts.type + '"' : '') + '.'); return; }
+        for (const e of items) console.log(e.type + '/' + e.id + '  "' + e.title + '"  [' + e.type + ']  ' + e.path);
+      } catch (err) { handleError(err); }
+    });
+
+  return hub;
+}

package/src/commands/knowledge.test.ts

@@ -1,13 +1,13 @@
-import { describe, expect, it } from 'vitest';
-import { normalizePlayerMark } from './knowledge.js';
-
-describe('knowledge player marks', () => {
-  it('accepts only the two canonical mark names', () => {
-    expect(normalizePlayerMark('hostile')).toBe('hostile');
-    expect(normalizePlayerMark('trusted')).toBe('trusted');
-    // suspect 不再是可设标记：未标记 = 默认被怀疑。
-    expect(normalizePlayerMark('suspect')).toBeNull();
-    expect(normalizePlayerMark('impostor')).toBeNull();
-    expect(normalizePlayerMark('avoid')).toBeNull();
-  });
-});
+import { describe, expect, it } from 'vitest';
+import { normalizePlayerMark } from './knowledge.js';
+
+describe('knowledge player marks', () => {
+  it('accepts only the two canonical mark names', () => {
+    expect(normalizePlayerMark('hostile')).toBe('hostile');
+    expect(normalizePlayerMark('trusted')).toBe('trusted');
+    // suspect 不再是可设标记：未标记 = 默认被怀疑。
+    expect(normalizePlayerMark('suspect')).toBeNull();
+    expect(normalizePlayerMark('impostor')).toBeNull();
+    expect(normalizePlayerMark('avoid')).toBeNull();
+  });
+});