@myclaw163/clawclaw-cli 0.6.56 → 0.6.58

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/strategy-export.test.ts

@@ -35,7 +35,7 @@ describe('strategy-export', () => {
       const source = `
 import type { GameState } from '../sdk/types.js';
 import { Action } from '../sdk/action.js';
-import { dist, KILL_RANGE } from './game-utils.js';
+import { dist, killCommitRange } from './game-utils.js';
 import { GoalRootStrategy } from './goals/goal-root-strategy.js';
 import { TaskOnlyTop } from './goals/task-only-top.js';
 import { parseGreetingArgs } from './greeting.js';

package/src/runtime/event-daemon.test.ts

@@ -1,5 +1,31 @@
-import { describe, expect, it } from 'vitest';
-import { buildMeetingStateProjection } from './event-daemon.js';
+import { mkdtempSync, rmSync } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { buildMeetingStateProjection, EventRuntime } from './event-daemon.js';
+
+const tempDirs: string[] = [];
+
+function makeRuntimeHarness() {
+  const dir = mkdtempSync(join(tmpdir(), 'ccl-event-runtime-'));
+  tempDirs.push(dir);
+  const appended: Record<string, any>[] = [];
+  const stops: string[] = [];
+  const runtime = new EventRuntime({
+    onStop: (stop) => stops.push(stop.reason),
+  });
+  (runtime as any).events = { append: vi.fn((event) => appended.push(event)) };
+  (runtime as any).feedPath = join(dir, 'feed.json');
+  (runtime as any).profileName = 'me';
+  return { runtime, appended, stops };
+}
+
+afterEach(() => {
+  while (tempDirs.length) {
+    const dir = tempDirs.pop();
+    if (dir) rmSync(dir, { recursive: true, force: true });
+  }
+});
 
 describe('buildMeetingStateProjection', () => {
   it('keeps meeting state fields without historical speech text', () => {
@@ -26,3 +52,56 @@ describe('buildMeetingStateProjection', () => {
     });
   });
 });
+
+describe('EventRuntime game over detection', () => {
+  it('stops when a state snapshot phase is game_over even without a game_over event', () => {
+    const { runtime, appended, stops } = makeRuntimeHarness();
+
+    (runtime as any).handleEvent({
+      type: '_state',
+      phase: 'game_over',
+      tick: 12,
+      winner: 'crab',
+      reason: 'all_lobsters_dead',
+    });
+
+    expect(appended).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        type: 'game_over',
+        synthetic: true,
+        source: '_state',
+        tick: 12,
+        winner: 'crab',
+        reason: 'all_lobsters_dead',
+      }),
+      expect.objectContaining({
+        type: 'event_runtime_stopped',
+        reason: 'game_over',
+      }),
+    ]));
+    expect(stops).toEqual(['game_over']);
+  });
+
+  it('stops when state.new_events has already been dispatched as a game_over event', () => {
+    const { runtime, appended, stops } = makeRuntimeHarness();
+
+    (runtime as any).handleEvent({
+      type: 'game_over',
+      tick: 13,
+      winner: 'lobster',
+    });
+
+    expect(appended).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        type: 'game_over',
+        tick: 13,
+        winner: 'lobster',
+      }),
+      expect.objectContaining({
+        type: 'event_runtime_stopped',
+        reason: 'game_over',
+      }),
+    ]));
+    expect(stops).toEqual(['game_over']);
+  });
+});