@mjasnikovs/pi-task 0.17.4 → 0.17.6

package/dist/task/auto-orchestrator.js

@@ -8,14 +8,16 @@
 import * as fsp from 'node:fs/promises';
 import * as path from 'node:path';
 import { gateRunTask } from './orchestrator.js';
-import { parseClarifyList, deriveTitle } from './parsers.js';
+import { parseClarifyList, parseAutoAnswer, autoAnswerHasTag, deriveTitle } from './parsers.js';
 import { renderInlineMarkdown, stripInlineMarkdown } from './inline-markdown.js';
 import { AUTO_CLARIFY_PROMPT, AUTO_DECOMPOSE_PROMPT } from './auto-prompts.js';
+import { GRILL_AUTO_ANSWER_PROMPT, GRILL_AUTO_FORMAT_HINT } from './prompts.js';
 import { isDuplicateQuestion, MAX_DUP_STRIKES, DUP_REPROMPT_HINT } from './question-dedup.js';
 import { allocateAutoId, buildAutoBody, parseDecomposeList, parseTaskList, checkOffTask, stampTaskInProgress, findResumableAuto } from './auto-io.js';
 import { writeTaskFile, readTaskFile, updateTaskFrontMatter, taskFilePath, tasksDir } from './task-io.js';
 import { findPhantomImports, rewritePhantomSpecifiers } from '../workers/phantom-imports.js';
 import { runPhaseChild, prependHint, USER_CANCELLED } from './child-runner.js';
+import { refineExistingFilesBlock } from './phases.js';
 import { SessionUI, registerBridgeCommand, publishLifecycleNotice } from '../remote/bridge.js';
 import { pushNotify } from '../remote/push.js';
 import { startAutoLoader } from './widget.js';
@@ -54,6 +56,66 @@ function logPlanDebug(cwd, msg) {
         .then(() => fsp.appendFile(path.join(dir, 'plan-debug.log'), line))
         .catch(() => { });
 }
