@myclaw163/clawclaw-cli 0.6.71 → 0.6.74

package/src/lib/game-context.ts

@@ -0,0 +1,92 @@
+import { readFileSync } from 'fs';
+
+function finiteNumber(value: unknown): number | undefined {
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  if (typeof value === 'string' && value.trim() !== '') {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return undefined;
+}
+
+function nonEmptyString(value: unknown): string | undefined {
+  return typeof value === 'string' && value.length > 0 ? value : undefined;
+}
+
+function cleanObject<T extends Record<string, any>>(obj: T): T {
+  for (const key of Object.keys(obj)) {
+    if (obj[key] === undefined) delete obj[key];
+  }
+  return obj;
+}
+
+export function briefGameMap(mapData: any): any {
+  if (!mapData) return null;
+  return {
+    rooms: mapData.rooms?.map((r: any) => ({
+      name: r.name,
+      polygon: r.polygon,
+    })),
+  };
+}
+
+export function taskLocations(mapData: any): { lobster: any[]; crab: any[] } {
+  const output = { lobster: [] as any[], crab: [] as any[] };
+  for (const task of Array.isArray(mapData?.all_task_locations) ? mapData.all_task_locations : []) {
+    const item = cleanObject({
+      name: task.name,
+      room: task.room,
+      x: task.x,
+      y: task.y,
+    });
+    if (task.faction === 'crab') output.crab.push(item);
+    else output.lobster.push(item);
+  }
+  return output;
+}
+
+export function loadAsciiMapAsset(): string | null {
+  try {
+    return readFileSync(new URL('../assets/clawclaw-ascii-map.txt', import.meta.url), 'utf8').trimEnd();
+  } catch {
+    return null;
+  }
+}
+
+export function summarizeGameMap(mapData: any, opts?: { ascii?: boolean }): any {
+  const output: Record<string, any> = {
+    rooms: mapData?.rooms?.map((r: any) => ({
+      name: r.name,
+      polygon: r.polygon,
+    })) ?? [],
+    task_locations: taskLocations(mapData),
+  };
+  if (opts?.ascii) output.ascii_map = loadAsciiMapAsset();
+  return output;
+}
+
+export function playersFromMap(mapData: any): Array<{ name: string; seat: number }> {
+  const players: Array<{ name: string; seat: number }> = [];
+  for (const player of Array.isArray(mapData?.all_players) ? mapData.all_players : []) {
+    const name = nonEmptyString(player?.name ?? player?.agent_name);
+    const seat = finiteNumber(player?.seat);
+    if (!name || seat === undefined) continue;
+    players.push({ name, seat });
+  }
+  return players;
+}
+
+export function seatMapFromPlayers(players: Array<{ name: string; seat: number }>): Record<string, number> {
+  const seats: Record<string, number> = {};
+  for (const player of players) seats[player.name] = player.seat;
+  return seats;
+}
+
+export function buildGameStartedEnrichment(mapData: any): Record<string, any> {
+  const players = playersFromMap(mapData);
+  return cleanObject({
+    players: players.length > 0 ? players : undefined,
+    all_seats: players.length > 0 ? seatMapFromPlayers(players) : undefined,
+    map: summarizeGameMap(mapData, { ascii: true }),
+  });
+}

package/src/lib/http-keepalive.ts

@@ -1,15 +1,15 @@
-import { Agent, setGlobalDispatcher } from 'undici';
-
-let initialized = false;
-
-export function initHttpKeepAlive(): void {
-  if (initialized) return;
-  initialized = true;
-
-  setGlobalDispatcher(new Agent({
-    keepAliveTimeout: 30_000,
-    keepAliveMaxTimeout: 120_000,
-    connections: 16,
-    pipelining: 1,
-  }));
-}
+import { Agent, setGlobalDispatcher } from 'undici';
+
+let initialized = false;
+
+export function initHttpKeepAlive(): void {
+  if (initialized) return;
+  initialized = true;
+
+  setGlobalDispatcher(new Agent({
+    keepAliveTimeout: 30_000,
+    keepAliveMaxTimeout: 120_000,
+    connections: 16,
+    pipelining: 1,
+  }));
+}

package/src/lib/http-transport.test.ts

@@ -1,42 +1,42 @@
-// src/lib/http-transport.test.ts
-import { describe, it, expect, vi, afterEach } from 'vitest';
-import { HttpTransport, ApiError } from './http-transport.js';
-
-const registry: any = { baseUrlFor: () => 'https://hub.example' };
-
-afterEach(() => { vi.restoreAllMocks(); });
-
-describe('HttpTransport.getBytes', () => {
-  it('returns response bytes as a Buffer', async () => {
-    const bytes = new Uint8Array([1, 2, 3, 4]);
-    vi.stubGlobal('fetch', vi.fn(async () => new Response(bytes, { status: 200 })));
-    const t = new HttpTransport('key', registry);
-    const buf = await t.getBytes('/api/v1/hub/x');
-    expect(Buffer.isBuffer(buf)).toBe(true);
-    expect([...buf]).toEqual([1, 2, 3, 4]);
-  });
-
-  it('throws ApiError on non-ok', async () => {
-    vi.stubGlobal('fetch', vi.fn(async () => new Response('nope', { status: 404 })));
-    const t = new HttpTransport('key', registry);
-    await expect(t.getBytes('/api/v1/hub/x')).rejects.toBeInstanceOf(ApiError);
-  });
-});
-
-describe('HttpTransport extraHeaders', () => {
-  it('merges extraHeaders into request() headers', async () => {
-    let captured: any;
-    vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response('{}', { status: 200 }); }));
-    const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
-    await t.request('GET', '/x');
-    expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
-    expect(captured['Authorization']).toBe('Bearer key');
-  });
-  it('merges extraHeaders into getBytes() headers', async () => {
-    let captured: any;
-    vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response(new Uint8Array([1]), { status: 200 }); }));
-    const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
-    await t.getBytes('/x');
-    expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
-  });
-});
+// src/lib/http-transport.test.ts
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import { HttpTransport, ApiError } from './http-transport.js';
+
+const registry: any = { baseUrlFor: () => 'https://hub.example' };
+
+afterEach(() => { vi.restoreAllMocks(); });
+
+describe('HttpTransport.getBytes', () => {
+  it('returns response bytes as a Buffer', async () => {
+    const bytes = new Uint8Array([1, 2, 3, 4]);
+    vi.stubGlobal('fetch', vi.fn(async () => new Response(bytes, { status: 200 })));
+    const t = new HttpTransport('key', registry);
+    const buf = await t.getBytes('/api/v1/hub/x');
+    expect(Buffer.isBuffer(buf)).toBe(true);
+    expect([...buf]).toEqual([1, 2, 3, 4]);
+  });
+
+  it('throws ApiError on non-ok', async () => {
+    vi.stubGlobal('fetch', vi.fn(async () => new Response('nope', { status: 404 })));
+    const t = new HttpTransport('key', registry);
+    await expect(t.getBytes('/api/v1/hub/x')).rejects.toBeInstanceOf(ApiError);
+  });
+});
+
+describe('HttpTransport extraHeaders', () => {
+  it('merges extraHeaders into request() headers', async () => {
+    let captured: any;
+    vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response('{}', { status: 200 }); }));
+    const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
+    await t.request('GET', '/x');
+    expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
+    expect(captured['Authorization']).toBe('Bearer key');
+  });
+  it('merges extraHeaders into getBytes() headers', async () => {
+    let captured: any;
+    vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response(new Uint8Array([1]), { status: 200 }); }));
+    const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
+    await t.getBytes('/x');
+    expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
+  });
+});

