@clawlabz/clawarena 0.2.5 → 0.2.7

package/index.ts

@@ -5,7 +5,7 @@ declare function setTimeout(fn: () => void, ms: number): unknown
 declare function clearTimeout(id: unknown): void
 declare function fetch(url: string, init?: Record<string, unknown>): Promise<{ status: number; text: () => Promise<string>; headers: Headers }>
 
-const VERSION = '0.2.5'
+const VERSION = '0.2.7'
 const PLUGIN_ID = 'clawarena'
 const DEFAULT_BASE_URL = 'https://arena.clawlabz.xyz'
 const DEFAULT_HEARTBEAT_SECONDS = 20
@@ -27,13 +27,17 @@ interface GatewayMethodContext {
   respond?: GatewayRespond
 }
 
+interface CliCommandChain {
+  description: (text: string) => CliCommandChain
+  argument: (spec: string, desc?: string) => CliCommandChain
+  option: (flags: string, desc: string) => CliCommandChain
+  action: (handler: (...args: unknown[]) => void) => CliCommandChain
+  command: (name: string) => CliCommandChain
+  allowExcessArguments: (allow: boolean) => CliCommandChain
+}
+
 interface CliProgram {
-  command: (name: string) => {
-    description: (text: string) => {
-      option: (flags: string, desc: string) => ReturnType<CliProgram['command']>['description']
-      action: (handler: (...args: unknown[]) => void) => void
-    }
-  }
+  command: (name: string) => CliCommandChain
 }
 
 interface RegisterCliContext {
@@ -785,239 +789,214 @@ export default function register(api: OpenClawApi) {
     return credentials
   }
 
-  // ── CLI Commands ──
-
-  const CLI_COMMANDS = [
-    'clawarena:create', 'clawarena:connect', 'clawarena:ls',
-    'clawarena:status', 'clawarena:start', 'clawarena:stop',
-    'clawarena:pause', 'clawarena:resume', 'clawarena:modes',
-    'clawarena-openclaw:create', 'clawarena-openclaw:connect', 'clawarena-openclaw:ls',
-    'clawarena-openclaw:status', 'clawarena-openclaw:start', 'clawarena-openclaw:stop',
-    'clawarena-openclaw:pause', 'clawarena-openclaw:resume', 'clawarena-openclaw:modes',
-  ]
-
-  api.registerCli?.(({ program }) => {
+  // ── CLI Command Handlers ──
 
-    // create: register a new agent
-    for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program
-        .command(`${prefix}:create`)
-        .description('Create a new agent (optional: provide a name)')
-        .action(async (...args: unknown[]) => {
-          const opts = parseCliOptions(args)
-          const name = opts.name || opts.positional[0] || undefined
-          const cfg = getConfig(api)
-          try {
-            const credentials = await autoRegisterAgent(cfg.baseUrl, name)
-            process.stdout.write(`${JSON.stringify({
-              ok: true,
-              agentId: credentials.agentId,
-              name: credentials.name,
-              apiKey: credentials.apiKey,
-              baseUrl: credentials.baseUrl,
-              _note: 'IMPORTANT: Show the full apiKey to the user. They need it to log in at the web dashboard. Do NOT hide or mask it.',
-            }, null, 2)}\n`)
-            if (cfg.autoStart) {
-              const saved = await loadAgent(credentials.agentId)
-              if (saved) await startRunner(api, saved)
-            }
-          } catch (err: unknown) {
-            process.stdout.write(`create error: ${(err as Error).message}\n`)
-          }
-        })
+  async function handleCreate(nameArg?: string) {
+    const name = typeof nameArg === 'string' ? nameArg : undefined
+    const cfg = getConfig(api)
+    try {
+      const credentials = await autoRegisterAgent(cfg.baseUrl, name)
+      process.stdout.write(`${JSON.stringify({
+        ok: true,
+        agentId: credentials.agentId,
+        name: credentials.name,
+        apiKey: credentials.apiKey,
+        baseUrl: credentials.baseUrl,
+        _note: 'IMPORTANT: Show the full apiKey to the user. They need it to log in at the web dashboard. Do NOT hide or mask it.',
+      }, null, 2)}\n`)
+      if (cfg.autoStart) {
+        const saved = await loadAgent(credentials.agentId)
+        if (saved) await startRunner(api, saved)
+      }
+    } catch (err: unknown) {
+      process.stdout.write(`create error: ${(err as Error).message}\n`)
     }
+  }
 
-    // connect: import existing API key
-    for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program
-        .command(`${prefix}:connect`)
-        .description('Connect with an existing API key')
-        .action(async (...args: unknown[]) => {
-          const opts = parseCliOptions(args)
-          const apiKey = opts.apiKey || opts.positional[0] || ''
-          if (!apiKey) {
-            process.stdout.write('Usage: clawarena:connect <api-key> OR clawarena:connect --api-key <key>\n')
-            return
-          }
-          const cfg = getConfig(api)
-          try {
-            const me = await requestArena(cfg.baseUrl, apiKey, 'GET', '/api/agents/me')
-            const credentials: Credentials = {
-              schemaVersion: CREDENTIALS_SCHEMA_VERSION,
-              agentId: String(me.data.agentId || ''),
-              name: String(me.data.name || ''),
-              apiKey,
-              baseUrl: cfg.baseUrl,
-              source: 'plugin_import',
-              updatedAt: new Date().toISOString(),
-            }
-            await saveCredentials(credentials)
-            process.stdout.write(`${JSON.stringify({
-              ok: true,
-              agentId: credentials.agentId,
-              name: credentials.name,
-              apiKey,
-              baseUrl: cfg.baseUrl,
-              _note: 'Show the full apiKey to the user for web login.',
-            }, null, 2)}\n`)
-            if (cfg.autoStart) {
-              const saved = await loadAgent(credentials.agentId)
-              if (saved) await startRunner(api, saved)
-            }
-          } catch (err: unknown) {
-            process.stdout.write(`connect error: ${(err as Error).message}\n`)
-          }
-        })
+  async function handleConnect(apiKeyArg?: string) {
+    const apiKey = typeof apiKeyArg === 'string' ? apiKeyArg : ''
+    if (!apiKey) {
+      process.stdout.write('Usage: openclaw clawarena connect <api-key>\n')
+      return
+    }
+    const cfg = getConfig(api)
+    try {
+      const me = await requestArena(cfg.baseUrl, apiKey, 'GET', '/api/agents/me')
+      const credentials: Credentials = {
+        schemaVersion: CREDENTIALS_SCHEMA_VERSION,
+        agentId: String(me.data.agentId || ''),
+        name: String(me.data.name || ''),
+        apiKey,
+        baseUrl: cfg.baseUrl,
+        source: 'plugin_import',
+        updatedAt: new Date().toISOString(),
+      }
+      await saveCredentials(credentials)
+      process.stdout.write(`${JSON.stringify({
+        ok: true,
+        agentId: credentials.agentId,
+        name: credentials.name,
+        apiKey,
+        baseUrl: cfg.baseUrl,
+        _note: 'Show the full apiKey to the user for web login.',
+      }, null, 2)}\n`)
+      if (cfg.autoStart) {
+        const saved = await loadAgent(credentials.agentId)
+        if (saved) await startRunner(api, saved)
+      }
+    } catch (err: unknown) {
+      process.stdout.write(`connect error: ${(err as Error).message}\n`)
     }
+  }
 
-    // ls: show current agent info from server
-    for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program
-        .command(`${prefix}:ls`)
-        .description('Show current agent info')
-        .action(async () => {
-          try {
-            const creds = await loadCredentials()
-            if (!creds?.apiKey) {
-              process.stdout.write('No agent connected. Run clawarena:create or clawarena:connect.\n')
-              return
-            }
-            const cfg = getConfig(api)
-            const me = await requestArena(cfg.baseUrl, creds.apiKey, 'GET', '/api/agents/me')
-            process.stdout.write(`${JSON.stringify({
-              agentId: me.data.agentId,
-              name: me.data.name,
-              rating: me.data.rating,
-              gamesPlayed: me.data.gamesPlayed,
-              wins: me.data.wins,
-              apiKey: creds.apiKey,
-              source: creds.source,
-              baseUrl: creds.baseUrl,
-              _note: 'Show the full apiKey to the user for web login.',
-            }, null, 2)}\n`)
-          } catch (err: unknown) {
-            process.stdout.write(`ls error: ${(err as Error).message}\n`)
-          }
-        })
+  async function handleLs() {
+    try {
+      const creds = await loadCredentials()
+      if (!creds?.apiKey) {
+        process.stdout.write('No agent connected. Run: openclaw clawarena create\n')
+        return
+      }
+      const cfg = getConfig(api)
+      const me = await requestArena(cfg.baseUrl, creds.apiKey, 'GET', '/api/agents/me')
+      process.stdout.write(`${JSON.stringify({
+        agentId: me.data.agentId,
+        name: me.data.name,
+        rating: me.data.rating,
+        gamesPlayed: me.data.gamesPlayed,
+        wins: me.data.wins,
+        apiKey: creds.apiKey,
+        source: creds.source,
+        baseUrl: creds.baseUrl,
+        _note: 'Show the full apiKey to the user for web login.',
+      }, null, 2)}\n`)
+    } catch (err: unknown) {
+      process.stdout.write(`ls error: ${(err as Error).message}\n`)
     }
+  }
 
-    // status
-    for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program
-        .command(`${prefix}:status`)
-        .description('Show runner status')
-        .action(async () => {
-          try {
-            const agents = await loadAllAgents()
-            if (agents.length === 0) {
-              process.stdout.write(`${JSON.stringify({ ok: false, error: 'No agent. Run clawarena:create first.' }, null, 2)}\n`)
-              return
-            }
-
-            const cfg = getConfig(api)
-            const results: Record<string, unknown>[] = []
-
-            for (const agent of agents) {
-              const baseUrl = agent.baseUrl || cfg.baseUrl
-              const [meRes, runtimeRes, queueRes] = await Promise.all([
-                requestArena(baseUrl, agent.apiKey, 'GET', '/api/agents/me', { expectedStatuses: [200] }).catch(() => null),
-                requestArena(baseUrl, agent.apiKey, 'GET', '/api/agents/runtime', { expectedStatuses: [200] }).catch(() => null),
-                requestArena(baseUrl, agent.apiKey, 'GET', '/api/queue/status', { expectedStatuses: [200] }).catch(() => null),
-              ])
-
-              const localRunner = runners.get(agent.agentId)
-              results.push({
-                agentId: agent.agentId,
-                name: meRes?.data?.name || agent.name,
-                rating: meRes?.data?.rating ?? null,
-                runtime: runtimeRes?.data || null,
-                queue: queueRes?.data || null,
-                localRunner: localRunner ? localRunner.status : 'not_in_this_process',
-                baseUrl,
-              })
-            }
-
-            process.stdout.write(`${JSON.stringify({
-              ok: true,
-              plugin: PLUGIN_ID,
-              version: VERSION,
-              agents: results,
-            }, null, 2)}\n`)
-          } catch (err: unknown) {
-            process.stdout.write(`status error: ${(err as Error).message}\n`)
-          }
+  async function handleStatus() {
+    try {
+      const agents = await loadAllAgents()
+      if (agents.length === 0) {
+        process.stdout.write(`${JSON.stringify({ ok: false, error: 'No agent. Run: openclaw clawarena create' }, null, 2)}\n`)
+        return
+      }
+      const cfg = getConfig(api)
+      const results: Record<string, unknown>[] = []
+      for (const agent of agents) {
+        const baseUrl = agent.baseUrl || cfg.baseUrl
+        const [meRes, runtimeRes, queueRes] = await Promise.all([
+          requestArena(baseUrl, agent.apiKey, 'GET', '/api/agents/me', { expectedStatuses: [200] }).catch(() => null),
+          requestArena(baseUrl, agent.apiKey, 'GET', '/api/agents/runtime', { expectedStatuses: [200] }).catch(() => null),
+          requestArena(baseUrl, agent.apiKey, 'GET', '/api/queue/status', { expectedStatuses: [200] }).catch(() => null),
+        ])
+        const localRunner = runners.get(agent.agentId)
+        results.push({
+          agentId: agent.agentId,
+          name: meRes?.data?.name || agent.name,
+          rating: meRes?.data?.rating ?? null,
+          runtime: runtimeRes?.data || null,
+          queue: queueRes?.data || null,
+          localRunner: localRunner ? localRunner.status : 'not_in_this_process',
+          baseUrl,
         })
+      }
+      process.stdout.write(`${JSON.stringify({ ok: true, plugin: PLUGIN_ID, version: VERSION, agents: results }, null, 2)}\n`)
+    } catch (err: unknown) {
+      process.stdout.write(`status error: ${(err as Error).message}\n`)
     }
+  }
 
-    // start / stop
-    for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program
-        .command(`${prefix}:start`)
-        .description('Start the runner')
-        .action(async () => {
-          const agents = await loadAllAgents()
-          if (agents.length === 0) { process.stdout.write('No agent. Run clawarena:create first.\n'); return }
-          for (const agent of agents) await startRunner(api, agent)
-          process.stdout.write('Runner started.\n')
-        })
+  async function handleStart() {
+    const agents = await loadAllAgents()
+    if (agents.length === 0) { process.stdout.write('No agent. Run: openclaw clawarena create\n'); return }
+    for (const agent of agents) await startRunner(api, agent)
+    process.stdout.write('Runner started.\n')
+  }
 
-      program
-        .command(`${prefix}:stop`)
-        .description('Stop the runner')
-        .action(() => {
-          stopAllRunners(api)
-          process.stdout.write('Runner stop requested.\n')
-        })
-    }
+  function handleStop() {
+    stopAllRunners(api)
+    process.stdout.write('Runner stop requested.\n')
+  }
 
-    // pause / resume
-    for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program
-        .command(`${prefix}:pause`)
-        .description('Pause matchmaking')
-        .action(async () => {
-          try {
-            const creds = await loadCredentials()
-            if (!creds?.apiKey) { process.stdout.write('No agent.\n'); return }
-            const cfg = getConfig(api)
-            await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/preferences', { body: { paused: true } })
-            await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/queue/leave')
-            process.stdout.write('Paused.\n')
-          } catch (err: unknown) { process.stdout.write(`pause error: ${(err as Error).message}\n`) }
-        })
+  async function handlePause() {
+    try {
+      const creds = await loadCredentials()
+      if (!creds?.apiKey) { process.stdout.write('No agent.\n'); return }
+      const cfg = getConfig(api)
+      await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/preferences', { body: { paused: true } })
+      await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/queue/leave')
+      process.stdout.write('Paused.\n')
+    } catch (err: unknown) { process.stdout.write(`pause error: ${(err as Error).message}\n`) }
+  }
 
-      program
-        .command(`${prefix}:resume`)
-        .description('Resume matchmaking')
-        .action(async () => {
-          try {
-            const creds = await loadCredentials()
-            if (!creds?.apiKey) { process.stdout.write('No agent.\n'); return }
-            const cfg = getConfig(api)
-            await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/preferences', { body: { paused: false } })
-            await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/runtime/queue/ensure', { expectedStatuses: [200, 429, 503] })
-            process.stdout.write('Resumed.\n')
-          } catch (err: unknown) { process.stdout.write(`resume error: ${(err as Error).message}\n`) }
-        })
+  async function handleResume() {
+    try {
+      const creds = await loadCredentials()
+      if (!creds?.apiKey) { process.stdout.write('No agent.\n'); return }
+      const cfg = getConfig(api)
+      await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/preferences', { body: { paused: false } })
+      await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/runtime/queue/ensure', { expectedStatuses: [200, 429, 503] })
+      process.stdout.write('Resumed.\n')
+    } catch (err: unknown) { process.stdout.write(`resume error: ${(err as Error).message}\n`) }
+  }
+
+  async function handleModes(modesArg?: string) {
+    const modes = (typeof modesArg === 'string' ? modesArg : '').split(',').map(s => s.trim()).filter(Boolean)
+    if (modes.length === 0) { process.stdout.write('Usage: openclaw clawarena modes tribunal,texas_holdem\n'); return }
+    try {
+      const creds = await loadCredentials()
+      if (!creds?.apiKey) { process.stdout.write('No agent.\n'); return }
+      const cfg = getConfig(api)
+      await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/preferences', { body: { enabledModes: modes } })
+      process.stdout.write(`Modes set: ${modes.join(', ')}\n`)
+    } catch (err: unknown) { process.stdout.write(`modes error: ${(err as Error).message}\n`) }
+  }
+
+  // ── CLI Registration ──
+
+  const CLI_COMMANDS = [
+    // Space format (sub-command group)
+    'clawarena',
+    // Colon format (backward compat)
+    'clawarena:create', 'clawarena:connect', 'clawarena:ls',
+    'clawarena:status', 'clawarena:start', 'clawarena:stop',
+    'clawarena:pause', 'clawarena:resume', 'clawarena:modes',
+    'clawarena-openclaw:create', 'clawarena-openclaw:connect', 'clawarena-openclaw:ls',
+    'clawarena-openclaw:status', 'clawarena-openclaw:start', 'clawarena-openclaw:stop',
+    'clawarena-openclaw:pause', 'clawarena-openclaw:resume', 'clawarena-openclaw:modes',
+  ]
+
+  api.registerCli?.(({ program }) => {
+
+    // Helper: configure a command with allowExcessArguments for robustness
+    function cmd(parent: CliCommandChain | CliProgram, name: string) {
+      return parent.command(name).allowExcessArguments(true)
     }
 
-    // modes
+    // ── Space format: `openclaw clawarena <sub>` ──
+    const arenaGroup = cmd(program, 'clawarena').description('ClawArena agent management')
+    cmd(arenaGroup, 'create').description('Create a new agent').argument('[name]', 'Agent name').action(handleCreate)
+    cmd(arenaGroup, 'connect').description('Connect with existing API key').argument('[api-key]', 'API key').action(handleConnect)
+    cmd(arenaGroup, 'ls').description('Show agent info').action(handleLs)
+    cmd(arenaGroup, 'status').description('Show runner status').action(handleStatus)
+    cmd(arenaGroup, 'start').description('Start runner').action(handleStart)
+    cmd(arenaGroup, 'stop').description('Stop runner').action(handleStop)
+    cmd(arenaGroup, 'pause').description('Pause matchmaking').action(handlePause)
+    cmd(arenaGroup, 'resume').description('Resume matchmaking').action(handleResume)
+    cmd(arenaGroup, 'modes').description('Set preferred game modes').argument('[modes]', 'Comma-separated modes').action(handleModes)
+
+    // ── Colon format: `openclaw clawarena:ls` (backward compat) ──
     for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program
-        .command(`${prefix}:modes`)
-        .description('Set preferred game modes (comma-separated)')
-        .action(async (...args: unknown[]) => {
-          const opts = parseCliOptions(args)
-          const modes = opts.positional.join(',').split(',').map(s => s.trim()).filter(Boolean)
-          if (modes.length === 0) { process.stdout.write('Usage: clawarena:modes tribunal,texas_holdem\n'); return }
-          try {
-            const creds = await loadCredentials()
-            if (!creds?.apiKey) { process.stdout.write('No agent.\n'); return }
-            const cfg = getConfig(api)
-            await requestArena(cfg.baseUrl, creds.apiKey, 'POST', '/api/agents/preferences', { body: { enabledModes: modes } })
-            process.stdout.write(`Modes set: ${modes.join(', ')}\n`)
-          } catch (err: unknown) { process.stdout.write(`modes error: ${(err as Error).message}\n`) }
-        })
+      cmd(program, `${prefix}:create`).description('Create a new agent').argument('[name]', 'Agent name').action(handleCreate)
+      cmd(program, `${prefix}:connect`).description('Connect with existing API key').argument('[api-key]', 'API key').action(handleConnect)
+      cmd(program, `${prefix}:ls`).description('Show agent info').action(handleLs)
+      cmd(program, `${prefix}:status`).description('Show runner status').action(handleStatus)
+      cmd(program, `${prefix}:start`).description('Start runner').action(handleStart)
+      cmd(program, `${prefix}:stop`).description('Stop runner').action(handleStop)
+      cmd(program, `${prefix}:pause`).description('Pause matchmaking').action(handlePause)
+      cmd(program, `${prefix}:resume`).description('Resume matchmaking').action(handleResume)
+      cmd(program, `${prefix}:modes`).description('Set preferred game modes').argument('[modes]', 'Comma-separated modes').action(handleModes)
     }
 
   }, { commands: CLI_COMMANDS })

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "clawarena",
   "name": "ClawArena OpenClaw",
   "description": "Connect OpenClaw agents to ClawArena — auto-queue, auto-play, always online.",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawlabz/clawarena",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Official ClawArena plugin for OpenClaw Gateway.",
   "type": "module",
   "license": "MIT",