@brainervirus/workit-pi 1.0.9 → 1.0.11

package/dist/workit.js

@@ -3,8 +3,8 @@ import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // packages/workit-core/src/core.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync3, realpathSync as realpathSync5 } from "node:fs";
-import path6 from "node:path";
+import { existsSync as existsSync4, realpathSync as realpathSync5 } from "node:fs";
+import path7 from "node:path";
 
 // packages/workit-core/src/core/task-contract.ts
 import { createHash, randomUUID } from "node:crypto";
@@ -7796,10 +7796,12 @@ var decisionSchema = object({
     scope: scopeSchema,
     presented: text,
     approvedContent: text,
-    contentRefs: array(refSchema)
+    displayed: text.optional(),
+    contentRefs: array(refSchema),
+    statedChoice: object({ ref: text, text }).strict().optional()
   }).strict(),
   digest,
-  response: _enum(["approved", "rejected"]),
+  response: _enum(["approved", "rejected", "stated"]),
   requirementIds: array(digest),
   revoked: object({ at: utc, reason: text }).strict().nullable(),
   consumption: object({
@@ -7808,6 +7810,27 @@ var decisionSchema = object({
     actionRef: refSchema
   }).strict().nullable()
 }).strict();
+var BINDING_QUESTION_BUDGET = 300;
+var bindingQuestionHeader = /^Workit decision: (design|action|limitation|preference)$/;
+var workitBindingQuestionIssue = (questions) => {
+  if (!Array.isArray(questions) || questions.length !== 1)
+    return null;
+  const question = questions[0];
+  if (!question || typeof question !== "object")
+    return null;
+  if (typeof question.header !== "string" || !bindingQuestionHeader.test(question.header.trim()))
+    return null;
+  const over = (label, value) => `invalid_input: ${label} is ${value.length} characters; Workit binding questions must stay within ${BINDING_QUESTION_BUDGET}. present the item in the conversation first, then ask a short scoped question.`;
+  if (typeof question.question === "string" && question.question.length > BINDING_QUESTION_BUDGET)
+    return over("the question text", question.question);
+  if (Array.isArray(question.options))
+    for (const option of question.options) {
+      const description = option.description;
+      if (typeof description === "string" && description.length > BINDING_QUESTION_BUDGET)
+        return over("an option description", description);
+    }
+  return null;
+};
 var findingSchema = object({
   claim: text,
   consequence: text,
@@ -7874,6 +7897,10 @@ var actionProgressListSchema = array(actionProgressSchema).check((ctx) => {
       path: ["decisionId"]
     });
 });
