@muyichengshayu/promptx 0.2.7 → 0.2.8

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.8
+
+- 修复 `Claude Code` 的 `TodoWrite` 过程映射：待办列表会被归一为结构化 `todo_list` 事件，正确展示待办内容、进行中与已完成状态，不再只暴露原始工具输入。
+- 优化 runner 长时间静默时的可见反馈：排队、运行中和停止中的任务会周期性补发状态进度事件，避免前端看起来像卡住，同时保持心跳与并发队列诊断信息一致。
+
 ## 0.2.7
 
 - 新增 `Aqua Classic` 主题：以复古 macOS Aqua / Snow Leopard 的银灰工具窗口为方向，补齐工作台、设置弹窗、按钮、输入框、消息卡片、确认删除等核心区域的主题 token 与专属样式。

package/apps/runner/src/engines/claudeCodeRunner.js

@@ -171,6 +171,52 @@ function isClaudeCollabToolName(name = '') {
   return ['agent', 'task'].includes(String(name || '').trim().toLowerCase())
 }
 
+function isClaudeTodoToolName(name = '') {
+  return String(name || '').trim().toLowerCase() === 'todowrite'
+}
+
+function normalizeClaudeTodoStatus(status = '') {
+  const normalized = String(status || '').trim().toLowerCase()
+  if (['completed', 'complete', 'done', 'checked'].includes(normalized)) {
+    return 'completed'
+  }
+  if (['in_progress', 'in-progress', 'active', 'doing', 'running'].includes(normalized)) {
+    return 'in_progress'
+  }
+  return 'pending'
+}
+
+function normalizeClaudeTodoText(entry = {}, status = 'pending') {
+  const content = String(entry?.content || entry?.text || entry?.title || entry?.label || '').trim()
+  const activeForm = String(entry?.activeForm || '').trim()
+  if (status === 'in_progress' && activeForm) {
+    return activeForm
+  }
+  return content || activeForm
+}
+
+function normalizeClaudeTodoItems(items = []) {
+  return (Array.isArray(items) ? items : [])
+    .map((entry) => {
+      if (!entry || typeof entry !== 'object') {
+        return null
+      }
+
+      const status = normalizeClaudeTodoStatus(entry.status)
+      const text = normalizeClaudeTodoText(entry, status)
+      if (!text) {
+        return null
+      }
+
+      return {
+        text,
+        status,
+        completed: status === 'completed',
+      }
+    })
+    .filter(Boolean)
+}
+
 function collectTextParts(value, parts = []) {
   if (!value) {
     return parts
@@ -333,23 +379,26 @@ function createClaudeToolUseEvent(block = {}, state = createClaudeNormalizationS
   const input = block?.input && typeof block.input === 'object' ? block.input : {}
   const command = buildClaudeToolCommand(name, input)
   const isCollabTool = isClaudeCollabToolName(name)
+  const isTodoTool = isClaudeTodoToolName(name)
   const collabPrompt = String(input.prompt || '').trim()
   const collabDescription = String(input.description || '').trim()
   const collabRole = String(input.subagent_type || input.agent || '').trim()
   const collabModel = String(input.model || '').trim()
   const collabTarget = extractAgentTargetFromTexts(collabDescription, collabPrompt)
+  const todoItems = normalizeClaudeTodoItems(input.todos)
 
   if (toolUseId) {
     state.toolUses.set(toolUseId, {
       name,
       command,
-      kind: isCollabTool ? 'collab' : 'command',
+      kind: isCollabTool ? 'collab' : (isTodoTool ? 'todo' : 'command'),
       prompt: collabPrompt || collabDescription,
       description: collabDescription,
       role: collabRole,
       model: collabModel,
       target: collabTarget,
       taskIds: [],
+      todoItems,
     })
   }
 
@@ -365,6 +414,15 @@ function createClaudeToolUseEvent(block = {}, state = createClaudeNormalizationS
     }
   }
 
+  if (isTodoTool) {
+    return {
+      ...createItemStartedEvent({
+        type: AGENT_RUN_ITEM_TYPES.TODO_LIST,
+        items: todoItems,
+      }),
+    }
+  }
+
   return {
     ...createItemStartedEvent({
       type: AGENT_RUN_ITEM_TYPES.COMMAND_EXECUTION,
@@ -381,6 +439,7 @@ function createClaudeToolResultEvent(block = {}, state = createClaudeNormalizati
   const isError = Boolean(block?.is_error)
   const taskIds = Array.isArray(remembered?.taskIds) ? remembered.taskIds.filter(Boolean) : []
   const collabTool = remembered?.kind === 'collab'
+  const todoTool = remembered?.kind === 'todo'
 
   if (toolUseId && state.completedCollabToolUseIds.has(toolUseId)) {
     return null
@@ -419,6 +478,15 @@ function createClaudeToolResultEvent(block = {}, state = createClaudeNormalizati
     }
   }
 
+  if (todoTool) {
+    return {
+      ...createItemCompletedEvent({
+        type: AGENT_RUN_ITEM_TYPES.TODO_LIST,
+        items: Array.isArray(remembered?.todoItems) ? remembered.todoItems : [],
+      }),
+    }
+  }
+
   return {
     ...createItemCompletedEvent({
       type: AGENT_RUN_ITEM_TYPES.COMMAND_EXECUTION,

package/apps/runner/src/engines/claudeCodeRunner.test.js

@@ -0,0 +1,279 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+import { createClaudeNormalizationState, normalizeClaudeEvents } from './claudeCodeRunner.js'
+
+test('runner claudeCodeRunner maps fatal auth api_retry to error event', () => {
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'system',
+      subtype: 'api_retry',
+      attempt: 1,
+      max_retries: 10,
+      error_status: 401,
+      error: 'authentication_failed',
+    }),
+    [{
+      type: 'error',
+      message: 'Claude Code 认证失败（HTTP 401 authentication_failed）。请重新登录 Claude Code，或检查当前环境中的认证令牌配置。',
+    }]
+  )
+})
+
+test('runner claudeCodeRunner maps transient api_retry to reconnecting error event', () => {
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'system',
+      subtype: 'api_retry',
+      attempt: 2,
+      max_retries: 10,
+      error_status: 503,
+      error: 'overloaded',
+    }),
+    [{
+      type: 'error',
+      message: 'Reconnecting... 2/10 (HTTP 503 overloaded)',
+    }]
+  )
+})
+
+test('runner claudeCodeRunner maps Agent sub-agents into collaboration events', () => {
+  const state = createClaudeNormalizationState()
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'assistant',
+      message: {
+        content: [
+          {
+            type: 'tool_use',
+            id: 'agent-tool-1',
+            name: 'Agent',
+            input: {
+              description: 'Analyze a.js exports',
+              subagent_type: 'general-purpose',
+              prompt: 'Analyze a.js in the current directory.',
+              model: 'sonnet',
+            },
+          },
+        ],
+      },
+    }, state),
+    [{
+      type: 'item.started',
+      item: {
+        type: 'collab_tool_call',
+        tool: 'spawn_agent',
+        receiver_thread_ids: [],
+        prompt: 'Analyze a.js in the current directory.',
+        agents_states: {},
+      },
+    }]
+  )
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'system',
+      subtype: 'task_started',
+      tool_use_id: 'agent-tool-1',
+      task_id: 'task-a',
+      description: 'Analyze a.js exports',
+    }, state),
+    [{
+      type: 'item.completed',
+      item: {
+        type: 'collab_tool_call',
+        tool: 'spawn_agent',
+        receiver_thread_ids: ['task-a'],
+        prompt: 'Analyze a.js in the current directory.',
+        agents_states: {
+          'task-a': {
+            status: 'running',
+            message: '',
+            title: 'Analyze a.js exports',
+            role: 'general-purpose',
+            target: 'a.js',
+            model: 'sonnet',
+            task_id: 'task-a',
+          },
+        },
+      },
+    }]
+  )
+})
+
+test('runner claudeCodeRunner maps task_completed and ignores duplicate tool_result for Agent sub-agents', () => {
+  const state = createClaudeNormalizationState()
+
+  normalizeClaudeEvents({
+    type: 'assistant',
+    message: {
+      content: [
+        {
+          type: 'tool_use',
+          id: 'agent-tool-2',
+          name: 'Agent',
+          input: {
+            description: 'Analyze b.js exports',
+            subagent_type: 'general-purpose',
+            prompt: 'Analyze b.js in the current directory.',
+            model: 'sonnet',
+          },
+        },
+      ],
+    },
+  }, state)
+
+  normalizeClaudeEvents({
+    type: 'system',
+    subtype: 'task_started',
+    tool_use_id: 'agent-tool-2',
+    task_id: 'task-b',
+    description: 'Analyze b.js exports',
+  }, state)
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'system',
+      subtype: 'task_completed',
+      task_id: 'task-b',
+      result: 'found 2 exports',
+      description: 'Analyze b.js exports',
+    }, state),
+    [{
+      type: 'item.completed',
+      item: {
+        type: 'collab_tool_call',
+        tool: 'wait',
+        receiver_thread_ids: ['task-b'],
+        prompt: 'Analyze b.js in the current directory.',
+        agents_states: {
+          'task-b': {
+            status: 'completed',
+            message: 'found 2 exports',
+            title: 'Analyze b.js exports',
+            role: 'general-purpose',
+            target: 'b.js',
+            model: 'sonnet',
+            task_id: 'task-b',
+          },
+        },
+      },
+    }]
+  )
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'user',
+      message: {
+        content: [
+          {
+            type: 'tool_result',
+            tool_use_id: 'agent-tool-2',
+            content: 'duplicate result',
+            is_error: false,
+          },
+        ],
+      },
+    }, state),
+    []
+  )
+})
+
+test('runner claudeCodeRunner maps TodoWrite into todo_list events', () => {
+  const state = createClaudeNormalizationState()
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'assistant',
+      message: {
+        content: [
+          {
+            type: 'tool_use',
+            id: 'todo-tool-1',
+            name: 'TodoWrite',
+            input: {
+              todos: [
+                {
+                  content: 'Inspect relevant backend and admin codepaths',
+                  activeForm: 'Inspecting relevant backend and admin codepaths',
+                  status: 'in_progress',
+                },
+                {
+                  content: 'Implement hospital database model and admin APIs',
+                  status: 'pending',
+                },
+                {
+                  content: 'Add tests',
+                  status: 'completed',
+                },
+              ],
+            },
+          },
+        ],
+      },
+    }, state),
+    [{
+      type: 'item.started',
+      item: {
+        type: 'todo_list',
+        items: [
+          {
+            text: 'Inspecting relevant backend and admin codepaths',
+            status: 'in_progress',
+            completed: false,
+          },
+          {
+            text: 'Implement hospital database model and admin APIs',
+            status: 'pending',
+            completed: false,
+          },
+          {
+            text: 'Add tests',
+            status: 'completed',
+            completed: true,
+          },
+        ],
+      },
+    }]
+  )
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'user',
+      message: {
+        content: [
+          {
+            type: 'tool_result',
+            tool_use_id: 'todo-tool-1',
+            content: 'Todos have been modified successfully.',
+            is_error: false,
+          },
+        ],
+      },
+    }, state),
+    [{
+      type: 'item.completed',
+      item: {
+        type: 'todo_list',
+        items: [
+          {
+            text: 'Inspecting relevant backend and admin codepaths',
+            status: 'in_progress',
+            completed: false,
+          },
+          {
+            text: 'Implement hospital database model and admin APIs',
+            status: 'pending',
+            completed: false,
+          },
+          {
+            text: 'Add tests',
+            status: 'completed',
+            completed: true,
+          },
+        ],
+      },
+    }]
+  )
+})

