@myclaw163/clawclaw-cli 0.6.76 → 0.6.77

package/src/lib/hub-unzip.ts

@@ -1,62 +1,62 @@
-// src/lib/hub-unzip.ts
-// Minimal dependency-free ZIP reader: supports store (method 0) and deflate (method 8),
-// enough for skill packages produced by Python's stdlib zipfile. No zip64/encryption.
-import { inflateRawSync } from 'zlib';
-
-export interface UnzippedFile { path: string; content: Buffer; }
-
-const EOCD_SIG = 0x06054b50;
-const CEN_SIG = 0x02014b50;
-const LOC_SIG = 0x04034b50;
-
-function findEocd(buf: Buffer): number {
-  const minPos = Math.max(0, buf.length - 22 - 0xffff);
-  for (let i = buf.length - 22; i >= minPos; i--) {
-    if (buf.readUInt32LE(i) === EOCD_SIG) {
-      const commentLen = buf.readUInt16LE(i + 20);
-      if (i + 22 + commentLen === buf.length) return i;
-    }
-  }
-  throw new Error('not a zip file (EOCD not found)');
-}
-
-export function unzip(buf: Buffer): UnzippedFile[] {
-  if (buf.length < 22) throw new Error('not a zip file (too small)');
-  const eocd = findEocd(buf);
-  const total = buf.readUInt16LE(eocd + 10);
-  const cdSize = buf.readUInt32LE(eocd + 12);
-  const cdOffset = buf.readUInt32LE(eocd + 16);
-  if (cdOffset + cdSize > buf.length) throw new Error('corrupt zip (central directory out of range)');
-
-  const files: UnzippedFile[] = [];
-  let p = cdOffset;
-  for (let n = 0; n < total; n++) {
-    if (p + 46 > cdOffset + cdSize) throw new Error('corrupt zip (central directory truncated)');
-    if (buf.readUInt32LE(p) !== CEN_SIG) throw new Error('corrupt zip (bad central directory header)');
-    const method = buf.readUInt16LE(p + 10);
-    const compSize = buf.readUInt32LE(p + 20);
-    const nameLen = buf.readUInt16LE(p + 28);
-    const extraLen = buf.readUInt16LE(p + 30);
-    const commentLen = buf.readUInt16LE(p + 32);
-    const localOffset = buf.readUInt32LE(p + 42);
-    const name = buf.toString('utf8', p + 46, p + 46 + nameLen);
-    p += 46 + nameLen + extraLen + commentLen;
-
-    if (name.endsWith('/')) continue; // directory entry
-
-    if (buf.readUInt32LE(localOffset) !== LOC_SIG) throw new Error(`corrupt zip (bad local header for ${name})`);
-    const locNameLen = buf.readUInt16LE(localOffset + 26);
-    const locExtraLen = buf.readUInt16LE(localOffset + 28);
-    const dataStart = localOffset + 30 + locNameLen + locExtraLen;
-    if (dataStart + compSize > buf.length) throw new Error(`corrupt zip (data out of range for ${name})`);
-    const data = buf.subarray(dataStart, dataStart + compSize);
-
-    let content: Buffer;
-    if (method === 0) content = Buffer.from(data);
-    else if (method === 8) content = inflateRawSync(data);
-    else throw new Error(`unsupported zip compression method ${method} for ${name}`);
-
-    files.push({ path: name.split('\\').join('/'), content });
-  }
-  return files;
-}
+// src/lib/hub-unzip.ts
+// Minimal dependency-free ZIP reader: supports store (method 0) and deflate (method 8),
+// enough for skill packages produced by Python's stdlib zipfile. No zip64/encryption.
+import { inflateRawSync } from 'zlib';
+
+export interface UnzippedFile { path: string; content: Buffer; }
+
+const EOCD_SIG = 0x06054b50;
+const CEN_SIG = 0x02014b50;
+const LOC_SIG = 0x04034b50;
+
+function findEocd(buf: Buffer): number {
+  const minPos = Math.max(0, buf.length - 22 - 0xffff);
+  for (let i = buf.length - 22; i >= minPos; i--) {
+    if (buf.readUInt32LE(i) === EOCD_SIG) {
+      const commentLen = buf.readUInt16LE(i + 20);
+      if (i + 22 + commentLen === buf.length) return i;
+    }
+  }
+  throw new Error('not a zip file (EOCD not found)');
+}
+
+export function unzip(buf: Buffer): UnzippedFile[] {
+  if (buf.length < 22) throw new Error('not a zip file (too small)');
+  const eocd = findEocd(buf);
+  const total = buf.readUInt16LE(eocd + 10);
+  const cdSize = buf.readUInt32LE(eocd + 12);
+  const cdOffset = buf.readUInt32LE(eocd + 16);
+  if (cdOffset + cdSize > buf.length) throw new Error('corrupt zip (central directory out of range)');
+
+  const files: UnzippedFile[] = [];
+  let p = cdOffset;
+  for (let n = 0; n < total; n++) {
+    if (p + 46 > cdOffset + cdSize) throw new Error('corrupt zip (central directory truncated)');
+    if (buf.readUInt32LE(p) !== CEN_SIG) throw new Error('corrupt zip (bad central directory header)');
+    const method = buf.readUInt16LE(p + 10);
+    const compSize = buf.readUInt32LE(p + 20);
+    const nameLen = buf.readUInt16LE(p + 28);
+    const extraLen = buf.readUInt16LE(p + 30);
+    const commentLen = buf.readUInt16LE(p + 32);
+    const localOffset = buf.readUInt32LE(p + 42);
+    const name = buf.toString('utf8', p + 46, p + 46 + nameLen);
+    p += 46 + nameLen + extraLen + commentLen;
+
+    if (name.endsWith('/')) continue; // directory entry
+
+    if (buf.readUInt32LE(localOffset) !== LOC_SIG) throw new Error(`corrupt zip (bad local header for ${name})`);
+    const locNameLen = buf.readUInt16LE(localOffset + 26);
+    const locExtraLen = buf.readUInt16LE(localOffset + 28);
+    const dataStart = localOffset + 30 + locNameLen + locExtraLen;
+    if (dataStart + compSize > buf.length) throw new Error(`corrupt zip (data out of range for ${name})`);
+    const data = buf.subarray(dataStart, dataStart + compSize);
+
+    let content: Buffer;
+    if (method === 0) content = Buffer.from(data);
+    else if (method === 8) content = inflateRawSync(data);
+    else throw new Error(`unsupported zip compression method ${method} for ${name}`);
+
+    files.push({ path: name.split('\\').join('/'), content });
+  }
+  return files;
+}