+var runtimeSchema = object({
+  createdWith: text.nullable(),
+  updatedWith: text
+}).strict();
 var taskRecordSchema = object({
   schemaVersion: literal(1),
   id,
@@ -7887,6 +7914,8 @@ var taskRecordSchema = object({
   status: _enum(["active", "paused", "closed"]),
   closure: closureSchema.nullable(),
   progress: progressSchema,
+  pauseReason: text.nullable().optional(),
+  runtime: runtimeSchema.optional(),
   assessments: array(entrySchema(assessmentSchema)),
   policy: policySchema.nullable(),
   policyChanges: array(policyChangeSchema),
@@ -7902,6 +7931,7 @@ var workspaceRecordSchema = object({
   id,
   revision,
   root: nonEmpty,
+  runtime: runtimeSchema.optional(),
   writer: object({ state: _enum(["held", "uncertain"]), owner: ownerSchema, acquiredAt: utc }).strict().nullable()
 }).strict();
 var capabilitySchema = object({
@@ -7929,6 +7959,9 @@ var taskSummarySchema = object({
   id,
   revision,
   workspaceRevision: revision,
+  createdAt: utc,
+  updatedAt: utc,
+  runtime: runtimeSchema.nullable(),
   objective: text,
   status: _enum(["active", "paused", "closed"]),
   closure: closureSchema.nullable(),
@@ -7999,7 +8032,7 @@ var taskOperations = {
     expectedWorkspaceRevision: revision.optional(),
     outcome: outcomeSchema,
     summary: text,
-    decisionIds: array(id)
+    decisionIds: array(id).optional()
   })
 };
 var policyOperations = {
@@ -8091,14 +8124,15 @@ var writerOperations = {
     ...taskId,
     expectedRevision: revision.optional(),
     expectedWorkspaceRevision: revision.optional(),
-    workerId: nullableId.optional()
+    workerId: nullableId.optional(),
+    reason: text.optional()
   }),
   release: operation({
     action: literal("release"),
     ...taskId,
     expectedRevision: revision.optional(),
     expectedWorkspaceRevision: revision.optional(),
-    reason: text
+    reason: text.optional()
   })
 };
 var stateOperations = {
@@ -8305,7 +8339,26 @@ function requirementId(input) {
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import * as fs4 from "node:fs";
 import { hostname } from "node:os";
-import path3 from "node:path";
+import path4 from "node:path";
+
+// packages/workit-core/src/core/package-root.ts
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+var packageRoot = () => {
+  let dir = path.dirname(fileURLToPath(import.meta.url));
+  while (true) {
+    const parent = path.dirname(dir);
+    if (existsSync(path.join(dir, "package.json")) || parent === dir)
+      return dir;
+    dir = parent;
+  }
+};
+var assetRoot = () => {
+  const root = packageRoot();
+  const assets = path.join(root, "assets");
+  return existsSync(assets) ? assets : root;
+};
 
 // node_modules/@openclaw/fs-safe/dist/errors.js
 var OPERATIONAL_CODES = new Set([
@@ -8356,7 +8409,7 @@ function sameFileIdentity(left, right, platform = process.platform) {
 // node_modules/@openclaw/fs-safe/dist/sidecar-lock-reclaim.js
 import { randomBytes } from "node:crypto";
 import fsSync from "node:fs";
-import path from "node:path";
+import path2 from "node:path";
 
 // node_modules/@openclaw/fs-safe/dist/bounded-read.js
 import fs from "node:fs";
@@ -8446,13 +8499,13 @@ ${ownershipToken}
   return { raw, ownershipToken };
 }
 function relativeSidecarLockPath(lockRoot, lockPath) {
-  const resolved = path.resolve(lockPath);
-  const lexicalRelative = path.relative(lockRoot.rootDir, resolved);
-  const relative = lexicalRelative !== ".." && !lexicalRelative.startsWith(`..${path.sep}`) && !path.isAbsolute(lexicalRelative) ? lexicalRelative : path.relative(lockRoot.rootReal, resolved);
-  if (!relative || relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+  const resolved = path2.resolve(lockPath);
+  const lexicalRelative = path2.relative(lockRoot.rootDir, resolved);
+  const relative = lexicalRelative !== ".." && !lexicalRelative.startsWith(`..${path2.sep}`) && !path2.isAbsolute(lexicalRelative) ? lexicalRelative : path2.relative(lockRoot.rootReal, resolved);
+  if (!relative || relative === ".." || relative.startsWith(`..${path2.sep}`) || path2.isAbsolute(relative)) {
     throw new FsSafeError("outside-workspace", "sidecar lock path is outside lockRoot");
   }
-  return relative.split(path.sep).join(path.posix.sep);
+  return relative.split(path2.sep).join(path2.posix.sep);
 }
 function parseSidecarLockPayload(raw, parser) {
   if (parser) {
@@ -8599,7 +8652,7 @@ function getFsSafeLockConfig() {
 
 // node_modules/@openclaw/fs-safe/dist/file-lock-sync.js
 import fs3 from "node:fs";
-import path2 from "node:path";
+import path3 from "node:path";
 
 // node_modules/@openclaw/fs-safe/dist/timing.js
 function sleepSync(ms) {
@@ -8690,26 +8743,26 @@ function canonicalLockParentSync(parent) {
   return process.platform === "win32" ? fs3.realpathSync.native(parent) : fs3.realpathSync(parent);
 }
 function normalizeTargetPath(targetPath) {
-  const resolved = path2.resolve(targetPath);
-  fs3.mkdirSync(path2.dirname(resolved), { recursive: true });
+  const resolved = path3.resolve(targetPath);
+  fs3.mkdirSync(path3.dirname(resolved), { recursive: true });
   try {
-    return path2.join(canonicalLockParentSync(path2.dirname(resolved)), path2.basename(resolved));
+    return path3.join(canonicalLockParentSync(path3.dirname(resolved)), path3.basename(resolved));
   } catch {
     return resolved;
   }
 }
 function boundedLockPath(lockPath, lockRoot) {
-  const resolved = path2.resolve(lockPath);
+  const resolved = path3.resolve(lockPath);
   if (!lockRoot)
     return resolved;
   relativeSidecarLockPath(lockRoot, resolved);
-  const parent = path2.dirname(resolved);
+  const parent = path3.dirname(resolved);
   const parentReal = canonicalLockParentSync(parent);
-  const parentRelative = path2.relative(lockRoot.rootReal, parentReal);
-  if (parentRelative === ".." || parentRelative.startsWith(`..${path2.sep}`) || path2.isAbsolute(parentRelative)) {
+  const parentRelative = path3.relative(lockRoot.rootReal, parentReal);
+  if (parentRelative === ".." || parentRelative.startsWith(`..${path3.sep}`) || path3.isAbsolute(parentRelative)) {
     throw new FsSafeError("outside-workspace", "sidecar lock parent is outside lockRoot");
   }
-  return path2.join(parentReal, path2.basename(resolved));
+  return path3.join(parentReal, path3.basename(resolved));
 }
 function defaultShouldReclaim(snapshot, staleMs, nowMs) {
   const createdAtMs = sidecarLockPayloadCreatedAtMs(snapshot.payload);
@@ -8922,6 +8975,33 @@ var metadataLockSchema = object({
   nonce: string2().min(1)
 }).strict();
 var now = () => new Date().toISOString().replace(/\.\d{3}Z$/, "Z");
+var cachedRuntimeVersion = null;
+var runtimeVersion = () => {
+  if (cachedRuntimeVersion === null) {
+    try {
+      const pkg = JSON.parse(fs4.readFileSync(path4.join(packageRoot(), "package.json"), "utf8"));
+      cachedRuntimeVersion = typeof pkg.version === "string" && pkg.version ? pkg.version : "0.0.0";
+    } catch {
+      cachedRuntimeVersion = "0.0.0";
+    }
+  }
+  return cachedRuntimeVersion;
+};
+var stampNew = (record) => ({
+  createdWith: record.runtime?.createdWith ?? null,
+  updatedWith: runtimeVersion()
+});
+var isNewerVersion = (candidate, current) => {
+  const parts = (value) => value.split("-")[0].split(".").map((item) => Number.parseInt(item, 10) || 0);
+  const [next, now] = [parts(candidate), parts(current)];
+  for (let index = 0;index < 3; index += 1) {
+    const left = next[index] ?? 0;
+    const right = now[index] ?? 0;
+    if (left !== right)
+      return left > right;
+  }
+  return false;
+};
 var jsonBytes = (value) => `${canonicalJson(value)}
 `;
 var digestBytes = (value) => createHash2("sha256").update(value).digest("hex");
@@ -8948,12 +9028,12 @@ var sameMetadataLock = (left, right) => {
 class TaskStore {
   root;
   constructor(root) {
-    this.root = fs4.existsSync(root) ? fs4.realpathSync(root) : path3.resolve(root);
+    this.root = fs4.existsSync(root) ? fs4.realpathSync(root) : path4.resolve(root);
   }
   readTask(taskId) {
     if (!validId(taskId))
       return failure("invalid_input", "task ID is invalid", { taskId });
-    const result = this.readRecord(path3.join(this.tasksDir, `${taskId}.json`), taskRecordSchema);
+    const result = this.readRecord(path4.join(this.tasksDir, `${taskId}.json`), taskRecordSchema);
     if (!result.exists)
       return failure("not_found", "task not found", { taskId });
     if (result.result.ok && result.result.data.id !== taskId)
@@ -8987,7 +9067,7 @@ class TaskStore {
       });
     const tasks = [];
     for (const name of names.sort()) {
-      const item = this.readRecord(path3.join(this.tasksDir, name), taskRecordSchema);
+      const item = this.readRecord(path4.join(this.tasksDir, name), taskRecordSchema);
       if (!item.exists)
         continue;
       if (!item.result.ok)
@@ -9021,7 +9101,7 @@ class TaskStore {
       if (!current.ok)
         return current;
       if (current.data ? value.expectedWorkspaceRevision !== current.data.revision : value.expectedWorkspaceRevision !== null) {
-        return failure("revision_conflict", "workspace revision does not match", {
+        return failure("revision_conflict", "workspace revision does not match; omit expectedWorkspaceRevision to use the current record", {
           expectedWorkspaceRevision: value.expectedWorkspaceRevision,
           actualWorkspaceRevision: current.data?.revision ?? null
         });
@@ -9033,11 +9113,17 @@ class TaskStore {
       const previousWorkspaceBytes = current.data ? this.snapshotBytes(this.workspacePath) : null;
       if (current.data && !previousWorkspaceBytes)
         return failure("storage_error", "workspace snapshot disappeared during creation");
-      const workspace = current.data ? { ...current.data, revision: newRevision(), root: this.root } : {
+      const workspace = current.data ? {
+        ...current.data,
+        revision: newRevision(),
+        root: this.root,
+        runtime: stampNew(current.data)
+      } : {
         schemaVersion: SCHEMA_VERSION,
         id: newId(),
         revision: newRevision(),
         root: this.root,
+        runtime: { createdWith: runtimeVersion(), updatedWith: runtimeVersion() },
         writer: null
       };
       const timestamp = value.now ?? now();
@@ -9059,6 +9145,7 @@ class TaskStore {
         status: "active",
         closure: null,
         progress: { summary: "", nextAction: null, blockers: [] },
+        runtime: { createdWith: runtimeVersion(), updatedWith: runtimeVersion() },
         assessments: [],
         policy: null,
         policyChanges: [],
@@ -9089,7 +9176,7 @@ class TaskStore {
       if (!current.ok)
         return current;
       if (current.data ? input.expectedWorkspaceRevision !== current.data.revision : input.expectedWorkspaceRevision !== null)
-        return failure("revision_conflict", "workspace revision does not match", {
+        return failure("revision_conflict", "workspace revision does not match; omit expectedWorkspaceRevision to use the current record", {
           expectedWorkspaceRevision: input.expectedWorkspaceRevision,
           actualWorkspaceRevision: current.data?.revision ?? null
         });
@@ -9097,11 +9184,17 @@ class TaskStore {
       if (current.data && !previousWorkspaceBytes)
         return failure("storage_error", "workspace snapshot disappeared during import");
       const timestamp = input.now ?? now();
-      const workspace = current.data ? { ...current.data, revision: newRevision(), root: this.root } : {
+      const workspace = current.data ? {
+        ...current.data,
+        revision: newRevision(),
+        root: this.root,
+        runtime: stampNew(current.data)
+      } : {
         schemaVersion: SCHEMA_VERSION,
         id: input.workspaceId ?? newId(),
         revision: newRevision(),
         root: this.root,
+        runtime: { createdWith: runtimeVersion(), updatedWith: runtimeVersion() },
         writer: null
       };
       const task = {
@@ -9109,7 +9202,11 @@ class TaskStore {
         workspaceId: workspace.id,
         revision: newRevision(),
         createdAt: timestamp,
-        updatedAt: timestamp
+        updatedAt: timestamp,
+        runtime: {
+          createdWith: input.task.runtime?.createdWith ?? null,
+          updatedWith: runtimeVersion()
+        }
       };
       const validTask = taskRecordSchema.safeParse(task);
       if (!validTask.success)
@@ -9158,7 +9255,8 @@ class TaskStore {
         workspaceId: current.data.workspaceId,
         createdAt: current.data.createdAt,
         revision: context.revision,
-        updatedAt: context.now
+        updatedAt: context.now,
+        runtime: stampNew(current.data)
       };
       const valid = taskRecordSchema.safeParse(record);
       if (!valid.success)
@@ -9192,7 +9290,8 @@ class TaskStore {
         ...changed.data,
         id: current.data.id,
         root: this.root,
-        revision: context.revision
+        revision: context.revision,
+        runtime: stampNew(current.data)
       };
       const valid = workspaceRecordSchema.safeParse(record);
       if (!valid.success)
@@ -9235,7 +9334,8 @@ class TaskStore {
         ...changedWorkspace.data,
         id: workspace.data.id,
         root: this.root,
-        revision: workspaceContext.revision
+        revision: workspaceContext.revision,
+        runtime: stampNew(workspace.data)
       });
       if (!nextWorkspace.success)
         return failure("invalid_input", "workspace mutation produced an invalid record");
@@ -9260,7 +9360,8 @@ class TaskStore {
         workspaceId: task.data.workspaceId,
         createdAt: task.data.createdAt,
         revision: taskContext.revision,
-        updatedAt: taskContext.now
+        updatedAt: taskContext.now,
+        runtime: stampNew(task.data)
       });
       if (!nextTask.success) {
         this.markUncertain(nextWorkspace.data);
@@ -9287,7 +9388,7 @@ class TaskStore {
         if (match)
           candidates.push({
             target: match[1],
-            path: path3.join(this.recoveryDir, name),
+            path: path4.join(this.recoveryDir, name),
             digest: match[3]
           });
       }
@@ -9480,7 +9581,8 @@ class TaskStore {
     const value = {
       ...workspace,
       writer: { ...workspace.writer, state: "uncertain" },
-      revision: newRevision()
+      revision: newRevision(),
+      runtime: stampNew(workspace)
     };
     this.replaceSnapshot(this.workspacePath, value, workspace);
   }
@@ -9558,7 +9660,7 @@ class TaskStore {
       }
       fs4.renameSync(temporary, file);
       temporary = undefined;
-      this.fsyncDirectory(path3.dirname(file));
+      this.fsyncDirectory(path4.dirname(file));
       return success(null, null, value);
     } catch (error) {
       return failure("storage_error", `snapshot replacement failed: ${String(error)}`, {
@@ -9572,9 +9674,9 @@ class TaskStore {
     }
   }
   saveRecovery(file, bytes) {
-    const target = path3.basename(file) === "workspace.json" ? "workspace" : "task";
-    const id = target === "task" ? path3.basename(file, ".json") : "workspace";
-    const destination = path3.join(this.recoveryDir, `${target}.${id}.${digestBytes(bytes)}.json`);
+    const target = path4.basename(file) === "workspace.json" ? "workspace" : "task";
+    const id = target === "task" ? path4.basename(file, ".json") : "workspace";
+    const destination = path4.join(this.recoveryDir, `${target}.${id}.${digestBytes(bytes)}.json`);
     if (fs4.existsSync(destination)) {
       if (digestBytes(fs4.readFileSync(destination)) === digestBytes(bytes))
         return;
@@ -9652,7 +9754,7 @@ class TaskStore {
       for (const name of fs4.readdirSync(this.tasksDir)) {
         if (!name.endsWith(".json") || !validId(name.slice(0, -5)))
           return null;
-        const parsed = this.parseBytes(fs4.readFileSync(path3.join(this.tasksDir, name)), taskRecordSchema);
+        const parsed = this.parseBytes(fs4.readFileSync(path4.join(this.tasksDir, name)), taskRecordSchema);
         if (!parsed.ok || parsed.data.id !== name.slice(0, -5))
           return null;
         ids.add(parsed.data.workspaceId);
@@ -9694,7 +9796,12 @@ class TaskStore {
     if (isObject2(value) && "schemaVersion" in value && value.schemaVersion !== SCHEMA_VERSION)
       return failure("unsupported_version", "unsupported snapshot schema version");
     const parsed = schema.safeParse(value);
-    return parsed.success ? success(null, null, parsed.data) : failure("recovery_required", "snapshot does not satisfy its schema");
+    if (parsed.success)
+      return success(null, null, parsed.data);
+    const writerVersion = isObject2(value) && isObject2(value.runtime) ? value.runtime.updatedWith : null;
+    if (typeof writerVersion === "string" && isNewerVersion(writerVersion, runtimeVersion()))
+      return failure("recovery_required", `snapshot was written by workit ${writerVersion}; upgrade Workit before mutating this checkout`);
+    return failure("recovery_required", "snapshot does not satisfy its schema");
   }
   processStart(pid) {
     try {
@@ -9704,43 +9811,98 @@ class TaskStore {
     }
   }
   conflict(expected, actual) {
-    return failure("revision_conflict", "snapshot revision does not match", {
+    return failure("revision_conflict", "snapshot revision does not match; omit expectedRevision to use the current record", {
       expectedRevision: expected,
       actualRevision: actual
     });
   }
   taskPath(taskId) {
-    return path3.join(this.tasksDir, `${taskId}.json`);
+    return path4.join(this.tasksDir, `${taskId}.json`);
   }
   get workitDir() {
-    return path3.join(this.root, ".workit");
+    return path4.join(this.root, ".workit");
   }
   get tasksDir() {
-    return path3.join(this.workitDir, "tasks");
+    return path4.join(this.workitDir, "tasks");
   }
   get recoveryDir() {
-    return path3.join(this.workitDir, "recovery");
+    return path4.join(this.workitDir, "recovery");
   }
   get workspacePath() {
-    return path3.join(this.workitDir, "workspace.json");
+    return path4.join(this.workitDir, "workspace.json");
   }
   get lockPath() {
-    return path3.join(this.workitDir, "metadata.lock");
+    return path4.join(this.workitDir, "metadata.lock");
   }
   get gitignorePath() {
-    return path3.join(this.workitDir, ".gitignore");
+    return path4.join(this.workitDir, ".gitignore");
   }
 }
+// packages/workit-core/src/core/workers.ts
+var same = (left, right) => {
+  try {
+    return canonicalJson(left) === canonicalJson(right);
+  } catch {
+    return false;
+  }
+};
+var UNCERTAIN_WORKER_STATES = ["dispatching", "running", "cancelling", "unknown"];
+var isUncertainWorker = (state) => UNCERTAIN_WORKER_STATES.includes(state);
+var callerSession = (caller) => caller.session ?? { kind: "host", host: caller.host, handle: caller.actor };
+var validPath = (value) => typeof value === "string" && value.length > 0 && ![...value].some((char) => {
+  const code = char.charCodeAt(0);
+  return code < 32 || code === 127;
+}) && !value.split(/[\\/]/).includes("..");
+var callerValue = (value) => ({ host: value.host, actor: value.actor });
+var workerIdOf = (value) => value.workerId ?? null;
+function assertProductWriteAllowed(input) {
+  if (!Array.isArray(input.paths) || input.paths.some((path) => !validPath(path)))
+    return failure("invalid_input", "invalid product write path");
+  if (!input.store)
+    return failure("permission_denied", "write authorization requires core state");
+  const task = input.store.readTask(input.task.id);
+  if (!task.ok)
+    return task;
+  const workspace = input.store.readWorkspace();
+  if (!workspace.ok)
+    return workspace;
+  if (!workspace.data)
+    return failure("not_found", "workspace not found");
+  const workspaceRecord = workspace.data;
+  if (task.data.status !== "active")
+    return failure("invalid_transition", "paused or closed tasks cannot own product writes");
+  if (workspaceRecord.id !== task.data.workspaceId || workspaceRecord.root.length === 0)
+    return failure("recovery_required", "task and workspace bindings are invalid");
+  const writer = workspaceRecord.writer;
+  if (!writer)
+    return failure("permission_denied", "checkout has no writer owner");
+  if (writer.state === "uncertain")
+    return failure("recovery_required", "checkout writer requires recovery", {
+      owner: writer.owner
+    });
+  const caller = callerValue(input.caller);
+  const workerId = workerIdOf(input.caller);
+  const owner = writer.owner;
+  if (owner.taskId !== task.data.id || owner.workerId !== workerId || owner.session.host !== caller.host || owner.session.handle !== caller.actor)
+    return failure("writer_conflict", "checkout is owned by another validated actor", { owner });
+  const worker = workerId === null ? null : task.data.workers.find((entry) => entry.id === workerId);
+  if (workerId !== null && (!worker || worker.data.assignment.role !== "implementer"))
+    return failure("permission_denied", "only implementers can own product writes");
+  if (workerId !== null && (!worker?.data.session || worker.data.state === "cancelling" || worker.data.state === "unknown" || worker.data.state === "stopped" || !same(worker.data.session, callerSession(input.caller))))
+    return failure("recovery_required", "worker session is not an active writer");
+  return success(null, workspaceRecord.revision, owner);
+}
+
 // packages/workit-core/src/core/task-evaluation.ts
 import { createHash as createHash4 } from "node:crypto";
 import * as fs6 from "node:fs";
 import { spawnSync } from "node:child_process";
-import path5 from "node:path";
+import path6 from "node:path";
 
 // packages/workit-core/src/core/authority.ts
 import { createHash as createHash3 } from "node:crypto";
 import * as fs5 from "node:fs";
-import path4 from "node:path";
+import path5 from "node:path";
 var verifiedAuthorities = new WeakMap;
 var trustedAuthority = (kind, provenance, expected, binding, caller) => {
   const token = {};
@@ -9867,20 +10029,31 @@ var verifyDecisionContentAtRoot = (checkoutRoot, binding) => {
       continue;
     if (!reference.digest)
       return failure("invalid_input", "document references require a byte digest");
-    const target = path4.resolve(root, reference.path);
-    if (target !== root && !target.startsWith(`${root}${path4.sep}`))
-      return failure("invalid_input", "document reference escapes checkout");
+    const target = path5.resolve(root, reference.path);
+    if (target !== root && !target.startsWith(`${root}${path5.sep}`))
+      return failure("invalid_input", "document reference escapes checkout; cite it as an external file:// reference instead", {
+        fields: [
+          { path: "contentRefs.path", reason: `${reference.path} is outside the checkout` }
+        ]
+      });
     try {
-      const relative = path4.relative(root, target);
+      const relative = path5.relative(root, target);
       let current = root;
-      for (const segment of relative.split(path4.sep)) {
+      for (const segment of relative.split(path5.sep)) {
         if (!segment)
           continue;
-        current = path4.join(current, segment);
+        current = path5.join(current, segment);
         const stat = fs5.lstatSync(current);
         const real = fs5.realpathSync(current);
-        if (real !== root && !real.startsWith(`${root}${path4.sep}`))
-          return failure("invalid_input", "document reference escapes checkout");
+        if (real !== root && !real.startsWith(`${root}${path5.sep}`))
+          return failure("invalid_input", "document reference escapes checkout; cite it as an external file:// reference instead", {
+            fields: [
+              {
+                path: "contentRefs.path",
+                reason: `${reference.path} resolves outside the checkout`
+              }
+            ]
+          });
         if (stat.isSymbolicLink())
           return failure("invalid_input", "document reference uses a symlink");
         if (current === target && !stat.isFile())
@@ -10227,14 +10400,14 @@ var verifyDecisionContent = verifyContentRefs;
 
 // packages/workit-core/src/core/task-evaluation.ts
 var digestBytes3 = (value) => createHash4("sha256").update(value).digest("hex");
-var inside = (root, candidate) => candidate === root || candidate.startsWith(`${root}${path5.sep}`);
-var relative = (root, candidate) => path5.relative(root, candidate).split(path5.sep).join("/") || ".";
+var inside = (root, candidate) => candidate === root || candidate.startsWith(`${root}${path6.sep}`);
+var relative = (root, candidate) => path6.relative(root, candidate).split(path6.sep).join("/") || ".";
 var canonicalPath = (value) => {
   if (typeof value !== "string" || !value)
     return null;
   if (value.includes("\\") || value.split("/").includes(".."))
     return null;
-  const normalized = path5.posix.normalize(value);
+  const normalized = path6.posix.normalize(value);
   if (normalized === ".." || normalized.startsWith("../") || normalized.startsWith("/"))
     return null;
   return normalized === "." ? "." : normalized.replace(/\/$/, "");
@@ -10282,14 +10455,14 @@ var gitPaths = (root) => {
       git: /not a git repository/i.test(stderr) ? false : true
     };
   }
-  const paths = result.stdout ? result.stdout.toString("utf8").split("\x00").filter(Boolean).map((item) => item.split(path5.sep).join("/")) : [];
+  const paths = result.stdout ? result.stdout.toString("utf8").split("\x00").filter(Boolean).map((item) => item.split(path6.sep).join("/")) : [];
   const stagedDeleted = spawnSync("git", ["diff", "--cached", "--name-only", "--diff-filter=D", "-z"], { cwd: root, encoding: "buffer" });
   if (stagedDeleted.status !== 0) {
     const stderr = stagedDeleted.stderr?.toString("utf8") ?? "";
     if (!/not a git repository/i.test(stderr))
       return { paths, uncertain: true, git: true };
   } else if (stagedDeleted.stdout) {
-    paths.push(...stagedDeleted.stdout.toString("utf8").split("\x00").filter(Boolean).map((item) => item.split(path5.sep).join("/")));
+    paths.push(...stagedDeleted.stdout.toString("utf8").split("\x00").filter(Boolean).map((item) => item.split(path6.sep).join("/")));
   }
   return { paths: [...new Set(paths)], uncertain: false, git: true };
 };
@@ -10304,7 +10477,7 @@ var walk = (root, directory, output) => {
   for (const name of names) {
     if (name === ".git" || name === ".workit")
       continue;
-    const target = path5.join(directory, name);
+    const target = path6.join(directory, name);
     let stat;
     try {
       stat = fs6.lstatSync(target);
@@ -10322,17 +10495,17 @@ var walk = (root, directory, output) => {
 var scopeRoots = (root, scope) => {
   const roots = [];
   for (const item of scope.paths.length ? scope.paths : ["."]) {
-    const target = path5.resolve(root, item);
+    const target = path6.resolve(root, item);
     if (!inside(root, target))
-      return failure("invalid_input", "candidate scope escapes checkout");
+      return failure("invalid_input", `candidate scope escapes checkout: ${item} — keep one task per repository and coordinate a separate linked task in the other checkout`, { fields: [{ path: "scope.paths", reason: `${item} is outside the checkout` }] });
     let ancestor = target;
     while (!fs6.existsSync(ancestor) && ancestor !== root)
-      ancestor = path5.dirname(ancestor);
+      ancestor = path6.dirname(ancestor);
     try {
       if (!inside(root, fs6.realpathSync(ancestor)))
-        return failure("invalid_input", "candidate scope escapes checkout");
+        return failure("invalid_input", `candidate scope escapes checkout through a symlink: ${item} — keep one task per repository and coordinate a separate linked task in the other checkout`, { fields: [{ path: "scope.paths", reason: `${item} resolves outside the checkout` }] });
     } catch {
-      return failure("invalid_input", "candidate scope cannot be inspected");
+      return failure("invalid_input", `candidate scope cannot be inspected: ${item}`);
     }
     roots.push(target);
   }
@@ -10347,7 +10520,7 @@ function captureCandidate(root, scope, environment = []) {
   }
   const normalizedScope = canonicalScope(scope);
   if (!normalizedScope)
-    return failure("invalid_input", "candidate scope is invalid");
+    return failure("invalid_input", "candidate scope is invalid: paths must be checkout-relative — to work in another repository, keep this task here and coordinate a separate linked task in that checkout", { fields: [{ path: "scope.paths", reason: "must be checkout-relative" }] });
   const roots = scopeRoots(checkout, normalizedScope);
   if (!roots.ok)
     return roots;
@@ -10379,7 +10552,7 @@ function captureCandidate(root, scope, environment = []) {
   for (const item of [...names].sort()) {
     if (!scopeMatches(item, normalizedScope))
       continue;
-    const target = path5.join(checkout, item);
+    const target = path6.join(checkout, item);
     try {
       const stat = fs6.lstatSync(target);
       if (stat.isSymbolicLink()) {
@@ -10501,7 +10674,7 @@ function evaluateEvidence(task, candidate) {
 }
 var scopeCovers2 = scopeCovers;
 var applicableDecision2 = (task, workspace, requirement, checkoutRoot) => task.decisions.filter((entry) => entry.provenance.kind !== "imported").map((entry) => entry.data).filter((decision) => decision.purpose === "limitation" && decision.response === "approved" && decision.revoked === null && decision.binding.taskId === task.id && decision.binding.workspaceId === workspace.id && decision.requirementIds.includes(requirement.id) && decision.binding.scope && scopeCovers2(decision.binding.scope, requirement.scope) && decision.digest === decisionDigest(decision) && (checkoutRoot ? verifyDecisionContentAtRoot(checkoutRoot, decision.binding).ok : decision.binding.contentRefs.every((reference) => reference.kind !== "file")));
-var applicableRequirementDecision = (task, workspace, requirement, checkoutRoot) => task.decisions.filter(({ data, provenance }) => provenance.kind !== "imported" && data.purpose !== "limitation" && data.response === "approved" && data.revoked === null && data.binding.taskId === task.id && data.binding.workspaceId === workspace.id && data.requirementIds.includes(requirement.id) && scopeCovers2(data.binding.scope, requirement.scope) && data.digest === decisionDigest(data) && (checkoutRoot ? verifyDecisionContentAtRoot(checkoutRoot, data.binding).ok : data.binding.contentRefs.every((reference) => reference.kind !== "file"))).map(({ id }) => ({ id }));
+var applicableRequirementDecision = (task, workspace, requirement, checkoutRoot) => task.decisions.filter(({ data, provenance }) => provenance.kind !== "imported" && data.purpose !== "limitation" && (data.response === "approved" || data.response === "stated") && data.revoked === null && data.binding.taskId === task.id && data.binding.workspaceId === workspace.id && data.requirementIds.includes(requirement.id) && scopeCovers2(data.binding.scope, requirement.scope) && data.digest === decisionDigest(data) && (checkoutRoot ? verifyDecisionContentAtRoot(checkoutRoot, data.binding).ok : data.binding.contentRefs.every((reference) => reference.kind !== "file"))).map(({ id }) => ({ id }));
 var evidenceMatchesRequirement = (kind, evidenceKind, dimension) => {
   if (kind !== "passed")
     return false;
@@ -10536,7 +10709,7 @@ function evaluateRequirements(task, workspace, capabilities, candidate, checkout
         return true;
       const reviewSession = sessionFromRef(entry.data.reviewContext);
       const sameImplementation = sameSession(reviewSession, task.intent.provenance.session);
-      const sameEvidenceSession = task.evidence.some((other) => other.id !== entry.id && sameSession(reviewSession, other.provenance.session));
+      const sameEvidenceSession = task.evidence.some((other) => other.id !== entry.id && other.data.kind === "review" && sameSession(reviewSession, other.provenance.session));
       return entry.data.kind === "review" && reviewSession !== null && sameSession(reviewSession, entry.provenance.session) && (requirement.ruleId === "self-review" || !sameImplementation && !sameEvidenceSession);
     });
     if (passed.length) {
@@ -10577,7 +10750,7 @@ function evaluateRequirements(task, workspace, capabilities, candidate, checkout
         status: "satisfied",
         evidenceIds: [],
         decisionIds: decisions.map((decision) => decision.id),
-        reason: "an applicable approved decision satisfies the requirement"
+        reason: "an applicable approved or stated decision satisfies the requirement"
       };
     const limitations = requirement.acceptanceAllowed ? applicableDecision2(task, workspace, requirement, checkoutRoot) : [];
     if (limitations.length)
@@ -10632,7 +10805,17 @@ function evaluateClosure(requestedOutcome, view) {
   const blocking = evaluations.filter((item) => item.status === "unsatisfied" || item.status === "unavailable");
   if (requestedOutcome !== "stopped" && blocking.length)
     return failure("requirements_unsatisfied", "applicable requirements are unsatisfied", {
-      requirementIds: blocking.map((item) => item.requirementId)
+      requirementIds: blocking.map((item) => item.requirementId),
+      requirements: blocking.map((item) => {
+        const requirement = view.task.policy?.requirements.find((candidate) => candidate.id === item.requirementId);
+        return {
+          requirementId: item.requirementId,
+          ruleId: requirement?.ruleId ?? "unknown",
+          reason: item.reason,
+          satisfaction: requirement?.satisfaction ?? "",
+          dependentAction: requirement?.dependentAction ?? null
+        };
+      })
     });
   const accepted = evaluations.filter((item) => item.status === "accepted_limitation");
   if (requestedOutcome === "verified" && accepted.length)
@@ -10663,7 +10846,7 @@ function evaluateClosure(requestedOutcome, view) {
 var METHODS = {
   "workit-challenge": { dimensions: ["challenge", "decisions"] },
   "workit-behavioral-tdd": { dimensions: ["testing"] },
-  "workit-review": { dimensions: ["review"] },
+  "workit-review": { dimensions: ["review"], ruleIds: ["fresh-context-review"] },
   "workit-plan": { dimensions: ["artifacts", "continuity"] },
   "workit-implement": { dimensions: ["delegation"] },
   "workit-debug": { ruleIds: ["root-cause-investigation"] },
@@ -10725,7 +10908,18 @@ decision.record {binding with taskId/workspaceId from inspect plus presented and
 approvedContent} only through a native approval question asked receipt-shaped:
 header Workit decision: <purpose>, the same label repeated in the question
 text (some host UIs do not render headers), exactly two options approved and
-rejected; ask once, never re-ask to mint a receipt. task.close {outcome,
+rejected; ask once, never re-ask to mint a receipt. Before asking, present the
+item in the conversation (durable artifacts: complete digest plus exact path;
+inline plans: the content) and keep the question to one short scoped sentence;
+never ask to approve something unseen. An answer with custom text is steering,
+not approval: adjust, re-present, then ask a new scoped question. After the user
+approves a spec or plan, execute the remaining tasks continuously with one
+atomic commit per task and do not ask whether to continue; stop only for a new
+product decision, a failed safety or verification gate, a conflicting edit, or
+missing authority. Record the plan's commit list once through the plan-scoped
+action approval (git.commit with plan_steps and plan_branch) so each listed
+commit executes without a new question; an unlisted message needs a fresh
+approval. task.close {outcome,
 summary, decisionIds}. A completed native subagent run stops its bound worker
 by itself; if a worker strands in cancelling with its run verifiably over,
 repeat worker.cancel {reason} to confirm the stop. Check and review evidence
@@ -10757,7 +10951,7 @@ function reconcileResume(view, observations = []) {
     return candidate;
   const staleEvidenceIds = evaluateEvidence(view.task, candidate.data).filter((entry) => entry.status === "stale").map((entry) => entry.evidenceId);
   const blockers = [...view.task.progress.blockers];
-  if (view.task.workers.some((entry) => ["dispatching", "running", "cancelling", "unknown"].includes(entry.data.state)))
+  if (view.task.workers.some((entry) => isUncertainWorker(entry.data.state)))
     blockers.push({
       reason: "worker state requires reconciliation",
       dependentAction: "resume",
@@ -10889,7 +11083,25 @@ function shellRouteIntent(command) {
   }
   return null;
 }
+function hasLiveWorkitTask(dir) {
+  try {
+    if (typeof dir !== "string" || dir === "")
+      return false;
+    const listed = new TaskStore(dir).listTasks();
+    if (!listed.ok)
+      return false;
+    return listed.data.some((task) => task.status === "active" || task.status === "paused");
+  } catch {
+    return false;
+  }
+}
+function shouldDenyShellRoute(dir, command) {
+  if (!hasLiveWorkitTask(dir))
+    return null;
+  return shellRouteIntent(command);
+}
 // packages/workit-core/src/core/external-action.ts
+import { execFileSync } from "node:child_process";
 var externalActionSchema = discriminatedUnion("operation", [
   object({
     operation: literal("git.branch_setup"),
@@ -10902,7 +11114,11 @@ var externalActionSchema = discriminatedUnion("operation", [
   }).strict(),
   object({
     operation: literal("git.commit"),
-    payload: object({ message: string2().min(1) }).strict()
+    payload: object({
+      message: string2().min(1).optional(),
+      plan_steps: array(string2().min(1)).optional(),
+      plan_branch: string2().min(1).optional()
+    }).strict()
   }).strict(),
   object({
     operation: literal("git.push"),
@@ -10991,7 +11207,7 @@ var externalActionDescriptor = (operation, payload) => canonicalJson({
   payload,
   ...payload && typeof payload === "object" && !Array.isArray(payload) && "resolved" in payload && payload.resolved && typeof payload.resolved === "object" && Array.isArray(payload.resolved.steps) ? { steps: payload.resolved.steps } : {}
 });
-var externalActionHelp = "Fixed actions: git.branch_setup {action?,sdd_dir?,target_branch?,stash?}; git.commit {message}; git.push {branch?}; hosting.pull_request {title,body?,draft?,target_branch?,babysit?}; youtrack.update {issueId,markdown,minutes?}; youtrack.time {issueId,minutes,text?,dateMs?}; youtrack.meeting {issueId,minutes,text}; changelog.apply {entries?,path?,normalize_only?}; context.read {kind,range?,issueId?,issueUrl?,issueRef?,mode?,specPath?,planPath?}. context.read is read-only and needs no approval; all other operations require native approval (CLI uses a TTY; caller-unattested MCP cannot mutate).";
+var externalActionHelp = "Fixed actions: git.branch_setup {action?,sdd_dir?,target_branch(required unless reapply_stash; the working branch to create or switch to),stash?}; git.commit {message}; git.push {branch?}; hosting.pull_request {title,body?,draft?,target_branch?,babysit?}; youtrack.update {issueId,markdown,minutes?}; youtrack.time {issueId,minutes,text?,dateMs?}; youtrack.meeting {issueId,minutes,text}; changelog.apply {entries?,path?,normalize_only?}; context.read {kind,range?,issueId?,issueUrl?,issueRef?,mode?,specPath?,planPath?}. context.read is read-only and needs no approval; all other operations require native approval (CLI uses a TTY; caller-unattested MCP cannot mutate).";
 var externalActionRef = (host, actor, descriptor) => ({
   kind: "host",
   host,
@@ -11042,14 +11258,185 @@ var priorExternalAction = (store, host, actor, operation, payload) => {
     return failure("permission_denied", candidates.length === 0 ? "no prior external action matches this request" : "multiple prior external actions match this request");
   return success(workspace.data.revision, null, { ...candidates[0], workspace: workspace.data });
 };
+var planCommitDescriptor = (content) => {
+  try {
+    const value = JSON.parse(content);
+    if (value.operation !== "git.commit" || !value.payload)
+      return null;
+    const steps = value.payload.plan_steps;
+    const branch = value.payload.plan_branch;
+    if (!Array.isArray(steps) || steps.some((step) => typeof step !== "string" || !step) || typeof branch !== "string" || !branch)
+      return null;
+    return { steps, branch };
+  } catch {
+    return null;
+  }
+};
+var approvedPlanCommit = (store, host, actor, message) => {
+  if (typeof message !== "string" || !message)
+    return failure("invalid_input", "commit message is required");
+  const listed = store.listTasks();
+  const workspace = store.readWorkspace();
+  if (!listed.ok || !workspace.ok)
+    return failure("storage_error", "external action state is unavailable");
+  if (!workspace.data)
+    return failure("not_found", "workspace not found");
+  const matches = listed.data.flatMap((task) => {
+    if (task.status !== "active" || task.workspaceId !== workspace.data.id)
+      return [];
+    if (task.intent.provenance.session?.kind !== "host" || task.intent.provenance.session.host !== host || task.intent.provenance.session.handle !== actor)
+      return [];
+    return task.decisions.flatMap((entry) => {
+      const decision = entry.data;
+      if (decision.purpose !== "action" || decision.response !== "approved" || decision.revoked !== null)
+        return [];
+      if (entry.provenance.kind !== "host_observed" || entry.provenance.receipts.length === 0)
+        return [];
+      const plan = planCommitDescriptor(decision.binding.approvedContent);
+      if (!plan)
+        return [];
+      const completed = task.actionProgress?.find((progress) => progress.decisionId === entry.id)?.completedSteps ?? [];
+      if (plan.steps[completed.length] !== message)
+        return [];
+      return [{ task, entry, steps: plan.steps, branch: plan.branch, completed: [...completed] }];
+    });
+  });
+  if (matches.length !== 1)
+    return failure("permission_denied", matches.length === 0 ? "no plan commit authorization matches this message" : "multiple plan authorizations match this message");
+  return success(workspace.data.revision, null, matches[0]);
+};
+var commitMessageFromDescriptor = (operation) => {
+  try {
+    const descriptor = JSON.parse(operation);
+    return descriptor.operation === "git.commit" && typeof descriptor.payload?.message === "string" ? descriptor.payload.message : undefined;
+  } catch {
+    return;
+  }
+};
+var planCommitBinding = (store, host, actor, operation) => {
+  const message = commitMessageFromDescriptor(operation);
+  if (!message)
+    return null;
+  const plan = approvedPlanCommit(store, host, actor, message);
+  if (!plan.ok)
+    return null;
+  let branch;
+  try {
+    branch = execFileSync("git", ["branch", "--show-current"], {
+      cwd: store.root,
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+  } catch {
+    return null;
+  }
+  if (!branch || branch !== plan.data.branch)
+    return null;
+  const workspace = store.readWorkspace();
+  if (!workspace.ok || !workspace.data)
+    return null;
+  return {
+    taskId: plan.data.task.id,
+    decisionId: plan.data.entry.id,
+    binding: plan.data.entry.data.binding,
+    expectedRevision: plan.data.task.revision,
+    expectedWorkspaceRevision: workspace.data.revision,
+    step: message
+  };
+};
 var approvedExternalAction = (store, host, actor, operation) => {
   const selected = externalActionState(store, host, actor, operation);
-  if (!selected.ok)
+  if (selected.ok) {
+    if (selected.data.entry.data.consumption !== null)
+      return failure(selected.data.entry.data.consumption.state === "uncertain" ? "external_outcome_unknown" : "permission_denied", selected.data.entry.data.consumption.state === "uncertain" ? "previous external action outcome is unknown" : "external action was already settled");
     return selected;
-  if (selected.data.entry.data.consumption !== null)
-    return failure(selected.data.entry.data.consumption.state === "uncertain" ? "external_outcome_unknown" : "permission_denied", selected.data.entry.data.consumption.state === "uncertain" ? "previous external action outcome is unknown" : "external action was already settled");
+  }
+  const intent = approvedBranchSetupIntent(store, host, actor, operation);
+  if (intent.ok) {
+    if (intent.data.entry.data.consumption !== null)
+      return failure(intent.data.entry.data.consumption.state === "uncertain" ? "external_outcome_unknown" : "permission_denied", intent.data.entry.data.consumption.state === "uncertain" ? "previous external action outcome is unknown" : "external action was already settled");
+    return intent;
+  }
   return selected;
 };
+var branchSetupIntent = (descriptor) => {
+  try {
+    const value = JSON.parse(descriptor);
+    if (value.operation !== "git.branch_setup" || !value.payload)
+      return null;
+    const { target_branch, resolved } = value.payload;
+    if (typeof target_branch !== "string" || !target_branch || !resolved)
+      return null;
+    if (typeof resolved.base_branch !== "string" || typeof resolved.target_exists !== "boolean")
+      return null;
+    return {
+      target: target_branch,
+      base: resolved.base_branch,
+      remoteBase: typeof resolved.remote_base === "string" ? resolved.remote_base : null,
+      targetExists: resolved.target_exists
+    };
+  } catch {
+    return null;
+  }
+};
+var approvedBranchSetupIntent = (store, host, actor, operation) => {
+  const current = branchSetupIntent(operation);
+  if (!current)
+    return failure("permission_denied", "no approved action is bound to this session");
+  const listed = store.listTasks();
+  const workspace = store.readWorkspace();
+  if (!listed.ok || !workspace.ok)
+    return failure("storage_error", "external action state is unavailable");
+  if (!workspace.data)
+    return failure("not_found", "workspace not found");
+  const candidates = listed.data.flatMap((task) => {
+    if (task.status !== "active" || task.workspaceId !== workspace.data.id || task.intent.provenance.session?.kind !== "host" || task.intent.provenance.session.host !== host || task.intent.provenance.session.handle !== actor)
+      return [];
+    return task.decisions.filter((entry) => entry.data.purpose === "action" && entry.data.response === "approved" && entry.data.revoked === null).map((entry) => ({ task, entry }));
+  });
+  const matches = candidates.filter(({ entry }) => {
+    const intent = branchSetupIntent(entry.data.binding.approvedContent);
+    return intent !== null && intent.target === current.target && intent.base === current.base && intent.remoteBase === current.remoteBase && intent.targetExists === current.targetExists;
+  });
+  if (matches.length !== 1)
+    return failure("permission_denied", matches.length === 0 ? "no approved action is bound to this session" : "multiple approved actions match this session");
+  return success(workspace.data.revision, null, { ...matches[0], workspace: workspace.data });
+};
+var priorResolvedDrift = (store, host, actor, operation, payload, currentResolved) => {
+  const prior = priorExternalAction(store, host, actor, operation, payload);
+  if (!prior.ok)
+    return success(null, null, null);
+  let baseline;
+  try {
+    const parsed = JSON.parse(prior.data.entry.data.binding.approvedContent);
+    baseline = parsed.payload?.resolved;
+  } catch {
+    return success(null, null, null);
+  }
+  if (baseline === undefined || baseline === null)
+    return success(null, null, null);
+  if (operation === "git.branch_setup") {
+    const before = branchSetupIntent(prior.data.entry.data.binding.approvedContent);
+    let after = null;
+    try {
+      after = branchSetupIntent(JSON.stringify({
+        operation,
+        payload: { ...payload, resolved: currentResolved }
+      }));
+    } catch {
+      after = null;
+    }
+    if (before && after) {
+      const moved = before.target !== after.target ? "target_branch" : before.base !== after.base ? "base_branch" : before.remoteBase !== after.remoteBase ? "remote_base" : before.targetExists !== after.targetExists ? "target_exists" : null;
+      if (moved === null)
+        return success(null, null, null);
+      return failure("invalid_input", `repository state changed since approval (${moved} moved); show the current state and approve the action again`, { outcome: "not_started", operation });
+    }
+  }
+  if (canonicalJson(baseline) === canonicalJson(currentResolved))
+    return success(null, null, null);
+  return failure("invalid_input", "repository state changed since approval; show the current state and approve the action again", { outcome: "not_started", operation });
+};
 var createAuthorizedExternalActionRunner = (core, bind) => async (operation, effect) => {
   let steps = [];
   try {
@@ -11327,7 +11714,7 @@ function resolveRequirements(input) {
       ].join(", ")}`,
       satisfaction: "An observed or inferred fact resolves the uncertainty and records its supporting references.",
       before: "dependent_action",
-      dependentAction: "dependent-action",
+      dependentAction: null,
       acceptanceAllowed: false
     }));
   if (signals.productChoiceOpen.value === true)
@@ -11338,7 +11725,7 @@ function resolveRequirements(input) {
       reason: `A consequential product choice remains open: ${signalReason(input, "productChoiceOpen")}`,
       satisfaction: "Present the material alternatives and record the user's decision before the dependent action.",
       before: "dependent_action",
-      dependentAction: "dependent-action",
+      dependentAction: null,
       acceptanceAllowed: false
     }));
   if (signals.behaviorChange.value === true)
@@ -11496,59 +11883,6 @@ function diffPolicy(previous, next, reason, now) {
   return parsed.data;
 }
 
-// packages/workit-core/src/core/workers.ts
-var same = (left, right) => {
-  try {
-    return canonicalJson(left) === canonicalJson(right);
-  } catch {
-    return false;
-  }
-};
-var callerSession = (caller) => caller.session ?? { kind: "host", host: caller.host, handle: caller.actor };
-var validPath = (value) => typeof value === "string" && value.length > 0 && ![...value].some((char) => {
-  const code = char.charCodeAt(0);
-  return code < 32 || code === 127;
-}) && !value.split(/[\\/]/).includes("..");
-var callerValue = (value) => ({ host: value.host, actor: value.actor });
-var workerIdOf = (value) => value.workerId ?? null;
-function assertProductWriteAllowed(input) {
-  if (!Array.isArray(input.paths) || input.paths.some((path) => !validPath(path)))
-    return failure("invalid_input", "invalid product write path");
-  if (!input.store)
-    return failure("permission_denied", "write authorization requires core state");
-  const task = input.store.readTask(input.task.id);
-  if (!task.ok)
-    return task;
-  const workspace = input.store.readWorkspace();
-  if (!workspace.ok)
-    return workspace;
-  if (!workspace.data)
-    return failure("not_found", "workspace not found");
-  const workspaceRecord = workspace.data;
-  if (task.data.status !== "active")
-    return failure("invalid_transition", "paused or closed tasks cannot own product writes");
-  if (workspaceRecord.id !== task.data.workspaceId || workspaceRecord.root.length === 0)
-    return failure("recovery_required", "task and workspace bindings are invalid");
-  const writer = workspaceRecord.writer;
-  if (!writer)
-    return failure("permission_denied", "checkout has no writer owner");
-  if (writer.state === "uncertain")
-    return failure("recovery_required", "checkout writer requires recovery", {
-      owner: writer.owner
-    });
-  const caller = callerValue(input.caller);
-  const workerId = workerIdOf(input.caller);
-  const owner = writer.owner;
-  if (owner.taskId !== task.data.id || owner.workerId !== workerId || owner.session.host !== caller.host || owner.session.handle !== caller.actor)
-    return failure("writer_conflict", "checkout is owned by another validated actor", { owner });
-  const worker = workerId === null ? null : task.data.workers.find((entry) => entry.id === workerId);
-  if (workerId !== null && (!worker || worker.data.assignment.role !== "implementer"))
-    return failure("permission_denied", "only implementers can own product writes");
-  if (workerId !== null && (!worker?.data.session || worker.data.state === "cancelling" || worker.data.state === "unknown" || worker.data.state === "stopped" || !same(worker.data.session, callerSession(input.caller))))
-    return failure("recovery_required", "worker session is not an active writer");
-  return success(null, workspaceRecord.revision, owner);
-}
-
 // packages/workit-core/src/core/task-engine.ts
 var provenance = (context, kind = context.provenanceKind ?? "host_observed") => ({
   kind,
@@ -11679,15 +12013,20 @@ var applyWorkerLifecycle = (input) => {
     return failure("invalid_transition", "worker has not started");
   if (input.state === "running" && entry.data.state === "stopped")
     return failure("invalid_transition", "stopped worker cannot run again");
+  const terminalCancel = entry.data.state === "cancelling" && input.state === "running";
   const nextEntry = {
     ...entry,
     recordedAt: input.now ?? entry.recordedAt,
     provenance: authority.provenance,
-    data: { ...entry.data, state: input.state, session: input.session }
+    data: {
+      ...entry.data,
+      state: terminalCancel ? "cancelling" : input.state,
+      session: input.session
+    }
   };
   const shouldClear = input.state === "stopped" && workspace.data.writer !== null && workspace.data.writer.owner.taskId === task.data.id && workspace.data.writer.owner.workerId === input.workerId;
   const shouldUncertain = input.state === "unknown" && workspace.data.writer !== null && workspace.data.writer.owner.taskId === task.data.id && workspace.data.writer.owner.workerId === input.workerId;
-  if (entry.data.state === input.state && sameValue(entry.data.session, input.session) && !shouldClear && !shouldUncertain)
+  if (entry.data.state === nextEntry.data.state && sameValue(entry.data.session, input.session) && !shouldClear && !shouldUncertain)
     return success(task.data.revision, workspace.data.revision, entry);
   const changed = input.store.mutateTaskAndWorkspace({
     taskId: task.data.id,
@@ -12057,7 +12396,7 @@ class WorkitCore {
   activeWorkerBlocker(task, workspace) {
     if (workspace.writer)
       return failure("recovery_required", "writer ownership must be released first");
-    if (task.workers.some((entry) => ["dispatching", "running", "cancelling", "unknown"].includes(entry.data.state)))
+    if (task.workers.some((entry) => isUncertainWorker(entry.data.state)))
       return failure("recovery_required", "worker state requires reconciliation");
     return null;
   }
@@ -12294,11 +12633,6 @@ class WorkitCore {
     if (helper && !helper.ok)
       return helper;
     const evidence = input.evidence;
-    if (helper?.ok) {
-      const assignment = helper.data.data.assignment;
-      if (evidence.requirementIds.some((id) => !assignment.requirementIds.includes(id)) || assignment.candidateId !== null && evidence.candidateId !== assignment.candidateId && evidence.beforeCandidateId !== assignment.candidateId || !refsWithinScope(evidence.refs, assignment.scope) || !refsWithinScope(evidence.refs, task.data.intent.data.scope))
-        return failure("permission_denied", "evidence is outside the worker assignment");
-    }
     if ((evidence.result === "missing" || evidence.result === "skipped") && !evidence.summary.trim())
       return failure("invalid_input", "missing or skipped evidence requires a reason");
     if (evidence.kind === "review") {
@@ -12315,6 +12649,11 @@ class WorkitCore {
       evidence.beforeCandidateId ??= null;
       evidence.candidateId ??= null;
     }
+    if (helper?.ok) {
+      const assignment = helper.data.data.assignment;
+      if (evidence.requirementIds.some((id) => !assignment.requirementIds.includes(id)) || assignment.candidateId !== null && evidence.candidateId !== assignment.candidateId && evidence.beforeCandidateId !== assignment.candidateId || !refsWithinScope(evidence.refs, assignment.scope) || !refsWithinScope(evidence.refs, task.data.intent.data.scope))
+        return failure("permission_denied", "evidence is outside the worker assignment");
+    }
     const knownCandidates = new Set(task.data.candidates.map((candidate) => candidate.id));
     for (const candidateId of [evidence.beforeCandidateId, evidence.candidateId]) {
       if (candidateId && candidateId !== currentCandidate.data.id && !knownCandidates.has(candidateId))
@@ -12368,7 +12707,12 @@ class WorkitCore {
     const input = parsed.data;
     if (nativeRequired && input.action !== "record")
       return failure("permission_denied", "native observation is only valid for recording decisions");
-    if (nativeRequired && nativeObservation === undefined)
+    const stated = input.action === "record" && input.response === "stated";
+    if (stated && input.purpose === "action")
+      return failure("permission_denied", "stated choices cannot authorize mutating actions");
+    if (stated && !input.binding?.statedChoice)
+      return failure("invalid_input", "stated choices require binding.statedChoice");
+    if (nativeRequired && nativeObservation === undefined && !stated)
       return failure("permission_denied", "native decision observation is required");
     const task = this.store.readTask(input.taskId);
     if (!task.ok)
@@ -12401,7 +12745,7 @@ class WorkitCore {
         consumption: null
       };
       const data = { ...base, digest: decisionDigest(base) };
-      const native = nativeRequired ? verifyNativeDecision(this.context.nativeAuthority, {
+      const native = nativeRequired && !stated ? verifyNativeDecision(this.context.nativeAuthority, {
         observation: nativeObservation,
         expected: {
           taskId: task.data.id,
@@ -13210,6 +13554,9 @@ class WorkitCore {
       id: task.id,
       revision: task.revision,
       workspaceRevision: workspace.data.revision,
+      createdAt: task.createdAt,
+      updatedAt: task.updatedAt,
+      runtime: task.runtime ?? null,
       objective: task.intent.data.objective,
       status: task.status,
       closure: task.closure,
@@ -13295,7 +13642,7 @@ class WorkitCore {
     const base = reconcileResume(effectiveView);
     if (!base.ok)
       return base;
-    const needsReconciliation = view.task.workers.some((entry) => ["dispatching", "running", "cancelling", "unknown"].includes(observedStates.get(entry.id) ?? entry.data.state));
+    const needsReconciliation = view.task.workers.some((entry) => isUncertainWorker(observedStates.get(entry.id) ?? entry.data.state));
     const blockers = [...base.data.blockers];
     if (needsReconciliation && !blockers.some((entry) => entry.reason === "worker state requires reconciliation"))
       blockers.push({
@@ -13362,7 +13709,8 @@ class WorkitCore {
         ...current,
         status,
         candidates: resumeCandidate && !current.candidates.some((candidate) => candidate.id === resumeCandidate.id) ? [...current.candidates, resumeCandidate] : current.candidates,
-        progress: status === "paused" ? { ...current.progress, summary: input.reason } : current.progress
+        progress: current.progress,
+        pauseReason: status === "paused" ? input.reason ?? null : null
       })
     });
     if (!changed.ok)
@@ -13398,7 +13746,7 @@ class WorkitCore {
       return workspace;
     if (!workspace.data)
       return failure("not_found", "workspace not found");
-    if (workspace.data.writer || task.data.workers.some((entry) => entry.data.state !== "stopped"))
+    if (workspace.data.writer || task.data.workers.some((entry) => isUncertainWorker(entry.data.state)))
       return failure("recovery_required", "scope revision requires worker ownership reconciliation");
     this.fillRevisions(input, task.data, workspace.data);
     const changed = this.store.mutateTaskAndWorkspace({
@@ -13516,15 +13864,15 @@ function resolveGitRevision(root, value) {
 }
 function resolveInside(root, candidate) {
   const base = realpathSync5(root);
-  const target = path6.resolve(base, candidate);
-  if (target !== base && !target.startsWith(base + path6.sep)) {
+  const target = path7.resolve(base, candidate);
+  if (target !== base && !target.startsWith(base + path7.sep)) {
     throw new Error("path must stay inside repository root");
   }
   let ancestor = target;
-  while (!existsSync3(ancestor))
-    ancestor = path6.dirname(ancestor);
+  while (!existsSync4(ancestor))
+    ancestor = path7.dirname(ancestor);
   const canonicalAncestor = realpathSync5(ancestor);
-  if (canonicalAncestor !== base && !canonicalAncestor.startsWith(base + path6.sep)) {
+  if (canonicalAncestor !== base && !canonicalAncestor.startsWith(base + path7.sep)) {
     throw new Error("path must stay inside repository root");
   }
   return target;
@@ -13567,6 +13915,13 @@ var piCapabilities = (ctx) => [
     assurance: "agent_guided",
     reason: "Pi extensions do not sandbox arbitrary shell commands.",
     refs: [hostRef("tool_call")]
+  },
+  {
+    name: "fresh-context-review",
+    surface: "supervised_worker",
+    assurance: "agent_guided",
+    reason: "independent review runs as a supervised stock-Pi process; evidence evaluation enforces reviewer exclusivity",
+    refs: [hostRef("worker")]
   }
 ];
 var piContext = (ctx) => ({
@@ -13634,15 +13989,15 @@ var WORKIT_SKILL_ALIASES = {
 if (false) {}
 
 // packages/workit-core/src/core/branch.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "node:fs";
-import { execFileSync as execFileSync2 } from "node:child_process";
-import path10 from "node:path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "node:fs";
+import { execFileSync as execFileSync3 } from "node:child_process";
+import path11 from "node:path";
 
 // packages/workit-core/src/core/git.ts
-import { execFileSync } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 var run2 = (cwd, args) => {
   try {
-    const stdout = execFileSync("git", args, {
+    const stdout = execFileSync2("git", args, {
       cwd,
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -13710,14 +14065,14 @@ var gitContext = (workspaceRoot, paths = []) => {
 import {
   copyFileSync,
   cpSync,
-  existsSync as existsSync4,
+  existsSync as existsSync5,
   mkdirSync as mkdirSync2,
   readFileSync as readFileSync4,
   readdirSync as readdirSync3,
   writeFileSync as writeFileSync2
 } from "node:fs";
 import os from "node:os";
-import path7 from "node:path";
+import path8 from "node:path";
 
 // packages/workit-core/src/core/boundary.ts
 var EVENT = {
@@ -13761,7 +14116,7 @@ var mergePreset = (preset, input = {}, current = {
     protected: preset === "custom" ? input.protectedNames ?? current.branchPolicy.protected : [...defs.protected]
   };
 };
-var resolveConfigDir = () => process.env.WORKFLOW_TOOLKIT_CONFIG ?? process.env.WORKFLOW_TOOLKIT_CONFIG_DIR ?? path7.join(process.env.XDG_CONFIG_HOME || path7.join(os.homedir(), ".config"), "workit");
+var resolveConfigDir = () => process.env.WORKFLOW_TOOLKIT_CONFIG ?? process.env.WORKFLOW_TOOLKIT_CONFIG_DIR ?? path8.join(process.env.XDG_CONFIG_HOME || path8.join(os.homedir(), ".config"), "workit");
 var migratedDir = null;
 var migrationFailed = false;
 var ensureConfigDir = (dir = resolveConfigDir()) => {
@@ -13771,12 +14126,12 @@ var ensureConfigDir = (dir = resolveConfigDir()) => {
     migratedDir = dir;
     return dir;
   }
-  const legacy = path7.join(process.env.XDG_CONFIG_HOME || path7.join(os.homedir(), ".config"), "workflow-toolkit");
-  if (!existsSync4(legacy)) {
+  const legacy = path8.join(process.env.XDG_CONFIG_HOME || path8.join(os.homedir(), ".config"), "workflow-toolkit");
+  if (!existsSync5(legacy)) {
     migratedDir = dir;
     return dir;
   }
-  if (!migrationFailed && existsSync4(dir)) {
+  if (!migrationFailed && existsSync5(dir)) {
     migratedDir = dir;
     return dir;
   }
@@ -13784,9 +14139,9 @@ var ensureConfigDir = (dir = resolveConfigDir()) => {
   mkdirSync2(dir, { recursive: true });
   diagnosticLogger?.info(EVENT.migration, { from: legacy, to: dir });
   for (const entry of readdirSync3(legacy, { withFileTypes: true })) {
-    const src = path7.join(legacy, entry.name);
-    const dest = path7.join(dir, entry.name);
-    if (existsSync4(dest))
+    const src = path8.join(legacy, entry.name);
+    const dest = path8.join(dir, entry.name);
+    if (existsSync5(dest))
       continue;
     try {
       if (entry.isDirectory())
@@ -13859,7 +14214,7 @@ var parseConfigResult = (raw, file) => {
   };
 };
 var readConfigTyped = (dir) => {
-  const file = path7.join(dir ?? configDir(), "config.json");
+  const file = path8.join(dir ?? configDir(), "config.json");
   return parseConfigResult(readSafe(file), file);
 };
 var readConfig = () => {
@@ -13905,9 +14260,9 @@ var resolveCommitPolicy = (config, workspace) => {
 
 // packages/workit-core/src/core/workspaces.ts
 import { readFileSync as readFileSync5, realpathSync as realpathSync6 } from "node:fs";
-import path8 from "node:path";
+import path9 from "node:path";
 var readWorkspacesResult = (dir = configDir()) => {
-  const file = path8.join(dir, "workspaces.json");
+  const file = path9.join(dir, "workspaces.json");
   let raw;
   try {
     raw = readFileSync5(file, "utf8");
@@ -14005,10 +14360,10 @@ var resolveWorkspace = (cwd) => resolveWorkspaceFrom(cwd, configDir());
 
 // packages/workit-core/src/core/vcs-config.ts
 import fs7 from "node:fs";
-import path9 from "node:path";
+import path10 from "node:path";
 import { spawnSync as spawnSync3 } from "node:child_process";
 var TOKEN_PLACEHOLDER = "YOUR_TOKEN_HERE";
-var vcsConfigPath = () => process.env.WORKFLOW_VCS_CONFIG ?? path9.join(configDir(), "vcs.json");
+var vcsConfigPath = () => process.env.WORKFLOW_VCS_CONFIG ?? path10.join(configDir(), "vcs.json");
 var vcsCwd = (cwd) => cwd ?? process.env.WORKFLOW_WORKSPACE_ROOT ?? process.cwd();
 var remoteProvider = (cwd) => {
   const r = spawnSync3("git", ["remote", "get-url", "origin"], { cwd, encoding: "utf8" });
@@ -14091,8 +14446,8 @@ function vcsConfig(mode, cwd) {
   }
   const prov = cfg[provider] ?? {};
   const wsTokenFile = typeof wsVcs.tokenFile === "string" && wsVcs.tokenFile.trim() !== "" ? wsVcs.tokenFile : null;
-  const tokenFile = String(wsTokenFile ?? prov.tokenFile ?? path9.join(configDir(), `${provider}.token`));
-  const tokenPath = path9.resolve(tokenFile);
+  const tokenFile = String(wsTokenFile ?? prov.tokenFile ?? path10.join(configDir(), `${provider}.token`));
+  const tokenPath = path10.resolve(tokenFile);
   let tokenOk = false;
   if (fs7.existsSync(tokenPath)) {
     const token = fs7.readFileSync(tokenPath, "utf8").trim();
@@ -14101,7 +14456,7 @@ function vcsConfig(mode, cwd) {
   }
   const out = {
     ok: true,
-    configPath: path9.resolve(cfgPath),
+    configPath: path10.resolve(cfgPath),
     provider,
     defaultTargetBranch: defaultTarget,
     pr: cfg.pr ?? {},
@@ -14202,7 +14557,7 @@ var baseBranch = (cwd) => {
   return { base: String(resolved.defaultTargetBranch ?? "develop") };
 };
 var originBaseReady = (cwd, base) => {
-  const run = (args) => execFileSync2("git", args, { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
+  const run = (args) => execFileSync3("git", args, { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
   try {
     try {
       run(["fetch", "origin", base, "--prune"]);
@@ -14210,7 +14565,7 @@ var originBaseReady = (cwd, base) => {
       run(["fetch", "origin", "--prune"]);
     }
     try {
-      execFileSync2("git", ["show-ref", "--verify", "--quiet", `refs/remotes/origin/${base}`], {
+      execFileSync3("git", ["show-ref", "--verify", "--quiet", `refs/remotes/origin/${base}`], {
         cwd,
         stdio: "pipe"
       });
@@ -14229,11 +14584,11 @@ var originBaseReady = (cwd, base) => {
   }
 };
 var fastForwardBase = (cwd, base) => {
-  const run = (args) => execFileSync2("git", args, { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
+  const run = (args) => execFileSync3("git", args, { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
   try {
     let hasLocalBase = true;
     try {
-      execFileSync2("git", ["show-ref", "--verify", "--quiet", `refs/heads/${base}`], {
+      execFileSync3("git", ["show-ref", "--verify", "--quiet", `refs/heads/${base}`], {
         cwd,
         stdio: "pipe"
       });
@@ -14273,19 +14628,18 @@ var branchSetup = ({
   workspace_root,
   log
 }) => {
-  const cwd = path10.resolve(workspace_root);
-  const exec = (args) => execFileSync2("git", args, { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
+  const cwd = path11.resolve(workspace_root);
+  const exec = (args) => execFileSync3("git", args, { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
   const current = gitContext(cwd).branch;
   if (!current || current === "unknown")
-    return { error: "not in a git repository" };
+    return { error: "not in a git repository", phase: "preflight" };
   const sdd = sdd_dir ?? "docs";
-  const manifestPath = path10.isAbsolute(sdd) ? path10.join(sdd, "manifest.json") : path10.join(cwd, sdd, "manifest.json");
+  const manifestPath = path11.isAbsolute(sdd) ? path11.join(sdd, "manifest.json") : path11.join(cwd, sdd, "manifest.json");
   const ensureManifestDir = () => {
-    const dir = path10.dirname(manifestPath);
-    if (!existsSync5(dir))
+    const dir = path11.dirname(manifestPath);
+    if (!existsSync6(dir))
       mkdirSync3(dir, { recursive: true, mode: 493 });
   };
-  ensureManifestDir();
   const readManifest = () => {
     try {
       return JSON.parse(readFileSync6(manifestPath, "utf8"));
@@ -14303,13 +14657,16 @@ var branchSetup = ({
     const manifest = readManifest();
     const ref = manifest.stash_ref;
     if (!ref)
-      return { error: "no stash_ref in manifest" };
+      return { error: "no stash_ref in manifest", phase: "preflight" };
     journal(`pre-pop: ${String(ref)}`);
     try {
       exec(["stash", "pop", String(ref)]);
     } catch (error) {
       journal("pop: failed");
-      return { error: error instanceof Error ? error.message : "stash pop failed" };
+      return {
+        error: error instanceof Error ? error.message : "stash pop failed",
+        phase: "post_mutation"
+      };
     }
     journal("pop: ok");
     delete manifest.stash_ref;
@@ -14319,11 +14676,17 @@ var branchSetup = ({
   }
   const target = target_branch ?? "";
   if (!target)
-    return { error: "target branch required" };
+    return {
+      error: "target_branch (the working branch to create or switch to) is required for setup",
+      phase: "preflight"
+    };
   if (isProtected(cwd, target))
-    return { error: `protected branch ${target}` };
+    return { error: `protected branch ${target}`, phase: "preflight" };
   if (!allowedBranch(cwd, target))
-    return { error: `target branch ${target} is not allowed by the branch policy` };
+    return {
+      error: `target branch ${target} is not allowed by the branch policy`,
+      phase: "preflight"
+    };
   let base;
   let targetExists = true;
   try {
@@ -14334,12 +14697,12 @@ var branchSetup = ({
   if (!targetExists) {
     const baseResolved = baseBranch(cwd);
     if ("error" in baseResolved)
-      return { error: baseResolved.error };
+      return { error: baseResolved.error, phase: "preflight" };
     base = baseResolved.base;
   }
   journal(`entry: current=${current} target=${target} base=${base ?? "-"}`);
   let stash_ref;
-  const failAfterStash = (message) => {
+  const failAfterStash = (message, phase = "post_mutation") => {
     let suffix = "";
     if (stash_ref) {
       journal(`pre-pop: ${stash_ref}`);
@@ -14352,27 +14715,31 @@ var branchSetup = ({
         suffix = " (changes preserved in stash)";
       }
     }
-    return { error: `${message}${suffix}` };
+    return { error: `${message}${suffix}`, phase: stash_ref ? "post_mutation" : phase };
   };
   if (current !== target) {
     const dirty = Boolean(gitContext(cwd).status_short.trim());
     if (dirty && stash !== "yes") {
       return {
-        error: "dirty working tree — ask with native question, then call workit_branch_setup with stash=yes"
+        error: "dirty working tree — ask with native question, then call workit_branch_setup with stash=yes",
+        phase: "preflight"
       };
     }
     let validatedBase;
     if (!targetExists && base !== undefined) {
       const ready = originBaseReady(cwd, base);
       if (!ready.ok)
-        return { error: ready.error ?? "ensure-base-branch failed" };
+        return { error: ready.error ?? "ensure-base-branch failed", phase: "preflight" };
       validatedBase = base;
     }
     if (dirty) {
       try {
         exec(["stash", "push", "-u", "-m", `workit: pre-checkout ${target}`]);
       } catch (error) {
-        return { error: error instanceof Error ? error.message : "stash push failed" };
+        return {
+          error: error instanceof Error ? error.message : "stash push failed",
+          phase: "post_mutation"
+        };
       }
       stash_ref = "stash@{0}";
       journal(`stash push: ${stash_ref}`);
@@ -14383,14 +14750,14 @@ var branchSetup = ({
     } catch (error) {
       const message = error instanceof Error ? error.message : "checkout failed";
       if (/worktree/i.test(message)) {
-        return failAfterStash(`branch ${target} is locked by an existing git worktree — remove it first (we do not use worktrees)`);
+        return failAfterStash(`branch ${target} is locked by an existing git worktree — remove it first (we do not use worktrees)`, "preflight");
       }
       try {
         let effectiveBase = base;
         if (effectiveBase === undefined) {
           const lateResolved = baseBranch(cwd);
           if ("error" in lateResolved)
-            return failAfterStash(lateResolved.error);
+            return failAfterStash(lateResolved.error, "preflight");
           effectiveBase = lateResolved.base;
         }
         const baseResult = validatedBase !== undefined ? fastForwardBase(cwd, effectiveBase) : ensureBaseBranch(cwd, effectiveBase);
@@ -14437,7 +14804,7 @@ var branchSetup = ({
 
 // packages/workit-core/src/core/pr-create.ts
 import fs8 from "node:fs";
-import path11 from "node:path";
+import path12 from "node:path";
 import { spawnSync as spawnSync4 } from "node:child_process";
 function parseGhRepo(remote) {
   remote = (remote || "").trim().replace(/\/+$/, "");
@@ -14502,11 +14869,11 @@ ${line}` : line;
 }
 function whichOnPath(tool) {
   const names = process.platform === "win32" ? [tool, `${tool}.exe`, `${tool}.cmd`] : [tool];
-  for (const dir of (process.env.PATH ?? "").split(path11.delimiter)) {
+  for (const dir of (process.env.PATH ?? "").split(path12.delimiter)) {
     if (!dir)
       continue;
     for (const name of names) {
-      const candidate = path11.join(dir, name);
+      const candidate = path12.join(dir, name);
       try {
         fs8.accessSync(candidate, fs8.constants.X_OK);
         return candidate;
@@ -14609,7 +14976,7 @@ function prCreate(env, cwd) {
   const draft = String(env.WF_PR_DRAFT ?? "false").toLowerCase() === "true";
   let baseUrl = cfg.youtrack_base_url;
   if (!baseUrl) {
-    const ytCfg = process.env.WORKFLOW_YOUTRACK_CONFIG ?? path11.join(path11.dirname(String(cfg.configPath)), "youtrack.json");
+    const ytCfg = process.env.WORKFLOW_YOUTRACK_CONFIG ?? path12.join(path12.dirname(String(cfg.configPath)), "youtrack.json");
     try {
       const yt = JSON.parse(fs8.readFileSync(ytCfg, "utf8"));
       if (yt && typeof yt === "object")
@@ -14716,8 +15083,8 @@ function prCreate(env, cwd) {
 
 // packages/workit-core/src/core/repo-context.ts
 import { spawnSync as spawnSync5 } from "node:child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync7, readdirSync as readdirSync4 } from "node:fs";
-import path12 from "node:path";
+import { existsSync as existsSync7, readFileSync as readFileSync7, readdirSync as readdirSync4 } from "node:fs";
+import path13 from "node:path";
 var isSafeContextRange = (value) => value.length <= 4096 && (() => {
   try {
     gitRevisionParts(value);
@@ -14851,7 +15218,7 @@ var findPrTemplate = (cwd) => {
   ]) {
     const parts = rel.split("/");
     const base = parts[parts.length - 1];
-    const dir = parts.length > 1 ? path12.join(cwd, ...parts.slice(0, -1)) : cwd;
+    const dir = parts.length > 1 ? path13.join(cwd, ...parts.slice(0, -1)) : cwd;
     const actual = probeCaseInsensitive(dir, base);
     if (actual)
       return [...parts.slice(0, -1), actual].join("/");
@@ -14882,8 +15249,8 @@ var diffStatForRange = (cwd, range) => {
   return runGit(cwd, ["diff", "--stat", "--"]).stdout;
 };
 var packageScripts = (cwd, keys) => {
-  const pkgPath = path12.join(cwd, "package.json");
-  if (!existsSync6(pkgPath))
+  const pkgPath = path13.join(cwd, "package.json");
+  if (!existsSync7(pkgPath))
     return [];
   try {
     const pkg = JSON.parse(readFileSync7(pkgPath, "utf8"));
@@ -14908,9 +15275,9 @@ var documentationFiles = (cwd) => {
       if (entry.isDirectory()) {
         if (excluded.has(entry.name))
           continue;
-        walk(path12.join(dir, entry.name), depth + 1);
+        walk(path13.join(dir, entry.name), depth + 1);
       } else if (entry.isFile() && (entry.name === "README.md" || entry.name.endsWith(".md"))) {
-        matches.push("./" + path12.relative(cwd, path12.join(dir, entry.name)).replaceAll("\\", "/"));
+        matches.push("./" + path13.relative(cwd, path13.join(dir, entry.name)).replaceAll("\\", "/"));
       }
     }
   };
@@ -14918,7 +15285,7 @@ var documentationFiles = (cwd) => {
   return matches.sort().slice(0, 200);
 };
 var readTrimmed = (file, maxLines) => {
-  if (!existsSync6(file))
+  if (!existsSync7(file))
     return "";
   const lines = readFileSync7(file, "utf8").split(`
 `);
@@ -14926,7 +15293,7 @@ var readTrimmed = (file, maxLines) => {
 `);
 };
 function prReadyContext(root, range) {
-  const cwd = path12.resolve(repoRoot2(root));
+  const cwd = path13.resolve(repoRoot2(root));
   if (range !== undefined && !isResolvableContextRange(cwd, range))
     return invalidRange(cwd);
   let stdout = "";
@@ -14984,7 +15351,7 @@ ${status.stderr}` : "");
     stdout += `template_path: ${template}
 
 `;
-    stdout += readTrimmed(path12.join(cwd, template), 220);
+    stdout += readTrimmed(path13.join(cwd, template), 220);
   } else {
     stdout += `template_path: none
 
@@ -14994,7 +15361,7 @@ ${status.stderr}` : "");
   stdout += `
 `;
   stdout += printSection("Recent Validation Signals");
-  if (existsSync6(path12.join(cwd, "package.json"))) {
+  if (existsSync7(path13.join(cwd, "package.json"))) {
     stdout += `package.json detected. Common scripts:
 `;
     const found = packageScripts(cwd, ["lint", "format:check", "test", "build"]);
@@ -15003,7 +15370,7 @@ ${status.stderr}` : "");
 `) + `
 `;
   }
-  if (existsSync6(path12.join(cwd, "Cargo.toml")) || existsSync6(path12.join(cwd, "src-tauri/Cargo.toml"))) {
+  if (existsSync7(path13.join(cwd, "Cargo.toml")) || existsSync7(path13.join(cwd, "src-tauri/Cargo.toml"))) {
     stdout += `Rust project detected.
 `;
   }
@@ -15036,7 +15403,7 @@ var CHANGELOG_RULES = `- Use an [Unreleased] section.
 - Apply with the native workit_changelog_apply tool only (not hand-edits under Unreleased).
 - If Unreleased already has duplicate category headings, normalize_only first.`;
 function changelogContext(root, range) {
-  const cwd = path12.resolve(repoRoot2(root));
+  const cwd = path13.resolve(repoRoot2(root));
   if (range !== undefined && !isResolvableContextRange(cwd, range))
     return invalidRange(cwd);
   const resolvedRange = rangeArgOrDefault(range, cwd);
@@ -15054,8 +15421,8 @@ function changelogContext(root, range) {
   stdout += CHANGELOG_RULES + `
 `;
   stdout += printSection("Existing CHANGELOG.md");
-  const changelogPath = path12.join(cwd, "CHANGELOG.md");
-  if (existsSync6(changelogPath)) {
+  const changelogPath = path13.join(cwd, "CHANGELOG.md");
+  if (existsSync7(changelogPath)) {
     stdout += readTrimmed(changelogPath, 260) + `
 `;
   } else {
@@ -15074,7 +15441,7 @@ function changelogContext(root, range) {
   return { stdout, stderr: "", exitCode: 0, cwd };
 }
 function docsRefreshContext(root, range) {
-  const cwd = path12.resolve(repoRoot2(root));
+  const cwd = path13.resolve(repoRoot2(root));
   if (range !== undefined && !isResolvableContextRange(cwd, range))
     return invalidRange(cwd);
   const resolvedRange = rangeArgOrDefault(range, cwd);
@@ -15096,8 +15463,8 @@ function docsRefreshContext(root, range) {
 `) + `
 `;
   stdout += printSection("README Preview");
-  const readme = path12.join(cwd, "README.md");
-  if (existsSync6(readme)) {
+  const readme = path13.join(cwd, "README.md");
+  if (existsSync7(readme)) {
     stdout += readTrimmed(readme, 220) + `
 `;
   } else {
@@ -15105,8 +15472,8 @@ function docsRefreshContext(root, range) {
 `;
   }
   stdout += printSection("Package Scripts");
-  const pkgPath = path12.join(cwd, "package.json");
-  if (existsSync6(pkgPath)) {
+  const pkgPath = path13.join(cwd, "package.json");
+  if (existsSync7(pkgPath)) {
     try {
       const pkg = JSON.parse(readFileSync7(pkgPath, "utf8"));
       stdout += JSON.stringify({ name: pkg.name, version: pkg.version, scripts: pkg.scripts }, null, 2) + `
@@ -15119,7 +15486,7 @@ function docsRefreshContext(root, range) {
   return { stdout, stderr: "", exitCode: 0, cwd };
 }
 function releaseNotesContext(root, rangeOrTag) {
-  const cwd = path12.resolve(repoRoot2(root));
+  const cwd = path13.resolve(repoRoot2(root));
   if (!rangeOrTag) {
     return { stdout: "", stderr: `ERROR: release tag or range required
 `, exitCode: 1, cwd };
@@ -15157,7 +15524,7 @@ function releaseNotesContext(root, rangeOrTag) {
 `;
   stdout += printSection("Existing Release Files");
   for (const rel of ["CHANGELOG.md", "RELEASE_NOTES.md", ".github/releases.md"]) {
-    if (existsSync6(path12.join(cwd, rel)))
+    if (existsSync7(path13.join(cwd, rel)))
       stdout += rel + `
 `;
   }
@@ -15348,25 +15715,6 @@ var fetchGitLabIssueBody = async (ref, root, deps = {}) => {
 import fs10 from "node:fs";
 import path14 from "node:path";
 
-// packages/workit-core/src/core/package-root.ts
-import { existsSync as existsSync7 } from "node:fs";
-import path13 from "node:path";
-import { fileURLToPath } from "node:url";
-var packageRoot = () => {
-  let dir = path13.dirname(fileURLToPath(import.meta.url));
-  while (true) {
-    const parent = path13.dirname(dir);
-    if (existsSync7(path13.join(dir, "package.json")) || parent === dir)
-      return dir;
-    dir = parent;
-  }
-};
-var assetRoot = () => {
-  const root = packageRoot();
-  const assets = path13.join(root, "assets");
-  return existsSync7(assets) ? assets : root;
-};
-
 // packages/workit-core/src/core/templates.ts
 var repoRoot3 = assetRoot();
 
@@ -16572,6 +16920,101 @@ var safePath = (root, value) => {
     return null;
   }
 };
+var branchCreationBaseline = (root, target, base) => {
+  const exists = gitValue(root, ["rev-parse", "--verify", "--quiet", `refs/heads/${target}`]) !== null;
+  if (exists)
+    return { base_branch: base, target_exists: true, remote_base: null };
+  const remote = run3(root, ["ls-remote", "origin", `refs/heads/${base}`]);
+  const sha = remote.exitCode === 0 ? remote.stdout.trim().split(/\s+/)[0] : "";
+  return {
+    base_branch: base,
+    target_exists: false,
+    remote_base: /^[0-9a-f]{40}$/.test(sha ?? "") ? sha : null
+  };
+};
+var shortSha = (value) => typeof value === "string" && value ? value.slice(0, 8) : "unknown";
+var isProtectedBranch2 = (root, branch) => resolveBranchPolicyFor(root).protected.has(branch.toLowerCase());
+var actionProposalQuestion = (request, descriptorPayload) => {
+  const payload = descriptorPayload ?? {};
+  const resolved = payload.resolved ?? {};
+  const payloadTarget = String(payload.target_branch ?? "");
+  if (request.operation === "git.commit" && Array.isArray(payload.plan_steps)) {
+    const steps = payload.plan_steps;
+    return {
+      presented: `Workit decision: action — Approve committing the plan's ${steps.length} listed tasks on \`${String(payload.plan_branch ?? "")}\`?`,
+      approvedText: `Approve the ${steps.length} listed plan commits.`
+    };
+  }
+  switch (request.operation) {
+    case "git.branch_setup": {
+      if (request.payload.action === "reapply_stash")
+        return {
+          presented: "Workit decision: action — Reapply the pre-checkout stash recorded in the branch manifest?",
+          approvedText: "Reapply the recorded stash."
+        };
+      const target = String(payload.target_branch ?? "");
+      const stashes = payload.stash === "yes" && resolved.dirty === true;
+      if (resolved.target_exists === true)
+        return stashes ? {
+          presented: `Workit decision: action — Stash the dirty working tree and switch to branch \`${target}\`?`,
+          approvedText: `Stash and switch to \`${target}\`.`
+        } : {
+          presented: `Workit decision: action — Switch to branch \`${target}\`?`,
+          approvedText: `Switch to \`${target}\`.`
+        };
+      const base = String(resolved.base_branch ?? "the base branch");
+      return stashes ? {
+        presented: `Workit decision: action — Stash the dirty working tree and create branch \`${target}\` from \`${base}\` (currently ${shortSha(resolved.remote_base)})?`,
+        approvedText: `Stash and create \`${target}\` from \`${base}\` at ${shortSha(resolved.remote_base)}.`
+      } : {
+        presented: `Workit decision: action — Create branch \`${target}\` from \`${base}\` (currently ${shortSha(resolved.remote_base)})?`,
+        approvedText: `Create \`${target}\` from \`${base}\` at ${shortSha(resolved.remote_base)}.`
+      };
+    }
+    case "git.commit": {
+      const paths = Array.isArray(resolved.paths) ? resolved.paths : [];
+      return {
+        presented: `Workit decision: action — Commit ${paths.length} staged file(s) as "${String(request.payload.message)}"?`,
+        approvedText: `Commit as "${String(request.payload.message)}".`
+      };
+    }
+    case "git.push":
+      return {
+        presented: `Workit decision: action — Push branch \`${String(payload.branch ?? "")}\` to origin?`,
+        approvedText: `Push \`${String(payload.branch ?? "")}\` to origin.`
+      };
+    case "hosting.pull_request":
+      return {
+        presented: `Workit decision: action — Open a PR from \`${String(resolved.source_branch ?? "")}\` to \`${payloadTarget}\` titled "${String(request.payload.title)}"?`,
+        approvedText: `Open the PR: ${String(resolved.source_branch ?? "")} → ${payloadTarget}, "${String(request.payload.title)}".`
+      };
+    case "changelog.apply":
+      return {
+        presented: `Workit decision: action — Apply changelog changes at \`${String(payload.path ?? "CHANGELOG.md")}\`?`,
+        approvedText: `Apply changelog changes at ${String(payload.path ?? "CHANGELOG.md")}.`
+      };
+    case "youtrack.update":
+      return {
+        presented: `Workit decision: action — Update YouTrack issue ${String(request.payload.issueId)}${request.payload.minutes ? ` and log ${String(request.payload.minutes)}m` : ""}?`,
+        approvedText: `Update YouTrack issue ${String(request.payload.issueId)}.`
+      };
+    case "youtrack.time":
+      return {
+        presented: `Workit decision: action — Log ${String(request.payload.minutes)}m to YouTrack issue ${String(request.payload.issueId)}?`,
+        approvedText: `Log time to YouTrack issue ${String(request.payload.issueId)}.`
+      };
+    case "youtrack.meeting":
+      return {
+        presented: `Workit decision: action — Log meeting time to YouTrack issue ${String(request.payload.issueId)}?`,
+        approvedText: `Log meeting time to YouTrack issue ${String(request.payload.issueId)}.`
+      };
+    default:
+      return {
+        presented: `Workit decision: action — Approve ${request.operation}?`,
+        approvedText: `Approve ${request.operation}.`
+      };
+  }
+};
 var approvedResolvedExternalAction = (content) => {
   try {
     const value = JSON.parse(content);
@@ -16835,24 +17278,35 @@ var resolveExternalActionRequest = (root, request, preservedDateMs) => {
         const sdd_dir = safePath(root, request.payload.sdd_dir ?? "docs");
         if (!sdd_dir)
           return failure("invalid_input", "sdd_dir must stay inside the workspace");
+        const action = request.payload.action ?? "setup";
         const policy = resolveBranchPolicyFor(root);
-        const target_branch = request.payload.target_branch ?? policy.defaultTargetBranch;
+        const target_branch = request.payload.target_branch;
+        if (action !== "reapply_stash" && !target_branch)
+          return failure("invalid_input", "target_branch (the working branch to create or switch to) is required for setup", {
+            outcome: "not_started",
+            fields: [{ path: "target_branch", reason: "required for action=setup" }]
+          });
         const head = gitValue(root, ["rev-parse", "HEAD"]);
         if (!head)
           return failure("storage_error", "current Git commit could not be resolved");
+        const dirty = Boolean((gitRaw(root, ["status", "--short"]) ?? "").trim());
+        const creation = action === "reapply_stash" || !target_branch ? { base_branch: policy.defaultTargetBranch } : branchCreationBaseline(root, target_branch, policy.defaultTargetBranch);
         const normalized = {
           operation: request.operation,
           payload: {
             ...request.payload,
-            action: request.payload.action ?? "setup",
+            action,
             sdd_dir,
             stash: request.payload.stash ?? "no",
-            target_branch
+            ...target_branch ? { target_branch } : {}
           }
         };
         return success(null, null, {
           request: normalized,
-          descriptorPayload: { ...normalized.payload, resolved: { head, target_branch } }
+          descriptorPayload: {
+            ...normalized.payload,
+            resolved: { head, dirty, ...creation }
+          }
         });
       }
       case "git.push": {
@@ -16866,7 +17320,37 @@ var resolveExternalActionRequest = (root, request, preservedDateMs) => {
         }) : failure("invalid_input", "git push requires a resolvable current branch");
       }
       case "git.commit": {
+        const planSteps = request.payload.plan_steps;
+        const planBranch = request.payload.plan_branch;
         const head = gitValue(root, ["rev-parse", "HEAD"]);
+        if (!head)
+          return failure("storage_error", "Git state could not be resolved");
+        const branch = gitValue(root, ["branch", "--show-current"]);
+        if (planSteps !== undefined || planBranch !== undefined) {
+          if (!Array.isArray(planSteps) || planSteps.some((step) => typeof step !== "string" || !step.trim()) || new Set(planSteps).size !== planSteps.length || planSteps.length === 0 || planSteps.length > 32)
+            return failure("invalid_input", "plan_steps must be 1-32 unique non-empty commit messages", {
+              outcome: "not_started",
+              fields: [{ path: "plan_steps", reason: "unique strings" }]
+            });
+          if (typeof planBranch !== "string" || !planBranch.trim() || planBranch !== branch)
+            return failure("invalid_input", "plan_branch must name the current working branch", {
+              outcome: "not_started",
+              fields: [{ path: "plan_branch", reason: "current branch" }]
+            });
+          if (isProtectedBranch2(root, planBranch))
+            return failure("invalid_input", "plan_branch must not be a protected branch", {
+              outcome: "not_started",
+              fields: [{ path: "plan_branch", reason: "protected branch" }]
+            });
+          return success(null, null, {
+            request,
+            descriptorPayload: {
+              plan_steps: planSteps,
+              plan_branch: planBranch,
+              resolved: { head, branch, steps: planSteps }
+            }
+          });
+        }
         const staged = gitRaw(root, [
           "diff",
           "--cached",
@@ -16877,7 +17361,13 @@ var resolveExternalActionRequest = (root, request, preservedDateMs) => {
           "HEAD"
         ]);
         const paths = stagedPaths(root);
-        if (!head || staged === null || paths === null)
+        const message = request.payload.message;
+        if (typeof message !== "string" || !message)
+          return failure("invalid_input", "git.commit requires a commit message", {
+            outcome: "not_started",
+            fields: [{ path: "message", reason: "required unless plan_steps is provided" }]
+          });
+        if (staged === null || paths === null)
           return failure("storage_error", "Git state could not be resolved");
         let policy;
         try {
@@ -16892,13 +17382,13 @@ var resolveExternalActionRequest = (root, request, preservedDateMs) => {
 `).filter(Boolean));
           flavor = detected.flavor ?? "conventional";
         }
-        if (!matchCommitFlavor(request.payload.message, flavor, policy.pattern))
+        if (!matchCommitFlavor(message, flavor, policy.pattern))
           return failure("invalid_input", `Commit message does not match the ${flavor} flavor (commitPolicy.preset)`);
         return success(null, null, {
           request,
           descriptorPayload: {
             ...request.payload,
-            resolved: { head, staged: sha256(staged), paths }
+            resolved: { head, branch, staged: sha256(staged), paths }
           }
         });
       }
@@ -17068,10 +17558,24 @@ var executeConcreteExternalAction = async (request, root, marker, dateMs, step,
         sdd_dir: request.payload.sdd_dir ?? "docs",
         workspace_root: root
       });
-      return result.error ? unknown2(request.operation) : success(null, null, result);
+      if ("error" in result) {
+        if (result.phase === "preflight")
+          return failure("invalid_input", result.error, {
+            outcome: "not_started",
+            operation: request.operation
+          });
+        return unknown2(request.operation);
+      }
+      return success(null, null, result);
     }
     case "git.commit": {
-      const result = run3(root, ["commit", "-m", request.payload.message]);
+      const message = request.payload.message;
+      if (typeof message !== "string" || !message)
+        return failure("invalid_input", "git.commit requires a commit message", {
+          outcome: "not_started",
+          fields: [{ path: "message", reason: "required" }]
+        });
+      const result = run3(root, ["commit", "-m", message]);
       return result.exitCode === 0 ? success(null, null, { stdout: result.stdout.trim() }) : unknown2(request.operation);
     }
     case "git.push": {
@@ -17244,8 +17748,34 @@ var nativeAuthority = (actor, reconciliationTokens = new WeakSet) => ({
 var nativeExternalActionRunner = (root, actor, core, step) => createAuthorizedExternalActionRunner(core, (operation) => {
   const store = new TaskStore(root);
   const selected = approvedExternalAction(store, "pi", actor, operation);
-  if (!selected.ok)
+  if (!selected.ok) {
+    const plan = planCommitBinding(store, "pi", actor, operation);
+    if (plan) {
+      const actionRef = externalActionRef("pi", actor, operation);
+      return {
+        taskId: plan.taskId,
+        decisionId: plan.decisionId,
+        actionRef,
+        expectedRevision: plan.expectedRevision,
+        expectedWorkspaceRevision: plan.expectedWorkspaceRevision,
+        binding: plan.binding,
+        step: plan.step,
+        refresh: () => {
+          const task = store.readTask(plan.taskId);
+          const freshWorkspace = store.readWorkspace();
+          if (!task.ok || !freshWorkspace.ok || !freshWorkspace.data)
+            throw new Error("external action state changed");
+          return {
+            expectedRevision: task.data.revision,
+            expectedWorkspaceRevision: freshWorkspace.data.revision
+          };
+        },
+        reserveObservation: nativeExternalActionObservation(actor, actionRef, "reserve"),
+        settleObservation: (outcome, revisions) => nativeExternalActionObservation(actor, actionRef, outcome, actionRef.kind === "host" ? actionRef.handle : "external-action", revisions)
+      };
+    }
     return selected;
+  }
   const actionRef = externalActionRef("pi", actor, operation);
   return {
     taskId: selected.data.task.id,
@@ -17311,6 +17841,21 @@ var executeFamily = async (family, toolCallId, input, ctx) => {
         operation: "decision.record"
       }));
     const decision = parsed.data;
+    const budgetIssue = workitBindingQuestionIssue([
+      {
+        header: `Workit decision: ${parsed.data.purpose}`,
+        question: decision.binding.presented,
+        options: [
+          {
+            label: "approved",
+            description: decision.binding.displayed ?? decision.binding.approvedContent
+          },
+          { label: "rejected", description: "Reject this decision" }
+        ]
+      }
+    ]);
+    if (budgetIssue)
+      return output(failure("invalid_input", budgetIssue));
     const approved = await ctx.ui.confirm("Workit decision", decision.binding.presented);
     if (approved !== (decision.response === "approved"))
       return output(failure("permission_denied", "Pi decision answer did not match the requested response"));
@@ -17363,9 +17908,17 @@ var registerWorkitTools = (pi, options = {}) => {
       if (!parsed.ok)
         return output(parsed);
       const context = piContext(ctx);
-      const resolved = resolveExternalActionRequest(ctx.cwd, parsed.data);
+      let resolved = resolveExternalActionRequest(ctx.cwd, parsed.data);
       if (!resolved.ok)
         return output(resolved);
+      if (resolved.data.request.operation === "git.branch_setup" && resolved.data.descriptorPayload.resolved?.dirty === true && resolved.data.descriptorPayload.stash !== "yes") {
+        const upgraded = resolveExternalActionRequest(ctx.cwd, {
+          ...parsed.data,
+          payload: { ...parsed.data.payload, stash: "yes" }
+        });
+        if (upgraded.ok)
+          resolved = upgraded;
+      }
       if (resolved.data.request.operation === "context.read")
         return output(await executeResolvedExternalAction(resolved.data, ctx.cwd));
       if (!ctx.isProjectTrusted())
@@ -17383,6 +17936,22 @@ var registerWorkitTools = (pi, options = {}) => {
         ...context,
         nativeAuthority: nativeAuthority(actor, reconciliationTokens)
       });
+      const localOperation = [
+        "git.branch_setup",
+        "git.commit",
+        "git.push",
+        "hosting.pull_request",
+        "changelog.apply"
+      ].includes(resolved.data.request.operation);
+      if (localOperation) {
+        const writer = assertLocalExternalActionWriter(ctx.cwd, { host: "pi", actor });
+        if (!writer.ok)
+          return output(failure("needs_input", "writer ownership is required before this action", {
+            outcome: "not_started",
+            operation: resolved.data.request.operation,
+            guidance: "Acquire checkout writer ownership first (writer.acquire) and retry the action."
+          }));
+      }
       const descriptor = externalActionDescriptor(resolved.data.request.operation, resolved.data.descriptorPayload);
       const priorRequest = priorExternalAction(store, "pi", actor, resolved.data.request.operation, resolved.data.request.payload);
       if (priorRequest.ok && priorRequest.data.entry.data.consumption?.state === "uncertain") {
@@ -17421,8 +17990,18 @@ var registerWorkitTools = (pi, options = {}) => {
       }
       if (priorRequest.ok && priorRequest.data.entry.data.consumption !== null)
         return output(failure("permission_denied", "external action was already settled"));
+      const drift = resolved.data.request.operation === "git.branch_setup" ? priorResolvedDrift(store, "pi", actor, resolved.data.request.operation, resolved.data.request.payload, resolved.data.descriptorPayload.resolved) : success(null, null, null);
+      if (!drift.ok)
+        return output(drift);
       const existing = approvedExternalAction(store, "pi", actor, descriptor);
       if (!existing.ok) {
+        const commitMessage = resolved.data.request.operation === "git.commit" ? resolved.data.request.payload.message : undefined;
+        const currentBranch = resolved.data.descriptorPayload.resolved?.branch;
+        const plan = typeof commitMessage === "string" && commitMessage ? approvedPlanCommit(store, "pi", actor, commitMessage) : null;
+        if (plan?.ok && plan.data.branch === currentBranch) {
+          const result = await nativeExternalActionRunner(ctx.cwd, actor, core)(descriptor, (step) => executeResolvedExternalAction(resolved.data, ctx.cwd, step, { host: "pi", actor }));
+          return output(result);
+        }
         const prior = externalActionState(store, "pi", actor, descriptor);
         if (prior.ok && prior.data.entry.data.consumption !== null)
           return output(failure("permission_denied", "external action was already settled"));
@@ -17434,7 +18013,8 @@ var registerWorkitTools = (pi, options = {}) => {
         if (candidates.length !== 1)
           return output(failure("permission_denied", "external action requires exactly one active Pi task"));
         const task = candidates[0];
-        const approved = await ctx.ui.confirm("Workit external action", descriptor);
+        const question = actionProposalQuestion(resolved.data.request, resolved.data.descriptorPayload);
+        const approved = await ctx.ui.confirm(question.presented, question.approvedText);
         if (!approved)
           return output(failure("permission_denied", "external action was not approved"));
         const currentWorkspace = store.readWorkspace();
@@ -17450,8 +18030,9 @@ var registerWorkitTools = (pi, options = {}) => {
             taskId: task.id,
             workspaceId: currentWorkspace.data.id,
             scope: task.intent.data.scope,
-            presented: `Approve ${descriptor}`,
+            presented: question.presented,
             approvedContent: descriptor,
+            displayed: question.approvedText,
             contentRefs: []
           },
           response: "approved",
@@ -17460,6 +18041,9 @@ var registerWorkitTools = (pi, options = {}) => {
         if (!decision.ok)
           return output(decision);
       }
+      const planSteps = resolved.data.descriptorPayload.plan_steps;
+      if (resolved.data.request.operation === "git.commit" && Array.isArray(planSteps))
+        return output(success(null, null, { plan_commits: planSteps.length }));
       const result = await nativeExternalActionRunner(ctx.cwd, actor, core)(descriptor, (step) => executeResolvedExternalAction(resolved.data, ctx.cwd, step, { host: "pi", actor }));
       return output(result);
     }
@@ -17468,7 +18052,7 @@ var registerWorkitTools = (pi, options = {}) => {
 var enforceNativeWriter = (event, ctx) => {
   if (event.toolName === "bash") {
     const command = event.input?.command;
-    const route = typeof command === "string" ? shellRouteIntent(command) : null;
+    const route = typeof command === "string" ? shouldDenyShellRoute(ctx.cwd, command) : null;
     if (route)
       return {
         block: true,