package/apps/runner/src/engines/openCodeRunner.test.js

@@ -0,0 +1,73 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+import { normalizeOpenCodeEvents } from './openCodeRunner.js'
+
+test('runner openCodeRunner maps sub-agent task tool_use to collaboration events', () => {
+  assert.deepEqual(
+    normalizeOpenCodeEvents({
+      type: 'tool_use',
+      sessionID: 'ses_main',
+      part: {
+        type: 'tool',
+        tool: 'task',
+        state: {
+          status: 'completed',
+          input: {
+            description: '分析 a.js 文件',
+            prompt: '请分析 /tmp/demo/a.js 文件',
+            subagent_type: 'explore',
+          },
+          output: 'task_id: ses_child_1\n\n<task_result>ok</task_result>',
+          metadata: {
+            sessionId: 'ses_child_1',
+            model: {
+              providerID: 'opencode',
+              modelID: 'minimax-m2.5-free',
+            },
+          },
+        },
+      },
+    }),
+    [
+      {
+        type: 'item.completed',
+        item: {
+          type: 'collab_tool_call',
+          tool: 'spawn_agent',
+          receiver_thread_ids: ['ses_child_1'],
+          prompt: '请分析 /tmp/demo/a.js 文件',
+          agents_states: {
+            ses_child_1: {
+              status: 'completed',
+              message: 'task_id: ses_child_1\n\n<task_result>ok</task_result>',
+              title: '分析 a.js 文件',
+              role: 'explore',
+              target: 'a.js',
+              model: 'opencode/minimax-m2.5-free',
+            },
+          },
+        },
+      },
+      {
+        type: 'item.completed',
+        item: {
+          type: 'collab_tool_call',
+          tool: 'wait',
+          receiver_thread_ids: ['ses_child_1'],
+          prompt: '请分析 /tmp/demo/a.js 文件',
+          agents_states: {
+            ses_child_1: {
+              status: 'completed',
+              message: 'task_id: ses_child_1\n\n<task_result>ok</task_result>',
+              title: '分析 a.js 文件',
+              role: 'explore',
+              target: 'a.js',
+              model: 'opencode/minimax-m2.5-free',
+            },
+          },
+        },
+      },
+    ]
+  )
+})

