pi-goal-x 0.18.10 → 0.19.0

package/extensions/goal-draft.ts

@@ -1,3 +1,5 @@
+import type { GoalTask } from "./goal-record.ts";
+
 export type GoalDraftingFocus = "goal" | "sisyphus";
 
 export interface GoalConfirmationIntentLike {
@@ -22,6 +24,45 @@ export type ToolGateDecision =
 	| { block: false }
 	| { block: true; reason: string };
 
+// ── Shared formatting helpers ──────────────────────────────────────────────
+
+function formatModeLabel(sisyphus: boolean): string {
+	return sisyphus ? "Sisyphus (prompt/criteria style)" : "Normal goal";
+}
+
+function formatPrefixedLines(content: string): string[] {
+	const lines: string[] = [];
+	for (const rawLine of content.split("\n")) {
+		const trimmed = rawLine.trim();
+		if (!trimmed) continue;
+		if (trimmed.startsWith("│")) {
+			lines.push(rawLine);
+		} else {
+			lines.push(`│   ${rawLine}`);
+		}
+	}
+	return lines;
+}
+
+function formatSection(title: string, content: string): string[] {
+	const body = formatPrefixedLines(content);
+	return ["", `─── ${title} ───`, "", ...body];
+}
+
+export function renderConfirmationTasks(tasks: GoalTask[], indent: number): string[] {
+	const prefix = "  ".repeat(indent);
+	const lines: string[] = [];
+	for (const t of tasks) {
+		const lw = t.lightweightSubtasks ? " (lightweight)" : "";
+		const contract = t.verificationContract ? ` contract: ${t.verificationContract}` : "";
+		lines.push(`${prefix}[ ] ${t.id}: ${t.title}${lw}${contract}`);
+		if (t.subtasks && t.subtasks.length > 0) {
+			lines.push(...renderConfirmationTasks(t.subtasks, indent + 1));
+		}
+	}
+	return lines;
+}
+
 export function promptSafeObjective(objective: string): string {
 	return objective.replace(/<\/?untrusted_objective>/gi, (tag) => tag.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
 }
@@ -84,30 +125,13 @@ export function buildDraftConfirmationText(args: {
 	autoContinue: boolean;
 }): string {
 	const lines: string[] = [];
-	const modeLabel = args.focus === "sisyphus" ? "Sisyphus (prompt/criteria style)" : "Normal goal";
 	lines.push("● Goal draft ready for confirmation.");
 	lines.push("");
 	lines.push("─── Draft Details ───");
-	lines.push(`│   Mode: ${modeLabel}`);
+	lines.push(`│   Mode: ${formatModeLabel(args.focus === "sisyphus")}`);
 	lines.push(`│   Auto-continue: ${args.autoContinue ? "yes" : "no"}`);
-	lines.push("");
-	lines.push("─── Original Topic ───");
-	lines.push("");
-	for (const topicLine of args.originalTopic.trim().split("\n")) {
-		if (topicLine.trim()) lines.push(`│   ${topicLine}`);
-	}
-	lines.push("");
-	lines.push("─── Proposed Goal ───");
-	lines.push("");
-	for (const objLine of args.objective.split("\n")) {
-		const trimmed = objLine.trim();
-		if (!trimmed) continue;
-		if (trimmed.startsWith("│")) {
-			lines.push(objLine);
-		} else {
-			lines.push(`│   ${objLine}`);
-		}
-	}
+	lines.push(...formatSection("Original Topic", args.originalTopic.trim()));
+	lines.push(...formatSection("Proposed Goal", args.objective));
 	return lines.join("\n");
 }
 
@@ -116,42 +140,22 @@ export function buildTweakConfirmationText(args: {
 	newObjective: string;
 	changeSummary: string;
 	sisyphus: boolean;
+	tasks?: GoalTask[];
 }): string {
 	const lines: string[] = [];
-	const modeLabel = args.sisyphus ? "Sisyphus (prompt/criteria style)" : "Normal goal";
 	lines.push("● Goal tweak ready for confirmation.");
 	lines.push("");
 	lines.push("─── Draft Details ───");
-	lines.push(`│   Mode: ${modeLabel}`);
-	lines.push("");
-	lines.push("─── Change ───");
-	lines.push("");
-	for (const changeLine of args.changeSummary.split("\n")) {
-		if (changeLine.trim()) lines.push(`│   ${changeLine}`);
-	}
-	lines.push("");
-	lines.push("─── Current Objective ───");
-	lines.push("");
-	for (const curLine of args.currentObjective.split("\n")) {
-		const trimmed = curLine.trim();
-		if (!trimmed) continue;
-		if (trimmed.startsWith("│")) {
-			lines.push(curLine);
-		} else {
-			lines.push(`│   ${curLine}`);
-		}
-	}
-	lines.push("");
-	lines.push("─── Proposed New Objective ───");
-	lines.push("");
-	for (const newLine of args.newObjective.split("\n")) {
-		const trimmed = newLine.trim();
-		if (!trimmed) continue;
-		if (trimmed.startsWith("│")) {
-			lines.push(newLine);
-		} else {
-			lines.push(`│   ${newLine}`);
-		}
+	lines.push(`│   Mode: ${formatModeLabel(args.sisyphus)}`);
+	lines.push(...formatSection("Change", args.changeSummary));
+	lines.push(...formatSection("Current Objective", args.currentObjective));
+	lines.push(...formatSection("Proposed New Objective", args.newObjective));
+	if (args.tasks && args.tasks.length > 0) {
+		const taskLines = renderConfirmationTasks(args.tasks, 0);
+		lines.push("");
+		lines.push(`┌─ TASKS ─────────────────────────────────────┐`);
+		for (const tl of taskLines) lines.push(tl);
+		lines.push(`└──────────────────────────────────────────────┘`);
 	}
 	return lines.join("\n");
 }

package/extensions/goal.ts

@@ -13,6 +13,7 @@ import {
 	buildTweakConfirmationText,
 	extractVerificationContract,
 	goalDraftingPrompt,
+	renderConfirmationTasks,
 	validateGoalDraftProposal,
 	type GoalDraftingFocus,
 } from "./goal-draft.ts";
@@ -2026,20 +2027,6 @@ Verification contract:
 			const autoContinueFlag = params.autoContinue ?? true;
 			const sisyphusFlag = validation.expectedSisyphus;
 			// Build confirmation text: goal + optional task list
-			function renderConfirmationTasks(tasks: GoalTask[], indent: number): string[] {
-				const prefix = "  ".repeat(indent);
-				const lines: string[] = [];
-				for (const t of tasks) {
-					const lw = t.lightweightSubtasks ? " (lightweight)" : "";
-					const contract = t.verificationContract ? ` contract: ${t.verificationContract}` : "";
-					lines.push(`${prefix}[ ] ${t.id}: ${t.title}${lw}${contract}`);
-					if (t.subtasks && t.subtasks.length > 0) {
-						lines.push(...renderConfirmationTasks(t.subtasks, indent + 1));
-					}
-				}
-				return lines;
-			}
-
 			let taskSummarySection = "";
 			let tasksToCreate: GoalTask[] | undefined;
 			if (params.tasks && params.tasks.length > 0) {
@@ -2186,10 +2173,25 @@ ${objective}` : objective,
 			"The user will see a full plain-text report plus a [Confirm] / [Continue Chatting] choice. Confirm applies the tweak; Continue Chatting returns control to you to ask follow-up questions.",
 			"If the tool returns 'continue chatting', ask the user what they want changed. Do NOT re-propose the same content immediately; iterate based on their feedback first.",
 			"Do NOT use write/edit/bash to modify the active goal file directly. propose_goal_tweak is the only sanctioned channel.",
+			"tasks (optional): an array of task objects to REPLACE the current goal's task list. When omitted,",
+			"  the existing task list is inherited as-is. When provided, the full task list is replaced with",
+			"  the new tasks — add/remove/change tasks by passing the complete updated list.",
+			"  Each task has: {id, title, verificationContract?, lightweightSubtasks?, subtasks?}.",
+			"  Subtasks use the same shape recursively. The task list is displayed in the confirmation",
+			"  dialog alongside the objective diff, matching propose_goal_draft's rendering format.",
+			"Start from the current goal's objective text and task list (the inheritance defaults), then",
+			"  edit/rewrite them directly rather than composing a goal from scratch.",
 		],
 		parameters: Type.Object({
 			newObjective: Type.String({ description: "The complete revised objective text. For Sisyphus goals, preserve the Sisyphus style unless the user explicitly changes it." }),
-			changeSummary: Type.String({ description: "One-sentence description of what was changed (used in confirmation dialog and tweak log)." }),
+			changeSummary: Type.String({ description: "One-sentence description of what was changed (used in confirmation dialog, activity log, and tweak log)." }),
+			tasks: Type.Optional(Type.Array(Type.Object({
+				id: Type.String({ description: "Short stable slug e.g. 'task-1'" }),
+				title: Type.String({ description: "Human-readable task title" }),
+				verificationContract: Type.Optional(Type.String({ description: "Optional verification contract for this task." })),
+				lightweightSubtasks: Type.Optional(Type.Boolean({ description: "If true, subtasks are lightweight (no completion enforcement). Default false." })),
+				subtasks: Type.Optional(Type.Any({ description: "Optional recursive array of sub-tasks (same shape as parent)." })),
+			}), { description: "Optional task list to replace the current goal's tasks. When omitted the existing task list is inherited. Each task supports recursive subtasks." })),
 		}),
 		executionMode: "sequential",
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
@@ -2211,6 +2213,41 @@ ${objective}` : objective,
 			const changeSummary = params.changeSummary.trim();
 			if (!changeSummary) throw new Error("propose_goal_tweak requires a non-empty changeSummary.");
 
+			// Resolve tasks: inherit from current goal if not provided, or normalize/validate the passed tasks.
+			let tweakTasks: GoalTask[] | undefined;
+			if (params.tasks && Array.isArray(params.tasks) && params.tasks.length > 0) {
+				tweakTasks = params.tasks.map((t: Record<string, unknown>) => {
+					const task: GoalTask = {
+						id: t.id as string,
+						title: t.title as string,
+						status: "pending",
+						verificationContract: t.verificationContract as string | undefined,
+						lightweightSubtasks: t.lightweightSubtasks === true ? true : undefined,
+					};
+					const rawSubtasks = t.subtasks;
+					if (Array.isArray(rawSubtasks) && rawSubtasks.length > 0) {
+						task.subtasks = rawSubtasks
+							.map((s: Record<string, unknown>) => normalizeTaskItem(s))
+							.filter((s: GoalTask | undefined): s is GoalTask => !!s);
+					}
+					return task;
+				});
+				// Validate task list
+				if (tweakTasks.length > 50) {
+					return { content: [{ type: "text", text: "Task list cannot exceed 50 tasks." }], details: goalDetails(state.goal) };
+				}
+				const settings = loadGoalSettings(ctx.cwd);
+				const depthViolation = findSubtaskDepthViolation(tweakTasks, settings.subtaskDepth ?? 1);
+				if (depthViolation) {
+					return { content: [{ type: "text", text: depthViolation }], details: goalDetails(state.goal) };
+				}
+			} else {
+				// Inherit current task list when no tasks parameter provided
+				if (state.goal.taskList && state.goal.taskList.tasks.length > 0) {
+					tweakTasks = state.goal.taskList.tasks;
+				}
+			}
+
 			// Auto-start the tweak drafting flow if not already active.
 			if (tweakDraftingFor !== state.goal.id) {
 				await startGoalTweakDrafting(changeSummary, ctx);
@@ -2230,6 +2267,7 @@ ${objective}` : objective,
 				newObjective,
 				changeSummary,
 				sisyphus: !!state.goal.sisyphus,
+				tasks: tweakTasks,
 			});
 
 			const headless = shouldAutoConfirmProposal({ hasUI: ctx.hasUI, autoConfirmEnv: process.env.PI_GOAL_AUTO_CONFIRM });
@@ -2266,6 +2304,9 @@ ${objective}` : objective,
 					// Clear any prior agent pause reason — the user has redefined the work.
 					pauseReason: undefined,
 					pauseSuggestedAction: undefined,
+					taskList: tweakTasks && tweakTasks.length > 0
+						? { tasks: tweakTasks, blockCompletion: false, proposedAt: nowIso() }
+						: undefined,
 				};
 				// IMPORTANT: bypass setGoal() / persist() here. persist() calls
 				// syncGoalPromptFromDisk() which would RE-READ the stale objective
@@ -2298,6 +2339,20 @@ ${objective}` : objective,
 				} catch {
 					// Ledger append failure should not crash tweak
 				}
+				// Append ledger event for task list change if tasks were provided
+				if (params.tasks && Array.isArray(params.tasks) && params.tasks.length > 0) {
+					try {
+						appendGoalEvent(ctx, {
+							type: "task_list_set",
+							goalId: state.goal.id,
+							taskCount: params.tasks.length,
+							blockCompletion: false,
+							at: state.goal.updatedAt,
+						});
+					} catch {
+						// Ledger append failure should not crash tweak
+					}
+				}
 				return {
 					content: [{
 						type: "text",

package/extensions/prompts/goal-prompts.ts

@@ -238,14 +238,21 @@ export function goalTweakDraftingPrompt(current: GoalRecord, hint: string): stri
 		"<current_objective>",
 		promptSafeObjective(current.objective),
 		"</current_objective>",
+		...(current.taskList && current.taskList.tasks.length > 0
+			? ["", taskListBlock(current), ""]
+			: []),
 		`Sisyphus mode: ${sisyphusOn ? "on (prompt/criteria style)" : "off"}`,
 		"",
 		"User's tweak hint (may be empty):",
+		"User's tweak hint (may be empty):",
 		"<tweak_hint>",
 		safeHint,
 		"</tweak_hint>",
 		"",
 		"Drafting protocol:",
+		"- Start from the EXISTING goal — you are editing the current goal, not writing from scratch.",
+		"  The current objective (above) and task list (if any) are your starting point. Edit/rewrite",
+		"  them directly, preserving what works and changing what needs to change.",
 		"- Apply common sense: if the hint is fully self-explanatory, acknowledge in one sentence and apply the tweak immediately. Do not invent unnecessary questions.",
 		"- Otherwise ask focused questions (1-3 rounds) to clarify exactly what to change. Prefer numbered options or yes/no.",
 		"- Do NOT call create_goal (a goal already exists).",
@@ -264,6 +271,10 @@ export function goalTweakDraftingPrompt(current: GoalRecord, hint: string): stri
 			? " === Sisyphus Goal === block (Objective / Success criteria / Boundaries / Constraints / If blocked / Sisyphus reminder)."
 			: " === Goal === block (Objective / Success criteria / Boundaries / Constraints / If blocked)."),
 		"   - changeSummary: one sentence describing what changed.",
+		"   - tasks (optional): an array of task objects to REPLACE the current goal's task list. If omitted,",
+		"     the existing task list is inherited as-is. If you need to add/remove/change tasks, pass the",
+		"     full updated task list here. Each task has {id, title, verificationContract?, lightweightSubtasks?, subtasks?}.",
+		"     Subtasks use the same shape recursively.",
 		"2. propose_goal_tweak opens the user's Confirm / Continue Chatting dialog.",
 		"   - Confirm applies the tweak. Stop; the next continuation will arrive automatically if the goal is active.",
 		"   - Continue Chatting means the drafting stays active — ask the user what they want changed, then revise and call propose_goal_tweak again.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goal-x",
-  "version": "0.18.10",
+  "version": "0.19.0",
   "description": "Goal mode extension for pi: persistent long-running objectives, /goal-set drafting, Sisyphus prompt style, autoContinue, and an above-editor status overlay. Fork of @capyup/pi-goal.",
   "license": "MIT",
   "author": "pi-goal-x contributors",