package/src/lib/http-transport.ts

@@ -1,113 +1,113 @@
-// src/lib/http-transport.ts
-import type { ServerRegistry } from './server-registry.js';
-
-export class ApiError extends Error {
-  constructor(
-    public readonly status: number,
-    public readonly body: string,
-    public readonly method: string,
-    public readonly path: string,
-  ) {
-    super(`API error ${status}: ${body}`);
-    this.name = 'ApiError';
-  }
-}
-
-function parseJsonBody(body: string): any | null {
-  try {
-    return JSON.parse(body);
-  } catch {
-    return null;
-  }
-}
-
-export function formatApiError(err: ApiError): string {
-  if (err.status === 429) {
-    const data = parseJsonBody(err.body);
-    const error = data?.error ?? {};
-    const code = error?.code ?? data?.code ?? 'RATE_LIMITED';
-    const retryAfter = error?.retry_after ?? error?.['retry after'] ?? data?.retry_after ?? data?.['retry after'];
-    const hint = error?.hint ?? data?.hint;
-    const message = error?.message ?? data?.message ?? 'Too many requests.';
-    const retryText = retryAfter !== undefined ? ` Retry after ${retryAfter}s.` : '';
-    const hintText = hint ? ` Hint: ${hint}.` : '';
-    return `Rate limited (${code}). ${message}.${retryText}${hintText}`;
-  }
-  return `Request failed (${err.status}): ${err.body}`;
-}
-
-export class HttpTransport {
-  private apiKey: string;
-  private registry: ServerRegistry;
-  private extraHeaders: Record<string, string>;
-
-  constructor(apiKey: string, registry: ServerRegistry, extraHeaders: Record<string, string> = {}) {
-    this.apiKey = apiKey;
-    this.registry = registry;
-    this.extraHeaders = extraHeaders;
-  }
-
-  /**
-   * Generic HTTP request. Supports JSON body and FormData.
-   * Adds Authorization header when apiKey is non-empty.
-   */
-  async request<T = any>(method: string, path: string, body?: any): Promise<T> {
-    const url = this.registry.baseUrlFor(path) + path;
-    const headers: Record<string, string> = {};
-
-    // Only add auth header if apiKey is present (register endpoint has no auth)
-    if (this.apiKey) {
-      headers['Authorization'] = `Bearer ${this.apiKey}`;
-    }
-
-    for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
-
-    let fetchBody: BodyInit | undefined;
-    if (body !== undefined) {
-      if (body instanceof FormData) {
-        fetchBody = body;
-        // Let fetch set Content-Type with boundary for FormData
-      } else {
-        headers['Content-Type'] = 'application/json; charset=utf-8';
-        fetchBody = JSON.stringify(body);
-      }
-    }
-
-    const res = await fetch(url, { method, headers, body: fetchBody, signal: AbortSignal.timeout(10_000) });
-    if (!res.ok) {
-      throw new ApiError(res.status, await res.text(), method, path);
-    }
-    return res.json() as Promise<T>;
-  }
-
-  /** GET with one fast retry for transient network failures. */
-  async get<T = any>(path: string): Promise<T> {
-    try {
-      return await this.request<T>('GET', path);
-    } catch (err) {
-      // Only retry network errors, not HTTP errors
-      if (err instanceof ApiError) throw err;
-      await new Promise(r => setTimeout(r, 500));
-      return this.request<T>('GET', path);
-    }
-  }
-
-  async post<T = any>(path: string, body?: any): Promise<T> {
-    return this.request<T>('POST', path, body);
-  }
-
-  /** GET raw bytes (binary artifacts). Throws ApiError on non-ok. */
-  async getBytes(path: string): Promise<Buffer> {
-    const url = this.registry.baseUrlFor(path) + path;
-    const headers: Record<string, string> = {};
-    if (this.apiKey) {
-      headers['Authorization'] = `Bearer ${this.apiKey}`;
-    }
-    for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
-    const res = await fetch(url, { method: 'GET', headers, signal: AbortSignal.timeout(30_000) });
-    if (!res.ok) {
-      throw new ApiError(res.status, await res.text(), 'GET', path);
-    }
-    return Buffer.from(await res.arrayBuffer());
-  }
-}
+// src/lib/http-transport.ts
+import type { ServerRegistry } from './server-registry.js';
+
+export class ApiError extends Error {
+  constructor(
+    public readonly status: number,
+    public readonly body: string,
+    public readonly method: string,
+    public readonly path: string,
+  ) {
+    super(`API error ${status}: ${body}`);
+    this.name = 'ApiError';
+  }
+}
+
+function parseJsonBody(body: string): any | null {
+  try {
+    return JSON.parse(body);
+  } catch {
+    return null;
+  }
+}
+
+export function formatApiError(err: ApiError): string {
+  if (err.status === 429) {
+    const data = parseJsonBody(err.body);
+    const error = data?.error ?? {};
+    const code = error?.code ?? data?.code ?? 'RATE_LIMITED';
+    const retryAfter = error?.retry_after ?? error?.['retry after'] ?? data?.retry_after ?? data?.['retry after'];
+    const hint = error?.hint ?? data?.hint;
+    const message = error?.message ?? data?.message ?? 'Too many requests.';
+    const retryText = retryAfter !== undefined ? ` Retry after ${retryAfter}s.` : '';
+    const hintText = hint ? ` Hint: ${hint}.` : '';
+    return `Rate limited (${code}). ${message}.${retryText}${hintText}`;
+  }
+  return `Request failed (${err.status}): ${err.body}`;
+}
+
+export class HttpTransport {
+  private apiKey: string;
+  private registry: ServerRegistry;
+  private extraHeaders: Record<string, string>;
+
+  constructor(apiKey: string, registry: ServerRegistry, extraHeaders: Record<string, string> = {}) {
+    this.apiKey = apiKey;
+    this.registry = registry;
+    this.extraHeaders = extraHeaders;
+  }
+
+  /**
+   * Generic HTTP request. Supports JSON body and FormData.
+   * Adds Authorization header when apiKey is non-empty.
+   */
+  async request<T = any>(method: string, path: string, body?: any): Promise<T> {
+    const url = this.registry.baseUrlFor(path) + path;
+    const headers: Record<string, string> = {};
+
+    // Only add auth header if apiKey is present (register endpoint has no auth)
+    if (this.apiKey) {
+      headers['Authorization'] = `Bearer ${this.apiKey}`;
+    }
+
+    for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
+
+    let fetchBody: BodyInit | undefined;
+    if (body !== undefined) {
+      if (body instanceof FormData) {
+        fetchBody = body;
+        // Let fetch set Content-Type with boundary for FormData
+      } else {
+        headers['Content-Type'] = 'application/json; charset=utf-8';
+        fetchBody = JSON.stringify(body);
+      }
+    }
+
+    const res = await fetch(url, { method, headers, body: fetchBody, signal: AbortSignal.timeout(10_000) });
+    if (!res.ok) {
+      throw new ApiError(res.status, await res.text(), method, path);
+    }
+    return res.json() as Promise<T>;
+  }
+
+  /** GET with one fast retry for transient network failures. */
+  async get<T = any>(path: string): Promise<T> {
+    try {
+      return await this.request<T>('GET', path);
+    } catch (err) {
+      // Only retry network errors, not HTTP errors
+      if (err instanceof ApiError) throw err;
+      await new Promise(r => setTimeout(r, 500));
+      return this.request<T>('GET', path);
+    }
+  }
+
+  async post<T = any>(path: string, body?: any): Promise<T> {
+    return this.request<T>('POST', path, body);
+  }
+
+  /** GET raw bytes (binary artifacts). Throws ApiError on non-ok. */
+  async getBytes(path: string): Promise<Buffer> {
+    const url = this.registry.baseUrlFor(path) + path;
+    const headers: Record<string, string> = {};
+    if (this.apiKey) {
+      headers['Authorization'] = `Bearer ${this.apiKey}`;
+    }
+    for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
+    const res = await fetch(url, { method: 'GET', headers, signal: AbortSignal.timeout(30_000) });
+    if (!res.ok) {
+      throw new ApiError(res.status, await res.text(), 'GET', path);
+    }
+    return Buffer.from(await res.arrayBuffer());
+  }
+}

