@myclaw163/clawclaw-cli 0.6.66 → 0.6.67

package/src/pipeline/event-store.ts

@@ -1,193 +1,193 @@
-import { appendFileSync, readFileSync, existsSync, writeFileSync, mkdirSync, readdirSync, statSync } from 'fs';
-import { dirname, join, basename } from 'path';
-import { AuthStore } from '../lib/auth.js';
-import { getProfileGamesDir } from '../lib/init-command.js';
-
-export const CCL_EVENTS_CURSOR_TYPE = '_ccl_events_cursor';
-export const CCL_EVENTS_CURSOR_NAME = 'agent_read';
-
-interface GameSessionFile {
-  path: string;
-  sessionId: string;
-  mtimeMs: number;
-}
-
-export interface EventRecord {
-  line: number;
-  event: Record<string, any>;
-}
-
-export interface EventsCursorRecord {
-  type: typeof CCL_EVENTS_CURSOR_TYPE;
-  cursor: typeof CCL_EVENTS_CURSOR_NAME;
-  line: number;
-  ts: string;
-}
-
-export function isLocalControlEvent(event: any): boolean {
-  return !!(
-    event
-    && typeof event === 'object'
-    && typeof event.type === 'string'
-    && event.type.startsWith('_ccl_')
-  );
-}
-
-export function extractNewEvents(source: any): Record<string, any>[] {
-  const candidates = [
-    source,
-    source?.new_events,
-    source?.data?.new_events,
-    source?.result?.new_events,
-    source?.result?.data?.new_events,
-  ];
-
-  for (const candidate of candidates) {
-    if (Array.isArray(candidate)) {
-      return candidate.filter((evt) => evt && typeof evt === 'object');
-    }
-  }
-
-  return [];
-}
-
-export class EventStore {
-  constructor(private filePath: string) {}
-
-  get path(): string {
-    return this.filePath;
-  }
-
-  static forActiveAccount(): EventStore {
-    return EventStore.forLatestGame();
-  }
-
-  static forLatestGame(): EventStore {
-    const store = new AuthStore();
-    const profile = store.getActive();
-    if (!profile) throw new Error('Not logged in.');
-
-    const latest = EventStore.latestSessionFile(getProfileGamesDir(profile));
-    if (!latest) {
-      throw new Error('No game events found. Join a game first.');
-    }
-
-    return new EventStore(latest.path);
-  }
-
-  /** Returns the path to the latest session jsonl, or null if none exists. */
-  static latestSessionPath(): string | null {
-    const store = new AuthStore();
-    const profile = store.getActive();
-    if (!profile) return null;
-    return EventStore.latestSessionFile(getProfileGamesDir(profile))?.path ?? null;
-  }
-
-  static createSessionForActiveAccount(sessionId = EventStore.createSessionId()): EventStore {
-    const store = new AuthStore();
-    const profile = store.getActive();
-    if (!profile) throw new Error('Not logged in.');
-
-    const dir = getProfileGamesDir(profile);
-    mkdirSync(dir, { recursive: true });
-    const filePath = join(dir, `${sessionId}.jsonl`);
-    if (!existsSync(filePath)) writeFileSync(filePath, '');
-    return new EventStore(filePath);
-  }
-
-  append(event: Record<string, any>): void {
-    mkdirSync(dirname(this.filePath), { recursive: true });
-    const line = JSON.stringify(event) + '\n';
-    appendFileSync(this.filePath, line);
-  }
-
-  appendNewEvents(events: any): void {
-    const extracted = extractNewEvents(events);
-    if (extracted.length === 0) return;
-    for (const evt of extracted) {
-      this.append(evt);
-    }
-  }
-
-  records(): EventRecord[] {
-    if (!existsSync(this.filePath)) return [];
-    const content = readFileSync(this.filePath, 'utf8');
-    if (!content.trim()) return [];
-    const records: EventRecord[] = [];
-    const lines = content.split('\n');
-    for (let i = 0; i < lines.length; i += 1) {
-      const line = lines[i].trim();
-      if (!line) continue;
-      try {
-        const event = JSON.parse(line);
-        if (event && typeof event === 'object') {
-          records.push({ line: i + 1, event });
-        }
-      } catch {}
-    }
-    return records;
-  }
-
-  eventRecords(): EventRecord[] {
-    return this.records().filter((record) => !isLocalControlEvent(record.event));
-  }
-
-  readEventsCursor(): number {
-    let cursor = 0;
-    for (const record of this.records()) {
-      const event = record.event;
-      if (
-        event.type === CCL_EVENTS_CURSOR_TYPE
-        && event.cursor === CCL_EVENTS_CURSOR_NAME
-        && typeof event.line === 'number'
-        && Number.isFinite(event.line)
-      ) {
-        cursor = event.line;
-      }
-    }
-    return cursor;
-  }
-
-  appendEventsCursor(line: number): void {
-    if (!Number.isFinite(line) || line <= 0) return;
-    const event: EventsCursorRecord = {
-      type: CCL_EVENTS_CURSOR_TYPE,
-      cursor: CCL_EVENTS_CURSOR_NAME,
-      line,
-      ts: new Date().toISOString(),
-    };
-    this.append(event);
-  }
-
-  tail(n: number): Record<string, any>[] {
-    return this.eventRecords().slice(-n).map((record) => record.event);
-  }
-
-  all(): Record<string, any>[] {
-    return this.eventRecords().map((record) => record.event);
-  }
-
-  clear(): void {
-    writeFileSync(this.filePath, '');
-  }
-
-  private static createSessionId(): string {
-    const id = new Date().toISOString();
-    return process.platform === 'win32' ? id.replace(/:/g, '_') : id;
-  }
-
-  private static latestSessionFile(dir: string): GameSessionFile | null {
-    if (!existsSync(dir)) return null;
-
-    const files = readdirSync(dir)
-      .filter(name => name.endsWith('.jsonl') && !name.endsWith('.raw-ws.jsonl') && !name.startsWith('index.'))
-      .map(name => {
-        const path = join(dir, name);
-        const stat = statSync(path);
-        return { path, sessionId: basename(name, '.jsonl'), mtimeMs: stat.mtimeMs };
-      })
-      .sort((a, b) => b.sessionId.localeCompare(a.sessionId) || b.mtimeMs - a.mtimeMs);
-
-    return files[0] ?? null;
-  }
-}
+import { appendFileSync, readFileSync, existsSync, writeFileSync, mkdirSync, readdirSync, statSync } from 'fs';
+import { dirname, join, basename } from 'path';
+import { AuthStore } from '../lib/auth.js';
+import { getProfileGamesDir } from '../lib/init-command.js';
+
+export const CCL_EVENTS_CURSOR_TYPE = '_ccl_events_cursor';
+export const CCL_EVENTS_CURSOR_NAME = 'agent_read';
+
+interface GameSessionFile {
+  path: string;
+  sessionId: string;
+  mtimeMs: number;
+}
+
+export interface EventRecord {
+  line: number;
+  event: Record<string, any>;
+}
+
+export interface EventsCursorRecord {
+  type: typeof CCL_EVENTS_CURSOR_TYPE;
+  cursor: typeof CCL_EVENTS_CURSOR_NAME;
+  line: number;
+  ts: string;
+}
+
+export function isLocalControlEvent(event: any): boolean {
+  return !!(
+    event
+    && typeof event === 'object'
+    && typeof event.type === 'string'
+    && event.type.startsWith('_ccl_')
+  );
+}
+
+export function extractNewEvents(source: any): Record<string, any>[] {
+  const candidates = [
+    source,
+    source?.new_events,
+    source?.data?.new_events,
+    source?.result?.new_events,
+    source?.result?.data?.new_events,
+  ];
+
+  for (const candidate of candidates) {
+    if (Array.isArray(candidate)) {
+      return candidate.filter((evt) => evt && typeof evt === 'object');
+    }
+  }
+
+  return [];
+}
+
+export class EventStore {
+  constructor(private filePath: string) {}
+
+  get path(): string {
+    return this.filePath;
+  }
+
+  static forActiveAccount(): EventStore {
+    return EventStore.forLatestGame();
+  }
+
+  static forLatestGame(): EventStore {
+    const store = new AuthStore();
+    const profile = store.getActive();
+    if (!profile) throw new Error('Not logged in.');
+
+    const latest = EventStore.latestSessionFile(getProfileGamesDir(profile));
+    if (!latest) {
+      throw new Error('No game events found. Join a game first.');
+    }
+
+    return new EventStore(latest.path);
+  }
+
+  /** Returns the path to the latest session jsonl, or null if none exists. */
+  static latestSessionPath(): string | null {
+    const store = new AuthStore();
+    const profile = store.getActive();
+    if (!profile) return null;
+    return EventStore.latestSessionFile(getProfileGamesDir(profile))?.path ?? null;
+  }
+
+  static createSessionForActiveAccount(sessionId = EventStore.createSessionId()): EventStore {
+    const store = new AuthStore();
+    const profile = store.getActive();
+    if (!profile) throw new Error('Not logged in.');
+
+    const dir = getProfileGamesDir(profile);
+    mkdirSync(dir, { recursive: true });
+    const filePath = join(dir, `${sessionId}.jsonl`);
+    if (!existsSync(filePath)) writeFileSync(filePath, '');
+    return new EventStore(filePath);
+  }
+
+  append(event: Record<string, any>): void {
+    mkdirSync(dirname(this.filePath), { recursive: true });
+    const line = JSON.stringify(event) + '\n';
+    appendFileSync(this.filePath, line);
+  }
+
+  appendNewEvents(events: any): void {
+    const extracted = extractNewEvents(events);
+    if (extracted.length === 0) return;
+    for (const evt of extracted) {
+      this.append(evt);
+    }
+  }
+
+  records(): EventRecord[] {
+    if (!existsSync(this.filePath)) return [];
+    const content = readFileSync(this.filePath, 'utf8');
+    if (!content.trim()) return [];
+    const records: EventRecord[] = [];
+    const lines = content.split('\n');
+    for (let i = 0; i < lines.length; i += 1) {
+      const line = lines[i].trim();
+      if (!line) continue;
+      try {
+        const event = JSON.parse(line);
+        if (event && typeof event === 'object') {
+          records.push({ line: i + 1, event });
+        }
+      } catch {}
+    }
+    return records;
+  }
+
+  eventRecords(): EventRecord[] {
+    return this.records().filter((record) => !isLocalControlEvent(record.event));
+  }
+
+  readEventsCursor(): number {
+    let cursor = 0;
+    for (const record of this.records()) {
+      const event = record.event;
+      if (
+        event.type === CCL_EVENTS_CURSOR_TYPE
+        && event.cursor === CCL_EVENTS_CURSOR_NAME
+        && typeof event.line === 'number'
+        && Number.isFinite(event.line)
+      ) {
+        cursor = event.line;
+      }
+    }
+    return cursor;
+  }
+
+  appendEventsCursor(line: number): void {
+    if (!Number.isFinite(line) || line <= 0) return;
+    const event: EventsCursorRecord = {
+      type: CCL_EVENTS_CURSOR_TYPE,
+      cursor: CCL_EVENTS_CURSOR_NAME,
+      line,
+      ts: new Date().toISOString(),
+    };
+    this.append(event);
+  }
+
+  tail(n: number): Record<string, any>[] {
+    return this.eventRecords().slice(-n).map((record) => record.event);
+  }
+
+  all(): Record<string, any>[] {
+    return this.eventRecords().map((record) => record.event);
+  }
+
+  clear(): void {
+    writeFileSync(this.filePath, '');
+  }
+
+  private static createSessionId(): string {
+    const id = new Date().toISOString();
+    return process.platform === 'win32' ? id.replace(/:/g, '_') : id;
+  }
+
+  private static latestSessionFile(dir: string): GameSessionFile | null {
+    if (!existsSync(dir)) return null;
+
+    const files = readdirSync(dir)
+      .filter(name => name.endsWith('.jsonl') && !name.endsWith('.raw-ws.jsonl') && !name.startsWith('index.'))
+      .map(name => {
+        const path = join(dir, name);
+        const stat = statSync(path);
+        return { path, sessionId: basename(name, '.jsonl'), mtimeMs: stat.mtimeMs };
+      })
+      .sort((a, b) => b.sessionId.localeCompare(a.sessionId) || b.mtimeMs - a.mtimeMs);
+
+    return files[0] ?? null;
+  }
+}

