@myclaw163/clawclaw-cli 0.6.71 → 0.6.76

package/src/lib/tts-speech.test.ts

@@ -1,63 +1,63 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
-import { mkdtempSync, rmSync } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
-import { AuthStore } from './auth.js';
-import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
-import { synthesizeNeteaseTTS } from './netease-tts.js';
-import { maybeSynthesizeSpeechAudioUrl } from './tts-speech.js';
-
-vi.mock('./netease-tts.js', () => ({
-  synthesizeNeteaseTTS: vi.fn(async () => ({
-    audio: Buffer.from('audio'),
-    contentType: 'audio/mpeg',
-  })),
-}));
-
-describe('maybeSynthesizeSpeechAudioUrl', () => {
-  let dir: string;
-  let authFile: string;
-
-  beforeEach(() => {
-    dir = mkdtempSync(join(tmpdir(), 'clawclaw-tts-'));
-    authFile = join(dir, '.auth.json');
-  });
-
-  afterEach(() => {
-    rmSync(dir, { recursive: true, force: true });
-    vi.clearAllMocks();
-  });
-
-  it('returns existing url without calling TTS', async () => {
-    const client = { uploadAudio: vi.fn() } as any;
-    const url = await maybeSynthesizeSpeechAudioUrl('hi', 'https://example.com/a.mp3', client);
-    expect(url).toBe('https://example.com/a.mp3');
-    expect(client.uploadAudio).not.toHaveBeenCalled();
-  });
-
-  it('returns undefined when no TTS key is configured', async () => {
-    const store = new AuthStore(authFile);
-    store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
-    const client = { uploadAudio: vi.fn() } as any;
-    const url = await maybeSynthesizeSpeechAudioUrl('hi', undefined, client, { authStore: store });
-    expect(url).toBeUndefined();
-  });
-
-  it('synthesizes and uploads when leihuo key is configured', async () => {
-    const store = new AuthStore(authFile);
-    store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
-    store.setTtsKey(TTS_PROVIDER_LEIHUO, 'sk-test');
-    store.setTtsDefaultVoice('male-qn-qingse');
-    const client = {
-      uploadAudio: vi.fn(async () => ({ audio_url: 'https://cdn.example.com/a.mp3' })),
-    } as any;
-    const url = await maybeSynthesizeSpeechAudioUrl('你好', undefined, client, { authStore: store });
-    expect(url).toBe('https://cdn.example.com/a.mp3');
-    expect(client.uploadAudio).toHaveBeenCalledOnce();
-    expect(synthesizeNeteaseTTS).toHaveBeenCalledWith(expect.objectContaining({
-      apiKey: 'sk-test',
-      text: '你好',
-      voice: 'male-qn-qingse',
-    }));
-  });
-});
+import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
+import { mkdtempSync, rmSync } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { AuthStore } from './auth.js';
+import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
+import { synthesizeNeteaseTTS } from './netease-tts.js';
+import { maybeSynthesizeSpeechAudioUrl } from './tts-speech.js';
+
+vi.mock('./netease-tts.js', () => ({
+  synthesizeNeteaseTTS: vi.fn(async () => ({
+    audio: Buffer.from('audio'),
+    contentType: 'audio/mpeg',
+  })),
+}));
+
+describe('maybeSynthesizeSpeechAudioUrl', () => {
+  let dir: string;
+  let authFile: string;
+
+  beforeEach(() => {
+    dir = mkdtempSync(join(tmpdir(), 'clawclaw-tts-'));
+    authFile = join(dir, '.auth.json');
+  });
+
+  afterEach(() => {
+    rmSync(dir, { recursive: true, force: true });
+    vi.clearAllMocks();
+  });
+
+  it('returns existing url without calling TTS', async () => {
+    const client = { uploadAudio: vi.fn() } as any;
+    const url = await maybeSynthesizeSpeechAudioUrl('hi', 'https://example.com/a.mp3', client);
+    expect(url).toBe('https://example.com/a.mp3');
+    expect(client.uploadAudio).not.toHaveBeenCalled();
+  });
+
+  it('returns undefined when no TTS key is configured', async () => {
+    const store = new AuthStore(authFile);
+    store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
+    const client = { uploadAudio: vi.fn() } as any;
+    const url = await maybeSynthesizeSpeechAudioUrl('hi', undefined, client, { authStore: store });
+    expect(url).toBeUndefined();
+  });
+
+  it('synthesizes and uploads when leihuo key is configured', async () => {
+    const store = new AuthStore(authFile);
+    store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
+    store.setTtsKey(TTS_PROVIDER_LEIHUO, 'sk-test');
+    store.setTtsDefaultVoice('male-qn-qingse');
+    const client = {
+      uploadAudio: vi.fn(async () => ({ audio_url: 'https://cdn.example.com/a.mp3' })),
+    } as any;
+    const url = await maybeSynthesizeSpeechAudioUrl('你好', undefined, client, { authStore: store });
+    expect(url).toBe('https://cdn.example.com/a.mp3');
+    expect(client.uploadAudio).toHaveBeenCalledOnce();
+    expect(synthesizeNeteaseTTS).toHaveBeenCalledWith(expect.objectContaining({
+      apiKey: 'sk-test',
+      text: '你好',
+      voice: 'male-qn-qingse',
+    }));
+  });
+});

