@myclaw163/clawclaw-cli 0.6.58 → 0.6.60

package/src/lib/server-registry.ts

@@ -1,152 +1,152 @@
-// src/lib/server-registry.ts
-import { AuthStore } from './auth.js';
-
-export interface ServerAddresses {
-  lobbyUrl: string;
-  gameServerUrl: string | null;
-  wsUrl: string | null;
-}
-
-export class ServerRegistry {
-  private lobbyUrl: string;
-  private _gameServerUrl: string | null;
-  private _gatewayWsUrl: string | null;
-  private agentName: string | undefined;
-  /** True when gameServerUrl was pre-configured (e.g. from auth) — prevents
-   *  discoverGameServer() from clearing it during queue status polling. */
-  private _urlPreconfigured: boolean;
-
-  constructor(opts: { lobbyUrl: string; gameServerUrl?: string; agentName?: string }) {
-    this.lobbyUrl = opts.lobbyUrl.replace(/\/$/, '');
-    this._gatewayWsUrl = null;
-    if (opts.gameServerUrl) {
-      const raw = opts.gameServerUrl.replace(/\/$/, '');
-      try {
-        const u = new URL(raw);
-        if (u.pathname && u.pathname !== '/') {
-          // Gateway URL — restore _gatewayWsUrl so wsUrl path prefix is preserved
-          this._gatewayWsUrl = raw;
-          this._gameServerUrl = raw;
-        } else {
-          this._gameServerUrl = raw.replace(/^https:\/\//, 'http://');
-        }
-      } catch {
-        this._gameServerUrl = raw.replace(/^https:\/\//, 'http://');
-      }
-      this._urlPreconfigured = true;
-    } else {
-      this._gameServerUrl = null;
-      this._urlPreconfigured = false;
-    }
-    this.agentName = opts.agentName;
-  }
-
-  get addresses(): ServerAddresses {
-    return {
-      lobbyUrl: this.lobbyUrl,
-      gameServerUrl: this._gameServerUrl,
-      wsUrl: this.wsUrl,
-    };
-  }
-
-  get gameServerUrl(): string | null {
-    return this._gameServerUrl;
-  }
-
-  /**
-   * Determine the correct base URL for a given API path.
-   *
-   * Game Server routes: /api/v1/game/current, /api/v1/game/action, /api/v1/game/map, /api/v1/game/leave, /api/v1/game/role_info
-   * Lobby routes: everything else (/api/v1/agents/*, /api/v1/queue/*, etc.)
-   */
-  baseUrlFor(path: string): string {
-    if (
-      path.startsWith('/api/v1/game/current') ||
-      path.startsWith('/api/v1/game/action') ||
-      path.startsWith('/api/v1/game/map') ||
-      path.startsWith('/api/v1/game/leave') ||
-      path.startsWith('/api/v1/game/role_info')
-    ) {
-      const base = this._gatewayWsUrl ?? this._gameServerUrl;
-      if (!base) throw new Error('No game server allocated');
-      return base;
-    }
-    return this.lobbyUrl;
-  }
-
-  /**
-   * Extract game server address from a queue response and update gameServerUrl.
-   * Prefers ws_url (Gateway route) over raw address:port.
-   * Returns true if the address changed.
-   */
-  updateFromQueueResponse(data: any): boolean {
-    if (!data || typeof data !== 'object') return false;
-    const qs = data.data ?? data;
-    if (qs.status && qs.status !== 'allocated') {
-      // Never clear a pre-configured URL just because queue status changed —
-      // the game may already be in progress. Only clear if the URL was
-      // originally discovered via queue (not pre-set from auth).
-      if (this._urlPreconfigured) return false;
-      if (this._gameServerUrl !== null || this._gatewayWsUrl !== null) {
-        this._gameServerUrl = null;
-        this._gatewayWsUrl = null;
-        this.persistGameServerUrl();
-        return true;
-      }
-      return false;
-    }
-
-    const wsUrl = qs.ws_url;
-    if (wsUrl && typeof wsUrl === 'string') {
-      const httpUrl = wsUrl.replace(/^wss:/, 'https:').replace(/^ws:/, 'http:');
-      if (this._gatewayWsUrl !== httpUrl) {
-        this._gatewayWsUrl = httpUrl;
-        this._gameServerUrl = httpUrl;
-        this.persistGameServerUrl();
-        return true;
-      }
-      return false;
-    }
-
-    const addr = qs.address ?? qs.game_server?.address;
-    const port = qs.port ?? qs.game_server?.port;
-    if (addr && port) {
-      const url = `http://${addr}:${port}`;
-      if (this._gameServerUrl !== url) {
-        this._gameServerUrl = url;
-        this._gatewayWsUrl = null;
-        this.persistGameServerUrl();
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /** Manually set the game server URL. */
-  setGameServerUrl(url: string): void {
-    this._gameServerUrl = url.replace(/\/$/, '');
-    this._urlPreconfigured = true;
-    this.persistGameServerUrl();
-  }
-
-  /** WS URL derived from gameServerUrl (Gateway or direct). */
-  get wsUrl(): string | null {
-    if (!this._gameServerUrl) return null;
-    try {
-      const u = new URL(this._gameServerUrl);
-      const protocol = u.protocol === 'https:' || u.protocol === 'wss:' ? 'wss:' : 'ws:';
-      const basePath = this._gatewayWsUrl ? u.pathname.replace(/\/$/, '') : '';
-      return `${protocol}//${u.host}${basePath}/api/v1/game/stream`;
-    } catch {
-      return null;
-    }
-  }
-
-  /** Persist gameServerUrl to auth profile (best-effort). */
-  private persistGameServerUrl(): void {
-    if (!this.agentName) return;
-    try {
-      new AuthStore().updateGameServerUrl(this._gameServerUrl ?? undefined, this.agentName);
-    } catch { /* non-critical */ }
-  }
-}
+// src/lib/server-registry.ts
+import { AuthStore } from './auth.js';
+
+export interface ServerAddresses {
+  lobbyUrl: string;
+  gameServerUrl: string | null;
+  wsUrl: string | null;
+}
+
+export class ServerRegistry {
+  private lobbyUrl: string;
+  private _gameServerUrl: string | null;
+  private _gatewayWsUrl: string | null;
+  private agentName: string | undefined;
+  /** True when gameServerUrl was pre-configured (e.g. from auth) — prevents
+   *  discoverGameServer() from clearing it during queue status polling. */
+  private _urlPreconfigured: boolean;
+
+  constructor(opts: { lobbyUrl: string; gameServerUrl?: string; agentName?: string }) {
+    this.lobbyUrl = opts.lobbyUrl.replace(/\/$/, '');
+    this._gatewayWsUrl = null;
+    if (opts.gameServerUrl) {
+      const raw = opts.gameServerUrl.replace(/\/$/, '');
+      try {
+        const u = new URL(raw);
+        if (u.pathname && u.pathname !== '/') {
+          // Gateway URL — restore _gatewayWsUrl so wsUrl path prefix is preserved
+          this._gatewayWsUrl = raw;
+          this._gameServerUrl = raw;
+        } else {
+          this._gameServerUrl = raw.replace(/^https:\/\//, 'http://');
+        }
+      } catch {
+        this._gameServerUrl = raw.replace(/^https:\/\//, 'http://');
+      }
+      this._urlPreconfigured = true;
+    } else {
+      this._gameServerUrl = null;
+      this._urlPreconfigured = false;
+    }
+    this.agentName = opts.agentName;
+  }
+
+  get addresses(): ServerAddresses {
+    return {
+      lobbyUrl: this.lobbyUrl,
+      gameServerUrl: this._gameServerUrl,
+      wsUrl: this.wsUrl,
+    };
+  }
+
+  get gameServerUrl(): string | null {
+    return this._gameServerUrl;
+  }
+
+  /**
+   * Determine the correct base URL for a given API path.
+   *
+   * Game Server routes: /api/v1/game/current, /api/v1/game/action, /api/v1/game/map, /api/v1/game/leave, /api/v1/game/role_info
+   * Lobby routes: everything else (/api/v1/agents/*, /api/v1/queue/*, etc.)
+   */
+  baseUrlFor(path: string): string {
+    if (
+      path.startsWith('/api/v1/game/current') ||
+      path.startsWith('/api/v1/game/action') ||
+      path.startsWith('/api/v1/game/map') ||
+      path.startsWith('/api/v1/game/leave') ||
+      path.startsWith('/api/v1/game/role_info')
+    ) {
+      const base = this._gatewayWsUrl ?? this._gameServerUrl;
+      if (!base) throw new Error('No game server allocated');
+      return base;
+    }
+    return this.lobbyUrl;
+  }
+
+  /**
+   * Extract game server address from a queue response and update gameServerUrl.
+   * Prefers ws_url (Gateway route) over raw address:port.
+   * Returns true if the address changed.
+   */
+  updateFromQueueResponse(data: any): boolean {
+    if (!data || typeof data !== 'object') return false;
+    const qs = data.data ?? data;
+    if (qs.status && qs.status !== 'allocated') {
+      // Never clear a pre-configured URL just because queue status changed —
+      // the game may already be in progress. Only clear if the URL was
+      // originally discovered via queue (not pre-set from auth).
+      if (this._urlPreconfigured) return false;
+      if (this._gameServerUrl !== null || this._gatewayWsUrl !== null) {
+        this._gameServerUrl = null;
+        this._gatewayWsUrl = null;
+        this.persistGameServerUrl();
+        return true;
+      }
+      return false;
+    }
+
+    const wsUrl = qs.ws_url;
+    if (wsUrl && typeof wsUrl === 'string') {
+      const httpUrl = wsUrl.replace(/^wss:/, 'https:').replace(/^ws:/, 'http:');
+      if (this._gatewayWsUrl !== httpUrl) {
+        this._gatewayWsUrl = httpUrl;
+        this._gameServerUrl = httpUrl;
+        this.persistGameServerUrl();
+        return true;
+      }
+      return false;
+    }
+
+    const addr = qs.address ?? qs.game_server?.address;
+    const port = qs.port ?? qs.game_server?.port;
+    if (addr && port) {
+      const url = `http://${addr}:${port}`;
+      if (this._gameServerUrl !== url) {
+        this._gameServerUrl = url;
+        this._gatewayWsUrl = null;
+        this.persistGameServerUrl();
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /** Manually set the game server URL. */
+  setGameServerUrl(url: string): void {
+    this._gameServerUrl = url.replace(/\/$/, '');
+    this._urlPreconfigured = true;
+    this.persistGameServerUrl();
+  }
+
+  /** WS URL derived from gameServerUrl (Gateway or direct). */
+  get wsUrl(): string | null {
+    if (!this._gameServerUrl) return null;
+    try {
+      const u = new URL(this._gameServerUrl);
+      const protocol = u.protocol === 'https:' || u.protocol === 'wss:' ? 'wss:' : 'ws:';
+      const basePath = this._gatewayWsUrl ? u.pathname.replace(/\/$/, '') : '';
+      return `${protocol}//${u.host}${basePath}/api/v1/game/stream`;
+    } catch {
+      return null;
+    }
+  }
+
+  /** Persist gameServerUrl to auth profile (best-effort). */
+  private persistGameServerUrl(): void {
+    if (!this.agentName) return;
+    try {
+      new AuthStore().updateGameServerUrl(this._gameServerUrl ?? undefined, this.agentName);
+    } catch { /* non-critical */ }
+  }
+}

package/src/lib/skill-version.test.ts

@@ -1,48 +1,48 @@
-import { mkdtempSync, writeFileSync } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
-import { describe, expect, it } from 'vitest';
-import { parseSkillVersion, readSkillVersion } from './skill-version.js';
-
-describe('parseSkillVersion', () => {
-  it('returns version from a normal frontmatter block', () => {
-    const md = '---\nname: clawclaw\ndescription: x\nversion: 3.2.8\n---\n\n# body\n';
-    expect(parseSkillVersion(md)).toBe('3.2.8');
-  });
-
-  it('handles CRLF line endings', () => {
-    const md = '---\r\nname: x\r\nversion: 1.0.0\r\n---\r\nbody';
-    expect(parseSkillVersion(md)).toBe('1.0.0');
-  });
-
-  it('returns null when frontmatter is missing', () => {
-    expect(parseSkillVersion('# just a heading\n')).toBeNull();
-  });
-
-  it('returns null when version key is absent', () => {
-    expect(parseSkillVersion('---\nname: x\n---\nbody')).toBeNull();
-  });
-
-  it('ignores a version: outside the frontmatter block', () => {
-    const md = '---\nname: x\n---\n\nversion: 9.9.9 (in body)\n';
-    expect(parseSkillVersion(md)).toBeNull();
-  });
-
-  it('strips surrounding whitespace from the value', () => {
-    const md = '---\nversion:    2.1.0   \n---\nbody';
-    expect(parseSkillVersion(md)).toBe('2.1.0');
-  });
-});
-
-describe('readSkillVersion', () => {
-  it('reads version from a file on disk', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'skill-version-'));
-    const path = join(dir, 'SKILL.md');
-    writeFileSync(path, '---\nversion: 4.0.0\n---\nbody');
-    expect(readSkillVersion(path)).toBe('4.0.0');
-  });
-
-  it('returns null when file does not exist', () => {
-    expect(readSkillVersion('/nonexistent/path/SKILL.md')).toBeNull();
-  });
-});
+import { mkdtempSync, writeFileSync } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { describe, expect, it } from 'vitest';
+import { parseSkillVersion, readSkillVersion } from './skill-version.js';
+
+describe('parseSkillVersion', () => {
+  it('returns version from a normal frontmatter block', () => {
+    const md = '---\nname: clawclaw\ndescription: x\nversion: 3.2.8\n---\n\n# body\n';
+    expect(parseSkillVersion(md)).toBe('3.2.8');
+  });
+
+  it('handles CRLF line endings', () => {
+    const md = '---\r\nname: x\r\nversion: 1.0.0\r\n---\r\nbody';
+    expect(parseSkillVersion(md)).toBe('1.0.0');
+  });
+
+  it('returns null when frontmatter is missing', () => {
+    expect(parseSkillVersion('# just a heading\n')).toBeNull();
+  });
+
+  it('returns null when version key is absent', () => {
+    expect(parseSkillVersion('---\nname: x\n---\nbody')).toBeNull();
+  });
+
+  it('ignores a version: outside the frontmatter block', () => {
+    const md = '---\nname: x\n---\n\nversion: 9.9.9 (in body)\n';
+    expect(parseSkillVersion(md)).toBeNull();
+  });
+
+  it('strips surrounding whitespace from the value', () => {
+    const md = '---\nversion:    2.1.0   \n---\nbody';
+    expect(parseSkillVersion(md)).toBe('2.1.0');
+  });
+});
+
+describe('readSkillVersion', () => {
+  it('reads version from a file on disk', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'skill-version-'));
+    const path = join(dir, 'SKILL.md');
+    writeFileSync(path, '---\nversion: 4.0.0\n---\nbody');
+    expect(readSkillVersion(path)).toBe('4.0.0');
+  });
+
+  it('returns null when file does not exist', () => {
+    expect(readSkillVersion('/nonexistent/path/SKILL.md')).toBeNull();
+  });
+});

package/src/lib/skill-version.ts

@@ -1,19 +1,19 @@
-import { readFileSync } from 'fs';
-
-const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---/;
-const VERSION_RE = /^version:\s*(\S.*?)\s*$/m;
-
-export function parseSkillVersion(content: string): string | null {
-  const fm = FRONTMATTER_RE.exec(content);
-  if (!fm) return null;
-  const v = VERSION_RE.exec(fm[1]);
-  return v ? v[1] : null;
-}
-
-export function readSkillVersion(path: string): string | null {
-  try {
-    return parseSkillVersion(readFileSync(path, 'utf8'));
-  } catch {
-    return null;
-  }
-}
+import { readFileSync } from 'fs';
+
+const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---/;
+const VERSION_RE = /^version:\s*(\S.*?)\s*$/m;
+
+export function parseSkillVersion(content: string): string | null {
+  const fm = FRONTMATTER_RE.exec(content);
+  if (!fm) return null;
+  const v = VERSION_RE.exec(fm[1]);
+  return v ? v[1] : null;
+}
+
+export function readSkillVersion(path: string): string | null {
+  try {
+    return parseSkillVersion(readFileSync(path, 'utf8'));
+  } catch {
+    return null;
+  }
+}