package/src/lib/hub-client.test.ts

@@ -1,56 +1,56 @@
-import { describe, it, expect } from 'vitest';
-import { HubClient, parseResourceRef } from './hub-client.js';
-
-function fakeTransport() {
-  const calls: any[] = [];
-  const transport: any = {
-    calls,
-    async get(path: string) {
-      calls.push(['GET', path]);
-      if (path.includes('/resources/')) return { data: { id: 'abc', type: 'strategy', title: 'T' } };
-      return { data: { items: [], total: 0, pagination: { mode: 'page', page: 1, limit: 20, hasMore: false } } };
-    },
-    async getBytes(path: string) { calls.push(['GETBYTES', path]); return Buffer.from('raw'); },
-  };
-  return transport;
-}
-
-describe('parseResourceRef', () => {
-  it('splits type/id', () => {
-    expect(parseResourceRef('strategy/ab12cd')).toEqual({ type: 'strategy', id: 'ab12cd' });
-    expect(parseResourceRef('skill/xyz')).toEqual({ type: 'skill', id: 'xyz' });
-  });
-  it('rejects bad type', () => {
-    expect(() => parseResourceRef('plugin/abc')).toThrow(/invalid resource ref/);
-  });
-  it('rejects missing id', () => {
-    expect(() => parseResourceRef('strategy/')).toThrow(/invalid resource ref/);
-  });
-});
-
-describe('HubClient', () => {
-  it('list builds query and unwraps data', async () => {
-    const t = fakeTransport();
-    const res = await new HubClient(t).list({ type: 'skill', sort: 'downloads', q: '抢刀', limit: 10 });
-    expect(t.calls[0][1]).toBe('/api/client/v1/resources?type=skill&q=%E6%8A%A2%E5%88%80&sort=downloads&limit=10');
-    expect(res.total).toBe(0);
-    expect(res.items).toEqual([]);
-  });
-  it('list with no opts hits bare endpoint', async () => {
-    const t = fakeTransport();
-    await new HubClient(t).list();
-    expect(t.calls[0][1]).toBe('/api/client/v1/resources');
-  });
-  it('getResource builds typed path and unwraps data', async () => {
-    const t = fakeTransport();
-    const d = await new HubClient(t).getResource('strategy', 'ab12');
-    expect(t.calls[0]).toEqual(['GET', '/api/client/v1/resources/strategy/ab12']);
-    expect(d.id).toBe('abc');
-  });
-  it('downloadArtifact hits the /download endpoint (encoding id)', async () => {
-    const t = fakeTransport();
-    const buf = await new HubClient(t).downloadArtifact('skill', 'xy z');
-    expect(t.calls[0]).toEqual(['GETBYTES', '/api/client/v1/resources/skill/xy%20z/download']);
-    expect(Buffer.isBuffer(buf)).toBe(true);
-  });
-});
+import { describe, it, expect } from 'vitest';
+import { HubClient, parseResourceRef } from './hub-client.js';
+
+function fakeTransport() {
+  const calls: any[] = [];
+  const transport: any = {
+    calls,
+    async get(path: string) {
+      calls.push(['GET', path]);
+      if (path.includes('/resources/')) return { data: { id: 'abc', type: 'strategy', title: 'T' } };
+      return { data: { items: [], total: 0, pagination: { mode: 'page', page: 1, limit: 20, hasMore: false } } };
+    },
+    async getBytes(path: string) { calls.push(['GETBYTES', path]); return Buffer.from('raw'); },
+  };
+  return transport;
+}
+
+describe('parseResourceRef', () => {
+  it('splits type/id', () => {
+    expect(parseResourceRef('strategy/ab12cd')).toEqual({ type: 'strategy', id: 'ab12cd' });
+    expect(parseResourceRef('skill/xyz')).toEqual({ type: 'skill', id: 'xyz' });
+  });
+  it('rejects bad type', () => {
+    expect(() => parseResourceRef('plugin/abc')).toThrow(/invalid resource ref/);
+  });
+  it('rejects missing id', () => {
+    expect(() => parseResourceRef('strategy/')).toThrow(/invalid resource ref/);
+  });
+});
+
+describe('HubClient', () => {
+  it('list builds query and unwraps data', async () => {
+    const t = fakeTransport();
+    const res = await new HubClient(t).list({ type: 'skill', sort: 'downloads', q: '抢刀', limit: 10 });
+    expect(t.calls[0][1]).toBe('/api/client/v1/resources?type=skill&q=%E6%8A%A2%E5%88%80&sort=downloads&limit=10');
+    expect(res.total).toBe(0);
+    expect(res.items).toEqual([]);
+  });
+  it('list with no opts hits bare endpoint', async () => {
+    const t = fakeTransport();
+    await new HubClient(t).list();
+    expect(t.calls[0][1]).toBe('/api/client/v1/resources');
+  });
+  it('getResource builds typed path and unwraps data', async () => {
+    const t = fakeTransport();
+    const d = await new HubClient(t).getResource('strategy', 'ab12');
+    expect(t.calls[0]).toEqual(['GET', '/api/client/v1/resources/strategy/ab12']);
+    expect(d.id).toBe('abc');
+  });
+  it('downloadArtifact hits the /download endpoint (encoding id)', async () => {
+    const t = fakeTransport();
+    const buf = await new HubClient(t).downloadArtifact('skill', 'xy z');
+    expect(t.calls[0]).toEqual(['GETBYTES', '/api/client/v1/resources/skill/xy%20z/download']);
+    expect(Buffer.isBuffer(buf)).toBe(true);
+  });
+});