package/apps/runner/src/engines/shellRunner.test.js

@@ -0,0 +1,46 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import { shellRunner } from './shellRunner.js'
+
+function collectShellEvents(command) {
+  const events = []
+  const stream = shellRunner.streamSessionPrompt({
+    id: 'session-shell-test',
+    cwd: process.cwd(),
+  }, command, {
+    onEvent(event) {
+      events.push(event)
+    },
+  })
+
+  return {
+    events,
+    stream,
+  }
+}
+
+test('shellRunner runs a one-shot shell command and emits command events', async () => {
+  const command = `"${process.execPath}" -e "console.log('hello shell')"`
+  const { events, stream } = collectShellEvents(command)
+  const result = await stream.result
+
+  assert.match(result.message, /hello shell/)
+  assert.ok(events.some((event) => event?.event?.type === 'item.started'))
+  assert.ok(events.some((event) => event?.event?.type === 'item.completed'))
+  assert.ok(events.some((event) => event?.type === 'stdout' && /hello shell/.test(event.text || '')))
+})
+
+test('shellRunner surfaces non-zero exit output on errors', async () => {
+  const command = `"${process.execPath}" -e "console.error('shell failed'); process.exit(3)"`
+  const { events, stream } = collectShellEvents(command)
+
+  await assert.rejects(
+    stream.result,
+    (error) => /exit 3/.test(String(error?.message || '')) && /shell failed/.test(String(error?.output || ''))
+  )
+
+  const completed = events.find((event) => event?.event?.type === 'item.completed')
+  assert.equal(completed?.event?.item?.exit_code, 3)
+  assert.equal(completed?.event?.item?.status, 'failed')
+})