opencode-wait-a-minute 1.1.0 → 1.2.0

package/README.md

@@ -21,7 +21,7 @@ WAM adds deterministic control, task-state management, context reconstruction, s
 
 WAM ships a CQE adapter (`src/context/cqe-adapter.js`) that integrates [context-query-core](https://github.com/khnker/context-query-core), a fast, in-process code-evidence retriever using SQLite + trigram indexing for lexical and symbolic snippet matching.
 
-Modes: `disabled`, `shadow`, `enabled`. The adapter defaults to `enabled` when invoked directly; override with `WAM_CQE_MODE`, or disable with `WAM_CQE=0`. It runs on file-search-intent prompts in the runtime context-retrieval path via `selectContextWithCqe`; opt out with `WAM_CQE_MODE=disabled` or `cfg.disableCqe`.
+Modes: `disabled`, `shadow`, `enabled`. The adapter defaults to `enabled` when invoked directly; override with `WAM_CQE_MODE`, or disable with `WAM_CQE=0`. Every runtime context retrieval consults CQE via `selectContextWithCqe` and augments the package with bounded `file_context`; opt out with `WAM_CQE_MODE=disabled`, `WAM_CQE=0`, or `cfg.disableCqe`.
 
 Benchmark (fixture corpus, k=5, 10 queries): CQE retrieved **142 tokens vs. 302 for the baseline** ripgrep search — **52.98% fewer tokens** — with higher precision (0.617 vs 0.613) and MRR (0.700 vs 0.683), and comparable recall (0.70 vs 0.75). Reproduce with:
 

package/index.js

@@ -29,7 +29,7 @@ import { activeTaskPath, sessionTaskPath, tasksDir as wamTasksDir, taskDir as wa
 
 import { initMemory, updateProjectMemo, summarizeOperationalContext, updateContext, getOperationalContext, updateTaskMemory, addRecentChange, recordDecision, getDecision, listDecisions, updateLiveContext, compactDecisions } from "./src/persistence/memory.js";
 import { purgeTasks } from "./src/persistence/retention-manager.js";
-import { getSessionId, listCapsules, getCapsule, promoteCapsule, selectContext, selectContextWithCqe, detectFileSearchIntent, retrieveContext, retrieveContextWithCqe, closeSession, resolveWamRoot, migrateLegacyCapsules, setActiveSession, applyBootstrapApproval } from "./src/context/context.js";
+import { getSessionId, listCapsules, getCapsule, promoteCapsule, selectContext, selectContextWithCqe, retrieveContext, retrieveContextWithCqe, closeSession, resolveWamRoot, migrateLegacyCapsules, setActiveSession, applyBootstrapApproval } from "./src/context/context.js";
 import { assembleContext } from "./src/context/assembly.js";
 import { injectCanonicalProjectContext } from "./src/context/canonical-project-context.js";
 import { evaluateRequirement as evaluateRequirementChecks, verifyRequirement } from "./src/verification/verification.js";
@@ -1608,7 +1608,6 @@ async function postToolExecution(input, output) {
         persistLiveContext,
         assembleContext,
         selectContextWithCqe,
-        detectFileSearchIntent,
         createSnapshot,
         checkContinuation,
         rebuildScope,
@@ -1627,7 +1626,6 @@ async function postToolExecution(input, output) {
         promoteCapsule,
         selectContext,
         selectContextWithCqe,
-        detectFileSearchIntent,
         retrieveContext,
         closeSession,
         resolveWamRoot,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-wait-a-minute",
   "description": "WAM keeps more state than it sends: deterministic task-state, context reconstruction, and evidence-backed completion for OpenCode agents.",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "index.js",
   "engines": {
     "node": ">=22.6"
@@ -11,7 +11,6 @@
     "src/",
     "skills/",
     "prompts/",
-    "vendor/**/dist",
     "vendor/**/src/",
     "vendor/**/index.js",
     "README.md",

package/src/agents/invocation-adapter.js

@@ -336,6 +336,32 @@ function sessionErrorMessage(data) {
   return `agent session error: ${detail}${status ? ` (${status})` : ""}`;
 }
 
+const NON_RETRYABLE_PROMPT_STATUS_CODES = new Set([400, 401, 403, 404, 422]);
+
+function promptErrorStatus(error) {
+  const raw = error?.data?.statusCode ?? error?.status ?? error?.statusCode;
+  const status = Number(raw);
+  return Number.isFinite(status) ? status : null;
+}
+
+function promptErrorFromResponse(response, sessionID) {
+  const cause = response?.info?.error ?? response?.error;
+  const status = promptErrorStatus(cause);
+  const nonRetryable =
+    status !== null && NON_RETRYABLE_PROMPT_STATUS_CODES.has(status);
+  let message = sessionErrorMessage(response) ?? "agent session error";
+  if (nonRetryable && !message.includes(`(${status})`)) {
+    message = `${message} (${status})`;
+  }
+  return new AgentInvocationError(message, {
+    code: nonRetryable
+      ? AGENT_INVOCATION_ERROR_CODES.INVALID_RESULT
+      : AGENT_INVOCATION_ERROR_CODES.PROMPT_FAILED,
+    cause,
+    sessionID,
+  });
+}
+
 function responseText(parts) {
   if (!Array.isArray(parts)) return "";
   return parts
@@ -431,7 +457,7 @@ export function createOpenCodeV1AgentAdapter({
             { code: AGENT_INVOCATION_ERROR_CODES.PROMPT_TIMEOUT, sessionID: session.id },
           ),
         );
-        if (response?.error) throw response.error;
+        if (response?.error) throw promptErrorFromResponse(response, session.id);
       } catch (cause) {
         if (cause instanceof AgentInvocationError) {
           if (!cause.sessionID) cause.sessionID = session.id;

package/src/context/context.js

@@ -27,15 +27,6 @@ export function loadDesignTokens(root = process.cwd()) {
   return ctx.tokens || {};
 }
 
-export function detectFileSearchIntent(task) {
-  if (typeof task !== "string" || !task) return false;
-  // Normalize common Spanish diacritics so patterns like "dónde"/"donde" match uniformly.
-  const q = task.toLowerCase().normalize("NFD").replace(/\p{Diacritic}/gu, "");
-  // English + Spanish intent keywords (intent detection only — does not capture the query itself).
-  // `\b` boundaries keep us from matching substrings inside larger words (e.g. "archivo" inside "desarchivo").
-  return /\b(find|search|grep|locate|where\s+is|busca|buscar|encuentra|donde|revisa|revise|ver|archivo|archivos|codigo|file|files)\b/.test(q);
-}
-
 const LEVELS = ["L1", "L2", "L3", "L4"];
 const LIFECYCLE = ["candidate", "active", "superseded", "stale", "invalidated"];
 const PROVENANCE = ["user_decided", "observed", "inferred"];
@@ -614,13 +605,12 @@ export function selectContext(task, { budget = 8000, root, sessionId, log = true
 
 /**
  * Variante async de selectContext que enriquece el paquete con file_context de
- * CQE cuando la tarea es una intención de búsqueda de archivos. Se mantiene
- * separada del selectContext sincrónico para no forzar `await` en callers que
- * no pueden esperarlo (p.ej. assembleContext).
+ * CQE. Se mantiene separada del selectContext sincrónico para no forzar `await`
+ * en callers que no pueden esperarlo (p.ej. assembleContext).
  */
 export async function selectContextWithCqe(task, opts = {}) {
   const pkg = selectContext(task, opts);
-  if (!opts.disableCqe && detectFileSearchIntent(task)) {
+  if (!opts.disableCqe) {
     const t0 = Date.now();
     try {
       const cqeRes = await retrieveWithCqe(task, { repoRoot: opts.root || process.cwd() });

package/src/context/selection.js

@@ -1,3 +1,3 @@
-import { selectContext, selectContextWithCqe, retrieveContext, detectFileSearchIntent } from "./context.js";
+import { selectContext, selectContextWithCqe, retrieveContext } from "./context.js";
 import { detectCouplingIntent, traceCouplingForTask } from "./coupling.js";
-export { selectContext, selectContextWithCqe, retrieveContext, detectFileSearchIntent, detectCouplingIntent, traceCouplingForTask };
+export { selectContext, selectContextWithCqe, retrieveContext, detectCouplingIntent, traceCouplingForTask };

package/src/execution/execution-gate.js

@@ -32,11 +32,38 @@ export function shouldClearExecutionGate(task, taskInFlight = false) {
 // guarded by this one, so it must be treated as stale instead of blocking
 // every mutation forever after a restart. Gates without ownerPid predate this
 // marker and are also stale.
+const DEFAULT_EXECUTION_GATE_TTL_MS = 30 * 60 * 1000;
+
+function executionGateTtlMs() {
+  const raw = Number(process.env.WAM_EXECUTION_GATE_TTL_MS);
+  return Number.isFinite(raw) && raw > 0 ? raw : DEFAULT_EXECUTION_GATE_TTL_MS;
+}
+
+function parseGateTimestamp(value) {
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value : null;
+  }
+  if (typeof value === "string" && value.trim() !== "") {
+    const numeric = Number(value);
+    if (Number.isFinite(numeric)) return numeric;
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+
 export function isExecutionGateStale(gate, currentPid = process.pid) {
   if (gate?.active !== true) return false;
   const ownerPid = gate?.ownerPid;
   if (!Number.isInteger(ownerPid)) return true;
-  return ownerPid !== currentPid;
+  if (ownerPid !== currentPid) return true;
+  // A same-pid gate can still be orphaned (its pass aborted before the
+  // `finally` ran), so bound its lifetime instead of trusting the pid alone.
+  // Missing or malformed timestamps fail open: a stuck gate must never brick
+  // the session.
+  const startedAt = parseGateTimestamp(gate?.startedAt);
+  if (startedAt === null) return true;
+  return Date.now() - startedAt > executionGateTtlMs();
 }
 
 // A gate is orphaned when its owning loop reached a terminal state but no

package/src/integration/message-handler.js

@@ -16,6 +16,7 @@ import fs from "node:fs";
 import path from "node:path";
 
 import { hasWamMarkerFor, injectWamParts, isWamSynthetic } from "./part-provenance.js";
+import { logger } from "./logger.js";
 import { reopenTerminalAgentRun, resetAuthorizationSurface } from "../execution/agent-run-state.js";
 import { ensurePermissionPlan, permissionPreflightLines, shouldNotifyPermissionPlan } from "../policy/permission-preflight.js";
 import { buildTaskInferenceDirective } from "../cognition/task-inference-engine.js";
@@ -189,6 +190,13 @@ const ASKING_CMD_RE = /^(answer|resolve|contract|progress|task|skills|assumption
  * @returns {Promise<void>}
  */
 export async function handleMessage(input, output, deps) {
+  const turnStart = performance.now();
+  let phaseStart = turnStart;
+  const phase = (label) => {
+    const now = performance.now();
+    logger.info("turn-timing", `phase=${label} durMs=${(now - phaseStart).toFixed(1)} totalMs=${(now - turnStart).toFixed(1)}`);
+    phaseStart = now;
+  };
   const {
     collector = null,
     bypassed,
@@ -220,7 +228,6 @@ export async function handleMessage(input, output, deps) {
     persistLiveContext,
     assembleContext,
     selectContextWithCqe,
-    detectFileSearchIntent,
     createSnapshot,
     checkContinuation,
     rebuildScope,
@@ -291,6 +298,7 @@ export async function handleMessage(input, output, deps) {
       taskId = resolved.taskId;
       fallbackKind = resolved.fallbackKind;
     }
+    phase("resolveTask");
     if (input.sessionID) {
       sessionTasks.set(input.sessionID, taskId);
       // Persist active-task pointer to disk so /wam contract approve (which
@@ -324,6 +332,7 @@ export async function handleMessage(input, output, deps) {
       const existing = getTaskState(taskId, wamRoot);
       if (existing) validateState(existing);
     } catch {}
+    phase("loadTaskState");
     try { pruneCompletedTasks(wamRoot).catch(() => {}); } catch {}
 
     // Welcome / disambiguation gate: cuando la primera inferencia cayó en
@@ -607,6 +616,7 @@ export async function handleMessage(input, output, deps) {
     }
 
     const updatedState = getTaskState(taskId, wamRoot) || state;
+    if (intentLane.lane === INTENT_LANES.CORRECTION) updatedState.flow = "correction";
 
     // Final completion message: emit once when the gate allows DONE.
     if (
@@ -669,18 +679,20 @@ export async function handleMessage(input, output, deps) {
           );
         }
       } catch {}
+      phase("history");
       try {
         const memory = loadConversationMemory(wamRoot, input.sessionID);
         const memoryText = formatMemoryForContext(memory, promptText, 3);
         if (memoryText) auxInject.push(`[wam memory]\n${memoryText}\n`);
       } catch {}
+      phase("memory");
     }
 
     const reqs = updatedState.requirements || [];
     const pend = reqs.filter((r) => r.status !== "done" && r.status !== "verified");
     const objective = updatedState.contract?.objective || analysis.intent?.goal || null;
     if (intentLane.lane !== INTENT_LANES.CONVERSATION) {
-      const requireApproval = cfg.contractApproval === "required";
+      const requireApproval = cfg.contractApproval === "required" && intentLane.lane !== INTENT_LANES.CORRECTION;
       if (requireApproval && updatedState.contract?.status !== "APPROVED" && reqs.length > 0) {
         const { visible, overflow } = splitVisibleRequirements(reqs);
         const verification = (updatedState.contract?.verification || []).filter(
@@ -760,7 +772,7 @@ export async function handleMessage(input, output, deps) {
         }
       }
 
-      if (detectFileSearchIntent(promptText)) {
+      if (cfg.disableCqe !== true) {
         const cqeT0 = Date.now();
         const cqePack = await selectContextWithCqe(promptText, {
           root: wamRoot,
@@ -811,6 +823,7 @@ export async function handleMessage(input, output, deps) {
         }
       }
     } catch {}
+    phase("cqe");
 
     // Directive inference
     if (updatedState.contract?.objective && updatedState.phase !== "DONE" && analysis.intent?.classification !== "trivial") {
@@ -874,6 +887,7 @@ const { lines } = buildTaskInferenceDirective({
         }
         updatedState.completionGateKey = gateKey;
         persistTaskState(taskId, updatedState, wamRoot);
+        phase("persist");
       }
       // Mismo set de pendientes que el turno anterior: no repetir el aviso.
       // -------------------------------------------------------------
@@ -966,6 +980,7 @@ const { lines } = buildTaskInferenceDirective({
       emitTextPart(output, wamBlockText, { sessionID: input.sessionID, messageID: output.message?.id || input.messageID });
     }
 
+    phase("rewrite");
     input.waitAnalysis = analysis;
   } catch (err) {
     console.error("[wait-a-minute] Pre-flight analysis failed:", err);

package/src/policy/governance-enforcement.js

@@ -170,6 +170,21 @@ function logDecision(event) {
   }
 }
 
+const CORRECTION_FLOW_RE =
+  /\b(corrige|corregir|correcci[oó]n|arregla|arreglar|arreglo|fix|bugfix|bug|debug|falla|fallas|error|errores|regression|incorrecto|mal)\b/i;
+
+export function isCorrectionFlow(state) {
+  if (!state) return false;
+  const flow = String(state.flow || "").toLowerCase();
+  if (flow === "correction") return true;
+  const kind = String(state.kind || state.contract?.kind || "").toLowerCase();
+  if (kind === "debugging" || kind === "bugfix") return true;
+  const text = [state.lastAction, state.contract?.objective, state.nextAction]
+    .filter((v) => typeof v === "string")
+    .join(" ");
+  return CORRECTION_FLOW_RE.test(text);
+}
+
 /**
  * @param {string} tool
  * @param {object|null} state - task state ({ phase, contract, requirements }).
@@ -211,6 +226,11 @@ export function enforceGovernance(tool, state, ctx = {}) {
   const contractStatus = state?.contract?.status;
   const phase = state?.phase;
 
+  if (isCorrectionFlow(state)) {
+    logDecision({ decision: "allow", reason: "correction-flow", tool, phase });
+    return { allowed: true, reason: "correction-flow" };
+  }
+
   if (contractStatus === "APPROVED") return { allowed: true, reason: "contract-approved" };
   if (isTerminalPhase(phase)) return { allowed: true, reason: "terminal-phase" };
   // Let the Clarification Gate handle ASKING (answer the unknown, don't approve).

package/src/quality/task-quality-contract.js

@@ -118,7 +118,7 @@ export function inferTaskKind(task = {}) {
 
   if (!text) return TASK_KINDS.UNKNOWN;
   if (/\brefactor/.test(text)) return TASK_KINDS.REFACTORING;
-  if (/\b(debug|bug|fix|failure|error|regression)\b/.test(text)) return TASK_KINDS.DEBUGGING;
+  if (/\b(debug|bug|bugfix|fix|failure|error|errores|regression|falla|fallas|corrige|corregir|correcci[oó]n|arregla|arreglar|arreglo)\b/.test(text)) return TASK_KINDS.DEBUGGING;
   if (/\b(review|audit|inspect)\b/.test(text)) return TASK_KINDS.REVIEW;
   if (/\b(document|documentation|readme|docs)\b/.test(text)) return TASK_KINDS.DOCUMENTATION;
   if (/\b(research|investigate|explore|compare|evaluate|analysis)\b/.test(text)) return TASK_KINDS.RESEARCH;