opencode-discipline 0.1.3 → 0.1.4

package/agents/README.md

@@ -7,7 +7,7 @@ This package ships seven agent definitions for disciplined plan-first execution.
 | `plan` | `anthropic/claude-opus-4-6` | primary | Runs the 4-wave planning workflow and coordinates accept/revise handoff |
 | `build` | `anthropic/claude-opus-4-6` | primary | Executes approved plans phase-by-phase with verification gates |
 | `oracle` | `openai/gpt-5.4` | subagent | Read-only architecture and tradeoff advisor |
-| `librarian` | `openai/gpt-4.1-mini` | subagent | Read-only research and documentation specialist |
+| `librarian` | `openai/gpt-5.4-mini` | subagent | Read-only research and documentation specialist |
 | `reviewer` | `openai/gpt-5.4` | subagent | Read-only quality critic for plans and code |
 | `designer` | `anthropic/claude-sonnet-4-6` | subagent | Read-only UI/UX and accessibility advisor |
 | `deep` | `openai/gpt-5.3-codex` | subagent | Advanced implementation subagent for complex coding work |

package/agents/explore.md

@@ -1,6 +1,6 @@
 ---
 description: Fast codebase search. Finds files, patterns, and structure quickly. Cheap and parallel-friendly.
-model: openai/gpt-4.1-mini
+model: openai/gpt-5.4-mini
 temperature: 0
 mode: subagent
 color: "#78909C"

package/agents/librarian.md

@@ -1,6 +1,6 @@
 ---
 description: Research specialist. Gathers context from codebase, external docs, and reference implementations before work begins. Returns structured findings.
-model: openai/gpt-4.1-mini
+model: openai/gpt-5.4-mini
 temperature: 0
 mode: subagent
 color: "#1D9E75"

package/agents/plan.md

@@ -73,10 +73,10 @@ Before generating the plan, perform a Metis-style gap check. Ask yourself:
 4. **Ambiguity** — Are there terms or requirements that could be interpreted two ways?
 5. **Breaking changes** — Will this plan touch shared interfaces, public APIs, or migration paths?
 
-If any gaps are found:
-- Ask the user to clarify (1-2 questions max)
-- Delegate to @oracle if the gap involves an architectural tradeoff
-- Document the gap and resolution in the plan under "## Decisions"
+Wave 2 policy (always required):
+- Ask the user to clarify gaps when needed (1-2 questions max)
+- Delegate to @oracle once in every Wave 2 pass, even for simple tasks
+- Summarize oracle feedback and document the resolution in the plan under "## Decisions"
 
 ### Wave 3: Plan generation
 
@@ -157,10 +157,7 @@ For high-stakes plans (production changes, data migrations, auth refactors):
 After writing and completing Wave 4 review:
 1. Tell the user: "Plan written to `tasks/plans/{filename}.md`"
 2. Summarize in 3-5 sentences
-3. Present exactly three choices and ask the user to pick one:
-   - **Accept plan & start work** — Call `accept_plan(action="accept")` to create a new Build session with the plan registered. The Build agent will start implementing immediately.
-   - **Start work later** — Do nothing. The plan is saved and the user can start a Build session manually whenever they're ready.
-   - **I have modifications to make** — Call `accept_plan(action="revise")` and stay in Wave 4 to incorporate the user's feedback. After revisions, present these three choices again.
+3. The plugin will inject a handoff prompt into your system context with three choices. Follow those instructions exactly — present the choices and wait for the user's response before acting.
 
 ## Rules
 

package/dist/index.js

@@ -11,7 +11,7 @@ var __export = (target, all) => {
 };
 
 // src/index.ts
-import { accessSync, constants } from "fs";
+import { accessSync, constants, existsSync as existsSync2 } from "fs";
 import { basename, relative, resolve } from "path";
 
 // node_modules/@opencode-ai/plugin/node_modules/zod/v4/classic/external.js
