pi-do-always 0.16.0 → 0.18.0

package/extensions/pi-do-always/index.ts

@@ -1033,7 +1033,8 @@ export default function doAlwaysExtension(pi: ExtensionAPI) {
 		const base = renderPrompt(task.prompt, ctx);
 		const enabled = task.questionnaire ?? questionnaireEnabled;
 		if (isPlanTask(task) && enabled && !base.includes("```plan")) {
-			return `${base}\n\n${PLAN_OUTPUT_INSTRUCTION}`;
+			// Prepend so the LLM sees the instruction first (more reliable in long sessions)
+			return `${PLAN_OUTPUT_INSTRUCTION}\n\n${base}`;
 		}
 		return base;
 	}
@@ -2979,6 +2980,7 @@ export default function doAlwaysExtension(pi: ExtensionAPI) {
 				{ value: "list", label: "list" },
 				{ value: "list-details", label: "list-details" },
 				{ value: "replan", label: "replan" },
+				{ value: "questionnaire", label: "questionnaire (toggle)" },
 				...visible.map((t, i) => ({ value: t.name, label: `${i + 1}. ${t.name}` })),
 			].filter((c) => c.value.toLowerCase().includes(p));
 			return matches.length > 0 ? matches : null;
@@ -3039,6 +3041,18 @@ export default function doAlwaysExtension(pi: ExtensionAPI) {
 			return;
 		}
 
+		// Toggle the questionnaire on/off for the rest of this session.
+		if (arg.toLowerCase() === "questionnaire") {
+			questionnaireEnabled = !questionnaireEnabled;
+			ctx.ui.notify(
+				questionnaireEnabled
+					? "do-always: questionnaire enabled (plan proposals will be offered)"
+					: "do-always: questionnaire disabled (plan proposals will not be offered)",
+				"info",
+			);
+			return;
+		}
+
 		if (arg.toLowerCase() === "list-details") {
 			// Display only — the description is metadata; selecting a task injects just its prompt.
 			// Render with the current context so what is shown is what gets injected.

package/extensions/pi-do-always/tasks.ts

@@ -1565,11 +1565,15 @@ export function formatCommitReviewPrompt(commits: SelectedCommit[]): string {
  * place so every Plan prompt shares the same contract.
  */
 export const PLAN_OUTPUT_INSTRUCTION =
-	"End your reply with a machine-readable plan block: a fenced code block tagged plan (```plan) containing JSON of exactly this shape: " +
-	'{"summary":"one-line summary","tiers":[{"id":"P0","label":"Critical","items":[{"title":"short action","detail":"where and why (file:line if known)"}]}]}. ' +
-	"One tier per priority level, most urgent first (P0, P1, P2, ...). " +
-	"Each item must be one concrete, independently doable action. " +
-	'Use an empty "tiers" array when no action is needed.';
+	"Plan block (required):\n" +
+	"End your reply with a fenced code block tagged plan (\`\`\`plan) containing ONLY the JSON object — nothing else:\n" +
+	'{"summary":"one-line summary","tiers":[{"id":"P0","label":"Critical","items":[{"title":"short action","detail":"where and why (file:line if known)"}]}]}\n' +
+	"Rules:\n" +
+	"- One tier per priority level, most urgent first (P0, P1, P2, …)\n" +
+	"- Each item must be one concrete, independently doable action\n" +
+	"- Use an empty \"tiers\" array when no action is needed\n" +
+	"- The fenced block must contain ONLY the JSON — no explanation, no comments, no text after the closing }\n" +
+	"- The plan block must be the very last thing in your reply\n";
 
 /** One concrete action item proposed by a Plan run. */
 export interface PlanItem {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-do-always",
-	"version": "0.16.0",
+	"version": "0.18.0",
 	"type": "module",
 	"description": "Pi extension: /do-always — pick a common task by number, it fills your prompt",
 	"author": {