@muyichengshayu/promptx 0.2.8 → 0.2.10

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.2.10
+
+- 修复 Claude Code 结果完成时偶发卡死的问题：当 Claude CLI 在 result 事件后延迟退出时，runner 会进入优雅退出等待，避免强制 kill 导致消息丢失。
+- 完善 Kimi Code 执行过程展示：思考过程（thinking）不再被隐藏，可直接在执行面板中查看；工具调用（ReadFile / WriteFile / Shell 等）正确映射到前端分类（读取/写入/命令），便于分组展示。
+- 补齐 Kimi Code 事件流完整性：新增 thread.started 事件发送，修复会话创建元信息泄漏到过程日志的问题。
+- 健壮化 Kimi Code 参数解析：支持 arguments 既为字符串也可为对象，避免空参数展示为 `{}`。
+- 代码变更弹窗轮次选择器日期精确到秒：select option 中显示完整时分秒，方便在密集 run 中快速定位目标轮次。
+
+## 0.2.9
+
+- 接入 `Kimi Code CLI` 执行引擎：工作台 Agent 选择器新增 Kimi Code 选项，支持本地会话发现、线程复用、TodoList 过程展示与停止控制，与现有 Codex / Claude Code / OpenCode 并列为第四类 Agent。
+- 工作台 Agent 选择器与过滤状态持久化：切换任务后会自动恢复上次选中的 Agent 引擎和中栏过滤条件，不再每次回到默认值。
+- runner 状态提示支持多语言：idle 进度提示（排队中、运行中、停止中）通过 `messageKey` 机制走前端 i18n 翻译，英文环境下显示对应英文文案。
+- 修复图片上传地址在云主机部署下失效的问题：前端 `API_BASE` 改为运行时按 `window.location.origin` 计算，数据库中只存相对路径；同时兼容已存的老数据（`localhost` / `127.0.0.1` 绝对路径在显示时自动替换为当前 host），runner 收到的 prompt 仍会正确转换为本地地址。
+
 ## 0.2.8
 
 - 修复 `Claude Code` 的 `TodoWrite` 过程映射：待办列表会被归一为结构化 `todo_list` 事件，正确展示待办内容、进行中与已完成状态，不再只暴露原始工具输入。

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

@@ -21,6 +21,14 @@ import { createManagedSpawnOptions, forceStopChildProcess } from '../processCont
 const CLAUDE_CODE_BIN = process.env.CLAUDE_CODE_BIN || 'claude'
 const CLAUDE_DEFAULT_ARGS = ['--dangerously-skip-permissions']
 const RESOLVED_CLAUDE_CODE_BIN = resolveClaudeCodeBinary()