@@ -12665,7 +12665,7 @@ function buildWaveStateSystemBlock(wave, planName) {
     "",
     "### Wave rules:",
     "- Wave 1 (Interview): Ask clarifying questions. Delegate to @explore and @librarian. Do NOT write the plan yet.",
-    "- Wave 2 (Gap Analysis): Check for hidden intent, over-engineering, missing context, ambiguity, breaking changes. Do NOT write the plan yet.",
+    "- Wave 2 (Gap Analysis): Check for hidden intent, over-engineering, missing context, ambiguity, breaking changes. MANDATORY: consult @oracle in this wave before advancing. Do NOT write the plan yet.",
     "- Wave 3 (Plan Generation): NOW write the plan to tasks/plans/{planName}.md using the structured template.",
     "- Wave 4 (Review): Self-review the plan. Delegate to @oracle for high-stakes decisions. Edit the plan if needed.",
     "",
@@ -12674,6 +12674,14 @@ function buildWaveStateSystemBlock(wave, planName) {
   ].join(`
 `);
 }
+function buildWave2OraclePrompt() {
+  return [
+    "## MANDATORY: Wave 2 Oracle Check",
+    "Before you can advance to Wave 3, delegate to `@oracle` once for a gap-analysis sanity check.",
+    'Use the Task tool with `subagent_type: "oracle"` and summarize the result in your analysis.'
+  ].join(`
+`);
+}
 function buildPlanReadOnlyReminder() {
   return [
     "## CRITICAL: Plan mode ACTIVE - you are in READ-ONLY phase...",
@@ -12684,6 +12692,31 @@ function buildPlanReadOnlyReminder() {
   ].join(`
 `);
 }
+function buildPlanHandoffPrompt(planName) {
+  const planPath = `tasks/plans/${planName}.md`;
+  return [
+    "## MANDATORY: Plan Handoff \u2014 Present Choices Now",
+    "",
+    `The plan file \`${planPath}\` has been written and Wave 4 review is complete.`,
+    "You MUST present the following choices to the user. Do NOT skip this step.",
+    "Do NOT say 'switch to Build' or any other freeform handoff text.",
+    "",
+    "Present this EXACTLY:",
+    "",
+    "---",
+    "**Choose one:**",
+    `1. **Accept plan & start work** \u2014 I'll call \`accept_plan\` to create a new Build session and start implementing \`${planPath}\` immediately.`,
+    "2. **Start work later** \u2014 The plan is saved. You can start a Build session whenever you're ready.",
+    "3. **I have modifications to make** \u2014 Stay in review mode so you can request changes.",
+    "---",
+    "",
+    "Then wait for the user's response before taking any action.",
+    '- If the user picks option 1: call `accept_plan(action="accept")`',
+    "- If the user picks option 2: do nothing, confirm the plan is saved",
+    '- If the user picks option 3: call `accept_plan(action="revise")`, ask what to change, and after revisions present these choices again'
+  ].join(`
+`);
+}
 function buildCompactionContext(state) {
   const acceptedLine = state.acceptedAt ? `- Accepted timestamp: ${state.acceptedAt}${state.acceptedBySessionID ? ` (build session ${state.acceptedBySessionID})` : ""}` : "- accept_plan controls handoff to Build; if accepted, preserve build session id and accepted timestamp.";
   return [
@@ -12701,20 +12734,51 @@ function buildCompactionContext(state) {
   ].join(`
 `);
 }
-function buildTodoSeedContent(planName) {
-  return `Plan kickoff: ${planName}`;
+function buildPlanningTodos(planName) {
+  const planPath = `tasks/plans/${planName}.md`;
+  return [
+    {
+      content: "Wave 1: Interview - clarify requirements, scope, constraints, and success criteria",
+      status: "in_progress",
+      priority: "high"
+    },
+    {
+      content: "Wave 2: Gap Analysis - surface hidden intent, ambiguity, risks, and breaking changes",
+      status: "pending",
+      priority: "high"
+    },
+    {
+      content: `Wave 3: Plan Generation - write the structured plan file at ${planPath}`,
+      status: "pending",
+      priority: "high"
+    },
+    {
+      content: "Wave 4: Review - self-review clarity, verification, scope, and implementation readiness",
+      status: "pending",
+      priority: "high"
+    },
+    {
+      content: "Step 5: Ask user to confirm - choose one: Accept plan & start work / Start work later / I have modifications to make",
+      status: "pending",
+      priority: "high"
+    }
+  ];
+}
+function normalizeTodoContent(content) {
+  return content.toLowerCase().replace(/\s+/g, " ").trim();
 }
 function buildTodoSeedInstruction(planName, retry) {
-  const content = buildTodoSeedContent(planName);
+  const todoItems = buildPlanningTodos(planName);
   const title = retry ? "## Discipline Plugin \u2014 Todo Seed Retry" : "## Discipline Plugin \u2014 Todo Seed";
-  const intro = retry ? "The plan kickoff todo is still missing in the right panel." : "Before continuing, create the kickoff todo so progress is visible in the right panel.";
+  const intro = retry ? "The planning checklist is still missing in the right panel." : "Before continuing, create the planning checklist in the right panel.";
+  const todoLines = todoItems.map((todo, index) => {
+    return `${index + 1}. content: \`${todo.content}\` | status: \`${todo.status}\` | priority: \`${todo.priority}\``;
+  });
   return [
     title,
     intro,
-    "Call `todowrite` now with this item:",
-    `- content: \`${content}\``,
-    "- status: `in_progress`",
-    "- priority: `high`"
+    "Call `todowrite` now with these five items:",
+    ...todoLines
   ].join(`
 `);
 }
@@ -12732,9 +12796,12 @@ function extractTodos(response) {
   }
   return [];
 }
-function hasPlanKickoffTodo(todos, planName) {
-  const expected = buildTodoSeedContent(planName).toLowerCase();
-  return todos.some((todo) => todo.content.toLowerCase().includes(expected));
+function hasPlanningTodoChecklist(todos, planName) {
+  const normalizedTodos = todos.map((todo) => normalizeTodoContent(todo.content));
+  const expectedContents = buildPlanningTodos(planName).map((todo) => normalizeTodoContent(todo.content));
+  return expectedContents.every((expected) => {
+    return normalizedTodos.some((content) => content.includes(expected));
+  });
 }
 async function readSessionTodos(client, directory, sessionID) {
   const sessionApi = client.session;
@@ -12771,6 +12838,15 @@ async function handleSystemTransform(ctx, input, output) {
   if (currentAgent === "plan" && state.wave < 3) {
     output.system.push(buildPlanReadOnlyReminder());
   }
+  if (currentAgent === "plan" && state.wave === 2 && !state.accepted) {
+    output.system.push(buildWave2OraclePrompt());
+  }
+  if (currentAgent === "plan" && state.wave === 4 && !state.accepted) {
+    const planFilePath = resolve(ctx.worktree, `tasks/plans/${state.planName}.md`);
+    if (existsSync2(planFilePath)) {
+      output.system.push(buildPlanHandoffPrompt(state.planName));
+    }
+  }
   if (sessionID && currentAgent === "plan" && !state.accepted) {
     const nudgeState = ctx.todoNudges.get(sessionID) ?? {
       prompted: false,
@@ -12778,7 +12854,7 @@ async function handleSystemTransform(ctx, input, output) {
       seeded: false
     };
     const todos = await readSessionTodos(ctx.client, ctx.directory, sessionID);
-    const hasSeededTodo = todos !== undefined && hasPlanKickoffTodo(todos, state.planName);
+    const hasSeededTodo = todos !== undefined && hasPlanningTodoChecklist(todos, state.planName);
     if (hasSeededTodo) {
       nudgeState.seeded = true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-discipline",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",