@myclaw163/clawclaw-cli 0.6.66 → 0.6.67

package/src/commands/account.ts

@@ -1,209 +1,209 @@
-import { Command } from 'commander';
-import { AuthStore } from '../lib/auth.js';
-import type { AuthProfile } from '../lib/auth.js';
-import { GameClient, ApiError } from '../lib/game-client.js';
-import { createProfileDirs, cmdInit } from '../lib/init-command.js';
-import { setMeta } from '../lib/command-meta.js';
-import { hubReminder, readCachedGamesPlayed, writeGamesPlayedCache } from '../lib/hub-reminder.js';
-
-const DEFAULT_SERVER_URL = 'https://myclaw.163.com/claw';
-const SERVER_URL_ENV = 'CLAWCLAW_SERVER_URL';
-
-function createClientForProfile(profile: AuthProfile): GameClient {
-  return new GameClient({
-    lobbyUrl: profile.serverUrl,
-    gameServerUrl: profile.gameServerUrl,
-    apiKey: profile.apiKey,
-    agentName: profile.agentName,
-  });
-}
-
-function extractServerAccountName(payload: any): string | undefined {
-  const data = payload?.data ?? payload;
-  return data?.agent_name ?? data?.agentName ?? data?.name;
-}
-
-function getRegisterServerUrl(env: NodeJS.ProcessEnv = process.env): string {
-  const configured = env[SERVER_URL_ENV]?.trim();
-  return configured || DEFAULT_SERVER_URL;
-}
-
-export function createAccountCommand(): Command {
-  const account = new Command('account');
-  account.description('Account management & game data');
-
-  // ─── Auth ───
-
-  account
-    .command('register')
-    .description('Register new agent')
-    .option('-n, --name <name>', 'Agent name (max 16 chars); omit to let the server choose randomly')
-    .option('-d, --desc <text>', 'Agent description (max 500 chars)')
-    .option('--invite-code <code>', 'Invite code (required during beta)')
-    .option('--avatar-url <url>', 'Avatar image URL')
-    .option('--avatar-file <path>', 'Avatar image file (jpeg/png/gif/webp, max 1MB)')
-    .action(async (opts: { name?: string; desc?: string; inviteCode?: string; avatarUrl?: string; avatarFile?: string }) => {
-      const authStore = new AuthStore();
-      const { created, path: wsPath } = cmdInit();
-      if (created) console.log(`[ClawClaw] Workspace initialized at ${wsPath}`);
-      const serverUrl = getRegisterServerUrl();
-
-      const tmpClient = new GameClient({ lobbyUrl: serverUrl, apiKey: '' });
-      const result = await tmpClient.registerAgent({
-        name: opts.name,
-        description: opts.desc,
-        inviteCode: opts.inviteCode,
-        avatarUrl: opts.avatarUrl,
-        avatarFile: opts.avatarFile,
-      });
-      const d = result.data ?? result;
-      const apiKey = d.api_key ?? d.apiKey ?? '';
-      if (!apiKey) throw new Error('Registration failed: server did not return an API key.');
-      const agentName = d.agent_name ?? '';
-      if (!agentName) throw new Error('Registration failed: server did not return an agent name.');
-
-      const profile: AuthProfile = {
-        agentName,
-        apiKey,
-        serverUrl,
-      };
-      authStore.addProfile(profile);
-      try { createProfileDirs(profile); } catch {}
-      console.log(JSON.stringify({ ...result, message: `Registered and saved as profile "${agentName}"` }, null, 2));
-    });
-
-  account
-    .command('rename <name>')
-    .description('Rename agent (max once/month, max 2/year, not during a game)')
-    .action(async (newName: string) => {
-      const authStore = new AuthStore();
-      const profile = authStore.getActive();
-      if (!profile) throw new Error('Not logged in.');
-      const client = GameClient.fromAuth();
-      const result = await client.renameAgent(newName);
-      const oldName = profile.agentName;
-      profile.agentName = newName;
-      authStore.removeProfile(oldName);
-      authStore.addProfile(profile);
-      authStore.switchProfile(newName);
-      console.log(JSON.stringify({ ...result, message: `Renamed "${oldName}" → "${newName}"` }, null, 2));
-    });
-
-  account
-    .command('switch <apiKey>')
-    .description('Switch active profile by API key')
-    .action(async (apiKey: string) => {
-      const authStore = new AuthStore();
-      const data = authStore.load();
-      const profileKey = Object.keys(data.profiles).find(key => data.profiles[key]?.apiKey === apiKey);
-      if (!profileKey) {
-        throw new Error(`Profile with apiKey "${apiKey}" not found. Use \`clawclaw-cli account list\` to inspect saved accounts.`);
-      }
-      authStore.switchProfile(profileKey);
-      console.log(JSON.stringify({ message: 'Switched active profile', apiKey }, null, 2));
-    });
-
-  account
-    .command('list')
-    .description('List all saved profiles with current server names')
-    .action(async () => {
-      const authStore = new AuthStore();
-      const active = authStore.getActive();
-      const data = authStore.load();
-      const result = await Promise.all(Object.values(data.profiles).map(async (profile) => {
-        try {
-          const me = await createClientForProfile(profile).getMe();
-          return {
-            name: extractServerAccountName(me) ?? profile.agentName,
-            apiKey: profile.apiKey,
-            active: profile.apiKey === active?.apiKey,
-          };
-        } catch {
-          return {
-            name: profile.agentName,
-            apiKey: profile.apiKey,
-            active: profile.apiKey === active?.apiKey,
-          };
-        }
-      }));
-      console.log(JSON.stringify(result, null, 2));
-    });
-
-  // ─── Game Data ───
-
-  account
-    .command('leaderboard')
-    .description('Show leaderboard')
-    .option('-p, --page <number>', 'Page number')
-    .option('-l, --limit <number>', 'Items per page (max 100)', '20')
-    .action(async (opts: { page?: string; limit: string }) => {
-      const client = GameClient.fromAuth();
-      const page = opts.page ? Number(opts.page) : undefined;
-      const result = await client.getLeaderboard(page, Number(opts.limit));
-      console.log(JSON.stringify(result, null, 2));
-    });
-
-  account
-    .command('settlement')
-    .description('Show settlement data from last game')
-    .action(async () => {
-      const client = GameClient.fromAuth();
-      try {
-        const result = await client.getSettlement();
-        // `ccl account settlement` is the last command the agent runs before
-        // writing the debrief close, and its `data` block is long enough to bury
-        // the reminder that rode in on the `game_over` push. Re-attach it here as
-        // the final fields (after `data`) so the nudge is the freshest thing in
-        // context the moment the agent writes the close.
-        const reminder = hubReminder(readCachedGamesPlayed());
-        const out: Record<string, any> = (result && typeof result === 'object' && !Array.isArray(result))
-          ? { ...result }
-          : { result };
-        if (reminder) {
-          out.hub_reminder = reminder;
-          out.next_step = `Write the post-game debrief with your user from this settlement, then close out. ${reminder}`;
-        }
-        console.log(JSON.stringify(out, null, 2));
-      } catch (err: any) {
-        if (err instanceof ApiError && err.body?.includes('NO_SETTLEMENT')) {
-          console.info('No settlement data yet. The game may still be in progress, or you quit early after dying; you can still give a brief recap from known events so far.');
-          return;
-        }
-        throw err;
-      }
-    });
-
-  account
-    .command('history')
-    .description('Show game history')
-    .option('-p, --page <number>', 'Page number', '1')
-    .option('-l, --limit <number>', 'Items per page (max 100)', '20')
-    .action(async (opts: { page: string; limit: string }) => {
-      const client = GameClient.fromAuth();
-      const result = await client.getGameHistory(Number(opts.page), Number(opts.limit));
-      console.log(JSON.stringify(result, null, 2));
-    });
-
-  account
-    .command('info')
-    .description('Print account name, Claw Key, and spectate URL')
-    .action(async () => {
-      const authStore = new AuthStore();
-      const profile = authStore.getActive();
-      if (!profile) throw new Error('Not logged in.');
-      const client = GameClient.fromAuth();
-      const result = await client.getMe();
-      if (result?.data) delete result.data.tutorial;
-      const gp = result?.data?.games_played;
-      if (typeof gp === 'number') writeGamesPlayedCache(gp);
-      const origin = new URL(profile.serverUrl).origin.replace(/^http:\/\//, 'https://');
-      const url = `${origin}/lobby?token=${encodeURIComponent(profile.apiKey)}`;
-      console.log(JSON.stringify({ ...result, clawKey: profile.apiKey, spectateUrl: url }, null, 2));
-    });
-
-  // ── Adapter metadata (consumed by ccl _schema, applied by openclaw-clawclaw L2 generator) ──
-  setMeta(account.commands.find((c) => c.name() === 'register')!, { requiresConfirm: true });
-  setMeta(account.commands.find((c) => c.name() === 'rename')!, { requiresConfirm: true });
-
-  return account;
-}
+import { Command } from 'commander';
+import { AuthStore } from '../lib/auth.js';
+import type { AuthProfile } from '../lib/auth.js';
+import { GameClient, ApiError } from '../lib/game-client.js';
+import { createProfileDirs, cmdInit } from '../lib/init-command.js';
+import { setMeta } from '../lib/command-meta.js';
+import { hubReminder, readCachedGamesPlayed, writeGamesPlayedCache } from '../lib/hub-reminder.js';
+
+const DEFAULT_SERVER_URL = 'https://myclaw.163.com/claw';
+const SERVER_URL_ENV = 'CLAWCLAW_SERVER_URL';
+
+function createClientForProfile(profile: AuthProfile): GameClient {
+  return new GameClient({
+    lobbyUrl: profile.serverUrl,
+    gameServerUrl: profile.gameServerUrl,
+    apiKey: profile.apiKey,
+    agentName: profile.agentName,
+  });
+}
+
+function extractServerAccountName(payload: any): string | undefined {
+  const data = payload?.data ?? payload;
+  return data?.agent_name ?? data?.agentName ?? data?.name;
+}
+
+function getRegisterServerUrl(env: NodeJS.ProcessEnv = process.env): string {
+  const configured = env[SERVER_URL_ENV]?.trim();
+  return configured || DEFAULT_SERVER_URL;
+}
+
+export function createAccountCommand(): Command {
+  const account = new Command('account');
+  account.description('Account management & game data');
+
+  // ─── Auth ───
+
+  account
+    .command('register')
+    .description('Register new agent')
+    .option('-n, --name <name>', 'Agent name (max 16 chars); omit to let the server choose randomly')
+    .option('-d, --desc <text>', 'Agent description (max 500 chars)')
+    .option('--invite-code <code>', 'Invite code (required during beta)')
+    .option('--avatar-url <url>', 'Avatar image URL')
+    .option('--avatar-file <path>', 'Avatar image file (jpeg/png/gif/webp, max 1MB)')
+    .action(async (opts: { name?: string; desc?: string; inviteCode?: string; avatarUrl?: string; avatarFile?: string }) => {
+      const authStore = new AuthStore();
+      const { created, path: wsPath } = cmdInit();
+      if (created) console.log(`[ClawClaw] Workspace initialized at ${wsPath}`);
+      const serverUrl = getRegisterServerUrl();
+
+      const tmpClient = new GameClient({ lobbyUrl: serverUrl, apiKey: '' });
+      const result = await tmpClient.registerAgent({
+        name: opts.name,
+        description: opts.desc,
+        inviteCode: opts.inviteCode,
+        avatarUrl: opts.avatarUrl,
+        avatarFile: opts.avatarFile,
+      });
+      const d = result.data ?? result;
+      const apiKey = d.api_key ?? d.apiKey ?? '';
+      if (!apiKey) throw new Error('Registration failed: server did not return an API key.');
+      const agentName = d.agent_name ?? '';
+      if (!agentName) throw new Error('Registration failed: server did not return an agent name.');
+
+      const profile: AuthProfile = {
+        agentName,
+        apiKey,
+        serverUrl,
+      };
+      authStore.addProfile(profile);
+      try { createProfileDirs(profile); } catch {}
+      console.log(JSON.stringify({ ...result, message: `Registered and saved as profile "${agentName}"` }, null, 2));
+    });
+
+  account
+    .command('rename <name>')
+    .description('Rename agent (max once/month, max 2/year, not during a game)')
+    .action(async (newName: string) => {
+      const authStore = new AuthStore();
+      const profile = authStore.getActive();
+      if (!profile) throw new Error('Not logged in.');
+      const client = GameClient.fromAuth();
+      const result = await client.renameAgent(newName);
+      const oldName = profile.agentName;
+      profile.agentName = newName;
+      authStore.removeProfile(oldName);
+      authStore.addProfile(profile);
+      authStore.switchProfile(newName);
+      console.log(JSON.stringify({ ...result, message: `Renamed "${oldName}" → "${newName}"` }, null, 2));
+    });
+
+  account
+    .command('switch <apiKey>')
+    .description('Switch active profile by API key')
+    .action(async (apiKey: string) => {
+      const authStore = new AuthStore();
+      const data = authStore.load();
+      const profileKey = Object.keys(data.profiles).find(key => data.profiles[key]?.apiKey === apiKey);
+      if (!profileKey) {
+        throw new Error(`Profile with apiKey "${apiKey}" not found. Use \`clawclaw-cli account list\` to inspect saved accounts.`);
+      }
+      authStore.switchProfile(profileKey);
+      console.log(JSON.stringify({ message: 'Switched active profile', apiKey }, null, 2));
+    });
+
+  account
+    .command('list')
+    .description('List all saved profiles with current server names')
+    .action(async () => {
+      const authStore = new AuthStore();
+      const active = authStore.getActive();
+      const data = authStore.load();
+      const result = await Promise.all(Object.values(data.profiles).map(async (profile) => {
+        try {
+          const me = await createClientForProfile(profile).getMe();
+          return {
+            name: extractServerAccountName(me) ?? profile.agentName,
+            apiKey: profile.apiKey,
+            active: profile.apiKey === active?.apiKey,
+          };
+        } catch {
+          return {
+            name: profile.agentName,
+            apiKey: profile.apiKey,
+            active: profile.apiKey === active?.apiKey,
+          };
+        }
+      }));
+      console.log(JSON.stringify(result, null, 2));
+    });
+
+  // ─── Game Data ───
+
+  account
+    .command('leaderboard')
+    .description('Show leaderboard')
+    .option('-p, --page <number>', 'Page number')
+    .option('-l, --limit <number>', 'Items per page (max 100)', '20')
+    .action(async (opts: { page?: string; limit: string }) => {
+      const client = GameClient.fromAuth();
+      const page = opts.page ? Number(opts.page) : undefined;
+      const result = await client.getLeaderboard(page, Number(opts.limit));
+      console.log(JSON.stringify(result, null, 2));
+    });
+
+  account
+    .command('settlement')
+    .description('Show settlement data from last game')
+    .action(async () => {
+      const client = GameClient.fromAuth();
+      try {
+        const result = await client.getSettlement();
+        // `ccl account settlement` is the last command the agent runs before
+        // writing the debrief close, and its `data` block is long enough to bury
+        // the reminder that rode in on the `game_over` push. Re-attach it here as
+        // the final fields (after `data`) so the nudge is the freshest thing in
+        // context the moment the agent writes the close.
+        const reminder = hubReminder(readCachedGamesPlayed());
+        const out: Record<string, any> = (result && typeof result === 'object' && !Array.isArray(result))
+          ? { ...result }
+          : { result };
+        if (reminder) {
+          out.hub_reminder = reminder;
+          out.next_step = `Write the post-game debrief with your user from this settlement, then close out. ${reminder}`;
+        }
+        console.log(JSON.stringify(out, null, 2));
+      } catch (err: any) {
+        if (err instanceof ApiError && err.body?.includes('NO_SETTLEMENT')) {
+          console.info('No settlement data yet. The game may still be in progress, or you quit early after dying; you can still give a brief recap from known events so far.');
+          return;
+        }
+        throw err;
+      }
+    });
+
+  account
+    .command('history')
+    .description('Show game history')
+    .option('-p, --page <number>', 'Page number', '1')
+    .option('-l, --limit <number>', 'Items per page (max 100)', '20')
+    .action(async (opts: { page: string; limit: string }) => {
+      const client = GameClient.fromAuth();
+      const result = await client.getGameHistory(Number(opts.page), Number(opts.limit));
+      console.log(JSON.stringify(result, null, 2));
+    });
+
+  account
+    .command('info')
+    .description('Print account name, Claw Key, and spectate URL')
+    .action(async () => {
+      const authStore = new AuthStore();
+      const profile = authStore.getActive();
+      if (!profile) throw new Error('Not logged in.');
+      const client = GameClient.fromAuth();
+      const result = await client.getMe();
+      if (result?.data) delete result.data.tutorial;
+      const gp = result?.data?.games_played;
+      if (typeof gp === 'number') writeGamesPlayedCache(gp);
+      const origin = new URL(profile.serverUrl).origin.replace(/^http:\/\//, 'https://');
+      const url = `${origin}/lobby?token=${encodeURIComponent(profile.apiKey)}`;
+      console.log(JSON.stringify({ ...result, clawKey: profile.apiKey, spectateUrl: url }, null, 2));
+    });
+
+  // ── Adapter metadata (consumed by ccl _schema, applied by openclaw-clawclaw L2 generator) ──
+  setMeta(account.commands.find((c) => c.name() === 'register')!, { requiresConfirm: true });
+  setMeta(account.commands.find((c) => c.name() === 'rename')!, { requiresConfirm: true });
+
+  return account;
+}

package/src/commands/do.test.ts

@@ -1,73 +1,73 @@
-import { describe, expect, it, vi } from 'vitest';
-import { audioContentTypeFor, normalizeDoOptions, parseIntents, resolveSpeechAudioUrl } from './do.js';
-
-vi.mock('../lib/tts-speech.js', () => ({
-  // Stub auto-TTS so the no-file path never touches AuthStore or the network.
-  maybeSynthesizeSpeechAudioUrl: vi.fn().mockResolvedValue(undefined),
-}));
-
-describe('normalizeDoOptions', () => {
-  it('joins unquoted speech words passed as extra arguments', () => {
-    expect(normalizeDoOptions({ speech: 'I' }, ['saw', 'player3']).speech).toBe('I saw player3');
-  });
-
-  it('leaves extra args alone when there is no speech option', () => {
-    expect(normalizeDoOptions({}, ['unused'])).toEqual({});
-  });
-});
-
-describe('parseIntents', () => {
-  it('builds speech intents', () => {
-    const action = parseIntents({ speech: 'hi' })[0].build().toJSON();
-    expect(action).toMatchObject({ action: 'speech', text: 'hi' });
-  });
-
-  it('includes audio_url when url is provided', () => {
-    const action = parseIntents({ speech: 'hi', url: 'https://cdn.example.com/a.mp3' })[0].build().toJSON();
-    expect(action).toMatchObject({
-      action: 'speech',
-      text: 'hi',
-      audio_url: 'https://cdn.example.com/a.mp3',
-    });
-  });
-
-  it('builds vote intents', () => {
-    const action = parseIntents({ vote: 'player1' })[0].build().toJSON();
-    expect(action).toMatchObject({ action: 'vote', target: 'player1' });
-  });
-
-  it('ignores removed direct-control options', () => {
-    expect(parseIntents({ move: '2424,237', task: true, kill: 'p1', report: true, alarm: true })).toEqual([]);
-  });
-});
-
-describe('audioContentTypeFor', () => {
-  it('maps known audio extensions', () => {
-    expect(audioContentTypeFor('/tmp/a.mp3')).toBe('audio/mpeg');
-    expect(audioContentTypeFor('/tmp/a.wav')).toBe('audio/wav');
-    expect(audioContentTypeFor('/tmp/a.m4a')).toBe('audio/mp4');
-    expect(audioContentTypeFor('/tmp/A.OGG')).toBe('audio/ogg');
-  });
-
-  it('defaults to audio/mpeg for unknown or extension-less paths', () => {
-    expect(audioContentTypeFor('/tmp/clip')).toBe('audio/mpeg');
-    expect(audioContentTypeFor('/tmp/clip.xyz')).toBe('audio/mpeg');
-  });
-});
-
-describe('resolveSpeechAudioUrl', () => {
-  it('uploads the local file and returns the cloud audio_url', async () => {
-    const uploadAudio = vi.fn().mockResolvedValue({ audio_url: 'https://cdn.example.com/uploaded.mp3' });
-    const url = await resolveSpeechAudioUrl({ speech: 'hi', file: '/tmp/clip.wav' }, { uploadAudio } as any);
-    expect(url).toBe('https://cdn.example.com/uploaded.mp3');
-    expect(uploadAudio).toHaveBeenCalledWith('/tmp/clip.wav', undefined, 'audio/wav');
-  });
-
-  it('falls back to auto TTS (no upload) when no file is given', async () => {
-    const uploadAudio = vi.fn();
-    const url = await resolveSpeechAudioUrl({ speech: 'hi' }, { uploadAudio } as any);
-    expect(uploadAudio).not.toHaveBeenCalled();
-    // No TTS key configured in test env → auto synthesis returns undefined.
-    expect(url).toBeUndefined();
-  });
-});
+import { describe, expect, it, vi } from 'vitest';
+import { audioContentTypeFor, normalizeDoOptions, parseIntents, resolveSpeechAudioUrl } from './do.js';
+
+vi.mock('../lib/tts-speech.js', () => ({
+  // Stub auto-TTS so the no-file path never touches AuthStore or the network.
+  maybeSynthesizeSpeechAudioUrl: vi.fn().mockResolvedValue(undefined),
+}));
+
+describe('normalizeDoOptions', () => {
+  it('joins unquoted speech words passed as extra arguments', () => {
+    expect(normalizeDoOptions({ speech: 'I' }, ['saw', 'player3']).speech).toBe('I saw player3');
+  });
+
+  it('leaves extra args alone when there is no speech option', () => {
+    expect(normalizeDoOptions({}, ['unused'])).toEqual({});
+  });
+});
+
+describe('parseIntents', () => {
+  it('builds speech intents', () => {
+    const action = parseIntents({ speech: 'hi' })[0].build().toJSON();
+    expect(action).toMatchObject({ action: 'speech', text: 'hi' });
+  });
+
+  it('includes audio_url when url is provided', () => {
+    const action = parseIntents({ speech: 'hi', url: 'https://cdn.example.com/a.mp3' })[0].build().toJSON();
+    expect(action).toMatchObject({
+      action: 'speech',
+      text: 'hi',
+      audio_url: 'https://cdn.example.com/a.mp3',
+    });
+  });
+
+  it('builds vote intents', () => {
+    const action = parseIntents({ vote: 'player1' })[0].build().toJSON();
+    expect(action).toMatchObject({ action: 'vote', target: 'player1' });
+  });
+
+  it('ignores removed direct-control options', () => {
+    expect(parseIntents({ move: '2424,237', task: true, kill: 'p1', report: true, alarm: true })).toEqual([]);
+  });
+});
+
+describe('audioContentTypeFor', () => {
+  it('maps known audio extensions', () => {
+    expect(audioContentTypeFor('/tmp/a.mp3')).toBe('audio/mpeg');
+    expect(audioContentTypeFor('/tmp/a.wav')).toBe('audio/wav');
+    expect(audioContentTypeFor('/tmp/a.m4a')).toBe('audio/mp4');
+    expect(audioContentTypeFor('/tmp/A.OGG')).toBe('audio/ogg');
+  });
+
+  it('defaults to audio/mpeg for unknown or extension-less paths', () => {
+    expect(audioContentTypeFor('/tmp/clip')).toBe('audio/mpeg');
+    expect(audioContentTypeFor('/tmp/clip.xyz')).toBe('audio/mpeg');
+  });
+});
+
+describe('resolveSpeechAudioUrl', () => {
+  it('uploads the local file and returns the cloud audio_url', async () => {
+    const uploadAudio = vi.fn().mockResolvedValue({ audio_url: 'https://cdn.example.com/uploaded.mp3' });
+    const url = await resolveSpeechAudioUrl({ speech: 'hi', file: '/tmp/clip.wav' }, { uploadAudio } as any);
+    expect(url).toBe('https://cdn.example.com/uploaded.mp3');
+    expect(uploadAudio).toHaveBeenCalledWith('/tmp/clip.wav', undefined, 'audio/wav');
+  });
+
+  it('falls back to auto TTS (no upload) when no file is given', async () => {
+    const uploadAudio = vi.fn();
+    const url = await resolveSpeechAudioUrl({ speech: 'hi' }, { uploadAudio } as any);
+    expect(uploadAudio).not.toHaveBeenCalled();
+    // No TTS key configured in test env → auto synthesis returns undefined.
+    expect(url).toBeUndefined();
+  });
+});