pi-better-goal 0.8.0 → 0.8.2

package/README.md

@@ -21,6 +21,20 @@ Use `pi-better-goal` when a Pi session should keep an explicit objective visible
 - A progress-aware follow-up loop with ten identical no-progress retries and linear backoff (60s through 600s by default), followed by a hold recoverable with `/goal resume`. Delays saturate at Node's timer limit, and observed background drains reset progress before callback turns can cancel the wake. Pi's network retry policy remains independent.
 - An observable-progress stall state for active goals.
 
+## Settings Storage
+
+Goal preferences are saved only in Pi's global `~/.pi/agent/settings.json` under
+`piBetterHarness.goal` (or `$PI_CODING_AGENT_DIR/settings.json` when overridden).
+The payload retains `version: 1` and the boolean `autoContinue`,
+`conversationalResume`, and `pauseOnEscape` fields; omitted controls default to
+`true`. Updates preserve other Pi settings and other `piBetterHarness` keys.
+
+On first read, an existing `extensions/pi-better-goal-preferences.json` in the
+agent directory is validated and migrated when the global Goal key is absent.
+An existing global key is authoritative, and subsequent changes write only
+`settings.json`. Invalid preferences report an error instead of being replaced
+with defaults.
+
 ## Skill-Owned Workflows
 
 Skills that own execution and their own task plan can opt in through `SKILL.md` frontmatter:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-goal",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "Pi extension for goal tracking with background-aware continuation.",
   "license": "MIT",
   "type": "module",
@@ -69,6 +69,7 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
+    "proper-lockfile": "^4.1.2",
     "yaml": "^2.9.1"
   }
 }

package/src/continuation.ts

