Skip to content

merge: sync dev-agent PRs (#255, #257) to main#258

Merged
ErlichLiu merged 4 commits intomainfrom
dev-agent
Apr 12, 2026
Merged

merge: sync dev-agent PRs (#255, #257) to main#258
ErlichLiu merged 4 commits intomainfrom
dev-agent

Conversation

@ErlichLiu
Copy link
Copy Markdown
Owner

Summary

Context

The upstream default branch was accidentally changed to dev-agent. After merging this PR, the default branch should be reset back to main.

🤖 Generated with Claude Code

ErlichLiu and others added 4 commits April 12, 2026 23:07
All dependencies except @anthropic-ai/claude-agent-sdk are already
bundled by esbuild/Vite into dist/, so their node_modules copies are
unnecessary in the packaged app. Move 45 packages from dependencies
to devDependencies to prevent electron-builder from auto-bundling them.

Also remove the 55MB Bun binary from extraResources — Node.js is
required for Agent functionality, and a clear error message is now
shown when it's unavailable instead of silently falling back to Bun.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
chore: remove redundant node_modules and bundled Bun from package
Bash/Agent/TaskOutput/MCP 等工具执行期间 SDK 不产出新事件,idle
watcher 120s 后误判为 API 无响应并触发自动重试,中断正在执行的工具。

通过 canUseTool 回调层检测长耗时工具(isLongRunningTool),在执行期间
设置 longRunningToolActive 标志抑制 idle timeout。收到 tool_result
或 turn 结束时清除标志,恢复正常超时检测。

与 waitingForUserInput 机制对称,共同覆盖所有「预期沉默」场景:
- waitingForUserInput:等待用户操作(AskUser / 权限确认 / ExitPlanMode)
- longRunningToolActive:等待工具执行结果(Bash / MCP / Agent / TaskOutput)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…tools

fix: idle timeout 在长耗时工具执行期间误触发重试
@ErlichLiu ErlichLiu merged commit 1ef6547 into main Apr 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant