@cspeach/cli 0.9.0 → 1.0.0

package/dist/tools/dispatch-skill.js

@@ -22,11 +22,20 @@
  *
  * The harness clears pendingDispatch at the start of every consume cycle,
  * so a stale dispatch from a prior turn never re-fires.
+ *
+ * A1 (2026-06-10, defect D23): `/abap-plan --resume …` is REJECTED here.
+ * Plan auto-run is harness-owned — commands/plan-resume.ts builds the
+ * resume command from the exact path it just saved and queues it itself
+ * (offerNextPhaseAutoRun). When the model authored this text it once
+ * hallucinated a wrong base token ("@…-plan-c1" → "no file matching")
+ * while the harness had just printed the real saved path. The tool stays
+ * for every other dispatch (e.g. /abap-generate → /abap-rap switch).
  */
 import { registerTool } from './index.js';
+import { isPlanResumeCommand } from '../commands/plan-resume.js';
 registerTool({
     name: 'dispatch_skill',
-    description: 'Queue the next user submission to a slash command the user already explicitly approved via an inquirer picker. Use this in place of telling the user "Type X at the next prompt" — re-typing what they already picked is friction. Only call this AFTER an explicit user consent (ask_question pick, picker confirmation, etc.); never from prose or a one-line suggestion. The command must start with a known slash route (e.g. "/abap-rap --from @<file>"). After this tool returns, end the turn — do not also print a continuation hint.',
+    description: 'Queue the next user submission to a slash command the user already explicitly approved via an inquirer picker. Use this in place of telling the user "Type X at the next prompt" — re-typing what they already picked is friction. Only call this AFTER an explicit user consent (ask_question pick, picker confirmation, etc.); never from prose or a one-line suggestion. The command must start with a known slash route (e.g. "/abap-rap --from @<file>"). NEVER dispatch "/abap-plan --resume" — plan continuation is harness-owned: the CLI offers and dispatches the next phase itself after the manifest is persisted. After this tool returns, end the turn — do not also print a continuation hint.',
     isMutating: false,
     input_schema: {
         type: 'object',
@@ -58,6 +67,18 @@ registerTool({
                 }),
             };
         }
+        // A1 (defect D23) — plan auto-run is harness-owned. The CLI builds the
+        // resume command from the exact saved envelope path and asks the user
+        // itself; a model-authored variant risks a hallucinated file token.
+        if (isPlanResumeCommand(command)) {
+            return {
+                is_error: true,
+                content: JSON.stringify({
+                    error: 'PLAN_RESUME_HARNESS_OWNED',
+                    reason: 'Do not dispatch /abap-plan --resume. After your plan manifest is persisted, the CLI itself offers the user the next phase and dispatches the resume with the exact saved file in a fresh bounded context. Simply end the turn now.',
+                }),
+            };
+        }
         if (!ctx.pendingDispatch) {
             // Non-REPL path (one-shot, tests). Tell the model the dispatch
             // can't take effect here so it falls back to a continuation hint.