package/src/lib/init-command.test.ts

@@ -1,75 +1,75 @@
-import { describe, expect, it } from 'vitest';
-import { join, resolve } from 'path';
-import { CLAWCLAW_WORKSPACE_DIR, resolveWorkspaceDir } from './init-command.js';
-
-describe('resolveWorkspaceDir', () => {
-  it('uses an absolute env override as-is', () => {
-    expect(
-      resolveWorkspaceDir({
-        env: { [CLAWCLAW_WORKSPACE_DIR]: 'D:\\workspaces\\clawclaw' },
-        platform: 'win32',
-        homeDir: 'C:\\Users\\test',
-        cwd: 'C:\\repo',
-      }),
-    ).toBe('D:\\workspaces\\clawclaw');
-  });
-
-  it('resolves a relative env override against cwd', () => {
-    const cwd = 'C:\\repo\\project';
-    expect(
-      resolveWorkspaceDir({
-        env: { [CLAWCLAW_WORKSPACE_DIR]: 'tmp/clawclaw-workspace' },
-        platform: 'linux',
-        homeDir: '/home/test',
-        cwd,
-      }),
-    ).toBe(resolve(cwd, 'tmp/clawclaw-workspace'));
-  });
-
-  it('ignores a blank env override', () => {
-    expect(
-      resolveWorkspaceDir({
-        env: {
-          [CLAWCLAW_WORKSPACE_DIR]: '   ',
-          APPDATA: 'C:\\Users\\test\\AppData\\Roaming',
-        },
-        platform: 'win32',
-        homeDir: 'C:\\Users\\test',
-        cwd: 'C:\\repo',
-      }),
-    ).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
-  });
-
-  it('uses APPDATA on win32 when override is not set', () => {
-    expect(
-      resolveWorkspaceDir({
-        env: { APPDATA: 'D:\\AppData' },
-        platform: 'win32',
-        homeDir: 'C:\\Users\\test',
-        cwd: 'C:\\repo',
-      }),
-    ).toBe('D:\\AppData\\clawclaw');
-  });
-
-  it('falls back to home/AppData/Roaming on win32 when APPDATA is missing', () => {
-    expect(
-      resolveWorkspaceDir({
-        env: {},
-        platform: 'win32',
-        homeDir: 'C:\\Users\\test',
-        cwd: 'C:\\repo',
-      }),
-    ).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
-  });
-
-  it('uses the non-win32 default path when override is not set', () => {
-    expect(
-      resolveWorkspaceDir({
-        env: {},
-        platform: 'linux',
-        homeDir: '/home/test',
-        cwd: '/repo/project',
-      }),
-    ).toBe(join('/home/test', '.clawclaw'));
-  });
-});
+import { describe, expect, it } from 'vitest';
+import { join, resolve } from 'path';
+import { CLAWCLAW_WORKSPACE_DIR, resolveWorkspaceDir } from './init-command.js';
+
+describe('resolveWorkspaceDir', () => {
+  it('uses an absolute env override as-is', () => {
+    expect(
+      resolveWorkspaceDir({
+        env: { [CLAWCLAW_WORKSPACE_DIR]: 'D:\\workspaces\\clawclaw' },
+        platform: 'win32',
+        homeDir: 'C:\\Users\\test',
+        cwd: 'C:\\repo',
+      }),
+    ).toBe('D:\\workspaces\\clawclaw');
+  });
+
+  it('resolves a relative env override against cwd', () => {
+    const cwd = 'C:\\repo\\project';
+    expect(
+      resolveWorkspaceDir({
+        env: { [CLAWCLAW_WORKSPACE_DIR]: 'tmp/clawclaw-workspace' },
+        platform: 'linux',
+        homeDir: '/home/test',
+        cwd,
+      }),
+    ).toBe(resolve(cwd, 'tmp/clawclaw-workspace'));
+  });
+
+  it('ignores a blank env override', () => {
+    expect(
+      resolveWorkspaceDir({
+        env: {
+          [CLAWCLAW_WORKSPACE_DIR]: '   ',
+          APPDATA: 'C:\\Users\\test\\AppData\\Roaming',
+        },
+        platform: 'win32',
+        homeDir: 'C:\\Users\\test',
+        cwd: 'C:\\repo',
+      }),
+    ).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
+  });
+
+  it('uses APPDATA on win32 when override is not set', () => {
+    expect(
+      resolveWorkspaceDir({
+        env: { APPDATA: 'D:\\AppData' },
+        platform: 'win32',
+        homeDir: 'C:\\Users\\test',
+        cwd: 'C:\\repo',
+      }),
+    ).toBe('D:\\AppData\\clawclaw');
+  });
+
+  it('falls back to home/AppData/Roaming on win32 when APPDATA is missing', () => {
+    expect(
+      resolveWorkspaceDir({
+        env: {},
+        platform: 'win32',
+        homeDir: 'C:\\Users\\test',
+        cwd: 'C:\\repo',
+      }),
+    ).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
+  });
+
+  it('uses the non-win32 default path when override is not set', () => {
+    expect(
+      resolveWorkspaceDir({
+        env: {},
+        platform: 'linux',
+        homeDir: '/home/test',
+        cwd: '/repo/project',
+      }),
+    ).toBe(join('/home/test', '.clawclaw'));
+  });
+});

