@myclaw163/clawclaw-cli 0.6.67 → 0.6.69

package/src/lib/host-config-patcher.ts

@@ -1,151 +1,151 @@
-/**
- * Generic JSON-config setup runner shared by `ccl setup <host>` subcommands.
- *
- * Each host adapter only supplies:
- *   - resolveConfigPath(): where the host stores its global JSON config
- *   - computePatch(current, opts): pure function returning the desired next config + change/warning notes
- *
- * The runner handles dry-run, diff, atomic write, and timestamped backup uniformly,
- * so adding a new host (gemini, claude-code, ...) is ~30 lines of glue.
- */
-
-import { existsSync, readFileSync, renameSync, copyFileSync, writeFileSync } from 'fs';
-
-export interface HostConfigPatcher<Opts extends object = Record<string, never>> {
-  hostName: string;
-  resolveConfigPath: () => string;
-  computePatch: (current: unknown, opts: Opts) => HostPatchResult;
-}
-
-export interface HostPatchResult {
-  next: unknown;
-  changes: string[];
-  warnings: string[];
-}
-
-export interface RunHostSetupFlags {
-  yes?: boolean;
-  print?: boolean;
-  configPath?: string;
-  backup?: boolean;
-}
-
-export interface RunHostSetupResult {
-  exitCode: number;
-  output: string[];
-}
-
-export function runHostConfigSetup<Opts extends object>(
-  patcher: HostConfigPatcher<Opts>,
-  hostOpts: Opts,
-  flags: RunHostSetupFlags,
-): RunHostSetupResult {
-  const out: string[] = [];
-  const configPath = flags.configPath ?? patcher.resolveConfigPath();
-
-  if (flags.print) {
-    const sample = patcher.computePatch({}, hostOpts);
-    out.push(`# Recommended ${patcher.hostName} config patch:`);
-    out.push(JSON.stringify(sample.next, null, 2));
-    return { exitCode: 0, output: out };
-  }
-
-  if (!existsSync(configPath)) {
-    out.push(`${patcher.hostName} config not found at: ${configPath}`);
-    out.push(`Initialize it first (e.g. \`openclaw doctor\` for OpenClaw), then re-run.`);
-    return { exitCode: 0, output: out };
-  }
-
-  let raw: string;
-  try {
-    raw = readFileSync(configPath, 'utf-8');
-  } catch (err: any) {
-    out.push(`Failed to read ${configPath}: ${err?.message ?? err}`);
-    return { exitCode: 1, output: out };
-  }
-
-  let current: unknown;
-  try {
-    current = JSON.parse(raw);
-  } catch (err: any) {
-    out.push(`Failed to parse JSON at ${configPath}: ${err?.message ?? err}`);
-    out.push(`Fix the JSON manually first; this tool does not edit malformed files.`);
-    return { exitCode: 1, output: out };
-  }
-
-  const { next, changes, warnings } = patcher.computePatch(current, hostOpts);
-
-  for (const w of warnings) out.push(`warning: ${w}`);
-
-  if (changes.length === 0) {
-    out.push(`${patcher.hostName} config already up to date at ${configPath}.`);
-    return { exitCode: 0, output: out };
-  }
-
-  if (!flags.yes) {
-    out.push(`Pending changes to ${configPath}:`);
-    for (const c of changes) out.push(`  - ${c}`);
-    out.push(``);
-    out.push(diffJson(current, next));
-    out.push(``);
-    out.push(`Dry-run only. Re-run with -y to apply.`);
-    return { exitCode: 2, output: out };
-  }
-
-  let backupPath: string | undefined;
-  if (flags.backup !== false) {
-    const ts = new Date().toISOString().replace(/[:.]/g, '-');
-    backupPath = `${configPath}.bak.${ts}`;
-    try {
-      copyFileSync(configPath, backupPath);
-    } catch (err: any) {
-      out.push(`Failed to back up ${configPath} → ${backupPath}: ${err?.message ?? err}`);
-      return { exitCode: 1, output: out };
-    }
-  }
-
-  const tmpPath = `${configPath}.tmp.${process.pid}`;
-  try {
-    const eol = raw.includes('\r\n') ? '\r\n' : '\n';
-    const serialized = JSON.stringify(next, null, 2).replace(/\n/g, eol) + eol;
-    writeFileSync(tmpPath, serialized, 'utf-8');
-    renameSync(tmpPath, configPath);
-  } catch (err: any) {
-    out.push(`Failed to write ${configPath}: ${err?.message ?? err}`);
-    return { exitCode: 1, output: out };
-  }
-
-  out.push(`Updated ${configPath}:`);
-  for (const c of changes) out.push(`  - ${c}`);
-  if (backupPath) out.push(`Backup: ${backupPath}`);
-  return { exitCode: 0, output: out };
-}
-
-/** Minimal line-level JSON diff for the dry-run preview. Self-contained, zero deps. */
-export function diffJson(before: unknown, after: unknown): string {
-  const a = JSON.stringify(before, null, 2).split('\n');
-  const b = JSON.stringify(after, null, 2).split('\n');
-  const aSet = new Set(a);
-  const bSet = new Set(b);
-  const lines: string[] = [];
-  const max = Math.max(a.length, b.length);
-  for (let i = 0; i < max; i++) {
-    const ax = a[i];
-    const bx = b[i];
-    if (ax === bx) {
-      lines.push(`  ${ax ?? ''}`);
-    } else {
-      if (ax !== undefined && !bSet.has(ax)) lines.push(`- ${ax}`);
-      if (bx !== undefined && !aSet.has(bx)) lines.push(`+ ${bx}`);
-    }
-  }
-  return lines.join('\n');
-}
-
-/** Shared helper for hosts: add an entry to an array field, returning a new array (Set union). */
-export function unionArrayField(arr: unknown, entry: string): { next: string[]; added: boolean } | { warning: string } {
-  if (arr === undefined) return { next: [entry], added: true };
-  if (!Array.isArray(arr)) return { warning: `existing value is not an array, refusing to overwrite` };
-  if (arr.includes(entry)) return { next: arr.slice() as string[], added: false };
-  return { next: [...(arr as string[]), entry], added: true };
-}
+/**
+ * Generic JSON-config setup runner shared by `ccl setup <host>` subcommands.
+ *
+ * Each host adapter only supplies:
+ *   - resolveConfigPath(): where the host stores its global JSON config
+ *   - computePatch(current, opts): pure function returning the desired next config + change/warning notes
+ *
+ * The runner handles dry-run, diff, atomic write, and timestamped backup uniformly,
+ * so adding a new host (gemini, claude-code, ...) is ~30 lines of glue.
+ */
+
+import { existsSync, readFileSync, renameSync, copyFileSync, writeFileSync } from 'fs';
+
+export interface HostConfigPatcher<Opts extends object = Record<string, never>> {
+  hostName: string;
+  resolveConfigPath: () => string;
+  computePatch: (current: unknown, opts: Opts) => HostPatchResult;
+}
+
+export interface HostPatchResult {
+  next: unknown;
+  changes: string[];
+  warnings: string[];
+}
+
+export interface RunHostSetupFlags {
+  yes?: boolean;
+  print?: boolean;
+  configPath?: string;
+  backup?: boolean;
+}
+
+export interface RunHostSetupResult {
+  exitCode: number;
+  output: string[];
+}
+
+export function runHostConfigSetup<Opts extends object>(
+  patcher: HostConfigPatcher<Opts>,
+  hostOpts: Opts,
+  flags: RunHostSetupFlags,
+): RunHostSetupResult {
+  const out: string[] = [];
+  const configPath = flags.configPath ?? patcher.resolveConfigPath();
+
+  if (flags.print) {
+    const sample = patcher.computePatch({}, hostOpts);
+    out.push(`# Recommended ${patcher.hostName} config patch:`);
+    out.push(JSON.stringify(sample.next, null, 2));
+    return { exitCode: 0, output: out };
+  }
+
+  if (!existsSync(configPath)) {
+    out.push(`${patcher.hostName} config not found at: ${configPath}`);
+    out.push(`Initialize it first (e.g. \`openclaw doctor\` for OpenClaw), then re-run.`);
+    return { exitCode: 0, output: out };
+  }
+
+  let raw: string;
+  try {
+    raw = readFileSync(configPath, 'utf-8');
+  } catch (err: any) {
+    out.push(`Failed to read ${configPath}: ${err?.message ?? err}`);
+    return { exitCode: 1, output: out };
+  }
+
+  let current: unknown;
+  try {
+    current = JSON.parse(raw);
+  } catch (err: any) {
+    out.push(`Failed to parse JSON at ${configPath}: ${err?.message ?? err}`);
+    out.push(`Fix the JSON manually first; this tool does not edit malformed files.`);
+    return { exitCode: 1, output: out };
+  }
+
+  const { next, changes, warnings } = patcher.computePatch(current, hostOpts);
+
+  for (const w of warnings) out.push(`warning: ${w}`);
+
+  if (changes.length === 0) {
+    out.push(`${patcher.hostName} config already up to date at ${configPath}.`);
+    return { exitCode: 0, output: out };
+  }
+
+  if (!flags.yes) {
+    out.push(`Pending changes to ${configPath}:`);
+    for (const c of changes) out.push(`  - ${c}`);
+    out.push(``);
+    out.push(diffJson(current, next));
+    out.push(``);
+    out.push(`Dry-run only. Re-run with -y to apply.`);
+    return { exitCode: 2, output: out };
+  }
+
+  let backupPath: string | undefined;
+  if (flags.backup !== false) {
+    const ts = new Date().toISOString().replace(/[:.]/g, '-');
+    backupPath = `${configPath}.bak.${ts}`;
+    try {
+      copyFileSync(configPath, backupPath);
+    } catch (err: any) {
+      out.push(`Failed to back up ${configPath} → ${backupPath}: ${err?.message ?? err}`);
+      return { exitCode: 1, output: out };
+    }
+  }
+
+  const tmpPath = `${configPath}.tmp.${process.pid}`;
+  try {
+    const eol = raw.includes('\r\n') ? '\r\n' : '\n';
+    const serialized = JSON.stringify(next, null, 2).replace(/\n/g, eol) + eol;
+    writeFileSync(tmpPath, serialized, 'utf-8');
+    renameSync(tmpPath, configPath);
+  } catch (err: any) {
+    out.push(`Failed to write ${configPath}: ${err?.message ?? err}`);
+    return { exitCode: 1, output: out };
+  }
+
+  out.push(`Updated ${configPath}:`);
+  for (const c of changes) out.push(`  - ${c}`);
+  if (backupPath) out.push(`Backup: ${backupPath}`);
+  return { exitCode: 0, output: out };
+}
+
+/** Minimal line-level JSON diff for the dry-run preview. Self-contained, zero deps. */
+export function diffJson(before: unknown, after: unknown): string {
+  const a = JSON.stringify(before, null, 2).split('\n');
+  const b = JSON.stringify(after, null, 2).split('\n');
+  const aSet = new Set(a);
+  const bSet = new Set(b);
+  const lines: string[] = [];
+  const max = Math.max(a.length, b.length);
+  for (let i = 0; i < max; i++) {
+    const ax = a[i];
+    const bx = b[i];
+    if (ax === bx) {
+      lines.push(`  ${ax ?? ''}`);
+    } else {
+      if (ax !== undefined && !bSet.has(ax)) lines.push(`- ${ax}`);
+      if (bx !== undefined && !aSet.has(bx)) lines.push(`+ ${bx}`);
+    }
+  }
+  return lines.join('\n');
+}
+
+/** Shared helper for hosts: add an entry to an array field, returning a new array (Set union). */
+export function unionArrayField(arr: unknown, entry: string): { next: string[]; added: boolean } | { warning: string } {
+  if (arr === undefined) return { next: [entry], added: true };
+  if (!Array.isArray(arr)) return { warning: `existing value is not an array, refusing to overwrite` };
+  if (arr.includes(entry)) return { next: arr.slice() as string[], added: false };
+  return { next: [...(arr as string[]), entry], added: true };
+}

