Upstream's biggest new subsystem: background subagents, managed shell pool, and the task_stop / send_message model-facing agent control surface.
Upstream PRs (in dependency order)
Why
Significant new capability surface — model-driven background work, parallel tool execution, status/control via /tasks. Maps closely to our subagent direction but expands it substantially.
Scope / effort
XL. Aggregated stats from prior investigation:
- 159 files touched (~100-110 unique after dedup)
- +13,109 / -1,703 lines (net +11,406 LOC)
- 72 conflict zones with our fork
- 7 of 9 PRs have intra-bundle dependencies — strict merge order required
- Permeates
config.ts, agent-core.ts, nonInteractiveCli.ts, AppContainer.tsx, dialog management, tool scheduling
Decision point: Porting this locks us into upstream's subagent / background-task model. If we diverge further on agent lifecycle or task orchestration, future merges become harder. If we plan to converge with upstream on agents, this is the moment.
Prerequisites
- Architecture review: do we want upstream's task_stop/send_message API surface as our model-facing agent control?
- Plan: dedicated feature branch, do not interleave with other upstream merges.
- Estimate: 2-3 days integration + 1-2 follow-up PRs for fixes.
Links
Upstream's biggest new subsystem: background subagents, managed shell pool, and the
task_stop/send_messagemodel-facing agent control surface.Upstream PRs (in dependency order)
task_stop,send_message, per-agent transcript)/taskscommandtask_stoptoolWhy
Significant new capability surface — model-driven background work, parallel tool execution, status/control via
/tasks. Maps closely to our subagent direction but expands it substantially.Scope / effort
XL. Aggregated stats from prior investigation:
config.ts,agent-core.ts,nonInteractiveCli.ts,AppContainer.tsx, dialog management, tool schedulingDecision point: Porting this locks us into upstream's subagent / background-task model. If we diverge further on agent lifecycle or task orchestration, future merges become harder. If we plan to converge with upstream on agents, this is the moment.
Prerequisites
Links