opencode-workflow-guard 1.8.4 → 1.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-workflow-guard",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "Deterministic workflow and safety policy enforcement for OpenCode",
   "license": "MIT",
   "type": "module",

package/src/lib/custom-tools.ts

@@ -30,7 +30,7 @@ import { detectVerifyCommand, getCurrentGitCommitHash } from "./verify.ts";
 import { buildReviewRubric } from "./review.ts";
 import { createGitWorktree, cleanupGitWorktree } from "./worktree.ts";
 import { restoreRecoveryCheckpoint } from "./checkpoint.ts";
-import { getRecentAuditEntries } from "./audit.ts";
+import { audit, getRecentAuditEntries } from "./audit.ts";
 import { guardToolCallImpl } from "./guard-dispatcher.ts";
 import { discoverPlanningSources } from "../policies/planning.ts";
 import { secretIn } from "../policies/secrets.ts";
@@ -154,14 +154,16 @@ export function createCustomTools(options: {
 			description: "Record a secondary reviewer agent's approval or critique of the current changes. The summary must reference the 5 core review axes from guard_review_rubric.",
 			args: { reviewer: tool.schema.string().describe("Identifier/name of the reviewer subagent"), summary: tool.schema.string().describe("Review findings summary across the 5 core review axes"), passed: tool.schema.boolean().describe("True if change is approved, false if changes requested") },
 			execute: async (args, toolContext) => {
+				const auditVerdict = (verdict: "approved" | "changes_requested" | "rejected", reason: string) => audit({ ts: new Date().toISOString(), sessionID: toolContext.sessionID, tool: "record_review.verdict", decision: verdict === "rejected" ? "block" : "allow", phase: "event", reason, evidence: { reviewVerdict: verdict } });
 				const parentSessionID = await fetchParentSessionID(toolContext.sessionID);
-				if (!parentSessionID) return "[workflow-guard] Review rejected: record_review must be called from a secondary/subagent session.";
+				if (!parentSessionID) { auditVerdict("rejected", "missing_parent_session"); return "[workflow-guard] Review rejected: record_review must be called from a secondary/subagent session."; }
 				const axesRefs = ["test integrity", "task completeness", "cleanliness", "security", "platform"];
 				const referenced = axesRefs.filter((axis) => args.summary.toLowerCase().includes(axis));
-				if (referenced.length < 3) return `[workflow-guard] Review rejected: summary must reference the review axes (found ${referenced.length}/5). Call guard_review_rubric to get the rubric, evaluate each axis, and include findings per axis in the summary.`;
-				if (args.passed && /(?:^|\s)(?:\[p[01]\]|p[01]\s*:\s*(?:blocker|defect|vulnerability|error|bug|issue)|p[01]\s+blocker)/i.test(args.summary)) return "[workflow-guard] Review rejected: cannot record approval when P0 or P1 blockers are flagged in findings. Resolve all P0/P1 issues before approving or record review with passed=false.";
+				if (referenced.length < 3) { auditVerdict("rejected", "insufficient_rubric_axes"); return `[workflow-guard] Review rejected: summary must reference the review axes (found ${referenced.length}/5). Call guard_review_rubric to get the rubric, evaluate each axis, and include findings per axis in the summary.`; }
+				if (args.passed && /(?:^|\s)(?:\[p[01]\]|p[01]\s*:\s*(?:blocker|defect|vulnerability|error|bug|issue)|p[01]\s+blocker)/i.test(args.summary)) { auditVerdict("rejected", "approval_contains_blocker"); return "[workflow-guard] Review rejected: cannot record approval when P0 or P1 blockers are flagged in findings. Resolve all P0/P1 issues before approving or record review with passed=false."; }
 				recordReviewResult(args.reviewer, args.summary, args.passed, parentSessionID, toolContext.worktree || toolContext.directory);
 				if (followupStore && !secretIn(args.summary)) for (const finding of extractReviewFollowups(args.summary)) recordReviewFollowup(followupStore, { severity: finding.severity, summary: finding.summary, reviewer: args.reviewer, sessionID: toolContext.sessionID, commit: getCurrentGitCommitHash(effectiveRoot) });
+				auditVerdict(args.passed ? "approved" : "changes_requested", args.passed ? "approved" : "changes_requested");
 				return args.passed ? `[workflow-guard] Review recorded as APPROVED by ${args.reviewer}.` : `[workflow-guard] Review recorded as CHANGES REQUESTED by ${args.reviewer}.`;
 			},
 		}),

