@clawlabz/clawarena 0.2.6 → 0.2.8

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.6'
+const VERSION = '0.2.8'
 const PLUGIN_ID = 'clawarena'
 const DEFAULT_BASE_URL = 'https://arena.clawlabz.xyz'
 const DEFAULT_HEARTBEAT_SECONDS = 20
@@ -17,6 +17,28 @@ const CREDENTIALS_SCHEMA_VERSION = 1
 const TRIBUNAL_PHASES = new Set(['day', 'vote', 'night'])
 const TEXAS_PHASES = new Set(['preflop', 'flop', 'turn', 'river'])
 
+// ── Speech templates for plugin runner variety ──
+const SPEECH_POOL_NORMAL = [
+  'Something about {target} feels off this round. Keep an eye on them.',
+  'I noticed {target} has been unusually quiet. That worries me.',
+  'Round {round}: {target} changed their voting pattern. Suspicious.',
+  'If we look at the elimination pattern, {target} benefits the most.',
+  'I want to hear from {target}. Their silence is not convincing.',
+  'The voting data from last round points to {target} as inconsistent.',
+  'Let us not rush. But {target} is my primary concern right now.',
+  'Has anyone else noticed {target} deflecting every accusation?',
+  'I think {target} is trying to blend in too hard. Classic move.',
+  'Round {round} observation: {target} voted against the majority. Why?',
+  'Something does not add up with {target}. I am watching closely.',
+  'We need to focus. {target} has survived too long without explaining.',
+]
+const SPEECH_POOL_FALLBACK = [
+  'Running out of time. I suspect {target}. Let us vote carefully.',
+  'Timeout pressure: {target} is still my best guess.',
+  'Quick take: {target} seems the most suspicious. Voting soon.',
+  'No more time to debate. I am leaning toward {target}.',
+]
+
 // ============================================================
 // OpenClaw API Types
 // ============================================================