+const CLAUDE_RESULT_EXIT_GRACE_MS = Math.max(
+  0,
+  Number(process.env.PROMPTX_CLAUDE_RESULT_EXIT_GRACE_MS) || 3000
+)
+const CLAUDE_RESULT_FORCE_STOP_GRACE_MS = Math.max(
+  200,
+  Number(process.env.PROMPTX_CLAUDE_RESULT_FORCE_STOP_GRACE_MS) || 1000
+)
 
 function resolveClaudeCodeBinary() {
   if (process.platform !== 'win32') {
@@ -798,8 +806,60 @@ export function streamPromptToClaudeCodeSession(sessionInput, prompt, callbacks
   let finalSessionId = String(session.engineSessionId || session.engineThreadId || session.codexThreadId || '').trim()
   let fatalClaudeErrorMessage = ''
   let fatalClaudeErrorTriggered = false
+  let resultExitGraceTimer = null
+  let settled = false
+  let resolveResult = null
+  let rejectResult = null
   const normalizationState = createClaudeNormalizationState()
 
+  const clearResultExitGraceTimer = () => {
+    if (resultExitGraceTimer) {
+      clearTimeout(resultExitGraceTimer)
+      resultExitGraceTimer = null
+    }
+  }
+
+  const settleCompleted = (options = {}) => {
+    if (settled) {
+      return
+    }
+
+    settled = true
+    clearResultExitGraceTimer()
+    onEvent(createCompletedEnvelopeEvent(finalMessage))
+    resolveResult?.({
+      sessionId: session.id,
+      threadId: finalSessionId,
+      message: finalMessage,
+    })
+
+    if (options.stopChild && child.exitCode === null && child.signalCode === null) {
+      forceStopChildProcess(child, { graceMs: CLAUDE_RESULT_FORCE_STOP_GRACE_MS })
+    }
+  }
+
+  const settleError = (error) => {
+    if (settled) {
+      return
+    }
+
+    settled = true
+    clearResultExitGraceTimer()
+    rejectResult?.(error)
+  }
+
+  const scheduleResultExitGrace = () => {
+    if (settled || resultExitGraceTimer || CLAUDE_RESULT_EXIT_GRACE_MS <= 0) {
+      return
+    }
+
+    resultExitGraceTimer = setTimeout(() => {
+      resultExitGraceTimer = null
+      settleCompleted({ stopChild: true })
+    }, CLAUDE_RESULT_EXIT_GRACE_MS)
+    resultExitGraceTimer.unref?.()
+  }
+
   const rememberSessionId = (sessionId) => {
     const value = String(sessionId || '').trim()
     if (!value || value === finalSessionId) {
@@ -836,6 +896,7 @@ export function streamPromptToClaudeCodeSession(sessionInput, prompt, callbacks
 
     if (String(event?.type || '').trim().toLowerCase() === 'result') {
       finalMessage = extractClaudeResultText(event) || finalMessage
+      scheduleResultExitGrace()
     }
   }
 
@@ -857,11 +918,18 @@ export function streamPromptToClaudeCodeSession(sessionInput, prompt, callbacks
   })
 
   const result = new Promise((resolve, reject) => {
+    resolveResult = resolve
+    rejectResult = reject
+
     child.on('error', (error) => {
-      reject(normalizeSpawnError(error))
+      settleError(normalizeSpawnError(error))
     })
 
     child.on('close', (code) => {
+      if (settled) {
+        return
+      }
+
       flushBufferedText(stdoutBuffer).forEach(emitClaudeJsonLine)
       flushBufferedText(stderrBuffer).forEach((line) => {
         lastStderrLine = line
@@ -870,17 +938,11 @@ export function streamPromptToClaudeCodeSession(sessionInput, prompt, callbacks
 
       if (code !== 0) {
         const detail = fatalClaudeErrorMessage || lastStderrLine || 'Claude Code 执行失败。'
-        reject(new Error(detail))
+        settleError(new Error(detail))
         return
       }
 
-      onEvent(createCompletedEnvelopeEvent(finalMessage))
-
-      resolve({
-        sessionId: session.id,
-        threadId: finalSessionId,
-        message: finalMessage,
-      })
+      settleCompleted()
     })
   })
 

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

@@ -1,7 +1,14 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
 
-import { createClaudeNormalizationState, normalizeClaudeEvents } from './claudeCodeRunner.js'
+import {
+  createClaudeNormalizationState,
+  extractClaudeAssistantText,
+  extractClaudeResultText,
+  extractClaudeSessionId,
+  normalizeClaudeEvent,
+  normalizeClaudeEvents,
+} from './claudeCodeRunner.js'
 
 test('runner claudeCodeRunner maps fatal auth api_retry to error event', () => {
   assert.deepEqual(
@@ -277,3 +284,184 @@ test('runner claudeCodeRunner maps TodoWrite into todo_list events', () => {
     }]
   )
 })
+
+test('extractClaudeAssistantText joins nested text parts', () => {
+  const text = extractClaudeAssistantText({
+    type: 'assistant',
+    message: {
+      content: [
+        { type: 'text', text: '第一段' },
+        { type: 'text', text: '第二段' },
+      ],
+    },
+  })
+
+  assert.equal(text, '第一段\n第二段')
+})
+
+test('extractClaudeSessionId reads common session id fields', () => {
+  assert.equal(extractClaudeSessionId({ session_id: 'claude-session-1' }), 'claude-session-1')
+  assert.equal(extractClaudeSessionId({ result: { session_id: 'claude-session-2' } }), 'claude-session-2')
+})
+
+test('normalizeClaudeEvent maps assistant output to agent message', () => {
+  assert.deepEqual(
+    normalizeClaudeEvent({
+      type: 'assistant',
+      message: {
+        content: [{ type: 'text', text: '已完成修改' }],
+      },
+    }),
+    {
+      type: 'item.completed',
+      item: {
+        type: 'agent_message',
+        text: '已完成修改',
+      },
+    }
+  )
+})
+
+test('normalizeClaudeEvent maps result output to turn completion', () => {
+  assert.deepEqual(
+    normalizeClaudeEvent({
+      type: 'result',
+      result: '最终回复',
+    }),
+    {
+      type: 'turn.completed',
+      result: '最终回复',
+    }
+  )
+
+  assert.equal(extractClaudeResultText({ result: '最终回复' }), '最终回复')
+})
+
+test('normalizeClaudeEvents maps system init to thread start', () => {
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'system',
+      subtype: 'init',
+      session_id: 'claude-session-init',
+    }),
+    [{
+      type: 'thread.started',
+      thread_id: 'claude-session-init',
+    }]
+  )
+})
+
+test('normalizeClaudeEvents maps thinking, tool use and text blocks', () => {
+  const state = createClaudeNormalizationState()
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'assistant',
+      message: {
+        content: [
+          { type: 'thinking', thinking: '先看看目录结构' },
+          { type: 'tool_use', id: 'tool-1', name: 'Bash', input: { command: 'ls -1' } },
+          { type: 'text', text: '已查看完成' },
+        ],
+      },
+    }, state),
+    [
+      {
+        type: 'item.started',
+        item: {
+          type: 'reasoning',
+          text: '先看看目录结构',
+        },
+      },
+      {
+        type: 'item.started',
+        item: {
+          type: 'command_execution',
+          command: 'Bash: ls -1',
+          status: 'in_progress',
+        },
+      },
+      {
+        type: 'item.completed',
+        item: {
+          type: 'agent_message',
+          text: '已查看完成',
+        },
+      },
+    ]
+  )
+})
+
+test('normalizeClaudeEvents maps tool results back to remembered tool call', () => {
+  const state = createClaudeNormalizationState()
+  normalizeClaudeEvents({
+    type: 'assistant',
+    message: {
+      content: [
+        { type: 'tool_use', id: 'tool-2', name: 'Bash', input: { command: 'pwd' } },
+      ],
+    },
+  }, state)
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'user',
+      message: {
+        content: [
+          { type: 'tool_result', tool_use_id: 'tool-2', content: '/tmp/demo', is_error: false },
+        ],
+      },
+    }, state),
+    [{
+      type: 'item.completed',
+      item: {
+        type: 'command_execution',
+        command: 'Bash: pwd',
+        status: 'completed',
+        exit_code: 0,
+        aggregated_output: '/tmp/demo',
+      },
+    }]
+  )
+})
+
+test('normalizeClaudeEvents stringifies structured tool results', () => {
+  const state = createClaudeNormalizationState()
+  normalizeClaudeEvents({
+    type: 'assistant',
+    message: {
+      content: [
+        { type: 'tool_use', id: 'tool-3', name: 'Read', input: { file_path: '/tmp/demo.txt' } },
+      ],
+    },
+  }, state)
+
+  assert.deepEqual(
+    normalizeClaudeEvents({
+      type: 'user',
+      message: {
+        content: [
+          {
+            type: 'tool_result',
+            tool_use_id: 'tool-3',
+            content: [
+              { type: 'text', text: '<path>/tmp/demo.txt</path>' },
+              { type: 'text', text: '<type>file</type>' },
+            ],
+          },
+        ],
+      },
+    },
+    state),
+    [{
+      type: 'item.completed',
+      item: {
+        type: 'command_execution',
+        command: 'Read: /tmp/demo.txt',
+        status: 'completed',
+        exit_code: 0,
+        aggregated_output: '<path>/tmp/demo.txt</path>\n<type>file</type>',
+      },
+    }]
+  )
+})

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

@@ -7,12 +7,14 @@ import {
 import { codexRunner } from './codexRunner.js'
 import { claudeCodeRunner } from './claudeCodeRunner.js'
 import { openCodeRunner } from './openCodeRunner.js'
+import { kimiCodeRunner } from './kimiCodeRunner.js'
 import { shellRunner } from './shellRunner.js'
 
 const runnerRegistry = new Map([
   [codexRunner.engine, codexRunner],
   [claudeCodeRunner.engine, claudeCodeRunner],
   [openCodeRunner.engine, openCodeRunner],
+  [kimiCodeRunner.engine, kimiCodeRunner],
   [shellRunner.engine, shellRunner],
 ])