package/src/pipeline/pipeline.ts

@@ -1,35 +1,35 @@
-import { GameClient } from '../lib/game-client.js';
-import { EventStore } from './event-store.js';
-
-interface PipelineAction {
-  action: Record<string, any>;
-  needsWait: boolean;
-}
-
-export async function runPipeline(actions: PipelineAction[], initialWaitMs?: number): Promise<void> {
-  const client = GameClient.fromAuth();
-  const store = EventStore.forActiveAccount();
-
-  if (initialWaitMs && initialWaitMs > 0) {
-    await new Promise(r => setTimeout(r, initialWaitMs));
-  }
-
-  for (const item of actions) {
-    const result = await client.submitAction(item.action as any);
-    store.appendNewEvents(result);
-    const durationSecs = result?.data?.duration_secs ?? result?.duration_secs ?? 0;
-
-    if (item.needsWait && durationSecs > 0) {
-      await new Promise(r => setTimeout(r, (durationSecs + 0.5) * 1000));
-      try {
-        const state = await client.getGameState();
-        if (state) store.appendNewEvents(state.new_events);
-      } catch {}
-      store.append({ type: 'pipeline', action: item.action, status: 'done' });
-    } else {
-      store.append({ type: 'pipeline', action: item.action, result });
-    }
-  }
-
-  store.append({ type: 'pipeline_done', count: actions.length });
-}
+import { GameClient } from '../lib/game-client.js';
+import { EventStore } from './event-store.js';
+
+interface PipelineAction {
+  action: Record<string, any>;
+  needsWait: boolean;
+}
+
+export async function runPipeline(actions: PipelineAction[], initialWaitMs?: number): Promise<void> {
+  const client = GameClient.fromAuth();
+  const store = EventStore.forActiveAccount();
+
+  if (initialWaitMs && initialWaitMs > 0) {
+    await new Promise(r => setTimeout(r, initialWaitMs));
+  }
+
+  for (const item of actions) {
+    const result = await client.submitAction(item.action as any);
+    store.appendNewEvents(result);
+    const durationSecs = result?.data?.duration_secs ?? result?.duration_secs ?? 0;
+
+    if (item.needsWait && durationSecs > 0) {
+      await new Promise(r => setTimeout(r, (durationSecs + 0.5) * 1000));
+      try {
+        const state = await client.getGameState();
+        if (state) store.appendNewEvents(state.new_events);
+      } catch {}
+      store.append({ type: 'pipeline', action: item.action, status: 'done' });
+    } else {
+      store.append({ type: 'pipeline', action: item.action, result });
+    }
+  }
+
+  store.append({ type: 'pipeline_done', count: actions.length });
+}