@@ -33,6 +55,7 @@ interface CliCommandChain {
   option: (flags: string, desc: string) => CliCommandChain
   action: (handler: (...args: unknown[]) => void) => CliCommandChain
   command: (name: string) => CliCommandChain
+  allowExcessArguments: (allow: boolean) => CliCommandChain
 }
 
 interface CliProgram {
@@ -43,6 +66,12 @@ interface RegisterCliContext {
   program: CliProgram
 }
 
+interface SubagentApi {
+  run: (params: { sessionKey: string; message: string; extraSystemPrompt?: string }) => Promise<{ runId: string }>
+  waitForRun: (params: { runId: string; timeoutMs?: number }) => Promise<{ status: 'ok' | 'error' | 'timeout'; error?: string }>
+  getSessionMessages: (params: { sessionKey: string; limit?: number }) => Promise<{ messages: unknown[] }>
+}
+
 interface OpenClawApi {
   config?: Record<string, unknown>
   logger?: {
@@ -56,6 +85,7 @@ interface OpenClawApi {
     options?: { commands?: string[] }
   ) => void
   registerService?: (service: { id: string; start?: () => void; stop?: () => void }) => void
+  runtime?: { subagent?: SubagentApi }
 }
 
 // ============================================================
@@ -80,6 +110,15 @@ function isObject(value: unknown): value is Record<string, unknown> {
   return value !== null && typeof value === 'object' && !Array.isArray(value)
 }
 
+function parseLlmAction(text: string): Record<string, unknown> | null {
+  try { const obj = JSON.parse(text); if (obj?.action) return obj } catch { /* not pure JSON */ }
+  const match = text.match(/\{[\s\S]*?"action"\s*:[\s\S]*?\}/)
+  if (match) {
+    try { const obj = JSON.parse(match[0]); if (obj?.action) return obj } catch { /* malformed */ }
+  }
+  return null
+}
+
 function toRetrySeconds(opts: { body?: Record<string, unknown>; headers?: Headers; fallback?: number }): number {
   const fallback = opts.fallback ?? 3
   const retryFromBodySeconds = toNumber(opts.body?.retryAfterSeconds, null)
@@ -298,6 +337,7 @@ class ArenaRunner {
   private timeoutFallbackMs: number
   private log: LogFn
   private warn: LogFn
+  private subagent: SubagentApi | null
 
   agentId = ''
   agentName = ''
@@ -321,6 +361,7 @@ class ArenaRunner {
     timeoutFallbackMs: number
     log: LogFn
     warn: LogFn
+    subagent?: SubagentApi | null
   }) {
     this.baseUrl = opts.baseUrl
     this.apiKey = opts.apiKey
@@ -330,6 +371,7 @@ class ArenaRunner {
     this.timeoutFallbackMs = opts.timeoutFallbackMs
     this.log = opts.log
     this.warn = opts.warn
+    this.subagent = opts.subagent || null
   }
 
   private async request(method: string, path: string, opts?: { body?: unknown; expectedStatuses?: number[] }) {
@@ -389,16 +431,24 @@ class ArenaRunner {
     return null
   }
 
+  private pickSpeech(pool: string[], round: number, target: string): string {
+    // Deterministic pick based on agentId + round for variety across agents
+    let hash = 0
+    for (let i = 0; i < this.agentId.length; i++) hash = ((hash << 5) - hash + this.agentId.charCodeAt(i)) | 0
+    const index = Math.abs(hash + round * 7) % pool.length
+    return pool[index].replace(/\{target\}/g, target).replace(/\{round\}/g, String(round))
+  }
+
   private tribunalAction(state: Record<string, unknown>, forceFallback: boolean) {
     const phase = String(state.phase || '')
     const round = Number(state.round || 1)
     const players = Array.isArray(state.players) ? state.players : []
     const target = this.pickAliveTarget(players)
+    const targetName = target ? String((players.find(p => isObject(p) && p.id === target) as Record<string, unknown>)?.name || target) : 'someone'
 
     if (phase === 'day') {
-      const text = forceFallback
-        ? `Round ${round} fallback note: keep observing voting patterns.`
-        : `Round ${round} analysis: watching contradictions before vote.`
+      const pool = forceFallback ? SPEECH_POOL_FALLBACK : SPEECH_POOL_NORMAL
+      const text = this.pickSpeech(pool, round, targetName)
       return { actions: [{ action: 'speak', text }], markSubmittedOnExhausted: false }
     }
     if (phase === 'vote' && target) {
@@ -423,6 +473,48 @@ class ArenaRunner {
     return false
   }
 
+  private async tryLlmAction(
+    gameId: string,
+    state: Record<string, unknown>,
+  ): Promise<{ actions: Array<{ action: string; [k: string]: unknown }>; markSubmittedOnExhausted: boolean } | null> {
+    if (!this.subagent) return null
+    const llmContext = state.llmContext as { rules?: string; situation?: string; keyFacts?: Record<string, string> } | null
+    const availableActions = state.availableActions as unknown[] | undefined
+    if (!llmContext?.rules || !availableActions?.length) return null
+
+    const systemPrompt = `You are an AI player in ClawArena. Analyze the game situation and choose the best action.
+Reply with ONLY a valid JSON object matching one of the available actions. No explanation, no markdown.`
+
+    const message = [
+      `## Rules\n${llmContext.rules}`,
+      llmContext.situation ? `## Situation\n${llmContext.situation}` : '',
+      llmContext.keyFacts ? `## Key Facts\n${Object.entries(llmContext.keyFacts).map(([k, v]) => `${k}: ${v}`).join('\n')}` : '',
+      `## Available Actions\n${JSON.stringify(availableActions, null, 2)}`,
+      `Choose your action (reply JSON only):`,
+    ].filter(Boolean).join('\n\n')
+
+    const sessionKey = `clawarena:${this.agentId}:${gameId}`
+    const { runId } = await this.subagent.run({ sessionKey, message, extraSystemPrompt: systemPrompt })
+
+    const phaseMs = toNumber(state.phaseRemainingMs, null)
+    const timeoutMs = Math.min(phaseMs ? phaseMs - 3000 : 12000, 15000)
+    const result = await this.subagent.waitForRun({ runId, timeoutMs: Math.max(timeoutMs, 3000) })
+
+    if (result.status !== 'ok') return null
+
+    const { messages } = await this.subagent.getSessionMessages({ sessionKey, limit: 5 })
+    const lastAssistant = [...messages].reverse().find(m =>
+      isObject(m) && (m as Record<string, unknown>).role === 'assistant'
+    ) as Record<string, unknown> | undefined
+    const text = String(lastAssistant?.content || lastAssistant?.text || '')
+    if (!text) return null
+
+    const action = parseLlmAction(text)
+    if (!action) return null
+
+    return { actions: [action as { action: string; [k: string]: unknown }], markSubmittedOnExhausted: false }
+  }
+
   private buildActionPlan(state: Record<string, unknown>, forceFallback: boolean) {
     const mode = String(state.mode || '')
     if (mode === 'tribunal') return this.tribunalAction(state, forceFallback)
@@ -524,7 +616,8 @@ class ArenaRunner {
     while (!this.stopRequested) {
       await this.maybeHeartbeat('in_game', gameId)
 
-      const stateResponse = await this.request('GET', `/api/games/${gameId}/state/private`, { expectedStatuses: [200, 401, 403, 404] })
+      const statePath = this.subagent ? `/api/games/${gameId}/state/private?includeLlm=true` : `/api/games/${gameId}/state/private`
+      const stateResponse = await this.request('GET', statePath, { expectedStatuses: [200, 401, 403, 404] })
       if (stateResponse.status !== 200) {
         this.warn(`state/private unavailable game=${gameId} status=${stateResponse.status}`)
         break
@@ -555,7 +648,20 @@ class ArenaRunner {
 
       const phaseRemainingMs = toNumber(state.phaseRemainingMs, null)
       const forceFallback = phaseRemainingMs !== null && phaseRemainingMs <= this.timeoutFallbackMs
-      const plan = this.buildActionPlan(state, forceFallback)
+
+      // Try LLM first, fallback to template
+      let plan: { actions: Array<{ action: string; [k: string]: unknown }>; markSubmittedOnExhausted: boolean } | null = null
+      if (this.subagent && !forceFallback) {
+        try {
+          plan = await this.tryLlmAction(gameId, state)
+          if (plan) this.log(`llm action: ${JSON.stringify(plan.actions[0])}`)
+        } catch (err) {
+          this.warn(`llm action failed: ${(err as Error).message}`)
+        }
+      }
+      if (!plan) {
+        plan = this.buildActionPlan(state, forceFallback)
+      }
       if (!plan) {
         actionDonePhaseKey = phaseKey
         await sleep(this.pollSeconds * 1000)
@@ -674,6 +780,7 @@ async function startRunner(api: OpenClawApi, agent: AgentEntry): Promise<void> {
     return
   }
   const cfg = getConfig(api)
+  const subagent = api.runtime?.subagent || null
   const r = new ArenaRunner({
     baseUrl: agent.baseUrl || cfg.baseUrl,
     apiKey: agent.apiKey,
@@ -683,6 +790,7 @@ async function startRunner(api: OpenClawApi, agent: AgentEntry): Promise<void> {
     timeoutFallbackMs: cfg.timeoutFallbackMs,
     log: (msg: string) => api.logger?.info?.(`[clawarena:${agent.name || agent.agentId}] ${msg}`),
     warn: (msg: string) => api.logger?.warn?.(`[clawarena:${agent.name || agent.agentId}] ${msg}`),
+    subagent,
   })
   runners.set(agent.agentId, r)
   r.start().catch((err: Error) => {
@@ -940,6 +1048,30 @@ export default function register(api: OpenClawApi) {
     } catch (err: unknown) { process.stdout.write(`resume error: ${(err as Error).message}\n`) }
   }
 
+  async function handleGames() {
+    const cfg = getConfig(api)
+    const baseUrl = cfg.baseUrl
+    try {
+      const res = await requestArena(baseUrl, '', 'GET', '/api/modes', { expectedStatuses: [200] })
+      const modes = Array.isArray(res.data.modes) ? res.data.modes : []
+      if (modes.length === 0) {
+        process.stdout.write('No game modes available.\n')
+        return
+      }
+      const lines: string[] = [`Available game modes (${modes.length}):\n`]
+      for (const m of modes) {
+        const mode = isObject(m) ? m : {} as Record<string, unknown>
+        const players = `${mode.minPlayers ?? '?'}-${mode.maxPlayers ?? '?'} players`
+        lines.push(`  ${String(mode.mode || '?').padEnd(20)} ${String(mode.displayName || '').padEnd(22)} ${players}`)
+        if (mode.description) lines.push(`  ${''.padEnd(20)} ${truncate(mode.description, 60)}`)
+      }
+      lines.push(`\nSet preferred modes: openclaw clawarena modes <mode1,mode2>`)
+      process.stdout.write(`${lines.join('\n')}\n`)
+    } catch (err: unknown) {
+      process.stdout.write(`games 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 }
@@ -960,37 +1092,44 @@ export default function register(api: OpenClawApi) {
     // Colon format (backward compat)
     'clawarena:create', 'clawarena:connect', 'clawarena:ls',
     'clawarena:status', 'clawarena:start', 'clawarena:stop',
-    'clawarena:pause', 'clawarena:resume', 'clawarena:modes',
+    'clawarena:pause', 'clawarena:resume', 'clawarena:modes', 'clawarena:games',
     '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',
+    'clawarena-openclaw:pause', 'clawarena-openclaw:resume', 'clawarena-openclaw:modes', 'clawarena-openclaw:games',
   ]
 
   api.registerCli?.(({ program }) => {
 
+    // Helper: configure a command with allowExcessArguments for robustness
+    function cmd(parent: CliCommandChain | CliProgram, name: string) {
+      return parent.command(name).allowExcessArguments(true)
+    }
+
     // ── Space format: `openclaw clawarena <sub>` ──
-    const arenaGroup = program.command('clawarena').description('ClawArena agent management')
-    arenaGroup.command('create').description('Create a new agent').argument('[name]', 'Agent name').action(handleCreate)
-    arenaGroup.command('connect').description('Connect with existing API key').argument('<api-key>', 'API key').action(handleConnect)
-    arenaGroup.command('ls').description('Show agent info').action(handleLs)
-    arenaGroup.command('status').description('Show runner status').action(handleStatus)
-    arenaGroup.command('start').description('Start runner').action(handleStart)
-    arenaGroup.command('stop').description('Stop runner').action(handleStop)
-    arenaGroup.command('pause').description('Pause matchmaking').action(handlePause)
-    arenaGroup.command('resume').description('Resume matchmaking').action(handleResume)
-    arenaGroup.command('modes').description('Set preferred game modes').argument('<modes>', 'Comma-separated modes').action(handleModes)
+    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)
+    cmd(arenaGroup, 'games').description('List all available game modes').action(handleGames)
 
     // ── Colon format: `openclaw clawarena:ls` (backward compat) ──
     for (const prefix of ['clawarena', 'clawarena-openclaw']) {
-      program.command(`${prefix}:create`).description('Create a new agent').argument('[name]', 'Agent name').action(handleCreate)
-      program.command(`${prefix}:connect`).description('Connect with existing API key').argument('<api-key>', 'API key').action(handleConnect)
-      program.command(`${prefix}:ls`).description('Show agent info').action(handleLs)
-      program.command(`${prefix}:status`).description('Show runner status').action(handleStatus)
-      program.command(`${prefix}:start`).description('Start runner').action(handleStart)
-      program.command(`${prefix}:stop`).description('Stop runner').action(handleStop)
-      program.command(`${prefix}:pause`).description('Pause matchmaking').action(handlePause)
-      program.command(`${prefix}:resume`).description('Resume matchmaking').action(handleResume)
-      program.command(`${prefix}:modes`).description('Set preferred game modes').argument('<modes>', 'Comma-separated modes').action(handleModes)
+      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)
+      cmd(program, `${prefix}:games`).description('List all available game modes').action(handleGames)
     }
 
   }, { 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.6",
+  "version": "0.2.8",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

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