@myclaw163/clawclaw-cli 0.6.76 → 0.6.78

package/src/lib/user-data.ts

@@ -1,400 +1,400 @@
-import {
-  copyFileSync,
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  readFileSync,
-  statSync,
-  writeFileSync,
-} from 'fs';
-import { createHash } from 'crypto';
-import { dirname, extname, join } from 'path';
-import { fileURLToPath } from 'url';
-import type { AuthData, AuthProfile } from './auth.js';
-import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
-
-export const USER_DATA_DIR = 'user-data';
-export const RUNTIME_DIR = 'runtime';
-
-export interface UserDataMigrationResult {
-  copied: string[];
-  skipped: string[];
-  skippedExisting: string[];
-}
-
-export interface RuntimeAuthStateProfile {
-  gameServerUrl?: string;
-  updatedAt?: string;
-}
-
-export interface RuntimeAuthState {
-  profiles: Record<string, RuntimeAuthStateProfile>;
-}
-
-const EMPTY_RESULT = (): UserDataMigrationResult => ({
-  copied: [],
-  skipped: [],
-  skippedExisting: [],
-});
-
-export function getUserDataDir(workspaceDir: string): string {
-  return join(workspaceDir, USER_DATA_DIR);
-}
-
-export function getRuntimeDir(workspaceDir: string): string {
-  return join(workspaceDir, RUNTIME_DIR);
-}
-
-export function getUserDataAuthFile(workspaceDir: string): string {
-  return join(getUserDataDir(workspaceDir), 'auth.json');
-}
-
-export function getRuntimeAuthStateFile(workspaceDir: string): string {
-  return join(getRuntimeDir(workspaceDir), 'auth-state.json');
-}
-
-export function getUserDataAccountsDir(workspaceDir: string): string {
-  return join(getUserDataDir(workspaceDir), 'accounts');
-}
-
-export function getUserDataAccountHash(apiKey: string): string {
-  return createHash('sha256').update(apiKey).digest('hex').slice(0, 16);
-}
-
-export function getUserDataAccountDir(workspaceDir: string, profile: Pick<AuthProfile, 'apiKey'>): string {
-  return join(getUserDataAccountsDir(workspaceDir), getUserDataAccountHash(profile.apiKey));
-}
-
-export function getUserDataPersonaFile(workspaceDir: string, profile: Pick<AuthProfile, 'apiKey'>): string {
-  return join(getUserDataAccountDir(workspaceDir, profile), 'persona.md');
-}
-
-export function getUserDataMemoryFile(workspaceDir: string, profile: Pick<AuthProfile, 'apiKey'>): string {
-  return join(getUserDataAccountDir(workspaceDir, profile), 'memory.md');
-}
-
-export function getUserDataStrategiesDir(workspaceDir: string): string {
-  return join(getUserDataDir(workspaceDir), 'strategies');
-}
-
-export function getUserDataHubDir(workspaceDir: string): string {
-  return join(getUserDataDir(workspaceDir), 'hub');
-}
-
-export function getUserDataHubStrategyLockfile(workspaceDir: string): string {
-  return join(getUserDataHubDir(workspaceDir), 'installed-strategies.json');
-}
-
-export function getRuntimeOfficialStrategiesDir(workspaceDir: string): string {
-  return join(getRuntimeDir(workspaceDir), 'official-strategies');
-}
-
-export function getRuntimeOfficialStrategiesManifestFile(workspaceDir: string): string {
-  return join(getRuntimeOfficialStrategiesDir(workspaceDir), 'manifest.json');
-}
-
-function ensureDir(path: string): void {
-  mkdirSync(path, { recursive: true });
-}
-
-function readJson<T>(path: string): T | null {
-  if (!existsSync(path)) return null;
-  try {
-    return JSON.parse(readFileSync(path, 'utf8')) as T;
-  } catch {
-    return null;
-  }
-}
-
-function writeJson(path: string, data: unknown): void {
-  ensureDir(dirname(path));
-  writeFileSync(path, JSON.stringify(data, null, 2) + '\n', 'utf8');
-}
-
-function normalizeTtsConfig(data: AuthData): boolean {
-  let changed = false;
-  if (data.neteaseTtsKey) {
-    data.ttsKeys = { ...data.ttsKeys, [TTS_PROVIDER_LEIHUO]: data.neteaseTtsKey };
-    delete data.neteaseTtsKey;
-    changed = true;
-  }
-
-  const legacyTtsKeys = data.ttsKeys;
-  const profiles = Object.values(data.profiles ?? {});
-  if (legacyTtsKeys && profiles.length > 0) {
-    for (const profile of profiles) {
-      profile.tts = {
-        ...profile.tts,
-        keys: {
-          ...legacyTtsKeys,
-          ...profile.tts?.keys,
-        },
-      };
-    }
-    delete data.ttsKeys;
-    changed = true;
-  }
-  return changed;
-}
-
-export function splitAuthData(data: AuthData): {
-  auth: AuthData;
-  runtime: RuntimeAuthState;
-  changed: boolean;
-} {
-  const auth: AuthData = {
-    ...data,
-    activeProfile: data.activeProfile ?? '',
-    profiles: Object.fromEntries(
-      Object.entries(data.profiles ?? {}).map(([name, profile]) => [name, { ...profile }]),
-    ),
-  };
-  const runtime: RuntimeAuthState = { profiles: {} };
-  let changed = normalizeTtsConfig(auth);
-
-  const longTermProfiles: Record<string, AuthProfile> = {};
-  for (const [name, originalProfile] of Object.entries(auth.profiles ?? {})) {
-    const { gameServerUrl, ...longTermProfile } = originalProfile;
-    longTermProfiles[name] = longTermProfile;
-    if (gameServerUrl) {
-      runtime.profiles[name] = { gameServerUrl, updatedAt: new Date().toISOString() };
-      changed = true;
-    }
-  }
-  auth.profiles = longTermProfiles;
-
-  if ('ttsKeys' in auth) {
-    delete auth.ttsKeys;
-    changed = true;
-  }
-  if ('neteaseTtsKey' in auth) {
-    delete auth.neteaseTtsKey;
-    changed = true;
-  }
-
-  return { auth, runtime, changed };
-}
-
-export function readRuntimeAuthState(path: string): RuntimeAuthState {
-  return readJson<RuntimeAuthState>(path) ?? { profiles: {} };
-}
-
-export function writeRuntimeAuthState(path: string, state: RuntimeAuthState): void {
-  writeJson(path, { profiles: state.profiles ?? {} });
-}
-
-function mergeRuntimeAuthState(path: string, incoming: RuntimeAuthState, result?: UserDataMigrationResult): void {
-  const incomingEntries = Object.entries(incoming.profiles ?? {}).filter(([, profile]) => profile.gameServerUrl);
-  if (incomingEntries.length === 0) return;
-
-  const current = readRuntimeAuthState(path);
-  let changed = false;
-  for (const [name, profile] of incomingEntries) {
-    if (current.profiles[name]?.gameServerUrl) {
-      result?.skippedExisting.push(`runtime/auth-state.json profiles.${name}.gameServerUrl`);
-      continue;
-    }
-    current.profiles[name] = profile;
-    changed = true;
-  }
-  if (changed) {
-    writeRuntimeAuthState(path, current);
-    result?.copied.push('auth gameServerUrl -> runtime/auth-state.json');
-  }
-}
-
-function migrateAuth(workspaceDir: string, result: UserDataMigrationResult): AuthData | null {
-  const legacyAuthFile = join(workspaceDir, '.auth.json');
-  const authFile = getUserDataAuthFile(workspaceDir);
-  const runtimeFile = getRuntimeAuthStateFile(workspaceDir);
-
-  const source = existsSync(authFile)
-    ? readJson<AuthData>(authFile)
-    : readJson<AuthData>(legacyAuthFile);
-
-  if (!source) return null;
-
-  const { auth, runtime, changed } = splitAuthData(source);
-  if (!existsSync(authFile)) {
-    writeJson(authFile, auth);
-    result.copied.push('.auth.json -> user-data/auth.json');
-  } else if (changed) {
-    writeJson(authFile, auth);
-    result.copied.push('normalized user-data/auth.json');
-  }
-  mergeRuntimeAuthState(runtimeFile, runtime, result);
-  return auth;
-}
-
-function migrateAccountFiles(workspaceDir: string, auth: AuthData | null, result: UserDataMigrationResult): void {
-  if (!auth) return;
-  for (const profile of Object.values(auth.profiles ?? {})) {
-    const legacyDir = join(workspaceDir, 'accounts', profile.apiKey);
-    const newDir = getUserDataAccountDir(workspaceDir, profile);
-    for (const fileName of ['persona.md', 'memory.md']) {
-      const from = join(legacyDir, fileName);
-      const to = join(newDir, fileName);
-      if (!existsSync(from)) continue;
-      if (existsSync(to)) {
-        result.skippedExisting.push(`user-data/accounts/${getUserDataAccountHash(profile.apiKey)}/${fileName}`);
-        continue;
-      }
-      ensureDir(dirname(to));
-      copyFileSync(from, to);
-      result.copied.push(`accounts/<apiKey>/${fileName} -> user-data/accounts/<account-hash>/${fileName}`);
-    }
-  }
-}
-
-interface OfficialManifestEntry {
-  sourceHash: string;
-  sidecarHash?: string;
-}
-
-type OfficialManifest = Record<string, OfficialManifestEntry>;
-
-function hashContent(content: string): string {
-  return createHash('sha256').update(content).digest('hex').slice(0, 16);
-}
-
-function locateBuiltinSource(id: string): string | null {
-  const currentDir = dirname(fileURLToPath(import.meta.url));
-  const strategiesDir = join(currentDir, '..', 'strategies');
-  const filePath = join(strategiesDir, `${id}.ts`);
-  return existsSync(filePath) ? filePath : null;
-}
-
-function rewriteBuiltinImportBody(source: string): string {
-  return source.replace(/from\s+['"]\.\.?\/[^'"]+['"]/g, `from '@myclaw163/clawclaw-cli'`);
-}
-
-function stripExportHeader(source: string, id: string): string | null {
-  const firstLineMatch = source.match(/^\/\/ Exported from ([^@\r\n]+)@[^\r\n]*(?:\r?\n|$)/);
-  if (!firstLineMatch || firstLineMatch[1] !== id) return null;
-  return source.replace(/^\/\/ Exported from [^\r\n]*(?:\r?\n|$)/, '');
-}
-
-function officialExportPairIsUnmodified(oldDir: string, id: string, entry: OfficialManifestEntry): boolean {
-  const strategyFile = join(oldDir, `${id}.ts`);
-  if (!existsSync(strategyFile)) return false;
-
-  const sourcePath = locateBuiltinSource(id);
-  if (!sourcePath) return false;
-  const source = readFileSync(sourcePath, 'utf8');
-  if (hashContent(source) !== entry.sourceHash) return false;
-
-  const oldBody = stripExportHeader(readFileSync(strategyFile, 'utf8'), id);
-  if (oldBody === null || oldBody !== rewriteBuiltinImportBody(source)) return false;
-
-  const oldSidecar = join(oldDir, `${id}.knowledge.md`);
-  const builtinSidecar = sourcePath.replace(/\.ts$/, '.knowledge.md');
-  if (existsSync(oldSidecar)) {
-    if (!existsSync(builtinSidecar)) return false;
-    const oldSidecarContent = readFileSync(oldSidecar, 'utf8');
-    const builtinSidecarContent = readFileSync(builtinSidecar, 'utf8');
-    if (entry.sidecarHash !== hashContent(builtinSidecarContent)) return false;
-    return oldSidecarContent === builtinSidecarContent;
-  }
-  return !existsSync(builtinSidecar);
-}
-
-function migrateStrategies(workspaceDir: string, result: UserDataMigrationResult): void {
-  const oldDir = join(workspaceDir, 'strategies');
-  if (!existsSync(oldDir)) return;
-  const newDir = getUserDataStrategiesDir(workspaceDir);
-  ensureDir(newDir);
-
-  const manifest = readJson<OfficialManifest>(join(oldDir, '.official', 'manifest.json')) ?? {};
-  const skipFiles = new Set<string>();
-  for (const [id, entry] of Object.entries(manifest)) {
-    if (officialExportPairIsUnmodified(oldDir, id, entry)) {
-      skipFiles.add(`${id}.ts`);
-      skipFiles.add(`${id}.knowledge.md`);
-      result.skipped.push(`strategies/${id}.ts official export`);
-    }
-  }
-
-  for (const fileName of readdirSync(oldDir)) {
-    if (fileName === '.official') continue;
-    const from = join(oldDir, fileName);
-    let stat;
-    try {
-      stat = statSync(from);
-    } catch {
-      continue;
-    }
-    if (!stat.isFile()) continue;
-    const ext = extname(fileName).toLowerCase();
-    const isStrategyFile = ext === '.ts' || ext === '.tsx' || ext === '.js';
-    const isKnowledgeSidecar = fileName.endsWith('.knowledge.md');
-    if (!isStrategyFile && !isKnowledgeSidecar) continue;
-    if (skipFiles.has(fileName)) continue;
-
-    const to = join(newDir, fileName);
-    if (existsSync(to)) {
-      result.skippedExisting.push(`user-data/strategies/${fileName}`);
-      continue;
-    }
-    copyFileSync(from, to);
-    result.copied.push(`strategies/${fileName} -> user-data/strategies/${fileName}`);
-  }
-}
-
-function migrateHubStrategyLockfile(workspaceDir: string, result: UserDataMigrationResult): void {
-  const oldLockFile = join(workspaceDir, 'hub', 'installed.json');
-  const newLockFile = getUserDataHubStrategyLockfile(workspaceDir);
-  const oldLock = readJson<Record<string, any>>(oldLockFile);
-  if (!oldLock) return;
-
-  const strategyEntries = Object.fromEntries(
-    Object.entries(oldLock).filter(([, entry]) => entry?.type === 'strategy'),
-  );
-  if (Object.keys(strategyEntries).length === 0) {
-    result.skipped.push('hub/installed.json skill entries');
-    return;
-  }
-
-  const current = readJson<Record<string, any>>(newLockFile) ?? {};
-  let changed = false;
-  for (const [ref, entry] of Object.entries(strategyEntries)) {
-    if (current[ref]) {
-      result.skippedExisting.push(`user-data/hub/installed-strategies.json ${ref}`);
-      continue;
-    }
-    current[ref] = entry;
-    changed = true;
-  }
-  if (changed) {
-    writeJson(newLockFile, current);
-    result.copied.push('hub/installed.json strategy entries -> user-data/hub/installed-strategies.json');
-  }
-}
-
-function writeMigrationMarker(workspaceDir: string, result: UserDataMigrationResult): void {
-  if (result.copied.length === 0 && result.skipped.length === 0 && result.skippedExisting.length === 0) return;
-  const marker = join(getUserDataDir(workspaceDir), '.migration.json');
-  if (existsSync(marker)) return;
-  writeJson(marker, {
-    from: 'legacy-workspace-layout',
-    migrated_at: new Date().toISOString(),
-    copied: result.copied,
-    skipped: result.skipped,
-    skipped_existing: result.skippedExisting,
-  });
-}
-
-export function ensureUserDataLayout(workspaceDir: string): UserDataMigrationResult {
-  const result = EMPTY_RESULT();
-  ensureDir(getUserDataDir(workspaceDir));
-  ensureDir(getUserDataAccountsDir(workspaceDir));
-  ensureDir(getUserDataStrategiesDir(workspaceDir));
-  ensureDir(getUserDataHubDir(workspaceDir));
-  ensureDir(getRuntimeDir(workspaceDir));
-
-  const auth = migrateAuth(workspaceDir, result);
-  migrateAccountFiles(workspaceDir, auth, result);
-  migrateStrategies(workspaceDir, result);
-  migrateHubStrategyLockfile(workspaceDir, result);
-  writeMigrationMarker(workspaceDir, result);
-  return result;
-}
+import {
+  copyFileSync,
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  statSync,
+  writeFileSync,
+} from 'fs';
+import { createHash } from 'crypto';
+import { dirname, extname, join } from 'path';
+import { fileURLToPath } from 'url';
+import type { AuthData, AuthProfile } from './auth.js';
+import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
+
+export const USER_DATA_DIR = 'user-data';
+export const RUNTIME_DIR = 'runtime';
+
+export interface UserDataMigrationResult {
+  copied: string[];
+  skipped: string[];
+  skippedExisting: string[];
+}
+
+export interface RuntimeAuthStateProfile {
+  gameServerUrl?: string;
+  updatedAt?: string;
+}
+
+export interface RuntimeAuthState {
+  profiles: Record<string, RuntimeAuthStateProfile>;
+}
+
+const EMPTY_RESULT = (): UserDataMigrationResult => ({
+  copied: [],
+  skipped: [],
+  skippedExisting: [],
+});
+
+export function getUserDataDir(workspaceDir: string): string {
+  return join(workspaceDir, USER_DATA_DIR);
+}
+
+export function getRuntimeDir(workspaceDir: string): string {
+  return join(workspaceDir, RUNTIME_DIR);
+}
+
+export function getUserDataAuthFile(workspaceDir: string): string {
+  return join(getUserDataDir(workspaceDir), 'auth.json');
+}
+
+export function getRuntimeAuthStateFile(workspaceDir: string): string {
+  return join(getRuntimeDir(workspaceDir), 'auth-state.json');
+}
+
+export function getUserDataAccountsDir(workspaceDir: string): string {
+  return join(getUserDataDir(workspaceDir), 'accounts');
+}
+
+export function getUserDataAccountHash(apiKey: string): string {
+  return createHash('sha256').update(apiKey).digest('hex').slice(0, 16);
+}
+
+export function getUserDataAccountDir(workspaceDir: string, profile: Pick<AuthProfile, 'apiKey'>): string {
+  return join(getUserDataAccountsDir(workspaceDir), getUserDataAccountHash(profile.apiKey));
+}
+
+export function getUserDataPersonaFile(workspaceDir: string, profile: Pick<AuthProfile, 'apiKey'>): string {
+  return join(getUserDataAccountDir(workspaceDir, profile), 'persona.md');
+}
+
+export function getUserDataMemoryFile(workspaceDir: string, profile: Pick<AuthProfile, 'apiKey'>): string {
+  return join(getUserDataAccountDir(workspaceDir, profile), 'memory.md');
+}
+
+export function getUserDataStrategiesDir(workspaceDir: string): string {
+  return join(getUserDataDir(workspaceDir), 'strategies');
+}
+
+export function getUserDataHubDir(workspaceDir: string): string {
+  return join(getUserDataDir(workspaceDir), 'hub');
+}
+
+export function getUserDataHubStrategyLockfile(workspaceDir: string): string {
+  return join(getUserDataHubDir(workspaceDir), 'installed-strategies.json');
+}
+
+export function getRuntimeOfficialStrategiesDir(workspaceDir: string): string {
+  return join(getRuntimeDir(workspaceDir), 'official-strategies');
+}
+
+export function getRuntimeOfficialStrategiesManifestFile(workspaceDir: string): string {
+  return join(getRuntimeOfficialStrategiesDir(workspaceDir), 'manifest.json');
+}
+
+function ensureDir(path: string): void {
+  mkdirSync(path, { recursive: true });
+}
+
+function readJson<T>(path: string): T | null {
+  if (!existsSync(path)) return null;
+  try {
+    return JSON.parse(readFileSync(path, 'utf8')) as T;
+  } catch {
+    return null;
+  }
+}
+
+function writeJson(path: string, data: unknown): void {
+  ensureDir(dirname(path));
+  writeFileSync(path, JSON.stringify(data, null, 2) + '\n', 'utf8');
+}
+
+function normalizeTtsConfig(data: AuthData): boolean {
+  let changed = false;
+  if (data.neteaseTtsKey) {
+    data.ttsKeys = { ...data.ttsKeys, [TTS_PROVIDER_LEIHUO]: data.neteaseTtsKey };
+    delete data.neteaseTtsKey;
+    changed = true;
+  }
+
+  const legacyTtsKeys = data.ttsKeys;
+  const profiles = Object.values(data.profiles ?? {});
+  if (legacyTtsKeys && profiles.length > 0) {
+    for (const profile of profiles) {
+      profile.tts = {
+        ...profile.tts,
+        keys: {
+          ...legacyTtsKeys,
+          ...profile.tts?.keys,
+        },
+      };
+    }
+    delete data.ttsKeys;
+    changed = true;
+  }
+  return changed;
+}
+
+export function splitAuthData(data: AuthData): {
+  auth: AuthData;
+  runtime: RuntimeAuthState;
+  changed: boolean;
+} {
+  const auth: AuthData = {
+    ...data,
+    activeProfile: data.activeProfile ?? '',
+    profiles: Object.fromEntries(
+      Object.entries(data.profiles ?? {}).map(([name, profile]) => [name, { ...profile }]),
+    ),
+  };
+  const runtime: RuntimeAuthState = { profiles: {} };
+  let changed = normalizeTtsConfig(auth);
+
+  const longTermProfiles: Record<string, AuthProfile> = {};
+  for (const [name, originalProfile] of Object.entries(auth.profiles ?? {})) {
+    const { gameServerUrl, ...longTermProfile } = originalProfile;
+    longTermProfiles[name] = longTermProfile;
+    if (gameServerUrl) {
+      runtime.profiles[name] = { gameServerUrl, updatedAt: new Date().toISOString() };
+      changed = true;
+    }
+  }
+  auth.profiles = longTermProfiles;
+
+  if ('ttsKeys' in auth) {
+    delete auth.ttsKeys;
+    changed = true;
+  }
+  if ('neteaseTtsKey' in auth) {
+    delete auth.neteaseTtsKey;
+    changed = true;
+  }
+
+  return { auth, runtime, changed };
+}
+
+export function readRuntimeAuthState(path: string): RuntimeAuthState {
+  return readJson<RuntimeAuthState>(path) ?? { profiles: {} };
+}
+
+export function writeRuntimeAuthState(path: string, state: RuntimeAuthState): void {
+  writeJson(path, { profiles: state.profiles ?? {} });
+}
+
+function mergeRuntimeAuthState(path: string, incoming: RuntimeAuthState, result?: UserDataMigrationResult): void {
+  const incomingEntries = Object.entries(incoming.profiles ?? {}).filter(([, profile]) => profile.gameServerUrl);
+  if (incomingEntries.length === 0) return;
+
+  const current = readRuntimeAuthState(path);
+  let changed = false;
+  for (const [name, profile] of incomingEntries) {
+    if (current.profiles[name]?.gameServerUrl) {
+      result?.skippedExisting.push(`runtime/auth-state.json profiles.${name}.gameServerUrl`);
+      continue;
+    }
+    current.profiles[name] = profile;
+    changed = true;
+  }
+  if (changed) {
+    writeRuntimeAuthState(path, current);
+    result?.copied.push('auth gameServerUrl -> runtime/auth-state.json');
+  }
+}
+
+function migrateAuth(workspaceDir: string, result: UserDataMigrationResult): AuthData | null {
+  const legacyAuthFile = join(workspaceDir, '.auth.json');
+  const authFile = getUserDataAuthFile(workspaceDir);
+  const runtimeFile = getRuntimeAuthStateFile(workspaceDir);
+
+  const source = existsSync(authFile)
+    ? readJson<AuthData>(authFile)
+    : readJson<AuthData>(legacyAuthFile);
+
+  if (!source) return null;
+
+  const { auth, runtime, changed } = splitAuthData(source);
+  if (!existsSync(authFile)) {
+    writeJson(authFile, auth);
+    result.copied.push('.auth.json -> user-data/auth.json');
+  } else if (changed) {
+    writeJson(authFile, auth);
+    result.copied.push('normalized user-data/auth.json');
+  }
+  mergeRuntimeAuthState(runtimeFile, runtime, result);
+  return auth;
+}
+
+function migrateAccountFiles(workspaceDir: string, auth: AuthData | null, result: UserDataMigrationResult): void {
+  if (!auth) return;
+  for (const profile of Object.values(auth.profiles ?? {})) {
+    const legacyDir = join(workspaceDir, 'accounts', profile.apiKey);
+    const newDir = getUserDataAccountDir(workspaceDir, profile);
+    for (const fileName of ['persona.md', 'memory.md']) {
+      const from = join(legacyDir, fileName);
+      const to = join(newDir, fileName);
+      if (!existsSync(from)) continue;
+      if (existsSync(to)) {
+        result.skippedExisting.push(`user-data/accounts/${getUserDataAccountHash(profile.apiKey)}/${fileName}`);
+        continue;
+      }
+      ensureDir(dirname(to));
+      copyFileSync(from, to);
+      result.copied.push(`accounts/<apiKey>/${fileName} -> user-data/accounts/<account-hash>/${fileName}`);
+    }
+  }
+}
+
+interface OfficialManifestEntry {
+  sourceHash: string;
+  sidecarHash?: string;
+}
+
+type OfficialManifest = Record<string, OfficialManifestEntry>;
+
+function hashContent(content: string): string {
+  return createHash('sha256').update(content).digest('hex').slice(0, 16);
+}
+
+function locateBuiltinSource(id: string): string | null {
+  const currentDir = dirname(fileURLToPath(import.meta.url));
+  const strategiesDir = join(currentDir, '..', 'strategies');
+  const filePath = join(strategiesDir, `${id}.ts`);
+  return existsSync(filePath) ? filePath : null;
+}
+
+function rewriteBuiltinImportBody(source: string): string {
+  return source.replace(/from\s+['"]\.\.?\/[^'"]+['"]/g, `from '@myclaw163/clawclaw-cli'`);
+}
+
+function stripExportHeader(source: string, id: string): string | null {
+  const firstLineMatch = source.match(/^\/\/ Exported from ([^@\r\n]+)@[^\r\n]*(?:\r?\n|$)/);
+  if (!firstLineMatch || firstLineMatch[1] !== id) return null;
+  return source.replace(/^\/\/ Exported from [^\r\n]*(?:\r?\n|$)/, '');
+}
+
+function officialExportPairIsUnmodified(oldDir: string, id: string, entry: OfficialManifestEntry): boolean {
+  const strategyFile = join(oldDir, `${id}.ts`);
+  if (!existsSync(strategyFile)) return false;
+
+  const sourcePath = locateBuiltinSource(id);
+  if (!sourcePath) return false;
+  const source = readFileSync(sourcePath, 'utf8');
+  if (hashContent(source) !== entry.sourceHash) return false;
+
+  const oldBody = stripExportHeader(readFileSync(strategyFile, 'utf8'), id);
+  if (oldBody === null || oldBody !== rewriteBuiltinImportBody(source)) return false;
+
+  const oldSidecar = join(oldDir, `${id}.knowledge.md`);
+  const builtinSidecar = sourcePath.replace(/\.ts$/, '.knowledge.md');
+  if (existsSync(oldSidecar)) {
+    if (!existsSync(builtinSidecar)) return false;
+    const oldSidecarContent = readFileSync(oldSidecar, 'utf8');
+    const builtinSidecarContent = readFileSync(builtinSidecar, 'utf8');
+    if (entry.sidecarHash !== hashContent(builtinSidecarContent)) return false;
+    return oldSidecarContent === builtinSidecarContent;
+  }
+  return !existsSync(builtinSidecar);
+}
+
+function migrateStrategies(workspaceDir: string, result: UserDataMigrationResult): void {
+  const oldDir = join(workspaceDir, 'strategies');
+  if (!existsSync(oldDir)) return;
+  const newDir = getUserDataStrategiesDir(workspaceDir);
+  ensureDir(newDir);
+
+  const manifest = readJson<OfficialManifest>(join(oldDir, '.official', 'manifest.json')) ?? {};
+  const skipFiles = new Set<string>();
+  for (const [id, entry] of Object.entries(manifest)) {
+    if (officialExportPairIsUnmodified(oldDir, id, entry)) {
+      skipFiles.add(`${id}.ts`);
+      skipFiles.add(`${id}.knowledge.md`);
+      result.skipped.push(`strategies/${id}.ts official export`);
+    }
+  }
+
+  for (const fileName of readdirSync(oldDir)) {
+    if (fileName === '.official') continue;
+    const from = join(oldDir, fileName);
+    let stat;
+    try {
+      stat = statSync(from);
+    } catch {
+      continue;
+    }
+    if (!stat.isFile()) continue;
+    const ext = extname(fileName).toLowerCase();
+    const isStrategyFile = ext === '.ts' || ext === '.tsx' || ext === '.js';
+    const isKnowledgeSidecar = fileName.endsWith('.knowledge.md');
+    if (!isStrategyFile && !isKnowledgeSidecar) continue;
+    if (skipFiles.has(fileName)) continue;
+
+    const to = join(newDir, fileName);
+    if (existsSync(to)) {
+      result.skippedExisting.push(`user-data/strategies/${fileName}`);
+      continue;
+    }
+    copyFileSync(from, to);
+    result.copied.push(`strategies/${fileName} -> user-data/strategies/${fileName}`);
+  }
+}
+
+function migrateHubStrategyLockfile(workspaceDir: string, result: UserDataMigrationResult): void {
+  const oldLockFile = join(workspaceDir, 'hub', 'installed.json');
+  const newLockFile = getUserDataHubStrategyLockfile(workspaceDir);
+  const oldLock = readJson<Record<string, any>>(oldLockFile);
+  if (!oldLock) return;
+
+  const strategyEntries = Object.fromEntries(
+    Object.entries(oldLock).filter(([, entry]) => entry?.type === 'strategy'),
+  );
+  if (Object.keys(strategyEntries).length === 0) {
+    result.skipped.push('hub/installed.json skill entries');
+    return;
+  }
+
+  const current = readJson<Record<string, any>>(newLockFile) ?? {};
+  let changed = false;
+  for (const [ref, entry] of Object.entries(strategyEntries)) {
+    if (current[ref]) {
+      result.skippedExisting.push(`user-data/hub/installed-strategies.json ${ref}`);
+      continue;
+    }
+    current[ref] = entry;
+    changed = true;
+  }
+  if (changed) {
+    writeJson(newLockFile, current);
+    result.copied.push('hub/installed.json strategy entries -> user-data/hub/installed-strategies.json');
+  }
+}
+
+function writeMigrationMarker(workspaceDir: string, result: UserDataMigrationResult): void {
+  if (result.copied.length === 0 && result.skipped.length === 0 && result.skippedExisting.length === 0) return;
+  const marker = join(getUserDataDir(workspaceDir), '.migration.json');
+  if (existsSync(marker)) return;
+  writeJson(marker, {
+    from: 'legacy-workspace-layout',
+    migrated_at: new Date().toISOString(),
+    copied: result.copied,
+    skipped: result.skipped,
+    skipped_existing: result.skippedExisting,
+  });
+}
+
+export function ensureUserDataLayout(workspaceDir: string): UserDataMigrationResult {
+  const result = EMPTY_RESULT();
+  ensureDir(getUserDataDir(workspaceDir));
+  ensureDir(getUserDataAccountsDir(workspaceDir));
+  ensureDir(getUserDataStrategiesDir(workspaceDir));
+  ensureDir(getUserDataHubDir(workspaceDir));
+  ensureDir(getRuntimeDir(workspaceDir));
+
+  const auth = migrateAuth(workspaceDir, result);
+  migrateAccountFiles(workspaceDir, auth, result);
+  migrateStrategies(workspaceDir, result);
+  migrateHubStrategyLockfile(workspaceDir, result);
+  writeMigrationMarker(workspaceDir, result);
+  return result;
+}