@@ -53,6 +53,10 @@ function resultContent(content: unknown): unknown[] {
 export function continuationEvidence(messages: readonly unknown[]): ContinuationEvidence {
   const records: unknown[] = [];
   const toolNames: string[] = [];
+  const hasActions = messages.some((candidate) => isRecord(candidate) && (
+    candidate.role === "toolResult" || (candidate.role === "assistant" && Array.isArray(candidate.content) &&
+      candidate.content.some((block) => isRecord(block) && block.type === "toolCall"))
+  ));
 
   for (const candidate of messages) {
     if (!isRecord(candidate)) {
@@ -67,7 +71,7 @@ export function continuationEvidence(messages: readonly unknown[]): Continuation
         toolNames.push(block.name);
         return [{ name: block.name, arguments: block.arguments }];
       });
-      const text = message.content.flatMap((block) =>
+      const text = hasActions ? [] : message.content.flatMap((block) =>
         isRecord(block) && block.type === "text" ? [{ text: block.text }] : [],
       );
       if (actions.length > 0 || text.length > 0) {

package/src/goal-state.ts

@@ -66,7 +66,7 @@ function isGoalStatus(value: unknown): value is GoalStatus {
 }
 
 function isPauseReason(value: unknown): value is GoalPauseReason {
-  return value === "interrupt";
+  return value === "interrupt" || value === "permission-blocker";
 }
 
 function isGoalLike(value: unknown): value is GoalLike {

package/src/index.ts

@@ -1,4 +1,4 @@
-import type { CustomEditor, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { CustomEditor, ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { AutocompleteItem } from "@earendil-works/pi-tui";
 import { isKeyRelease, matchesKey } from "@earendil-works/pi-tui";
 import { readFileSync } from "node:fs";
@@ -28,6 +28,7 @@ import {
   type GoalEntrySource,
 } from "./goal-state.js";
 import { continuationEvidence, type ContinuationEvidence } from "./continuation.js";
+import { currentPermissionHold, logicalPermissionBlockerKey, MAX_PERMISSION_BLOCKERS, MAX_PERMISSION_RECORDS, permissionHoldRecord, permissionInstruction, permissionRecord, reportedPermissionBlockers, reportedPermissionGap, type PermissionHold } from "./permission-hold.js";
 import { observeGoalStall } from "./stall.js";
 import {
   flattenObjectiveForRail,
@@ -91,6 +92,7 @@ export function agentResumable(goal: GoalSnapshot | null, conversationalResume =
 
 /** Footer status for a paused goal, telling the user how to resume it. */
 export function pausedGoalStatus(goal: GoalSnapshot, conversationalResume = true): string {
+  if (goal.pauseReason === "permission-blocker") return "goal held: permission blocker · /goal resume (one retry)";
   return agentResumable(goal, conversationalResume) ? 'goal paused · say "go" or /goal resume' : "goal paused · /goal resume";
 }
 
@@ -229,6 +231,7 @@ function formatGoal(
   continuation: ReturnType<typeof currentContinuationState> = null,
   stall = observeGoalStall(goal, continuation),
   preferences: GoalPreferences = { autoContinue: true, conversationalResume: true, pauseOnEscape: true },
+  permissions?: PermissionHold | null,
 ): string {
   const settings = formatPreferences(preferences);
   if (!goal) {
@@ -242,6 +245,11 @@ function formatGoal(
   return [
     `Goal: ${goal.objective}`,
     `Status: ${goal.status}`,
+    ...(goal.pauseReason ? [`Pause reason: ${goal.pauseReason}`] : []),
+    ...(permissions?.blockers.length ? [
+      `Permission hold: ${permissions.blockers.length} scope(s); ${permissions.recordCount} history records; retry ${permissions.retryPending ? "released once" : "held"}`,
+      ...(permissions.saturated ? ["Permission observation incomplete: history/scope limit reached; release refused."] : []),
+    ] : []),
     `Token budget: ${budget}`,
     `Tokens used: ${goal.usage.tokensUsed}`,
     `Active time: ${timing.activeSeconds}s`,
@@ -375,6 +383,13 @@ export default function (pi: ExtensionAPI): void {
   };
 
   const setGoal = (goal: GoalSnapshot, ctx: ExtensionContext, source: GoalEntrySource): void => {
+    const permissionHold = currentPermissionHold(ctx, goal.goalId);
+    if (goal.status === "paused" && permissionHold.blockers.length > 0) {
+      if (permissionHold.retryPending && permissionHold.recordCount < MAX_PERMISSION_RECORDS) {
+        pi.appendEntry(EXTENSION_NAME, permissionRecord(goal.goalId, "permission-retry-finished"));
+      }
+      goal = { ...goal, pauseReason: "permission-blocker" };
+    }
     executionGeneration += 1;
     lastAgentEvidence = null;
     const previous = getGoal(ctx);
@@ -418,7 +433,9 @@ export default function (pi: ExtensionAPI): void {
       return;
     }
     setGoal(goalWithStatus(goal, "paused", undefined, "interrupt"), ctx, "runtime");
-    notifyGoal(ctx, preferences.conversationalResume
+    notifyGoal(ctx, currentPermissionHold(ctx, goal.goalId).blockers.length > 0
+      ? "Goal remains permission-held. Use /goal resume or alt+g for one same-scope retry."
+      : preferences.conversationalResume
       ? 'Goal paused. Say "go" to resume it, or use /goal resume.'
       : "Goal paused. Use /goal resume or alt+g to resume it.");
   };
@@ -457,6 +474,18 @@ export default function (pi: ExtensionAPI): void {
       return { ok: false, message: blocker };
     }
     const goal = held ? current : goalWithStatus(current, "active");
+    const permissions = currentPermissionHold(ctx, current.goalId);
+    if (current.pauseReason === "permission-blocker" && permissions.blockers.length === 0) {
+      return { ok: false, message: "Permission hold evidence is unavailable. The goal stays held; inspect the report before replacing this goal explicitly." };
+    }
+    if (permissions.blockers.length > 0) {
+      if (source === "tool" || permissions.saturated) {
+        return { ok: false, message: permissions.saturated
+          ? "Permission hold history is full. The goal stays held; inspect it and create a new goal explicitly if needed."
+          : "Only /goal resume or alt+g can release one permission retry." };
+      }
+      pi.appendEntry(EXTENSION_NAME, permissionRecord(current.goalId, "permission-release"));
+    }
     setGoal(goal, ctx, source);
     queueGoalContinuation(goal, ctx);
     return { ok: true, goal };
@@ -489,8 +518,11 @@ export default function (pi: ExtensionAPI): void {
     if (!boundCommandReady(goal, ctx)) return;
     clearIdleContinuation();
     continuationQueuedFor = goal.goalId;
-    resetContinuationState(goal);
-    sendGoalContinuation(goal, continuationPrompt(goal, getWorkflow(ctx)), "continuation");
+    const permissions = currentPermissionHold(ctx, goal.goalId);
+    if (permissions.blockers.length === 0) resetContinuationState(goal);
+    sendGoalContinuation(goal, permissions.blockers.length > 0
+      ? `${continuationPrompt(goal, getWorkflow(ctx))}\n\n${permissionInstruction(permissions)}`
+      : continuationPrompt(goal, getWorkflow(ctx)), "continuation");
   };
 
   function clearIdleContinuation(): void {
@@ -511,6 +543,7 @@ export default function (pi: ExtensionAPI): void {
     if (WAKE_DISABLED || !preferences.autoContinue || !isPokeable(goal) || continuationQueuedFor === goal.goalId) {
       return;
     }
+    if (currentPermissionHold(ctx, goal.goalId).blockers.length > 0) return;
     if (kind === "continuation" && currentContinuationState(ctx, goal.goalId)?.blocked) {
       return;
     }
@@ -541,6 +574,7 @@ export default function (pi: ExtensionAPI): void {
       if (WAKE_DISABLED || !preferences.autoContinue || execution !== executionGeneration || wake !== wakeGeneration) return false;
       const current = currentGoalSnapshot(ctx);
       return isPokeable(current) && current.goalId === goalId &&
+        currentPermissionHold(ctx, goalId).blockers.length === 0 &&
         continuationQueuedFor !== goalId && !isForegroundBusy(ctx);
     };
     const goal = currentGoalSnapshot(ctx);
@@ -603,7 +637,7 @@ export default function (pi: ExtensionAPI): void {
     const goal = currentGoalSnapshot(ctx);
     const wakePlan = planBackgroundDrainWake(backgroundDrainTracker, goal, snapshot);
     backgroundDrainTracker = wakePlan.nextTracker;
-    if (isPokeable(goal) && wakePlan.wakeSignature) {
+    if (isPokeable(goal) && wakePlan.wakeSignature && currentPermissionHold(ctx, goal.goalId).blockers.length === 0) {
       // Persist external progress now: a foreground/callback turn may cancel its delayed wake.
       clearIdleContinuation();
       resetContinuationState(goal);
@@ -808,6 +842,36 @@ export default function (pi: ExtensionAPI): void {
     if (latestSnapshot) collectIfPossible();
   });
 
+  const changePreference = async (ctx: ExtensionCommandContext, key: keyof GoalPreferences, enabled: boolean): Promise<void> => {
+    const previous = preferences;
+    preferences = writeGoalPreference(key, enabled);
+    if (previous.autoContinue !== preferences.autoContinue) clearIdleContinuation();
+    syncResumeTool(getGoal(ctx));
+    applyStatus(ctx);
+    if (!previous.autoContinue && preferences.autoContinue) {
+      const snapshot = await publishSnapshot(ctx);
+      const goal = getGoal(ctx);
+      if (snapshot && isPokeable(goal) && !isForegroundBusy(ctx) && !snapshot.backgroundRunning) {
+        scheduleIdleContinuation(goal, ctx, "continuation", snapshot);
+      }
+    }
+  };
+  const openSettings = async (ctx: ExtensionCommandContext): Promise<void> => {
+    currentCtx = ctx;
+    if (ctx.hasUI && ctx.mode !== "rpc" && typeof ctx.ui.custom === "function") {
+      await ctx.ui.custom<void>((tui, theme, _kb, done) => createGoalSettingsPage(theme, {
+        get: () => ({ ...preferences }),
+        change: (key, enabled) => changePreference(ctx, key, enabled),
+      }, () => tui.requestRender(), () => done()));
+    } else {
+      ctx.ui.notify(`${formatPreferences(preferences)}\nPreferences: ${goalPreferencesPath()}`, "info");
+    }
+  };
+  const contribution = { id: "goal", label: "Goal", command: "/goal settings", open: openSettings };
+  const registerSettings = () => pi.events.emit("harness-settings:register", contribution);
+  const unsubscribeSettingsRequest = pi.events.on("harness-settings:request", registerSettings);
+  registerSettings();
+
   pi.registerCommand("goal", {
     description: "Create, inspect, pause, resume, clear, or complete the active goal; configure persistent goal settings",
     getArgumentCompletions: goalArgumentCompletions,
@@ -817,25 +881,8 @@ export default function (pi: ExtensionAPI): void {
       const current = getGoal(ctx);
 
       if (trimmed === "settings" || trimmed.startsWith("settings ")) {
-        const changePreference = async (key: keyof GoalPreferences, enabled: boolean): Promise<void> => {
-          const previous = preferences;
-          preferences = writeGoalPreference(key, enabled);
-          if (previous.autoContinue !== preferences.autoContinue) clearIdleContinuation();
-          syncResumeTool(getGoal(ctx));
-          applyStatus(ctx);
-          if (!previous.autoContinue && preferences.autoContinue) {
-            const snapshot = await publishSnapshot(ctx);
-            const goal = getGoal(ctx);
-            if (snapshot && isPokeable(goal) && !isForegroundBusy(ctx) && !snapshot.backgroundRunning) {
-              scheduleIdleContinuation(goal, ctx, "continuation", snapshot);
-            }
-          }
-        };
-        if (trimmed === "settings" && ctx.hasUI && ctx.mode !== "rpc" && typeof ctx.ui.custom === "function") {
-          await ctx.ui.custom<void>((tui, theme, _kb, done) => createGoalSettingsPage(theme, {
-            get: () => ({ ...preferences }),
-            change: changePreference,
-          }, () => tui.requestRender(), () => done()));
+        if (trimmed === "settings") {
+          await openSettings(ctx);
           return;
         }
         const [, setting, mode, ...extra] = trimmed.split(/\s+/);
@@ -848,7 +895,7 @@ export default function (pi: ExtensionAPI): void {
           try {
             const key = setting === "auto-continue" ? "autoContinue"
               : setting === "conversational-resume" ? "conversationalResume" : "pauseOnEscape";
-            await changePreference(key, mode === "on");
+            await changePreference(ctx, key, mode === "on");
           } catch (error) {
             notifyGoal(ctx, error instanceof Error ? error.message : String(error), "error");
             return;
@@ -861,7 +908,8 @@ export default function (pi: ExtensionAPI): void {
       if (!trimmed) {
         const continuation = current ? currentContinuationState(ctx, current.goalId) : null;
         // Inspection is always explicit user intent; show the full summary even while busy.
-        ctx.ui.notify(formatGoal(current, continuation, observeGoalStall(current, continuation, { foregroundRunning }), preferences), "info");
+        ctx.ui.notify(formatGoal(current, continuation, observeGoalStall(current, continuation, { foregroundRunning }), preferences,
+          current ? currentPermissionHold(ctx, current.goalId) : null), "info");
         return;
       }
 
@@ -938,8 +986,8 @@ export default function (pi: ExtensionAPI): void {
         backgroundRunning: latestSnapshot?.backgroundRunning ?? false,
       });
       return {
-        content: [{ type: "text", text: formatGoal(goal, continuation, stall, preferences) }],
-        details: { goal, continuation, stall, preferences: { ...preferences }, timing: goal ? goalTiming(goal) : null, hasGoal: goal !== null },
+        content: [{ type: "text", text: formatGoal(goal, continuation, stall, preferences, goal ? currentPermissionHold(ctx, goal.goalId) : null) }],
+        details: { goal, continuation, permissionHold: goal ? currentPermissionHold(ctx, goal.goalId) : null, stall, preferences: { ...preferences }, timing: goal ? goalTiming(goal) : null, hasGoal: goal !== null },
       };
     },
   });
@@ -1104,6 +1152,10 @@ export default function (pi: ExtensionAPI): void {
       notifyGoal(ctx, error instanceof Error ? error.message : String(error), "error");
     }
     const restoredGoal = getGoal(ctx);
+    if (restoredGoal?.status === "active" && currentPermissionHold(ctx, restoredGoal.goalId).blockers.length > 0) {
+      // A persisted release is not a replayable dispatch ticket after reload.
+      setGoal(goalWithStatus(restoredGoal, "paused", undefined, "permission-blocker"), ctx, "runtime");
+    }
     if (restoredGoal?.status === "active" && !restoredGoal.command && skillCommandName(restoredGoal.objective)) {
       setGoal(goalWithStatus(restoredGoal, "paused"), ctx, "runtime");
       notifyGoal(ctx, "Goal paused: invoke its skill directly before resuming.", "error");
@@ -1159,7 +1211,7 @@ export default function (pi: ExtensionAPI): void {
     // A paused goal stays paused while the user talks: the message is ordinary
     // conversation. Only /goal resume, the hotkey, or goal_resume resume it.
     const goal = getGoal(ctx);
-    if (goal?.status === "active") {
+    if (goal?.status === "active" && currentPermissionHold(ctx, goal.goalId).blockers.length === 0) {
       executionGeneration += 1;
       clearIdleContinuation();
       lastAgentEvidence = null;
@@ -1173,8 +1225,17 @@ export default function (pi: ExtensionAPI): void {
     const owner = getWorkflow(ctx);
     const snapshot = await publishSnapshot(ctx);
     if (!snapshot) return;
-    const pausedInstruction = goal?.status === "paused" && goal.pauseReason === "interrupt"
-      ? pausedGoalPrompt(goal, preferences.conversationalResume) : "";
+    const permissions = goal ? currentPermissionHold(ctx, goal.goalId) : null;
+    const permissionPrompt = permissions && goal?.status !== "complete" &&
+      (permissions.blockers.length > 0 || goal?.pauseReason === "permission-blocker")
+      ? permissionInstruction({ ...permissions, retryPending: permissions.retryPending && goal?.status === "active" }) +
+        (permissions.blockers.length === 0 ? "\nBlocker evidence is unavailable. Stay held; do not invent a retry scope." : "") : "";
+    // A held goal overrides workflow ownership without invoking or invalidating that workflow.
+    if (permissionPrompt && goal?.status === "paused") {
+      return { systemPrompt: `${event.systemPrompt}\n\n${permissionPrompt}` };
+    }
+    const pausedInstruction = permissionPrompt || (goal?.status === "paused" && goal.pauseReason === "interrupt"
+      ? pausedGoalPrompt(goal, preferences.conversationalResume) : "");
     if (!isPokeable(goal) && !owner) {
       return pausedInstruction ? { systemPrompt: `${event.systemPrompt}\n\n${pausedInstruction}` } : undefined;
     }
@@ -1199,7 +1260,9 @@ export default function (pi: ExtensionAPI): void {
       return {
         systemPrompt: `${event.systemPrompt}\n\n` +
           (pausedInstruction
-            ? `${pausedInstruction}\nWhile the goal is paused, this overrides the workflow instructions below: do not advance the workflow until the goal is resumed.\n\n`
+            ? `${pausedInstruction}\n` + (permissionPrompt
+              ? "These permission constraints override the workflow instructions below.\n\n"
+              : "While the goal is paused, this overrides the workflow instructions below: do not advance the workflow until the goal is resumed.\n\n")
             : "") +
           `Active workflow: ${owner.name} (${owner.path}). Its task plan owns planning and the parent is a coordinator, not a product-code implementer. Follow the workflow instructions below, including on resumed turns:\n\n${instructions}` +
           (isPokeable(goal) ? `\n\nActive objective: ${goal.objective}. Complete it only after the workflow completion audit.` : "") +
@@ -1214,7 +1277,8 @@ export default function (pi: ExtensionAPI): void {
     return {
       systemPrompt:
         `${event.systemPrompt}\n\n` +
-        `Pi Better Goal active objective: ${goal.objective}. Keep working through clear low-risk next steps, and mark complete only after an evidence-backed completion audit.${backgroundInstruction}${questionInstruction}`,
+        `Pi Better Goal active objective: ${goal.objective}. Keep working through clear low-risk next steps, and mark complete only after an evidence-backed completion audit.${backgroundInstruction}${questionInstruction}` +
+        (permissionPrompt ? `\n\n${permissionPrompt}` : ""),
     };
   });
 
@@ -1255,6 +1319,40 @@ export default function (pi: ExtensionAPI): void {
     escapeAbortSuppression = undefined;
   });
 
+  pi.on("tool_result", (event, ctx) => {
+    const goal = getGoal(ctx);
+    if (!goal || (goal.status !== "active" && goal.status !== "paused")) return;
+    const reports = reportedPermissionBlockers(pi, event.toolName, event.details);
+    const incomplete = reportedPermissionGap(pi, event.toolName, event.details);
+    if (reports.length === 0 && !incomplete) return;
+    let hold = currentPermissionHold(ctx, goal.goalId);
+    let changed = false;
+    for (const blocker of reports) {
+      const previous = hold.blockers.find((item) => logicalPermissionBlockerKey(item) === logicalPermissionBlockerKey(blocker));
+      if (!hold.retryPending && previous && JSON.stringify(previous) === JSON.stringify(blocker)) continue;
+      if (hold.saturated || (!previous && hold.blockers.length >= MAX_PERMISSION_BLOCKERS)) {
+        if (!hold.saturated && hold.recordCount < MAX_PERMISSION_RECORDS) {
+          pi.appendEntry(EXTENSION_NAME, permissionRecord(goal.goalId, "permission-gap"));
+        }
+        break;
+      }
+      pi.appendEntry(EXTENSION_NAME, permissionHoldRecord(goal.goalId, blocker));
+      changed = true;
+      hold = currentPermissionHold(ctx, goal.goalId);
+    }
+    if (incomplete && !hold.saturated && hold.recordCount < MAX_PERMISSION_RECORDS) {
+      pi.appendEntry(EXTENSION_NAME, permissionRecord(goal.goalId, "permission-gap"));
+      changed = true;
+      hold = currentPermissionHold(ctx, goal.goalId);
+    }
+    if (hold.retryPending && hold.recordCount < MAX_PERMISSION_RECORDS) {
+      pi.appendEntry(EXTENSION_NAME, permissionRecord(goal.goalId, "permission-retry-finished"));
+    }
+    if (!changed && goal.status === "paused" && goal.pauseReason === "permission-blocker") return;
+    setGoal(goalWithStatus(goal, "paused", undefined, "permission-blocker"), ctx, "runtime");
+    notifyGoal(ctx, "Goal held for a permission blocker. /goal resume or alt+g releases one same-scope retry.", "warning");
+  });
+
   pi.on("tool_execution_start", async (event, ctx) => {
     if (!BLOCKING_QUESTION_TOOLS.has(event.toolName)) return;
     currentCtx = ctx;
@@ -1291,6 +1389,16 @@ export default function (pi: ExtensionAPI): void {
     const snapshot = await publishSnapshot(ctx);
     if (!snapshot) return;
     const goal = getGoal(ctx);
+    if (isPokeable(goal)) {
+      const permissions = currentPermissionHold(ctx, goal.goalId);
+      if (permissions.blockers.length > 0) {
+        if (permissions.retryPending && permissions.recordCount < MAX_PERMISSION_RECORDS) {
+          pi.appendEntry(EXTENSION_NAME, permissionRecord(goal.goalId, "permission-retry-finished"));
+        }
+        setGoal(goalWithStatus(goal, "paused", undefined, "permission-blocker"), ctx, "runtime");
+        return;
+      }
+    }
     if (!isPokeable(goal) || snapshot.backgroundRunning) {
       return;
     }
@@ -1330,6 +1438,8 @@ export default function (pi: ExtensionAPI): void {
   });
 
   pi.on("session_shutdown", async (_event, ctx) => {
+    if (typeof unsubscribeSettingsRequest === "function") unsubscribeSettingsRequest();
+
     executionGeneration += 1;
     sessionGeneration += 1;
     escapeAbortSuppression = undefined;

package/src/permission-hold.ts

@@ -0,0 +1,150 @@
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { readFileSync, realpathSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { isPermissionBlocker, permissionBlockerKey, type PermissionBlocker } from "./shared-permission-blocker.js";
+import { EXTENSION_NAME } from "./types.js";
+
+export const MAX_PERMISSION_BLOCKERS = 32;
+export const MAX_PERMISSION_RECORDS = 128;
+
+export type PermissionRecord =
+  | { version: 1; kind: "permission-hold"; goalId: string; blocker: PermissionBlocker; at: number }
+  | { version: 1; kind: "permission-release" | "permission-retry-finished" | "permission-gap"; goalId: string; at: number };
+
+export interface PermissionHold {
+  blockers: PermissionBlocker[];
+  retryPending: boolean;
+  recordCount: number;
+  saturated: boolean;
+}
+
+/** Worker/incident references describe evidence, not authority for a different retry scope. */
+export function logicalPermissionBlockerKey(blocker: PermissionBlocker): string {
+  return permissionBlockerKey({
+    version: 1, kind: "permission-blocker", context: blocker.context, resource: blocker.resource,
+    basis: blocker.basis, operation: blocker.operation, remoteOutcome: "unknown",
+  });
+}
+
+/** Replay only compact goal-owned authority records, independently of progress resets. */
+export function currentPermissionHold(ctx: ExtensionContext, goalId: string): PermissionHold {
+  const blockers = new Map<string, PermissionBlocker>();
+  let retryPending = false;
+  let recordCount = 0;
+  let saturated = false;
+  for (const entry of ctx.sessionManager.getBranch()) {
+    if (entry.type !== "custom" || entry.customType !== EXTENSION_NAME || !entry.data || typeof entry.data !== "object") continue;
+    const data = entry.data as Partial<PermissionRecord>;
+    // Only attributable authority records can make this goal's retry scope incomplete.
+    if (data.goalId !== goalId || (data.kind !== "permission-hold" && data.kind !== "permission-release" &&
+        data.kind !== "permission-retry-finished" && data.kind !== "permission-gap")) continue;
+    if (data.version !== 1 || typeof data.at !== "number" || !Number.isFinite(data.at) ||
+        (data.kind === "permission-hold" && !isPermissionBlocker(data.blocker))) {
+      saturated = true;
+      retryPending = false;
+      recordCount += 1;
+      continue;
+    }
+    if (data.kind === "permission-hold" && isPermissionBlocker(data.blocker)) {
+      const key = logicalPermissionBlockerKey(data.blocker);
+      if (blockers.has(key) || blockers.size < MAX_PERMISSION_BLOCKERS) blockers.set(key, compactBlocker(data.blocker));
+      else saturated = true;
+      retryPending = false;
+    } else if (data.kind === "permission-release" && blockers.size > 0) {
+      retryPending = !saturated;
+    } else if (data.kind === "permission-retry-finished") {
+      retryPending = false;
+    } else if (data.kind === "permission-gap") {
+      saturated = true;
+      retryPending = false;
+    } else continue;
+    recordCount += 1;
+    // Reserve room to record an incomplete scope and consume an outstanding release.
+    if (recordCount >= MAX_PERMISSION_RECORDS - 2) saturated = true;
+  }
+  return { blockers: [...blockers.values()], retryPending, recordCount, saturated };
+}
+
+function compactBlocker(blocker: PermissionBlocker): PermissionBlocker {
+  return {
+    version: 1, kind: "permission-blocker", context: blocker.context,
+    resource: blocker.resource, basis: blocker.basis, operation: blocker.operation, remoteOutcome: blocker.remoteOutcome,
+    ...(blocker.incidentId ? { incidentId: blocker.incidentId } : {}),
+    ...(blocker.runId ? { runId: blocker.runId } : {}),
+    ...(blocker.policySnapshotId ? { policySnapshotId: blocker.policySnapshotId } : {}),
+  };
+}
+
+function packageName(root: string): unknown {
+  try {
+    return (JSON.parse(readFileSync(join(root, "package.json"), "utf8")) as { name?: unknown }).name;
+  } catch {
+    return undefined;
+  }
+}
+
+function isSubagentEntry(path: string): boolean {
+  const root = dirname(path);
+  const name = packageName(root);
+  return (name === "pi-better-subagents" || name === "@vanillagreen/pi-better-subagents") &&
+    path === realpathSync(join(root, "index.ts"));
+}
+
+/** Trust the registered parent producer's canonical entry, never a tool name alone. */
+export function isParentBlockerProducer(pi: ExtensionAPI, toolName: string): boolean {
+  if (toolName !== "subagent_result" && toolName !== "subagent_output") return false;
+  try {
+    const source = pi.getAllTools().find((tool) => tool.name === toolName)?.sourceInfo.path;
+    if (!source) return false;
+    const path = realpathSync(source);
+    if (isSubagentEntry(path)) return true;
+    const root = dirname(dirname(dirname(path)));
+    if (packageName(root) !== "pi-better-harness" || path !== join(root, "extensions/subagents/index.ts")) return false;
+    const manifest = JSON.parse(readFileSync(join(root, "package.json"), "utf8")) as {
+      pi?: { extensions?: unknown }; dependencies?: Record<string, unknown>; bundledDependencies?: unknown;
+    };
+    if (!Array.isArray(manifest.pi?.extensions) || !manifest.pi.extensions.includes("extensions/subagents/index.ts") ||
+        typeof manifest.dependencies?.["pi-better-subagents"] !== "string" ||
+        !Array.isArray(manifest.bundledDependencies) || !manifest.bundledDependencies.includes("pi-better-subagents")) return false;
+    // The SDK attributes tools to the loaded wrapper. Admit only the shipped literal shim, not arbitrary imports.
+    if (readFileSync(path, "utf8").trim() !== 'export { default } from "../../node_modules/pi-better-subagents/index.ts";') return false;
+    return isSubagentEntry(realpathSync(join(root, "node_modules/pi-better-subagents/index.ts")));
+  } catch {
+    return false;
+  }
+}
+
+/** The parent emits actionable open reports; child errors/prose are not this contract. */
+export function reportedPermissionBlockers(pi: ExtensionAPI, toolName: string, details: unknown): PermissionBlocker[] {
+  if (!isParentBlockerProducer(pi, toolName) || !details || typeof details !== "object") return [];
+  const reports = (details as { permissionBlockers?: unknown }).permissionBlockers;
+  if (!Array.isArray(reports) || reports.length > MAX_PERMISSION_BLOCKERS) return [];
+  // Reject a malformed batch whole rather than accidentally widening a partial retry scope.
+  if (!reports.every((report) => isPermissionBlocker(report) && report.context === "worker")) return [];
+  return reports.map(compactBlocker);
+}
+
+export function reportedPermissionGap(pi: ExtensionAPI, toolName: string, details: unknown): boolean {
+  if (!isParentBlockerProducer(pi, toolName) || !details || typeof details !== "object") return false;
+  const omitted = (details as { permissionBlockersOmitted?: unknown }).permissionBlockersOmitted;
+  return typeof omitted === "number" && Number.isSafeInteger(omitted) && omitted > 0;
+}
+
+export function permissionRecord(goalId: string, kind: "permission-release" | "permission-retry-finished" | "permission-gap"): PermissionRecord {
+  return { version: 1, kind, goalId, at: Math.floor(Date.now() / 1000) };
+}
+
+export function permissionHoldRecord(goalId: string, blocker: PermissionBlocker): PermissionRecord {
+  return { version: 1, kind: "permission-hold", goalId, blocker: compactBlocker(blocker), at: Math.floor(Date.now() / 1000) };
+}
+
+export function permissionInstruction(hold: PermissionHold): string {
+  return [
+    hold.retryPending
+      ? "The human explicitly released ONE bounded retry of the held operation and scope below. This is not a permission grant or evidence of success."
+      : "The goal is paused for a permission blocker. Answer ordinary questions, but do not advance goal or workflow work. Only /goal resume or alt+g releases one bounded retry; goal_resume cannot release it.",
+    ...hold.blockers.map((blocker) => `- ${blocker.context}: ${blocker.resource}; operation=${blocker.operation}; basis=${blocker.basis}; remoteOutcome=${blocker.remoteOutcome}` +
+      (blocker.runId ? `; runId=${blocker.runId}` : "") + (blocker.policySnapshotId ? `; policySnapshotId=${blocker.policySnapshotId}` : "")),
+    "Keep the same operation and scope. Do not switch to foreground execution, copy credentials, change authentication, or broaden permissions. Changed worker settings require a fresh worker; retain the logical operation identity. Runtime-observed refusals and agent-reported blockers are distinct. Unknown remote outcome is never evidence of success.",
+  ].join("\n");
+}

package/src/preferences.ts

@@ -1,6 +1,11 @@
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
+import {
+  harnessSettingsPath,
+  readHarnessSetting,
+  updateHarnessSetting,
+  type HarnessSettingsSeams,
+} from "./shared-harness-settings.js";
 
 export interface GoalPreferences {
   autoContinue: boolean;
@@ -8,30 +13,33 @@ export interface GoalPreferences {
   pauseOnEscape: boolean;
 }
 
-export interface GoalPreferenceSeams {
-  agentDir?: () => string;
-}
+export interface GoalPreferenceSeams extends HarnessSettingsSeams {}
 
 export function goalPreferencesPath(seams: GoalPreferenceSeams = {}): string {
-  return join((seams.agentDir ?? getAgentDir)(), "extensions", "pi-better-goal-preferences.json");
+  return harnessSettingsPath(seams);
 }
 
 export function readGoalPreferences(seams: GoalPreferenceSeams = {}): GoalPreferences {
   const path = goalPreferencesPath(seams);
-  let raw: string;
+  const legacyPath = join((seams.agentDir ?? getAgentDir)(), "extensions", "pi-better-goal-preferences.json");
   try {
-    raw = readFileSync(path, "utf8");
+    const value = readHarnessSetting<unknown>("goal", seams, {
+      path: legacyPath,
+      parse: (value) => ({ version: 1, ...parseGoalPreferences(value, legacyPath) }),
+    });
+    return parseGoalPreferences(value, path);
   } catch (error) {
-    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
-      return { autoContinue: true, conversationalResume: true, pauseOnEscape: true };
+    if (messageOf(error).startsWith("Goal preferences at ")) throw error;
+    if (error instanceof SyntaxError || /not valid JSON/.test(messageOf(error))) {
+      throw new Error(`Goal preferences at ${path} are not valid JSON: ${messageOf(error)}`);
     }
     throw new Error(`Goal preferences at ${path} could not be read: ${messageOf(error)}`);
   }
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (error) {
-    throw new Error(`Goal preferences at ${path} are not valid JSON: ${messageOf(error)}`);
+}
+
+function parseGoalPreferences(parsed: unknown, path: string): GoalPreferences {
+  if (parsed === undefined) {
+    return { autoContinue: true, conversationalResume: true, pauseOnEscape: true };
   }
   const value = parsed as Partial<GoalPreferences> & { version?: unknown } | null;
   if (value?.version !== 1 ||
@@ -53,19 +61,20 @@ export function writeGoalPreference(
   enabled: boolean,
   seams: GoalPreferenceSeams = {},
 ): GoalPreferences {
-  const preferences = { ...readGoalPreferences(seams), [key]: enabled };
+  // Migrate legacy preferences before updating the authoritative value under lock.
+  readGoalPreferences(seams);
   const path = goalPreferencesPath(seams);
-  const pending = `${path}.${process.pid}.tmp`;
   try {
-    mkdirSync(dirname(path), { recursive: true });
-    writeFileSync(pending, `${JSON.stringify({ version: 1, ...preferences }, null, 2)}\n`, "utf8");
-    renameSync(pending, path);
+    const { version: _version, ...preferences } = updateHarnessSetting("goal", (current) => ({
+      version: 1,
+      ...parseGoalPreferences(current, path),
+      [key]: enabled,
+    }), seams);
+    return preferences;
   } catch (error) {
+    if (messageOf(error).startsWith("Goal preferences at ")) throw error;
     throw new Error(`Goal preferences at ${path} could not be written: ${messageOf(error)}`);
-  } finally {
-    rmSync(pending, { force: true });
   }
-  return preferences;
 }
 
 function messageOf(error: unknown): string {

package/src/shared-harness-settings.ts

@@ -0,0 +1,114 @@
+// Generated from packages/harness-settings/index.ts. Do not edit directly.
+import { existsSync, lstatSync, realpathSync, readFileSync, mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { createRequire } from "node:module";
+import { join } from "node:path";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+
+// Match Pi's settings lock without depending on a private SDK import.
+const lockfile = createRequire(import.meta.url)("proper-lockfile") as {
+  lockSync(path: string, options: { realpath: boolean }): () => void;
+};
+const NAMESPACE = "piBetterHarness";
+export interface HarnessSettingsSeams { agentDir?: () => string }
+
+export function harnessSettingsPath(seams: HarnessSettingsSeams = {}): string {
+  return join((seams.agentDir ?? getAgentDir)(), "settings.json");
+}
+
+function object(value: unknown, label: string): Record<string, unknown> {
+  if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`${label} must be a JSON object.`);
+  return value as Record<string, unknown>;
+}
+
+function readSettings(path: string): Record<string, unknown> {
+  try { return object(JSON.parse(readFileSync(path, "utf8")), `Settings at ${path}`); }
+  catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return {};
+    throw error;
+  }
+}
+
+function section(settings: Record<string, unknown>): Record<string, unknown> {
+  return Object.hasOwn(settings, NAMESPACE) ? object(settings[NAMESPACE], NAMESPACE) : {};
+}
+
+function acquire(path: string): () => void {
+  for (let attempt = 0; attempt < 10; attempt++) {
+    try { return lockfile.lockSync(path, { realpath: false }); }
+    catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== "ELOCKED" || attempt === 9) throw error;
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 20);
+    }
+  }
+  throw new Error(`Cannot lock settings at ${path}`);
+}
+
+function lockedRead(path: string): Record<string, unknown> {
+  if (!existsSync(path)) return {};
+  const release = acquire(path);
+  try { return readSettings(path); } finally { release(); }
+}
+
+function writeDestination(path: string): string {
+  let stat;
+  try { stat = lstatSync(path); }
+  catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return path;
+    throw error;
+  }
+  // Keep managed dotfiles links intact. A dangling link fails rather than being replaced.
+  return stat.isSymbolicLink() ? realpathSync(path) : path;
+}
+
+function mutate<T>(seams: HarnessSettingsSeams, change: (values: Record<string, unknown>) => T): T {
+  const path = harnessSettingsPath(seams);
+  mkdirSync((seams.agentDir ?? getAgentDir)(), { recursive: true });
+  const release = acquire(path);
+  let pending: string | undefined;
+  try {
+    // Read inside the lock so another session's settings are never replaced by a stale snapshot.
+    const settings = readSettings(path);
+    const values = section(settings);
+    const result = change(values);
+    settings[NAMESPACE] = values;
+    const destination = writeDestination(path);
+    pending = `${destination}.${randomUUID()}.tmp`;
+    writeFileSync(pending, `${JSON.stringify(settings, null, 2)}\n`, { mode: 0o600, flag: "wx" });
+    renameSync(pending, destination);
+    return result;
+  } finally {
+    try { if (pending) rmSync(pending, { force: true }); } finally { release(); }
+  }
+}
+
+export function readHarnessSetting<T = unknown>(
+  key: string,
+  seams: HarnessSettingsSeams = {},
+  legacy?: { path: string; parse: (value: unknown) => T },
+): T | undefined {
+  const values = section(lockedRead(harnessSettingsPath(seams)));
+  if (Object.hasOwn(values, key)) return values[key] as T;
+  if (!legacy) return undefined;
+  let raw: string;
+  try { raw = readFileSync(legacy.path, "utf8"); }
+  catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
+    throw error;
+  }
+  const migrated = legacy.parse(JSON.parse(raw));
+  return mutate(seams, current => {
+    if (!Object.hasOwn(current, key)) current[key] = migrated;
+    return current[key] as T;
+  });
+}
+
+export function updateHarnessSetting<T>(
+  key: string, update: (current: unknown) => T, seams: HarnessSettingsSeams = {},
+): T {
+  return mutate(seams, values => {
+    const next = update(values[key]);
+    values[key] = next;
+    return next;
+  });
+}

package/src/shared-permission-blocker.ts

@@ -0,0 +1,48 @@
+// Generated from packages/failure-observations/permission-blocker.ts. Do not edit directly.
+/** Privacy-safe wire contract. Context and identity must be assigned by a trusted adapter. */
+export const PERMISSION_RESOURCES = Object.freeze([
+  "credential-files", "process-inspection", "project-files", "outside-project-files",
+  "runtime-control-files", "command-execution", "network-access", "unknown",
+] as const);
+export type PermissionResource = typeof PERMISSION_RESOURCES[number];
+export interface PermissionBlocker {
+  version: 1;
+  kind: "permission-blocker";
+  context: "worker" | "foreground";
+  resource: PermissionResource;
+  basis: "policy-refusal" | "os-permission-error" | "agent-reported";
+  /** A stable hash or bounded logical identifier, never a command or path. */
+  operation: string;
+  remoteOutcome: "unknown" | "not-started";
+  incidentId?: string;
+  runId?: string;
+  policySnapshotId?: string;
+}
+const FIELDS = new Set(["version", "kind", "context", "resource", "basis", "operation", "remoteOutcome", "incidentId", "runId", "policySnapshotId"]);
+const LOGICAL_ID = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,199}$/;
+// Responses SDK references join call_id and item_id with "|"; these are opaque evidence ids,
+// not caller-chosen logical operations. Keep the same bound and exclude paths and prose.
+const INCIDENT_REFERENCE = /^[A-Za-z0-9][A-Za-z0-9._:|\-]{0,199}$/;
+export function isPermissionResource(value: unknown): value is PermissionResource {
+  return typeof value === "string" && (PERMISSION_RESOURCES as readonly string[]).includes(value);
+}
+/** Pure and strict: no coercion, unknown fields, paths, argv, or free-form prose. */
+export function isPermissionBlocker(value: unknown): value is PermissionBlocker {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const prototype = Object.getPrototypeOf(value);
+  if (prototype !== Object.prototype && prototype !== null) return false;
+  if (Reflect.ownKeys(value).some(key => typeof key !== "string" || !FIELDS.has(key))) return false;
+  const v = value as Record<string, unknown>;
+  if (v.version !== 1 || v.kind !== "permission-blocker" || !["worker", "foreground"].includes(v.context as string) ||
+    !isPermissionResource(v.resource) || !["policy-refusal", "os-permission-error", "agent-reported"].includes(v.basis as string) ||
+    !["unknown", "not-started"].includes(v.remoteOutcome as string) ||
+    typeof v.operation !== "string" || v.operation.length > 64 || !LOGICAL_ID.test(v.operation)) return false;
+  if (Object.hasOwn(v, "incidentId") && (typeof v.incidentId !== "string" || !INCIDENT_REFERENCE.test(v.incidentId))) return false;
+  return ["runId", "policySnapshotId"].every(key => !Object.hasOwn(v, key) ||
+    (typeof v[key] === "string" && LOGICAL_ID.test(v[key] as string)));
+}
+/** Order-independent identity without I/O or a platform-specific crypto dependency. */
+export function permissionBlockerKey(blocker: PermissionBlocker): string {
+  return JSON.stringify([blocker.version, blocker.kind, blocker.context, blocker.resource, blocker.basis,
+    blocker.operation, blocker.remoteOutcome, blocker.incidentId ?? null, blocker.runId ?? null, blocker.policySnapshotId ?? null]);
+}

package/src/types.ts

@@ -71,9 +71,11 @@ export type GoalStatus = "active" | "paused" | "budgetLimited" | "complete";
  * resume a goal on their own. An `interrupt` pause may be resumed by the agent
  * with `goal_resume` when the user clearly says to proceed. A paused goal
  * without a reason (`/goal pause`, an unavailable command or workflow) resumes
- * only through `/goal resume` or the resume hotkey.
+ * only through `/goal resume` or the resume hotkey. `permission-blocker` also
+ * requires those human controls, and releases just one same-scope retry while
+ * keeping its separate blocker/release history.
  */
-export type GoalPauseReason = "interrupt";
+export type GoalPauseReason = "interrupt" | "permission-blocker";
 
 export interface GoalUsage {
   tokensUsed: number;