package/src/runtime/auto-upgrade.test.ts

@@ -1,66 +1,66 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
-
-vi.mock('../commands/upgrade.js', () => ({
-  runDefaultUpgrade: vi.fn(),
-}));
-
-import { runDefaultUpgrade } from '../commands/upgrade.js';
-import { runAutoUpgradeOnLoad, shouldSkipAutoUpgrade } from './auto-upgrade.js';
-
-describe('runAutoUpgradeOnLoad', () => {
-  const prev = process.env.CLAWCLAW_SKIP_AUTO_UPGRADE;
-
-  beforeEach(() => {
-    vi.mocked(runDefaultUpgrade).mockReset();
-    delete process.env.CLAWCLAW_SKIP_AUTO_UPGRADE;
-  });
-
-  afterEach(() => {
-    if (prev === undefined) delete process.env.CLAWCLAW_SKIP_AUTO_UPGRADE;
-    else process.env.CLAWCLAW_SKIP_AUTO_UPGRADE = prev;
-  });
-
-  it('skips when CLAWCLAW_SKIP_AUTO_UPGRADE=1', () => {
-    process.env.CLAWCLAW_SKIP_AUTO_UPGRADE = '1';
-    runAutoUpgradeOnLoad({ packageVersion: '0.5.25' });
-    expect(runDefaultUpgrade).not.toHaveBeenCalled();
-  });
-
-  it('skips prerelease/test package versions', () => {
-    runAutoUpgradeOnLoad({ packageVersion: '0.5.25-test' });
-    expect(runDefaultUpgrade).not.toHaveBeenCalled();
-  });
-
-  it('runs default upgrade when not skipped', () => {
-    vi.mocked(runDefaultUpgrade).mockReturnValue({ version: '0.4.8' });
-    runAutoUpgradeOnLoad({ packageVersion: '0.5.25' });
-    expect(runDefaultUpgrade).toHaveBeenCalledOnce();
-  });
-
-  it('does not write upgrade progress to stdout', () => {
-    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.mocked(runDefaultUpgrade).mockReturnValue({ version: '0.4.8' });
-    try {
-      runAutoUpgradeOnLoad({ packageVersion: '0.5.25' });
-      expect(logSpy).not.toHaveBeenCalled();
-    } finally {
-      logSpy.mockRestore();
-    }
-  });
-
-  it('notifies on upgrade success and failure', () => {
-    const notify = vi.fn();
-    vi.mocked(runDefaultUpgrade).mockReturnValueOnce({ version: '0.4.8' });
-    runAutoUpgradeOnLoad({ packageVersion: '0.5.25', notify });
-    expect(notify).toHaveBeenCalledWith('[clawclaw-cli] auto-upgrade installed 0.4.8');
-
-    vi.mocked(runDefaultUpgrade).mockReturnValueOnce({ error: 'npm install failed: EACCES' });
-    runAutoUpgradeOnLoad({ packageVersion: '0.5.25', notify });
-    expect(notify).toHaveBeenCalledWith('[clawclaw-cli] auto-upgrade failed: npm install failed: EACCES');
-  });
-
-  it('treats prerelease versions as skip-worthy', () => {
-    expect(shouldSkipAutoUpgrade('0.5.25-test')).toBe(true);
-    expect(shouldSkipAutoUpgrade('0.5.25')).toBe(false);
-  });
-});
+import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
+
+vi.mock('../commands/upgrade.js', () => ({
+  runDefaultUpgrade: vi.fn(),
+}));
+
+import { runDefaultUpgrade } from '../commands/upgrade.js';
+import { runAutoUpgradeOnLoad, shouldSkipAutoUpgrade } from './auto-upgrade.js';
+
+describe('runAutoUpgradeOnLoad', () => {
+  const prev = process.env.CLAWCLAW_SKIP_AUTO_UPGRADE;
+
+  beforeEach(() => {
+    vi.mocked(runDefaultUpgrade).mockReset();
+    delete process.env.CLAWCLAW_SKIP_AUTO_UPGRADE;
+  });
+
+  afterEach(() => {
+    if (prev === undefined) delete process.env.CLAWCLAW_SKIP_AUTO_UPGRADE;
+    else process.env.CLAWCLAW_SKIP_AUTO_UPGRADE = prev;
+  });
+
+  it('skips when CLAWCLAW_SKIP_AUTO_UPGRADE=1', () => {
+    process.env.CLAWCLAW_SKIP_AUTO_UPGRADE = '1';
+    runAutoUpgradeOnLoad({ packageVersion: '0.5.25' });
+    expect(runDefaultUpgrade).not.toHaveBeenCalled();
+  });
+
+  it('skips prerelease/test package versions', () => {
+    runAutoUpgradeOnLoad({ packageVersion: '0.5.25-test' });
+    expect(runDefaultUpgrade).not.toHaveBeenCalled();
+  });
+
+  it('runs default upgrade when not skipped', () => {
+    vi.mocked(runDefaultUpgrade).mockReturnValue({ version: '0.4.8' });
+    runAutoUpgradeOnLoad({ packageVersion: '0.5.25' });
+    expect(runDefaultUpgrade).toHaveBeenCalledOnce();
+  });
+
+  it('does not write upgrade progress to stdout', () => {
+    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    vi.mocked(runDefaultUpgrade).mockReturnValue({ version: '0.4.8' });
+    try {
+      runAutoUpgradeOnLoad({ packageVersion: '0.5.25' });
+      expect(logSpy).not.toHaveBeenCalled();
+    } finally {
+      logSpy.mockRestore();
+    }
+  });
+
+  it('notifies on upgrade success and failure', () => {
+    const notify = vi.fn();
+    vi.mocked(runDefaultUpgrade).mockReturnValueOnce({ version: '0.4.8' });
+    runAutoUpgradeOnLoad({ packageVersion: '0.5.25', notify });
+    expect(notify).toHaveBeenCalledWith('[clawclaw-cli] auto-upgrade installed 0.4.8');
+
+    vi.mocked(runDefaultUpgrade).mockReturnValueOnce({ error: 'npm install failed: EACCES' });
+    runAutoUpgradeOnLoad({ packageVersion: '0.5.25', notify });
+    expect(notify).toHaveBeenCalledWith('[clawclaw-cli] auto-upgrade failed: npm install failed: EACCES');
+  });
+
+  it('treats prerelease versions as skip-worthy', () => {
+    expect(shouldSkipAutoUpgrade('0.5.25-test')).toBe(true);
+    expect(shouldSkipAutoUpgrade('0.5.25')).toBe(false);
+  });
+});