package/src/lib/tts-speech.ts

@@ -1,76 +1,76 @@
-import { AuthStore } from './auth.js';
-import type { GameClient } from './game-client.js';
-import { synthesizeNeteaseTTS } from './netease-tts.js';
-import {
-  DEFAULT_TTS_VOICE,
-  TTS_PROVIDER_LEIHUO,
-  TTS_TEXT_MAX_LENGTH,
-} from './tts-keys.js';
-
-export interface SynthesizeSpeechAudioOptions {
-  voice?: string;
-  provider?: string;
-  authStore?: AuthStore;
-}
-
-/**
- * Synthesize speech audio via the configured TTS provider and upload to OSS.
- * @throws when the provider key is missing, text is too long, or synthesis/upload fails.
- */
-export async function synthesizeAndUploadSpeechAudio(
-  text: string,
-  client: GameClient,
-  opts: SynthesizeSpeechAudioOptions = {},
-): Promise<string> {
-  const store = opts.authStore ?? new AuthStore();
-  const provider = opts.provider ?? TTS_PROVIDER_LEIHUO;
-  const apiKey = store.getTtsKey(provider);
-  if (!apiKey) {
-    throw new Error(
-      `TTS API key for provider "${provider}" is not configured. Use \`clawclaw-cli tts config <apiKey>\` first.`,
-    );
-  }
-  if (text.length > TTS_TEXT_MAX_LENGTH) {
-    throw new Error(`TTS text must be ${TTS_TEXT_MAX_LENGTH} characters or fewer.`);
-  }
-
-  const audio = await synthesizeNeteaseTTS({
-    apiKey,
-    text,
-    voice: opts.voice ?? store.getTtsDefaultVoice() ?? DEFAULT_TTS_VOICE,
-  });
-  const upload = await client.uploadAudio(audio.audio, 'tts-audio.mp3', audio.contentType);
-  return upload.audio_url;
-}
-
-/**
- * When the active account has a Leihuo TTS key, synthesize and upload audio for speech.
- * Returns undefined if no key, a URL was already provided, or auto-TTS was skipped (e.g. text too long).
- */
-export async function maybeSynthesizeSpeechAudioUrl(
-  text: string,
-  existingUrl: string | undefined,
-  client: GameClient,
-  opts: SynthesizeSpeechAudioOptions = {},
-): Promise<string | undefined> {
-  if (existingUrl) return existingUrl;
-
-  const store = opts.authStore ?? new AuthStore();
-  const provider = opts.provider ?? TTS_PROVIDER_LEIHUO;
-  const apiKey = store.getTtsKey(provider);
-  if (!apiKey) return undefined;
-
-  if (text.length > TTS_TEXT_MAX_LENGTH) {
-    console.error(
-      `Speech is ${text.length} characters; auto TTS supports up to ${TTS_TEXT_MAX_LENGTH}. Sending without audio.`,
-    );
-    return undefined;
-  }
-
-  try {
-    return await synthesizeAndUploadSpeechAudio(text, client, opts);
-  } catch (err: any) {
-    console.error(`Auto TTS failed: ${err?.message ?? String(err)}. Sending speech without audio.`);
-    return undefined;
-  }
-}
+import { AuthStore } from './auth.js';
+import type { GameClient } from './game-client.js';
+import { synthesizeNeteaseTTS } from './netease-tts.js';
+import {
+  DEFAULT_TTS_VOICE,
+  TTS_PROVIDER_LEIHUO,
+  TTS_TEXT_MAX_LENGTH,
+} from './tts-keys.js';
+
+export interface SynthesizeSpeechAudioOptions {
+  voice?: string;
+  provider?: string;
+  authStore?: AuthStore;
+}
+
+/**
+ * Synthesize speech audio via the configured TTS provider and upload to OSS.
+ * @throws when the provider key is missing, text is too long, or synthesis/upload fails.
+ */
+export async function synthesizeAndUploadSpeechAudio(
+  text: string,
+  client: GameClient,
+  opts: SynthesizeSpeechAudioOptions = {},
+): Promise<string> {
+  const store = opts.authStore ?? new AuthStore();
+  const provider = opts.provider ?? TTS_PROVIDER_LEIHUO;
+  const apiKey = store.getTtsKey(provider);
+  if (!apiKey) {
+    throw new Error(
+      `TTS API key for provider "${provider}" is not configured. Use \`clawclaw-cli tts config <apiKey>\` first.`,
+    );
+  }
+  if (text.length > TTS_TEXT_MAX_LENGTH) {
+    throw new Error(`TTS text must be ${TTS_TEXT_MAX_LENGTH} characters or fewer.`);
+  }
+
+  const audio = await synthesizeNeteaseTTS({
+    apiKey,
+    text,
+    voice: opts.voice ?? store.getTtsDefaultVoice() ?? DEFAULT_TTS_VOICE,
+  });
+  const upload = await client.uploadAudio(audio.audio, 'tts-audio.mp3', audio.contentType);
+  return upload.audio_url;
+}
+
+/**
+ * When the active account has a Leihuo TTS key, synthesize and upload audio for speech.
+ * Returns undefined if no key, a URL was already provided, or auto-TTS was skipped (e.g. text too long).
+ */
+export async function maybeSynthesizeSpeechAudioUrl(
+  text: string,
+  existingUrl: string | undefined,
+  client: GameClient,
+  opts: SynthesizeSpeechAudioOptions = {},
+): Promise<string | undefined> {
+  if (existingUrl) return existingUrl;
+
+  const store = opts.authStore ?? new AuthStore();
+  const provider = opts.provider ?? TTS_PROVIDER_LEIHUO;
+  const apiKey = store.getTtsKey(provider);
+  if (!apiKey) return undefined;
+
+  if (text.length > TTS_TEXT_MAX_LENGTH) {
+    console.error(
+      `Speech is ${text.length} characters; auto TTS supports up to ${TTS_TEXT_MAX_LENGTH}. Sending without audio.`,
+    );
+    return undefined;
+  }
+
+  try {
+    return await synthesizeAndUploadSpeechAudio(text, client, opts);
+  } catch (err: any) {
+    console.error(`Auto TTS failed: ${err?.message ?? String(err)}. Sending speech without audio.`);
+    return undefined;
+  }
+}

