diff --git a/assets/orchestrate/workflow.md b/assets/orchestrate/workflow.md index 9d215d0b..cfca937d 100644 --- a/assets/orchestrate/workflow.md +++ b/assets/orchestrate/workflow.md @@ -20,7 +20,8 @@ preference; choose the least costly adequate profile. bounded assignment for implementation, investigation, testing, or verification. Include the context it cannot see, the objective, scope and constraints, checkable acceptance criteria, and the result evidence you need. Scale the - number of workers to the task and the independence of their scopes. + number of workers to the work that can advance concurrently and its dependencies; + trivial indivisible tasks do not need multiple workers. - **Decision collaboration — `collaborate`.** Optionally ask an enabled collaboration model for an independent approach, challenge, tradeoff analysis, or decision review. This is separate from execution dispatch and does not @@ -28,8 +29,8 @@ preference; choose the least costly adequate profile. advisory and you own the decision. Keep peer briefs focused on independent judgment; route implementation and broad -sweeps through `dispatch`. Preserve existing user work, and use disjoint worker -scopes or isolation where execution could overlap. +sweeps through `dispatch`. Proactively dispatch work that can advance concurrently. +Preserve existing user work and task outcomes. Prefer Orchestrate to provider-native subagents so delegated work stays visible and configurable in tcode. Use native subagents only when Orchestrate genuinely @@ -42,7 +43,9 @@ abandonment after one failed call. You retain discretion over the lead work needed for understanding, decisions, acceptance, coordination, and integration within the user's authorization. Use that discretion in support of execution ownership; assigned implementation stays -with the worker unless the fallback above applies. +with the worker unless the fallback above applies. You integrate parallel +deliverables and resolve conflicts, retaining final acceptance of the integrated +result. ## Accept the result diff --git a/docs/DESIGN.md b/docs/DESIGN.md index a38aae85..26999fb1 100644 --- a/docs/DESIGN.md +++ b/docs/DESIGN.md @@ -322,9 +322,12 @@ Orchestrate uses one provider-neutral workflow, refreshed on each explicit `/orchestrate` message. The main thread frames and decides, routes concrete work to execution models across the enabled provider fleet, and independently accepts or rejects the actual integrated result. Small tasks reduce coordination overhead, -not execution ownership. Optional peer discussion remains separate from execution. -A child report informs the main thread's judgment but is not itself acceptance; -the main thread retains discretion over proportionate verification. +not execution ownership. Work that can advance concurrently is routed according +to task dependencies; the main thread integrates parallel deliverables, resolves +conflicts, and retains final acceptance of the integrated result. Optional peer +discussion remains separate from execution. A child report informs the main +thread's judgment but is not itself acceptance; the main thread retains discretion +over proportionate verification. Settings show two model lists: **Collaboration models**, bundled with GPT-6 Astra and Claude Fable 5.1, and **Execution models**, bundled with