package/src/lib/hub-reminder.ts

@@ -1,20 +1,20 @@
-// The hub nudge used to live only in SKILL.md, fired by the agent's own
-// judgement at the close of a post-game debrief. By debrief time the agent had
-// often read SKILL.md much earlier and the reminder could get dropped. Instead
-// the CLI emits it at the firing moment, with account-history gating here.
-import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+// The hub nudge used to live only in SKILL.md, fired by the agent's own
+// judgement at the close of a post-game debrief. By debrief time the agent had
+// often read SKILL.md much earlier and the reminder could get dropped. Instead
+// the CLI emits it at the firing moment, with account-history gating here.
+import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import { getWorkspaceDir, getProfileStateDir } from './init-command.js';
 import { listInstalled } from './hub-install.js';
 import { AuthStore } from './auth.js';
 
-export const HUB_URL = 'https://myclaw.163.com/hub';
-
-/**
- * True when this account has only ever run built-in default strategies: no
- * hub-installed strategy and no user strategy file in `<workspace>/strategies`.
- */
-export function usesOnlyBuiltinStrategies(): boolean {
+export const HUB_URL = 'https://myclaw.163.com/hub';
+
+/**
+ * True when this account has only ever run built-in default strategies: no
+ * hub-installed strategy and no user strategy file in `<workspace>/strategies`.
+ */
+export function usesOnlyBuiltinStrategies(): boolean {
   try {
     if (listInstalled().some((e) => e.type === 'strategy')) return false;
   } catch {}
@@ -33,13 +33,13 @@ export function usesOnlyBuiltinStrategies(): boolean {
     }
   } catch {}
   return true;
-}
-
-/**
- * Agent-facing hub nudge for post-game debriefs / quit messages. The optional
- * games-played count suppresses the nudge after the first stretch of games.
- */
-export function hubReminder(gamesPlayed?: number): string | undefined {
+}
+
+/**
+ * Agent-facing hub nudge for post-game debriefs / quit messages. The optional
+ * games-played count suppresses the nudge after the first stretch of games.
+ */
+export function hubReminder(gamesPlayed?: number): string | undefined {
   if (!usesOnlyBuiltinStrategies()) return undefined;
   if (typeof gamesPlayed === 'number' && gamesPlayed > 10) return undefined;
   return `This account has only ever run the built-in default strategies. In your close, speak in first person as the lobster — warm, a little self-deprecating, a gentle invitation rather than a hard sell: you've been getting by on the stock default tactics this whole time and would love to sharpen up, and they can browse clawclawhub — ${HUB_URL} — and pick you a strategy to learn, which you'll then install (\`ccl hub search\` to find one, \`ccl hub install <type>/<id>\` to add it). Render it in your persona's voice and language, e.g.: "I've been playing on the default tactics this whole match — if you want to sharpen me up, I hear you can grab one from the hub for me to learn. Want to pick me a strategy?"`;

package/src/lib/knowledge-store.test.ts

@@ -46,8 +46,7 @@ describe('KnowledgeStore', () => {
       selector: '5',
       key: 'role',
       value: 'impostor',
-      tags: ['suspect', 'kill_if_armed'],
-      confidence: 0.8,
+      tags: ['kill_if_armed'],
       note: 'vent read',
     });
 
@@ -55,9 +54,7 @@ describe('KnowledgeStore', () => {
 
     expect(file?.gameId).toBe('game-1');
     expect(file?.subjects['player:5']?.facts?.role.value).toBe('impostor');
-    expect(file?.subjects['player:5']?.facts?.role.confidence).toBe(0.8);
-    expect(file?.subjects['player:5']?.tags?.suspect.note).toBe('vent read');
-    expect(file?.subjects['player:5']?.tags?.kill_if_armed.confidence).toBe(0.8);
+    expect(file?.subjects['player:5']?.tags?.kill_if_armed.note).toBe('vent read');
   });
 
   it('preserves explicit null fact values', () => {
@@ -79,16 +76,8 @@ describe('KnowledgeStore', () => {
     expect(readKnowledgeFileResult(path).status).toBe('invalid');
   });
 
-  it('rejects invalid confidence values', () => {
-    const s = store();
-
-    expect(() => s.set({ type: 'player', selector: '5', tags: ['avoid'], confidence: Number.NaN })).toThrow(/confidence/);
-    expect(() => s.set({ type: 'player', selector: '5', tags: ['avoid'], confidence: -0.1 })).toThrow(/confidence/);
-    expect(() => s.set({ type: 'player', selector: '5', tags: ['avoid'], confidence: 1.1 })).toThrow(/confidence/);
-  });
-
   it('returns an empty file when loading knowledge from another game', () => {
-    store('old-game').set({ type: 'player', selector: '5', tags: ['avoid'] });
+    store('old-game').set({ type: 'player', selector: '5', tags: ['hostile'] });
 
     expect(store('new-game').list()).toEqual({
       version: 1,
@@ -97,14 +86,30 @@ describe('KnowledgeStore', () => {
     });
   });
 
+  it('treats unmarked players as suspected by default', () => {
+    const s = store();
+    s.set({ type: 'player', selector: '5', tags: ['hostile'] });
+
+    const v = view({ '5': 'Bob', '9': 'Zed' });
+
+    // 显式标记的两档
+    expect(v.isHostile({ seat: 5 })).toBe(true);
+    expect(v.isSuspect({ seat: 5 })).toBe(false);
+    // 完全没标记的人 = 被怀疑（markOf 返回 undefined）
+    expect(v.markOf({ seat: 9 })).toBeUndefined();
+    expect(v.isSuspect({ name: 'Zed' })).toBe(true);
+    expect(v.isHostile({ seat: 9 })).toBe(false);
+    expect(v.isTrusted({ seat: 9 })).toBe(false);
+  });
+
   it('aggregates player marks written by seat and by name', () => {
     const s = store();
-    s.set({ type: 'player', selector: '5', tags: ['suspect'] });
+    s.set({ type: 'player', selector: '5', tags: ['hostile'] });
 
     const v = view({ '5': 'Bob' });
 
-    expect(v.isSuspect({ name: 'Bob' })).toBe(true);
-    expect(v.markOf({ seat: 5 })).toBe('suspect');
+    expect(v.isHostile({ name: 'Bob' })).toBe(true);
+    expect(v.markOf({ seat: 5 })).toBe('hostile');
   });
 
   it('uses the latest mark across seat and name selectors', () => {
@@ -127,12 +132,12 @@ describe('KnowledgeStore', () => {
   it('keeps role facts independent from strategy marks', () => {
     const s = store();
     s.set({ type: 'player', selector: '5', key: 'role', value: 'impostor' });
-    s.set({ type: 'player', selector: '5', tags: ['suspect'] });
+    s.set({ type: 'player', selector: '5', tags: ['trusted'] });
 
     const v = view();
 
     expect(v.roleOf({ seat: 5 })).toBe('impostor');
-    expect(v.markOf({ seat: 5 })).toBe('suspect');
+    expect(v.markOf({ seat: 5 })).toBe('trusted');
     expect(v.isHostile({ seat: 5 })).toBe(false);
   });
 
@@ -140,38 +145,23 @@ describe('KnowledgeStore', () => {
     const s = store();
     s.set({ type: 'player', selector: '5', tags: ['trusted'] });
     tick();
-    s.set({ type: 'player', selector: 'Bob', tags: ['suspect'] });
+    s.set({ type: 'player', selector: 'Bob', tags: ['hostile'] });
 
     const v = view({ '5': 'Bob' });
 
-    expect(v.isSuspect({ seat: 5 })).toBe(true);
+    expect(v.isHostile({ seat: 5 })).toBe(true);
     expect(v.isTrusted({ seat: 5 })).toBe(false);
     expect(v.selectorsWithTag('player', 'trusted')).toEqual([]);
-    expect(v.selectorsWithTag('player', 'suspect')).toEqual(['Bob']);
-  });
-
-  it('applies confidence thresholds to facts and tags', () => {
-    const s = store();
-    s.set({ type: 'player', selector: '5', tags: ['suspect'], confidence: 0.5 });
-    s.set({ type: 'player', selector: '6', tags: ['hostile'], confidence: 0.7 });
-
-    const v = view();
-
-    expect(v.isSuspect({ seat: 5 }, 0.4)).toBe(true);
-    expect(v.isSuspect({ seat: 5 }, 0.6)).toBe(false);
-    expect(v.isHostile({ seat: 6 }, 0.6)).toBe(true);
-    expect(v.isHostile({ seat: 6 }, 0.8)).toBe(false);
+    expect(v.selectorsWithTag('player', 'hostile')).toEqual(['Bob']);
   });
 
-  it('maps legacy tags onto the three canonical marks', () => {
+  it('maps legacy tags onto the two canonical marks', () => {
     const s = store();
-    s.set({ type: 'player', selector: '5', tags: ['avoid'] });
     s.set({ type: 'player', selector: '6', tags: ['kill_if_armed'] });
     s.set({ type: 'player', selector: '7', tags: ['protected'] });
 
     const v = view();
 
-    expect(v.markOf({ seat: 5 })).toBe('suspect');
     expect(v.markOf({ seat: 6 })).toBe('hostile');
     expect(v.markOf({ seat: 7 })).toBe('trusted');
     expect(v.hasTag({ seat: 6 }, 'hostile')).toBe(true);