pi-goal-x 0.16.0 → 0.16.1

package/extensions/goal-policy.ts

@@ -202,7 +202,8 @@ export function validateTaskSkip(args: {
 	const task = args.goal.taskList.tasks.find((t) => t.id === args.taskId);
 	if (!task) return { ok: false, message: `Task "${args.taskId}" not found.` };
 	if (task.status === "complete") return { ok: false, message: `Task "${args.taskId}" is already complete.` };
-	if (task.status === "skipped") return { ok: false, message: `Task "${args.taskId}" was already skipped.` };
+	// Skipped tasks toggle via the executor; reason is only required for first-time skips.
+	if (task.status === "skipped") return { ok: true };
 	if (!args.reason.trim()) return { ok: false, message: "skip_task requires a non-empty reason." };
 	return { ok: true };
 }

package/extensions/goal.ts

@@ -2555,6 +2555,7 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		promptGuidelines: [
 			"Use propose_task_list after a goal is confirmed, on the first continuation turn, if the objective naturally decomposes into trackable milestones.",
 			"Do not add a task list for simple, single-step goals.",
+			"If a task list already exists on the goal, only call propose_task_list to restructure it when (a) the user explicitly asks for a change, or (b) the goal objective or requirements have structurally changed. Do not restructure the task list autonomously.",
 			"Existing tasks with matching IDs preserve their status/evidence/timestamps; new IDs start as pending; removed IDs are gone.",
 			"After confirmation the turn stops; the next continuation will arrive automatically.",
 			"You may optionally specify a verificationContract per task to define what verification evidence is required before completing that task.",
@@ -2811,9 +2812,12 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		label: "Skip Task",
 		description: "Skip a pending task in the current goal's task list. Does NOT stop the turn — the agent can continue working.",
 		promptSnippet: "Skip a task with a reason. Does not stop the turn.",
-		promptGuidelines: [
+promptGuidelines: [
 			"Use skip_task to mark a task as skipped with a required reason.",
 			"The turn does NOT stop after skip_task — you may continue with other work.",
+			"Only skip a task when the user explicitly asks you to, or when the task directly contradicts a hard constraint (e.g. an impossible requirement).",
+			"Do NOT autonomously skip tasks to avoid work, or because they look optional, inconvenient, or out of scope. When in doubt, ask the user first.",
+			"If skip_task is called on an already-skipped task, it toggles back to pending (unskip).",
 		],
 		parameters: Type.Object({
 			taskId: Type.String({ description: "Task id to skip" }),
@@ -2837,8 +2841,15 @@ export default function goalExtension(pi: ExtensionAPI): void {
 			}
 			if (!state.goal?.taskList) throw new Error("Task list disappeared during task skip.");
 			const now = nowIso();
+			const wasAlreadySkipped = findTaskInTree(state.goal.taskList.tasks, params.taskId)?.status === "skipped";
+
 			const updatedTasks = updateTaskInTree(state.goal.taskList.tasks, params.taskId, (t) => {
-				// Cascade skip to all subtasks (full subtasks only)
+				if (t.status === "skipped") {
+					// Toggle back to pending — clear skip state, do NOT cascade to subtasks
+					const { skippedAt, skipReason, ...rest } = t;
+					return { ...rest, status: "pending" as const };
+				}
+				// First-time skip: cascade to all subtasks (full subtasks only)
 				const base = { ...t, status: "skipped" as const, skippedAt: now, skipReason: params.reason.trim() };
 				if (t.subtasks && t.subtasks.length > 0 && !t.lightweightSubtasks) {
 					return skipAllSubtasks(base, now, params.reason.trim());
@@ -2856,22 +2867,33 @@ export default function goalExtension(pi: ExtensionAPI): void {
 			syncGoalTools();
 			updateUI(ctx);
 
-			// Append ledger event
+// Append ledger event
 			try {
-				appendGoalEvent(ctx, {
-					type: "task_skipped",
-					goalId: state.goal.id,
-					taskId: params.taskId,
-					reason: params.reason.trim(),
-					at: now,
-				});
+				if (wasAlreadySkipped) {
+					appendGoalEvent(ctx, {
+						type: "task_skipped",
+						goalId: state.goal.id,
+						taskId: params.taskId,
+	reason: "unskipped (toggle via skip_task)",
+						at: now,
+					});
+				} else {
+					appendGoalEvent(ctx, {
+						type: "task_skipped",
+						goalId: state.goal.id,
+						taskId: params.taskId,
+						reason: params.reason.trim(),
+						at: now,
+					});
+				}
 			} catch {
 				// Ledger failure should not block task skip
 			}
 
 			const taskSummary = buildTaskSummary(state.goal.taskList!);
+			const action = wasAlreadySkipped ? "unsikpped" : "skipped";
 			return {
-				content: [{ type: "text", text: `${params.taskId} skipped. ${taskSummary}.` }],
+				content: [{ type: "text", text: `${params.taskId} ${action}. ${taskSummary}.` }],
 				details: goalDetails(state.goal),
 			};
 		},

package/extensions/prompts/goal-prompts.ts

@@ -130,10 +130,12 @@ ${untrustedObjectiveBlock(goal)}
 
 Available work tools for pursuing the active goal include write, read, bash, and edit. Use those tools directly for file and shell work; do not call get_goal repeatedly to discover tools.
 
-If the objective naturally decomposes into trackable milestones, you may call propose_task_list to set up structured tasks. Do not add a task list for simple, single-step goals.
+After goal confirmation, you may call propose_task_list once to set up an initial task list if the objective decomposes into trackable milestones. If a task list already exists, only restructure it when the user asks or the goal structurally changes — do not restructure autonomously. Do not add a task list for simple, single-step goals.
 
 To ask the user a structured question (e.g. when the user's spec changes and you need to clarify before updating the goal), use goal_question. It opens a question dialog and returns the user's answer as tool output. Use plain conversation for simple clarifications.
 
+Task skipping restrictions: Only skip a task when the user explicitly asks you to, or when the task directly contradicts a hard constraint (e.g. an impossible requirement). Do NOT autonomously skip tasks to avoid work, or because they look optional, inconvenient, or out of scope. When in doubt, ask the user first. Calling skip_task on an already-skipped task toggles it back to pending (unskip).
+
 Keep this goal in force until it is actually achieved. Do not pause for confirmation just because a phase, chapter, file, or checklist item is finished. At each natural stopping point, compare every explicit requirement with concrete evidence from the workspace/session. If the objective is complete, call complete_goal with status=complete and provide a verificationSummary; complete_goal will launch an independent pi auditor agent and only archive if that auditor returns <approved/>. If it is not complete, choose the next concrete action and do it.
 
 The completion auditor is independent and semantic, not a paperwork checklist. It may inspect files and command output, and it will reject scaffold-only, alpha, template, proxy-metric, or weakly verified completions with <disapproved/>.
@@ -168,7 +170,9 @@ export function continuationPrompt(goal: GoalRecord, settings?: GoalSettings): s
 		"",
 		"Available work tools for pursuing the active goal include write, read, bash, and edit. Use those tools directly for file and shell work; do not call get_goal repeatedly to discover tools.",
 		"",
-		"To ask the user a structured question (e.g. when the user's spec changes and you need to clarify before updating the goal), use goal_question. It opens a question dialog and returns the user's answer as tool output. Use plain conversation for simple clarifications.",
+"To ask the user a structured question (e.g. when the user's spec changes and you need to clarify before updating the goal), use goal_question. It opens a question dialog and returns the user's answer as tool output. Use plain conversation for simple clarifications.",
+		"",
+		"Task skipping restrictions: Only skip a task when the user explicitly asks you to, or when the task directly contradicts a hard constraint (e.g. an impossible requirement). Do NOT autonomously skip tasks to avoid work, or because they look optional, inconvenient, or out of scope. When in doubt, ask the user first. Calling skip_task on an already-skipped task toggles it back to pending (unskip).",
 		"",
 		"Avoid repeating work that is already done. Choose the next concrete action toward the objective.",
 		"",

package/extensions/widgets/goal-escape-dialog.ts

@@ -46,13 +46,6 @@ export async function showEscapeDialog(
 				},
 			];
 
-			/** Build a bordered line: fits exactly `innerWidth` visible chars between ││ */
-			function line(leftContent: string): string {
-				const vis = visibleWidth(leftContent);
-				const fill = innerWidth - vis;
-				return accent("│") + leftContent + (fill > 0 ? " ".repeat(fill) : "") + accent("│");
-			}
-
 			const accent = (s: string) => theme.fg("accent", s);
 			const dim = (s: string) => theme.fg("dim", s);
 			const warning = (s: string) => theme.fg("warning", s);
@@ -70,6 +63,14 @@ export async function showEscapeDialog(
 				render(width: number): string[] {
 					const termWidth = Math.min(width, 80);
 					const innerWidth = Math.min(termWidth, 64) - 2; // inner content width between ││
+
+					/** Build a bordered line: fits exactly `innerWidth` visible chars between ││ */
+					function line(leftContent: string): string {
+						const vis = visibleWidth(leftContent);
+						const fill = innerWidth - vis;
+						return accent("│") + leftContent + (fill > 0 ? " ".repeat(fill) : "") + accent("│");
+					}
+
 					const horizLine = "─".repeat(innerWidth);
 					const lines: string[] = [];
 					const p = "  "; // left padding inside the border

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goal-x",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "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",