myclaude

cexll/myclaude

Fork 0

mirror of https://github.com/cexll/myclaude.git synced 2026-02-05 02:30:26 +08:00

Commit Graph

Author	SHA1	Message	Date
ben	0f359b048f	Improve backend termination after message and extend timeout (#86 ) * Improve backend termination after message and extend timeout * fix: prevent premature backend termination and revert timeout Critical fixes for executor.go termination logic: 1. Add onComplete callback to prevent premature termination - Parser now distinguishes between "any message" (onMessage) and "terminal event" (onComplete) - Codex: triggers onComplete on thread.completed - Claude: triggers onComplete on type:"result" - Gemini: triggers onComplete on type:"result" + terminal status 2. Fix executor to wait for completion events - Replace messageSeen termination trigger with completeSeen - Only start postMessageTerminateDelay after terminal event - Prevents killing backend before final answer in multi-message scenarios 3. Fix terminated flag synchronization - Only set terminated=true if terminateCommandFn actually succeeds - Prevents "marked as terminated but not actually terminated" state 4. Simplify timer cleanup logic - Unified non-blocking drain on messageTimer.C - Remove dependency on messageTimerCh nil state 5. Revert defaultTimeout from 24h to 2h - 24h (86400s) → 2h (7200s) to avoid operational risks - 12× timeout increase could cause resource exhaustion - Users needing longer tasks can use CODEX_TIMEOUT env var All tests pass. Resolves early termination bug from code review. Co-authored-by: Codeagent (Codex) Generated with SWE-Agent.ai Co-Authored-By: SWE-Agent.ai <noreply@swe-agent.ai> --------- Co-authored-by: SWE-Agent.ai <noreply@swe-agent.ai>	2025-12-21 15:55:01 +08:00
swe-agent[bot]	6f4f4e701b	fix(parser): 修复 bufio.Scanner token too long 错误 (#64 ) ## 问题 - 执行 rg 等命令时，如果匹配到 minified 文件，单行输出可能超过 10MB - 旧实现使用 bufio.Scanner，遇到超长行会报错并中止整个解析 - 导致后续的 agent_message 无法读取，任务失败 ## 修复 1. parser.go: - 移除 bufio.Scanner，改用 bufio.Reader + readLineWithLimit - 超长行（>10MB）会被跳过但继续处理后续事件 - 添加 codexHeader 轻量级解析，只在 agent_message 时完整解析 2. utils.go: - 修复 logWriter 内存膨胀问题 - 添加 writeLimited 方法限制缓冲区大小 3. 测试: - parser_token_too_long_test.go: 验证超长行处理 - log_writer_limit_test.go: 验证日志缓冲限制 ## 测试结果 - ✅ TestParseJSONStream_SkipsOverlongLineAndContinues - ✅ TestLogWriterWriteLimitsBuffer - ✅ 完整测试套件通过 Fixes #64 Generated with swe-agent-bot Co-Authored-By: swe-agent-bot <agent@swe-agent.ai>	2025-12-15 13:19:51 +08:00

Author

SHA1

Message

Date

ben

0f359b048f

Improve backend termination after message and extend timeout (#86 )

* Improve backend termination after message and extend timeout

* fix: prevent premature backend termination and revert timeout

Critical fixes for executor.go termination logic:

1. Add onComplete callback to prevent premature termination
   - Parser now distinguishes between "any message" (onMessage) and
     "terminal event" (onComplete)
   - Codex: triggers onComplete on thread.completed
   - Claude: triggers onComplete on type:"result"
   - Gemini: triggers onComplete on type:"result" + terminal status

2. Fix executor to wait for completion events
   - Replace messageSeen termination trigger with completeSeen
   - Only start postMessageTerminateDelay after terminal event
   - Prevents killing backend before final answer in multi-message scenarios

3. Fix terminated flag synchronization
   - Only set terminated=true if terminateCommandFn actually succeeds
   - Prevents "marked as terminated but not actually terminated" state

4. Simplify timer cleanup logic
   - Unified non-blocking drain on messageTimer.C
   - Remove dependency on messageTimerCh nil state

5. Revert defaultTimeout from 24h to 2h
   - 24h (86400s) → 2h (7200s) to avoid operational risks
   - 12× timeout increase could cause resource exhaustion
   - Users needing longer tasks can use CODEX_TIMEOUT env var

All tests pass. Resolves early termination bug from code review.

Co-authored-by: Codeagent (Codex)

Generated with SWE-Agent.ai

Co-Authored-By: SWE-Agent.ai <noreply@swe-agent.ai>

---------

Co-authored-by: SWE-Agent.ai <noreply@swe-agent.ai>

2025-12-21 15:55:01 +08:00

swe-agent[bot]

6f4f4e701b

fix(parser): 修复 bufio.Scanner token too long 错误 (#64 )

## 问题
- 执行 rg 等命令时，如果匹配到 minified 文件，单行输出可能超过 10MB
- 旧实现使用 bufio.Scanner，遇到超长行会报错并中止整个解析
- 导致后续的 agent_message 无法读取，任务失败

## 修复
1. **parser.go**:
   - 移除 bufio.Scanner，改用 bufio.Reader + readLineWithLimit
   - 超长行（>10MB）会被跳过但继续处理后续事件
   - 添加 codexHeader 轻量级解析，只在 agent_message 时完整解析

2. **utils.go**:
   - 修复 logWriter 内存膨胀问题
   - 添加 writeLimited 方法限制缓冲区大小

3. **测试**:
   - parser_token_too_long_test.go: 验证超长行处理
   - log_writer_limit_test.go: 验证日志缓冲限制

## 测试结果
- ✅ TestParseJSONStream_SkipsOverlongLineAndContinues
- ✅ TestLogWriterWriteLimitsBuffer
- ✅ 完整测试套件通过

Fixes #64

Generated with swe-agent-bot

Co-Authored-By: swe-agent-bot <agent@swe-agent.ai>

2025-12-15 13:19:51 +08:00

2 Commits