package/src/lib/project-memory.ts

@@ -88,8 +88,8 @@ export function openProjectMemory(projectId: string, directory = getProjectMemor
 		writeFileSync(activeMarker, "", { mode: 0o600 });
 		db = new Database(path);
 		db.exec(`
-		PRAGMA journal_mode = WAL;
 		PRAGMA busy_timeout = 2000;
+		PRAGMA journal_mode = WAL;
 		CREATE TABLE IF NOT EXISTS memories (
 			id TEXT PRIMARY KEY, project_id TEXT NOT NULL, kind TEXT NOT NULL, content TEXT NOT NULL,
 			source TEXT NOT NULL, created_at INTEGER NOT NULL, session_id TEXT, commit_sha TEXT,
@@ -122,7 +122,7 @@ export function openProjectMemory(projectId: string, directory = getProjectMemor
 function acquireDatabaseLock(directory: string): () => void {
 	const lock = new Database(join(directory, ".coordination"));
 	try {
-		lock.exec("PRAGMA busy_timeout = 2000; BEGIN IMMEDIATE");
+		lock.exec("PRAGMA busy_timeout = 10000; BEGIN IMMEDIATE");
 	} catch (error) {
 		lock.close();
 		throw error;

package/src/lib/shell.ts

@@ -242,7 +242,22 @@ function unwrapShellWordsImpl(command: string): { words: string[]; changesCwd: b
 			continue;
 		}
 
-		if (word === "command" || word === "exec" || word === "eval" || word === "nohup") {
+		if (word === "command") {
+			i++;
+			while (i < words.length && words[i] === "-p") i++;
+			if (words[i] === "--") i++;
+			continue;
+		}
+		if (word === "exec") {
+			i++;
+			while (i < words.length && words[i]!.startsWith("-")) {
+				const option = words[i++]!;
+				if (option === "--") break;
+				if (option === "-a" && i < words.length) i++;
+			}
+			continue;
+		}
+		if (word === "nohup") {
 			i++;
 			continue;
 		}

package/src/lib/types.ts

@@ -9,7 +9,7 @@ export interface TodoSdkClient {
 	};
 	session?: {
 		todo?: (opts: { path: { id: string } }) => Promise<{ data?: unknown }>;
-		get?: (opts: { path: { id: string } }) => Promise<{ data?: { parentID?: unknown } }>;
+		get?: (opts: { path: { id: string } }) => Promise<{ data?: { parentID?: unknown; title?: unknown } }>;
 		promptAsync?: (opts: {
 			path: { id: string };
 			body: { messageID?: string; parts: Array<{ type: "text"; text: string; synthetic?: boolean }> };
@@ -36,6 +36,7 @@ export interface ProjectConfig {
 	recoveryCheckpoints?: boolean;
 	projectMemory?: boolean;
 	learning?: boolean;
+	titleSettleWorkaround?: boolean;
 	maxSubagentMutations?: number;
 	maxLearningInterventions?: number;
 }
@@ -83,6 +84,7 @@ export interface AuditEntry {
 			durationMs?: number;
 		};
 		allowLive?: boolean;
+		reviewVerdict?: "approved" | "changes_requested" | "rejected";
 	};
 }
 

package/src/policies/continuation.ts

@@ -3,6 +3,9 @@ import { getSdkClient } from "../lib/state.ts";
 import { effectiveTodosWithOwner, hasActiveTodo } from "./todo.ts";
 
 const MAX_CONSECUTIVE_CONTINUATIONS = 3;
+const TITLE_SETTLE_MS = 250;
+const TITLE_SETTLE_ATTEMPTS = 8;
+const DEFAULT_SESSION_TITLE = /^(?:New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
 type ContinuationState = {
 	counts: Map<string, number>;
 	generatedMessageIDs: Map<string, Set<string>>;
@@ -10,6 +13,20 @@ type ContinuationState = {
 };
 const states = new WeakMap<object, ContinuationState>();
 
+export async function waitForSessionTitle(sessionID: string): Promise<void> {
+	const session = getSdkClient()?.session;
+	if (typeof session?.get !== "function") return;
+	for (let attempt = 0; attempt < TITLE_SETTLE_ATTEMPTS; attempt++) {
+		try {
+			const current = (await session.get({ path: { id: sessionID } }))?.data;
+			if (current?.parentID || typeof current?.title !== "string" || !DEFAULT_SESSION_TITLE.test(current.title)) return;
+		} catch {
+			return;
+		}
+		if (attempt + 1 < TITLE_SETTLE_ATTEMPTS) await new Promise((resolve) => setTimeout(resolve, TITLE_SETTLE_MS));
+	}
+}
+
 function getState(): ContinuationState | undefined {
 	const client = getSdkClient();
 	if (!client || (typeof client !== "object" && typeof client !== "function")) return undefined;
@@ -21,13 +38,14 @@ function getState(): ContinuationState | undefined {
 	return state;
 }
 
-export async function continueUnfinishedSession(sessionID: string): Promise<boolean> {
+export async function continueUnfinishedSession(sessionID: string, settleTitle = false): Promise<boolean> {
 	const state = getState();
 	if (!state || state.inFlight.has(sessionID)) return false;
 	state.inFlight.add(sessionID);
 	try {
 		const effective = await effectiveTodosWithOwner(sessionID);
-		if (!effective || !hasActiveTodo(effective.todos) || effective.ownerSessionID !== sessionID) return false;
+		if (!effective || effective.ownerSessionID !== sessionID || !hasActiveTodo(effective.todos)) return false;
+		if (settleTitle) await waitForSessionTitle(sessionID);
 
 		const count = state.counts.get(sessionID) ?? 0;
 		if (count >= MAX_CONSECUTIVE_CONTINUATIONS) return false;

package/src/policies/shell-safety.ts

@@ -1,4 +1,6 @@
 import { spawn } from "node:child_process";
+import { basename } from "node:path";
+import { splitShellSegments, unwrapShellWords } from "../lib/shell.ts";
 
 // AI agents frequently run dangerous package manager flags (e.g. npm audit fix --force,
 // npm install -g, pip install --force-reinstall, agent-driven publish) that introduce
@@ -48,11 +50,6 @@ const INTERACTIVE_COMMAND_PATTERNS: Array<{ regex: RegExp; name: string; advice:
 		name: "interactive text editor",
 		advice: "Use the edit, write, or apply_patch tools instead of interactive terminal editors.",
 	},
-	{
-		regex: /\b(?:less|more|most)\b/i,
-		name: "terminal pager",
-		advice: "Use cat, head, or grep with non-interactive pipes instead of interactive pagers.",
-	},
 	{
 		regex: /\bsudo\b/i,
 		name: "sudo with password prompt",
@@ -86,6 +83,7 @@ const INTERACTIVE_COMMAND_PATTERNS: Array<{ regex: RegExp; name: string; advice:
 ];
 
 const MONITOR_ADVICE = "Use ps aux, uptime, or batch flags (e.g. top -b -n 1) instead of interactive monitors.";
+const PAGER_ADVICE = "Use cat, head, or grep with non-interactive pipes instead of interactive pagers.";
 // Process monitoring tokens are matched on whitespace/segment boundaries so that
 // an unrelated word such as `desktop`, a hyphenated filename like `top-level-dir`,
 // or a quoted argument like `echo "top"` is not mistaken for the `top` command.
@@ -105,9 +103,29 @@ function checkProcessMonitorCommand(command: string): { isInteractive: boolean;
 	return { isInteractive: false };
 }
 
+function containsPagerCommand(command: string, depth = 0): boolean {
+	if (depth >= 16) return false;
+	for (const segment of splitShellSegments(command)) {
+		const words = unwrapShellWords(segment);
+		while (words[0] === "--") words.shift();
+		const executable = basename(words[0] ?? "");
+		if (/^(?:less|more|most)$/i.test(executable)) return true;
+		if (executable === "eval" && words.length > 1 && containsPagerCommand(words.slice(1).join(" "), depth + 1)) return true;
+		if (executable === "busybox" && /^(?:less|more)$/i.test(words[1] ?? "")) return true;
+		if (/^(?:ba|z|da|k)?sh$/i.test(executable)) {
+			const commandFlag = words.findIndex((word, index) => index > 0 && /^-[A-Za-z]*c[A-Za-z]*$/.test(word));
+			if (commandFlag >= 0 && words[commandFlag + 1] && containsPagerCommand(words[commandFlag + 1]!, depth + 1)) return true;
+		}
+	}
+	return false;
+}
+
 export function checkInteractiveTtyCommand(command: string): { isInteractive: boolean; name?: string; advice?: string } {
 	const monitor = checkProcessMonitorCommand(command);
 	if (monitor.isInteractive) return monitor;
+	if (containsPagerCommand(command)) {
+		return { isInteractive: true, name: "terminal pager", advice: PAGER_ADVICE };
+	}
 	for (const { regex, name, advice } of INTERACTIVE_COMMAND_PATTERNS) {
 		if (regex.test(command)) {
 			return { isInteractive: true, name, advice };

package/src/policies/todo.ts

@@ -97,14 +97,39 @@ export function validateTodoLifecycle(
 			return s === "pending" || s === "in_progress";
 		});
 		if (activeExisting.length > 0) {
+			const activeNew = newTodos.filter((t) => ACTIVE_TODO_STATUSES.has(String(t.status ?? "")));
+			const reviewObligation = /\b(?:secondary\s+review|re-?review|reviewer|(?:run|perform|request|obtain|complete)\s+(?:an?\s+)?review)\b/i;
+			const remediationAction = /\b(?:address|fix|resolve|remediate)\b/i;
+			const reviewReference = /\b(?:secondary\s+review|re-?review|reviewer|review)\b/i;
+			const remediationSubject = /\b(?:findings?|feedback|comments?|issues?)\b/i;
+			const isReviewObligation = (content: string) => reviewObligation.test(content) && !(remediationAction.test(content) && reviewReference.test(content) && remediationSubject.test(content));
 			const newContentCounts = new Map<string, number>();
 			for (const todo of newTodos) {
 				const content = String(todo.content ?? "").trim();
 				newContentCounts.set(content, (newContentCounts.get(content) ?? 0) + 1);
 			}
+			const retainedReviewCounts = new Map<string, number>();
+			for (const todo of activeNew) {
+				const content = String(todo.content ?? "").trim();
+				retainedReviewCounts.set(content, (retainedReviewCounts.get(content) ?? 0) + 1);
+			}
+			let retainedReviewObligations = 0;
+			for (const todo of activeExisting) {
+				const content = String(todo.content ?? "").trim();
+				const remaining = retainedReviewCounts.get(content) ?? 0;
+				if (remaining > 0 && isReviewObligation(content)) {
+					retainedReviewCounts.set(content, remaining - 1);
+					retainedReviewObligations++;
+				}
+			}
+			let replacementReviewObligations = activeNew.filter((t) => isReviewObligation(String(t.content ?? ""))).length - retainedReviewObligations;
 			const missing = activeExisting.find((todo) => {
 				const content = String(todo.content ?? "").trim();
 				const remaining = newContentCounts.get(content) ?? 0;
+				if (remaining === 0 && isReviewObligation(content) && replacementReviewObligations > 0) {
+					replacementReviewObligations--;
+					return false;
+				}
 				if (remaining === 0) return true;
 				newContentCounts.set(content, remaining - 1);
 				return false;

package/src/workflow-guard-ui.ts

@@ -35,7 +35,9 @@ const BLOCKED_BADGE_DURATION_MS = 5_000;
 let lastBlockedReason: string | undefined;
 const sessionBlockedReasons = new Map<string, string>();
 
-export function readProjectOption(root: string, option: "recoveryCheckpoints" | "projectMemory" | "learning"): boolean {
+type ProjectToggle = "recoveryCheckpoints" | "projectMemory" | "learning" | "titleSettleWorkaround";
+
+export function readProjectOption(root: string, option: ProjectToggle): boolean {
 	const path = projectConfigPath(root);
 	if (!existsSync(path)) return option === "projectMemory";
 	const errors: ParseError[] = [];
@@ -44,7 +46,7 @@ export function readProjectOption(root: string, option: "recoveryCheckpoints" |
 	return option === "projectMemory" ? config?.projectMemory !== false : config?.[option] === true;
 }
 
-function writeProjectOption(root: string, option: "recoveryCheckpoints" | "projectMemory" | "learning", enabled: boolean): string {
+function writeProjectOption(root: string, option: ProjectToggle, enabled: boolean): string {
 	const path = projectConfigPath(root);
 	const raw = existsSync(path) ? readFileSync(path, "utf8") : "{}\n";
 	const errors: ParseError[] = [];
@@ -107,6 +109,7 @@ export const WorkflowGuardTui: TuiPlugin = async (api) => {
 				const recovery = readProjectOption(root, "recoveryCheckpoints");
 				const memory = readProjectOption(root, "projectMemory");
 				const learning = readProjectOption(root, "learning");
+				const titleSettle = readProjectOption(root, "titleSettleWorkaround");
 				api.ui.dialog.replace(() => api.ui.DialogSelect({
 					title: "Workflow Guard Project Options",
 					current: undefined,
@@ -114,9 +117,10 @@ export const WorkflowGuardTui: TuiPlugin = async (api) => {
 						{ title: `Recovery checkpoints: ${recovery ? "On" : "Off"}`, value: "recoveryCheckpoints", description: "Toggle durable pre-run Git checkpoints" },
 						{ title: `Project memory: ${memory ? "On" : "Off"}`, value: "projectMemory", description: "Toggle durable local project memory" },
 						{ title: `Learner mode: ${learning ? "On" : "Off"}`, value: "learning", description: "Toggle evidence-based learning tools" },
+						{ title: `Title settle workaround: ${titleSettle ? "On" : "Off"}`, value: "titleSettleWorkaround", description: "Delay automatic continuation while OpenCode generates a session title" },
 					],
 					onSelect: (option) => {
-						const key = option.value as "recoveryCheckpoints" | "projectMemory" | "learning";
+						const key = option.value as ProjectToggle;
 						const enabled = !readProjectOption(root, key);
 						const path = writeProjectOption(root, key, enabled);
 						api.ui.dialog.clear();

package/src/workflow-guard.ts

@@ -650,7 +650,8 @@ export const WorkflowGuard: Plugin = async (ctx) => {
 					if (recoveryRun !== undefined) {
 						finalizeRecoveryCheckpoint(effectiveRoot, sessionID, recoveryRun);
 					}
-					await runWithRuntimeState(effectiveRoot, ctx.client, () => continueUnfinishedSession(sessionID));
+					const settleTitle = getProjectConfig(effectiveRoot).titleSettleWorkaround === true;
+					await runWithRuntimeState(effectiveRoot, ctx.client, () => continueUnfinishedSession(sessionID, settleTitle));
 				}
 			}
 			if (event?.type === "message.updated") {