package/src/lib/user-data.test.ts

@@ -0,0 +1,96 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import {
+  ensureUserDataLayout,
+  getRuntimeAuthStateFile,
+  getUserDataAccountHash,
+  getUserDataAuthFile,
+  getUserDataHubStrategyLockfile,
+  getUserDataMemoryFile,
+  getUserDataPersonaFile,
+  getUserDataStrategiesDir,
+} from './user-data.js';
+
+describe('user-data layout migration', () => {
+  let ws: string;
+
+  beforeEach(() => {
+    ws = mkdtempSync(join(tmpdir(), 'ccl-user-data-'));
+  });
+
+  afterEach(() => {
+    rmSync(ws, { recursive: true, force: true });
+  });
+
+  it('migrates only portable user data from the legacy workspace layout', () => {
+    const apiKey = 'claw_secret_123';
+    writeFileSync(join(ws, '.auth.json'), JSON.stringify({
+      activeProfile: 'lobster-1',
+      profiles: {
+        'lobster-1': {
+          agentName: 'lobster-1',
+          apiKey,
+          serverUrl: 'https://example.com/claw',
+          gameServerUrl: 'http://game.example.com',
+        },
+      },
+      neteaseTtsKey: 'tts-secret',
+    }, null, 2));
+
+    mkdirSync(join(ws, 'accounts', apiKey), { recursive: true });
+    writeFileSync(join(ws, 'accounts', apiKey, 'persona.md'), 'persona old', 'utf8');
+    writeFileSync(join(ws, 'accounts', apiKey, 'memory.md'), 'memory old', 'utf8');
+
+    mkdirSync(join(ws, 'strategies', '.official'), { recursive: true });
+    writeFileSync(join(ws, 'strategies', 'custom.ts'), 'export const strategy = {};', 'utf8');
+    writeFileSync(join(ws, 'strategies', '.official', 'manifest.json'), JSON.stringify({ 'task-only': { sourceHash: 'x' } }), 'utf8');
+
+    mkdirSync(join(ws, 'hub'), { recursive: true });
+    writeFileSync(join(ws, 'hub', 'installed.json'), JSON.stringify({
+      'strategy/abc': { type: 'strategy', id: 'abc', title: 'Strategy', path: 'strategies/custom.ts', installedAt: 'now' },
+      'skill/def': { type: 'skill', id: 'def', title: 'Skill', path: 'skills/helper', installedAt: 'now' },
+    }, null, 2), 'utf8');
+
+    ensureUserDataLayout(ws);
+
+    const auth = JSON.parse(readFileSync(getUserDataAuthFile(ws), 'utf8'));
+    expect(auth.activeProfile).toBe('lobster-1');
+    expect(auth.profiles['lobster-1'].apiKey).toBe(apiKey);
+    expect(auth.profiles['lobster-1'].gameServerUrl).toBeUndefined();
+    expect(auth.profiles['lobster-1'].tts.keys.leihuo).toBe('tts-secret');
+
+    const runtimeAuth = JSON.parse(readFileSync(getRuntimeAuthStateFile(ws), 'utf8'));
+    expect(runtimeAuth.profiles['lobster-1'].gameServerUrl).toBe('http://game.example.com');
+
+    expect(getUserDataAccountHash(apiKey)).toHaveLength(16);
+    expect(readFileSync(getUserDataPersonaFile(ws, { apiKey }), 'utf8')).toBe('persona old');
+    expect(readFileSync(getUserDataMemoryFile(ws, { apiKey }), 'utf8')).toBe('memory old');
+
+    expect(readFileSync(join(getUserDataStrategiesDir(ws), 'custom.ts'), 'utf8')).toContain('strategy');
+    expect(existsSync(join(getUserDataStrategiesDir(ws), '.official'))).toBe(false);
+
+    const strategyLock = JSON.parse(readFileSync(getUserDataHubStrategyLockfile(ws), 'utf8'));
+    expect(Object.keys(strategyLock)).toEqual(['strategy/abc']);
+    expect(strategyLock['skill/def']).toBeUndefined();
+  });
+
+  it('does not overwrite existing user-data account files', () => {
+    const apiKey = 'claw_keep_new';
+    writeFileSync(join(ws, '.auth.json'), JSON.stringify({
+      activeProfile: 'lobster-1',
+      profiles: {
+        'lobster-1': { agentName: 'lobster-1', apiKey, serverUrl: 'https://example.com/claw' },
+      },
+    }), 'utf8');
+    mkdirSync(join(ws, 'accounts', apiKey), { recursive: true });
+    writeFileSync(join(ws, 'accounts', apiKey, 'persona.md'), 'old persona', 'utf8');
+    mkdirSync(join(ws, 'user-data', 'accounts', getUserDataAccountHash(apiKey)), { recursive: true });
+    writeFileSync(getUserDataPersonaFile(ws, { apiKey }), 'new persona', 'utf8');
+
+    ensureUserDataLayout(ws);
+
+    expect(readFileSync(getUserDataPersonaFile(ws, { apiKey }), 'utf8')).toBe('new persona');
+  });
+});