@brainervirus/workit-opencode 1.0.10 → 1.0.11

package/dist/plugin.js

@@ -7591,10 +7591,11 @@ var decisionSchema = object({
     presented: text,
     approvedContent: text,
     displayed: text.optional(),
-    contentRefs: array(refSchema)
+    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({
@@ -10413,7 +10414,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;
@@ -10489,7 +10490,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)
@@ -10822,6 +10823,23 @@ 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", [
@@ -11068,12 +11086,62 @@ var planCommitBinding = (store, host, actor, operation) => {
 };
 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)
@@ -11087,6 +11155,24 @@ var priorResolvedDrift = (store, host, actor, operation, payload, currentResolve
   }
   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 });
@@ -12361,7 +12447,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)
@@ -12394,7 +12485,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,
@@ -30820,13 +30911,20 @@ var actionProposalQuestion = (request, descriptorPayload) => {
           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 {
+        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 {
+      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)}.`
       };
@@ -31545,7 +31643,6 @@ var sessionParent = (session) => {
   const parentID = session.parentID;
   return typeof parentID === "string" && parentID.length > 0 ? parentID : null;
 };
-var freshMs = 5 * 60 * 1000;
 var rejectedDescription = "Reject this decision";
 var isSelfAuthorizingActionContent = (content) => {
   try {
@@ -31660,8 +31757,6 @@ class NativeReceiptStore {
       queue.splice(i, 1);
       if (!queue.length)
         this.#receipts.delete(sessionID);
-      if (this.#now() - receipt.recordedAt > freshMs)
-        return { ok: false, error: "permission_denied: native question receipt is stale" };
       const observation = { receipt };
       this.#observations.add(observation);
       return { ok: true, receipt, observation };
@@ -31682,8 +31777,6 @@ class NativeReceiptStore {
             reasons.push(`purpose was "${closest.decisionPurpose}"`);
           if (expected.contentDigest !== undefined && closest.contentDigest !== expected.contentDigest)
             reasons.push("question or approved content differed from the asked receipt");
-          if (this.#now() - closest.recordedAt > freshMs)
-            reasons.push("receipt is stale (older than 5 minutes)");
           if (reasons.length)
             return `${base} (closest ${purpose} receipt: ${reasons.join("; ")})`;
         }
@@ -31962,8 +32055,7 @@ var workerIdFor = (store, actor, current, directChildren) => {
 var createWorkitTools = ({
   client,
   receipts = new NativeReceiptStore,
-  directChildren = new Map,
-  now = Date.now
+  directChildren = new Map
 } = {}) => {
   const actionProposals = new Map;
   const make = (family) => tool({
@@ -31999,6 +32091,10 @@ var createWorkitTools = ({
       let result;
       if (family === "decision" && args.action === "record") {
         const decision = parsed.data;
+        if (decision.response === "stated") {
+          result = core.observeDecision(parsed.data, undefined);
+          return output2(result);
+        }
         const budgetIssue = workitBindingQuestionIssue([
           decisionContent(decision.purpose, decision.binding.presented, decision.binding.approvedContent)
         ]);
@@ -32019,22 +32115,30 @@ var createWorkitTools = ({
         if (decision.purpose === "action" && decision.response === "approved") {
           const queue = actionProposals.get(context.sessionID) ?? [];
           const textMatches = queue.filter((pending) => pending.presented === decision.binding.presented && pending.approvedText === decision.binding.approvedContent);
-          const matches = textMatches.filter((pending) => now() - pending.createdAt <= 5 * 60 * 1000);
-          if (matches.length > 1)
+          if (textMatches.length > 1 && new Set(textMatches.map((pending) => pending.descriptor)).size > 1)
             return output2(failure("invalid_input", "multiple action proposals match this approval; resolve the action again"));
-          const pending = matches[0];
+          let bound = false;
+          const pending = textMatches[0];
           if (pending) {
-            actionProposals.set(context.sessionID, queue.filter((candidate) => candidate !== pending));
-            recordInput = {
-              ...recordInput,
-              binding: {
-                ...recordInput.binding,
-                approvedContent: pending.descriptor,
-                displayed: pending.approvedText
-              }
-            };
-          } else if (!isSelfAuthorizingActionContent(decision.binding.approvedContent)) {
-            return output2(failure("invalid_input", textMatches.length > 0 ? "action proposal expired; resolve the action again for a fresh proposal" : "no matching action proposal; resolve the action through the action tool first"));
+            const fresh = resolveExternalActionRequest(context.directory, pending.request);
+            const freshDescriptor = fresh.ok ? externalActionDescriptor(pending.request.operation, fresh.data.descriptorPayload) : null;
+            if (freshDescriptor === pending.descriptor) {
+              actionProposals.set(context.sessionID, queue.filter((candidate) => candidate !== pending));
+              recordInput = {
+                ...recordInput,
+                binding: {
+                  ...recordInput.binding,
+                  approvedContent: pending.descriptor,
+                  displayed: pending.approvedText
+                }
+              };
+              bound = true;
+            } else if (fresh.ok) {
+              actionProposals.set(context.sessionID, queue.filter((candidate) => candidate !== pending));
+            }
+          }
+          if (!bound && !isSelfAuthorizingActionContent(decision.binding.approvedContent)) {
+            return output2(failure("invalid_input", textMatches.length > 0 ? "repository state changed since the proposal; resolve the action again for a fresh proposal" : "no matching action proposal; resolve the action through the action tool first"));
           }
         }
         result = core.observeDecision(recordInput, observed.observation);
@@ -32073,9 +32177,17 @@ var createWorkitTools = ({
           if (earlySession !== null && sessionParent(earlySession) !== undefined)
             return output2(failure("permission_denied", "child sessions cannot run external actions"));
         }
-        const resolved = resolveExternalActionRequest(context.directory, parsed.data);
+        let resolved = resolveExternalActionRequest(context.directory, parsed.data);
         if (!resolved.ok)
           return output2(resolved);
+        if (resolved.ok && resolved.data.request.operation === "git.branch_setup" && resolved.data.descriptorPayload.resolved?.dirty === true && resolved.data.descriptorPayload.stash !== "yes") {
+          const upgraded = resolveExternalActionRequest(context.directory, {
+            ...parsed.data,
+            payload: { ...parsed.data.payload, stash: "yes" }
+          });
+          if (upgraded.ok)
+            resolved = upgraded;
+        }
         if (resolved.data.request.operation === "context.read")
           return output2(await executeResolvedExternalAction(resolved.data, context.directory));
         if (!client)
@@ -32174,15 +32286,19 @@ var createWorkitTools = ({
           if (selected.error.startsWith("no approved action")) {
             const proposal = actionProposalQuestion(resolved.data.request, resolved.data.descriptorPayload);
             const pending = actionProposals.get(context.sessionID) ?? [];
-            pending.push({
+            const existing = pending.find((candidate) => candidate.descriptor === descriptor);
+            const open = existing ?? {
               descriptor,
               presented: proposal.presented,
               approvedText: proposal.approvedText,
-              createdAt: now()
-            });
-            if (pending.length > 8)
-              pending.shift();
-            actionProposals.set(context.sessionID, pending);
+              request: resolved.data.request
+            };
+            if (!existing) {
+              pending.push(open);
+              if (pending.length > 8)
+                pending.shift();
+              actionProposals.set(context.sessionID, pending);
+            }
             return output2(failure("needs_input", proposal.presented, {
               outcome: "not_started",
               operation: resolved.data.request.operation,
@@ -32616,7 +32732,7 @@ var plugin = async ({ client, directory }) => {
       warnStaleSources();
       if (input.tool === "bash") {
         const command = output?.args?.command;
-        const route = typeof command === "string" ? shellRouteIntent(command) : null;
+        const route = typeof command === "string" ? shouldDenyShellRoute(directory, command) : null;
         if (route)
           throw new Error(`recovery_required: direct branch or PR creation bypasses the Workit route; ${route.guidance}`);
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainervirus/workit-opencode",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": false,
   "description": "Workit OpenCode plugin — native tools, adaptive policy, and fourteen method skills",
   "keywords": [
@@ -38,7 +38,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@brainervirus/workit-core": "^1.0.10"
+    "@brainervirus/workit-core": "^1.0.11"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "1.18.30"