+/**
+ * Clarify's answer-side TRIAGE — the second stage /task-auto's clarify gate was
+ * missing that /task's grill already had. /task-auto's clarify was single-stage:
+ * it generated a question and went straight to the user, with the gen prompt's
+ * own "do not re-ask what the spec settles" prose as the only guard — and a weak
+ * local model ignores that prose, surfacing questions the inlined spec already
+ * answers (the "use Hono's Bun adapter or node adapter?" question when the spec
+ * pins the Bun adapter outright).
+ *
+ * grill is gen → AUTO-ANSWER triage → user; clarify was gen → user. This runs
+ * grill's exact triage (ALREADY-DECIDED → FUNCTIONAL-REQUIREMENT → reversibility,
+ * see GRILL_AUTO_ANSWER_PROMPT) against the inlined spec BEFORE a question reaches
+ * the user. If the spec already settles the answer (or it's a cheap-to-undo
+ * default the user would accept without thinking), the question is auto-resolved
+ * and never shown — the resolved value still flows into the clarify transcript so
+ * decompose sees the decision and the next gen call won't re-ask it. Only a
+ * genuine UNKNOWN — a fork the spec leaves open — survives to the user.
+ *
+ * Returns the auto-resolved answer string when the question is settled, or null
+ * to surface it. The source fed to the triage is the feature spec itself; there
+ * is no per-feature research blob at this pre-decomposition stage (each task does
+ * its own research downstream), so the "Research" slot is a stub. Best-effort: a
+ * throw or an untagged reply falls back to surfacing the question (the prior
+ * behavior), never dropping it silently.
+ */
+async function triageClarifyQuestion(deps, cwd, featureForModel, existingFilesBlock, question) {
+    try {
+        // Prepend the existing-files block (refine's REFINE_PRESERVE_DIRECTIVE +
+        // manifest/config content) so a "scaffold/create/from scratch" question is
+        // auto-resolved as an in-place UPDATE that PRESERVES what is on disk —
+        // instead of "greenfield, from scratch", which the spec-only triage emitted
+        // 13/15 of the time and would mint a destructive decompose decision that can
+        // outrank refine's preserve directive (A/B live: 2/15 → 14/15 preserve).
+        // Empty (greenfield repo / orientation off) → byte-identical to before.
+        const source = existingFilesBlock.length > 0 ?
+            `${existingFilesBlock}\n\n${featureForModel}`
+            : featureForModel;
+        const basePrompt = GRILL_AUTO_ANSWER_PROMPT(source, '(none — clarify runs before decomposition; each task researches itself later)', question);
+        let text = await deps.runChild('clarify-triage', 'read', basePrompt);
+        if (!autoAnswerHasTag(text)) {
+            // No ANSWER/UNKNOWN/ALT tag — the model wrote prose. Reprompt once for
+            // the tagged form before trusting parseAutoAnswer's lenient salvage,
+            // exactly as phaseAutoAnswer does, so a preamble line can't masquerade
+            // as a decision.
+            text = await deps.runChild('clarify-triage', 'read', prependHint(GRILL_AUTO_FORMAT_HINT, basePrompt));
+        }
+        const parsed = parseAutoAnswer(text);
+        if (parsed.kind === 'answered') {
+            logPlanDebug(cwd, `clarify-triage auto-resolved (spec-settled): ${question.replace(/\s+/g, ' ').slice(0, 100)}`
+                + ` → ${parsed.text.replace(/\s+/g, ' ').slice(0, 100)}`);
+            return parsed.text;
+        }
+        return null;
+    }
+    catch {
+        // Triage is a best-effort filter, not a gate: on any failure, surface the
+        // question rather than silently dropping it.
+        return null;
+    }
+}
 /**
  * Expand any @file references in the feature text by appending each referenced
  * file's contents, so the planning children (clarify, decompose) always see the
@@ -186,8 +248,10 @@ export async function planAuto(ctx, cwd, feature, deps) {
     // otherwise the model's recommendation is shown as the input placeholder and
     // in the title. Nothing is pre-filled into the editor — submitting an empty
     // field is what accepts the recommendation (see the typed.length === 0 branch
-    // below); typing overrides it. We never auto-answer; the model emits NONE when
-    // nothing remains.
+    // below); typing overrides it. Each generated question first runs the
+    // answer-side TRIAGE (triageClarifyQuestion): a question the inlined spec
+    // already settles is auto-resolved and never shown — only genuine open forks
+    // reach the user. The model emits NONE when nothing remains.
     const theme = ctx.ui.theme;
     const ui = new SessionUI(ctx);
     // Inline any @file spec the user referenced so clarify/decompose reason over
@@ -208,6 +272,15 @@ export async function planAuto(ctx, cwd, feature, deps) {
     if (planPhantoms.length > 0) {
         logPlanDebug(cwd, `phantom specifiers rewritten in plan spec: ${planPhantoms.map(x => x.spec).join(', ')}`);
     }
+    // Existing manifest/config on disk (REFINE_PRESERVE_DIRECTIVE + tier 0–1
+    // content), computed ONCE and fed to every triage call so a "scaffold X"
+    // question resolves to an in-place update instead of "greenfield". '' for a
+    // greenfield/non-git repo or orientation off → triage stays spec-only.
+    const existingFilesBlock = await refineExistingFilesBlock({
+        cwd,
+        taskId: '',
+        signal: new AbortController().signal
+    }).catch(() => '');
     const answers = [];
     // Plain text of every question already shown, for the duplicate backstop.
     const askedQuestions = [];
@@ -242,6 +315,16 @@ export async function planAuto(ctx, cwd, feature, deps) {
         const shownQ = renderInlineMarkdown(question, theme);
         const plainQ = stripInlineMarkdown(question);
         askedQuestions.push(plainQ);
+        // Answer-side triage (grill parity): if the inlined spec already settles
+        // this question, auto-resolve it and never show it. The resolved value is
+        // recorded so decompose sees the decision and the next gen call's priorQA
+        // won't re-ask it.
+        const autoResolved = await triageClarifyQuestion(deps, cwd, featureForModel, existingFilesBlock, plainQ);
+        if (autoResolved !== null) {
+            answers.push(`Q${answers.length + 1}: ${plainQ}\n`
+                + `A${answers.length + 1}: ${autoResolved} (auto-resolved — already settled by the spec)`);
+            continue;
+        }
         const plainSuggested = suggested === undefined ? undefined : stripInlineMarkdown(suggested);
         const plainAlt = alt === undefined ? undefined : stripInlineMarkdown(alt);
         // Identical to /task's grill dialog: a recommendation (or A/B fork)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mjasnikovs/pi-task",
-    "version": "0.17.4",
+    "version": "0.17.6",
     "description": "Deterministic spec-orchestration for local models, with a bundled real-time remote web view and web/docs/fetch/worker subagent tools.",
     "type": "module",
     "main": "./dist/index.js",