package/src/runtime/auto-upgrade.ts

@@ -1,31 +1,31 @@
-import { readFileSync } from 'fs';
-import { runDefaultUpgrade } from '../commands/upgrade.js';
-
-function readPackageVersion(): string | null {
-  try {
-    const pkg = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8'));
-    return typeof pkg?.version === 'string' ? pkg.version : null;
-  } catch {
-    return null;
-  }
-}
-
-export function shouldSkipAutoUpgrade(packageVersion = readPackageVersion()): boolean {
-  if (process.env.CLAWCLAW_SKIP_AUTO_UPGRADE === '1') return true;
-  return Boolean(packageVersion?.includes('-'));
-}
-
-/** Run during `ccl load`, before game start and event streaming begin. */
-export function runAutoUpgradeOnLoad(options?: { packageVersion?: string; notify?: (message: string) => void }): void {
-  if (shouldSkipAutoUpgrade(options?.packageVersion)) return;
-
-  const result = runDefaultUpgrade();
-  if (result.error) {
-    const msg = result.version ? `${result.version} (${result.error})` : result.error;
-    options?.notify?.(`[clawclaw-cli] auto-upgrade failed: ${msg}`);
-    return;
-  }
-  if (result.version) {
-    options?.notify?.(`[clawclaw-cli] auto-upgrade installed ${result.version}`);
-  }
-}
+import { readFileSync } from 'fs';
+import { runDefaultUpgrade } from '../commands/upgrade.js';
+
+function readPackageVersion(): string | null {
+  try {
+    const pkg = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8'));
+    return typeof pkg?.version === 'string' ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+
+export function shouldSkipAutoUpgrade(packageVersion = readPackageVersion()): boolean {
+  if (process.env.CLAWCLAW_SKIP_AUTO_UPGRADE === '1') return true;
+  return Boolean(packageVersion?.includes('-'));
+}
+
+/** Run during `ccl load`, before game start and event streaming begin. */
+export function runAutoUpgradeOnLoad(options?: { packageVersion?: string; notify?: (message: string) => void }): void {
+  if (shouldSkipAutoUpgrade(options?.packageVersion)) return;
+
+  const result = runDefaultUpgrade();
+  if (result.error) {
+    const msg = result.version ? `${result.version} (${result.error})` : result.error;
+    options?.notify?.(`[clawclaw-cli] auto-upgrade failed: ${msg}`);
+    return;
+  }
+  if (result.version) {
+    options?.notify?.(`[clawclaw-cli] auto-upgrade installed ${result.version}`);
+  }
+}