package/src/lib/init-command.ts

@@ -1,130 +1,130 @@
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { isAbsolute, join, resolve, win32 } from 'path';
-import { homedir } from 'os';
-import type { AuthProfile } from './auth.js';
-import {
-  ensureUserDataLayout,
-  getRuntimeDir,
-  getUserDataAccountDir,
-  getUserDataMemoryFile,
-  getUserDataPersonaFile,
-} from './user-data.js';
-
-const ACCOUNT_DIRS = ['state', 'logs', 'games'];
-
-export const CLAWCLAW_WORKSPACE_DIR = 'CLAWCLAW_WORKSPACE_DIR';
-
-export type ResolveWorkspaceDirOptions = {
-  env?: Record<string, string | undefined>;
-  platform?: NodeJS.Platform;
-  homeDir?: string;
-  cwd?: string;
-};
-
-export function resolveWorkspaceDir({
-  env = process.env,
-  platform = process.platform,
-  homeDir = homedir(),
-  cwd = process.cwd(),
-}: ResolveWorkspaceDirOptions = {}): string {
-  const rawWorkspaceDir = env[CLAWCLAW_WORKSPACE_DIR];
-  const pathApi = platform === 'win32' ? win32 : { isAbsolute, join, resolve };
-  if (typeof rawWorkspaceDir === 'string') {
-    const trimmedWorkspaceDir = rawWorkspaceDir.trim();
-    if (trimmedWorkspaceDir !== '') {
-      return pathApi.isAbsolute(trimmedWorkspaceDir)
-        ? trimmedWorkspaceDir
-        : pathApi.resolve(cwd, trimmedWorkspaceDir);
-    }
-  }
-
-  if (platform === 'win32') {
-    const appData = env.APPDATA ?? win32.join(homeDir, 'AppData', 'Roaming');
-    return win32.join(appData, 'clawclaw');
-  }
-  return join(homeDir, '.clawclaw');
-}
-
-export function getWorkspaceDir(): string {
-  return resolveWorkspaceDir();
-}
-
-export function cmdInit(force = false): { created: boolean; path: string } {
-  const workspaceDir = getWorkspaceDir();
-  const alreadyExists = existsSync(join(workspaceDir, 'config.json'));
-
-  if (alreadyExists && !force) {
-    return { created: false, path: workspaceDir };
-  }
-
-  mkdirSync(workspaceDir, { recursive: true });
-  mkdirSync(join(workspaceDir, 'accounts'), { recursive: true });
-  ensureUserDataLayout(workspaceDir);
-
-  if (!alreadyExists) {
-    writeFileSync(
-      join(workspaceDir, 'config.json'),
-      JSON.stringify({}, null, 2),
-    );
-  }
-
-  return { created: !alreadyExists, path: workspaceDir };
-}
-
-export function getAccountDir(accountId: string): string {
-  return join(getWorkspaceDir(), 'accounts', accountId);
-}
-
-export function createAccountDirs(accountId: string): void {
-  const accountDir = getAccountDir(accountId);
-  for (const sub of ACCOUNT_DIRS) {
-    mkdirSync(join(accountDir, sub), { recursive: true });
-  }
-}
-
-export function getAccountId(profile: Pick<AuthProfile, 'apiKey'>): string {
-  return profile.apiKey;
-}
-
-export function createProfileDirs(profile: Pick<AuthProfile, 'apiKey'>): void {
-  createAccountDirs(getAccountId(profile));
-  mkdirSync(getUserDataAccountDir(getWorkspaceDir(), profile), { recursive: true });
-  mkdirSync(getRuntimeDir(getWorkspaceDir()), { recursive: true });
-}
-
-export function getStateDir(accountId: string): string {
-  return join(getAccountDir(accountId), 'state');
-}
-
-export function getLogsDir(accountId: string): string {
-  return join(getAccountDir(accountId), 'logs');
-}
-
-export function getGamesDir(accountId: string): string {
-  return join(getAccountDir(accountId), 'games');
-}
-
-export function getProfileStateDir(profile: Pick<AuthProfile, 'apiKey'>): string {
-  createProfileDirs(profile);
-  return getStateDir(getAccountId(profile));
-}
-
-export function getProfileLogsDir(profile: Pick<AuthProfile, 'apiKey'>): string {
-  createProfileDirs(profile);
-  return getLogsDir(getAccountId(profile));
-}
-
-export function getProfileGamesDir(profile: Pick<AuthProfile, 'apiKey'>): string {
-  createProfileDirs(profile);
-  return getGamesDir(getAccountId(profile));
-}
-
-export function getProfileMemoryFile(profile: Pick<AuthProfile, 'apiKey'>): string {
-  createProfileDirs(profile);
-  return getUserDataMemoryFile(getWorkspaceDir(), profile);
-}
-
-export function getProfilePersonaFile(profile: Pick<AuthProfile, 'apiKey'>): string {
-  createProfileDirs(profile);
-  return getUserDataPersonaFile(getWorkspaceDir(), profile);
-}
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
+import { isAbsolute, join, resolve, win32 } from 'path';
+import { homedir } from 'os';
+import type { AuthProfile } from './auth.js';
+import {
+  ensureUserDataLayout,
+  getRuntimeDir,
+  getUserDataAccountDir,
+  getUserDataMemoryFile,
+  getUserDataPersonaFile,
+} from './user-data.js';
+
+const ACCOUNT_DIRS = ['state', 'logs', 'games'];
+
+export const CLAWCLAW_WORKSPACE_DIR = 'CLAWCLAW_WORKSPACE_DIR';
+
+export type ResolveWorkspaceDirOptions = {
+  env?: Record<string, string | undefined>;
+  platform?: NodeJS.Platform;
+  homeDir?: string;
+  cwd?: string;
+};
+
+export function resolveWorkspaceDir({
+  env = process.env,
+  platform = process.platform,
+  homeDir = homedir(),
+  cwd = process.cwd(),
+}: ResolveWorkspaceDirOptions = {}): string {
+  const rawWorkspaceDir = env[CLAWCLAW_WORKSPACE_DIR];
+  const pathApi = platform === 'win32' ? win32 : { isAbsolute, join, resolve };
+  if (typeof rawWorkspaceDir === 'string') {
+    const trimmedWorkspaceDir = rawWorkspaceDir.trim();
+    if (trimmedWorkspaceDir !== '') {
+      return pathApi.isAbsolute(trimmedWorkspaceDir)
+        ? trimmedWorkspaceDir
+        : pathApi.resolve(cwd, trimmedWorkspaceDir);
+    }
+  }
+
+  if (platform === 'win32') {
+    const appData = env.APPDATA ?? win32.join(homeDir, 'AppData', 'Roaming');
+    return win32.join(appData, 'clawclaw');
+  }
+  return join(homeDir, '.clawclaw');
+}
+
+export function getWorkspaceDir(): string {
+  return resolveWorkspaceDir();
+}
+
+export function cmdInit(force = false): { created: boolean; path: string } {
+  const workspaceDir = getWorkspaceDir();
+  const alreadyExists = existsSync(join(workspaceDir, 'config.json'));
+
+  if (alreadyExists && !force) {
+    return { created: false, path: workspaceDir };
+  }
+
+  mkdirSync(workspaceDir, { recursive: true });
+  mkdirSync(join(workspaceDir, 'accounts'), { recursive: true });
+  ensureUserDataLayout(workspaceDir);
+
+  if (!alreadyExists) {
+    writeFileSync(
+      join(workspaceDir, 'config.json'),
+      JSON.stringify({}, null, 2),
+    );
+  }
+
+  return { created: !alreadyExists, path: workspaceDir };
+}
+
+export function getAccountDir(accountId: string): string {
+  return join(getWorkspaceDir(), 'accounts', accountId);
+}
+
+export function createAccountDirs(accountId: string): void {
+  const accountDir = getAccountDir(accountId);
+  for (const sub of ACCOUNT_DIRS) {
+    mkdirSync(join(accountDir, sub), { recursive: true });
+  }
+}
+
+export function getAccountId(profile: Pick<AuthProfile, 'apiKey'>): string {
+  return profile.apiKey;
+}
+
+export function createProfileDirs(profile: Pick<AuthProfile, 'apiKey'>): void {
+  createAccountDirs(getAccountId(profile));
+  mkdirSync(getUserDataAccountDir(getWorkspaceDir(), profile), { recursive: true });
+  mkdirSync(getRuntimeDir(getWorkspaceDir()), { recursive: true });
+}
+
+export function getStateDir(accountId: string): string {
+  return join(getAccountDir(accountId), 'state');
+}
+
+export function getLogsDir(accountId: string): string {
+  return join(getAccountDir(accountId), 'logs');
+}
+
+export function getGamesDir(accountId: string): string {
+  return join(getAccountDir(accountId), 'games');
+}
+
+export function getProfileStateDir(profile: Pick<AuthProfile, 'apiKey'>): string {
+  createProfileDirs(profile);
+  return getStateDir(getAccountId(profile));
+}
+
+export function getProfileLogsDir(profile: Pick<AuthProfile, 'apiKey'>): string {
+  createProfileDirs(profile);
+  return getLogsDir(getAccountId(profile));
+}
+
+export function getProfileGamesDir(profile: Pick<AuthProfile, 'apiKey'>): string {
+  createProfileDirs(profile);
+  return getGamesDir(getAccountId(profile));
+}
+
+export function getProfileMemoryFile(profile: Pick<AuthProfile, 'apiKey'>): string {
+  createProfileDirs(profile);
+  return getUserDataMemoryFile(getWorkspaceDir(), profile);
+}
+
+export function getProfilePersonaFile(profile: Pick<AuthProfile, 'apiKey'>): string {
+  createProfileDirs(profile);
+  return getUserDataPersonaFile(getWorkspaceDir(), profile);
+}