@sayknow-cli/coding-agent 0.3.7 → 0.3.9

package/src/skc-runtime/deep-interview-state.ts

@@ -31,6 +31,13 @@ export interface DeepInterviewEstablishedFact {
 	dimension?: string;
 	evidence?: string;
 	disputed: boolean;
+	/**
+	 * Resolution pointer for a disputed fact: the id of the fact that replaced it
+	 * after the user confirmed a pivot. A disputed fact without `superseded_by`
+	 * keeps the deterministic ambiguity floor elevated; setting it releases the
+	 * pressure while preserving the contradicted fact for audit.
+	 */
+	superseded_by?: string;
 }
 
 export interface DeepInterviewTriggerMetadata {
@@ -66,7 +73,12 @@ export interface DeepInterviewRoundRecord {
 	answered_at: string;
 	scored_at?: string;
 	scores?: Record<string, number>;
+	/** Effective ambiguity after the deterministic floor clamp (`max(reported, floor)`). */
 	ambiguity?: number;
+	/** Original LLM-reported ambiguity, preserved for audit when the floor clamped it. */
+	reported_ambiguity?: number;
+	/** Deterministic floor in effect when this round was scored, when it clamped. */
+	ambiguity_floor?: number;
 	triggers?: DeepInterviewTriggerMetadata[];
 }
 
@@ -125,6 +137,7 @@ const TRANSCRIPT_STATE_FIELDS = [
 	"rounds",
 	"established_facts",
 	"current_ambiguity",
+	"ambiguity_floor",
 	"topology",
 	"ontology_snapshots",
 	"auto_researched_rounds",
@@ -150,13 +163,39 @@ const HOISTED_STATE_FIELDS = [
 	"threshold_source",
 ] as const;
 
+/**
+ * Envelope-reserved keys that are never legitimate interview `state` fields.
+ *
+ * A malformed write that wraps a whole envelope under `state`
+ * (`skc state deep-interview write --input '{"state": <envelope>}'`) leaks these
+ * into the nested state. Because normalization otherwise preserves unknown
+ * nested fields, they would accrete a recursive `state.state` chain (plus stale
+ * `receipt`/`skill`/`version`/... duplicates) that no later merge or write ever
+ * removes, permanently corrupting the shape. They are stripped from `state` on
+ * normalize so the canonical envelope self-heals on the next write.
+ */
+const ENVELOPE_RESERVED_STATE_KEYS = [
+	"state",
+	"receipt",
+	"skill",
+	"version",
+	"updated_at",
+	"active",
+	"current_phase",
+	"state_revision",
+	"session_id",
+] as const;
+
 /**
  * Canonicalize a deep-interview envelope: interview data nested under `state`,
  * legacy flattened fields hoisted in losslessly, transcript duplicates removed
  * from the top level, and `rounds`/`established_facts` guaranteed to be arrays.
  *
- * Idempotent: a canonical envelope is returned unchanged in shape. Never deletes
- * unknown envelope or nested fields, and never mutates the input.
+ * Idempotent: a canonical envelope is returned unchanged in shape. Preserves all
+ * unknown envelope and nested fields except the envelope-reserved keys that leak
+ * into `state` (see `ENVELOPE_RESERVED_STATE_KEYS`), which are stripped so a
+ * malformed envelope-in-state write cannot permanently nest state. Never mutates
+ * the input.
  */
 export function normalizeDeepInterviewEnvelope(value: unknown): DeepInterviewStateEnvelope {
 	const envelope: DeepInterviewStateEnvelope = isPlainObject(value) ? { ...value } : {};
@@ -169,6 +208,9 @@ export function normalizeDeepInterviewEnvelope(value: unknown): DeepInterviewSta
 	for (const field of HOISTED_STATE_FIELDS) {
 		if (inner[field] === undefined && envelope[field] !== undefined) inner[field] = envelope[field];
 	}
+	for (const field of ENVELOPE_RESERVED_STATE_KEYS) {
+		if (field in inner) delete inner[field];
+	}
 
 	if (!Array.isArray(inner.rounds)) inner.rounds = [];
 	if (!Array.isArray(inner.established_facts)) inner.established_facts = [];

package/src/skc-runtime/session-state-sidecar.ts

@@ -3,15 +3,32 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { AssistantMessage } from "@sayknow-cli/ai";
 import { logger, postmortem } from "@sayknow-cli/utils";
+import { sessionRuntimeDir } from "./session-layout";
 
 export const SKC_COORDINATOR_SESSION_STATE_FILE_ENV = "SKC_COORDINATOR_SESSION_STATE_FILE";
 export const SKC_COORDINATOR_SESSION_ID_ENV = "SKC_COORDINATOR_SESSION_ID";
 export const SKC_COORDINATOR_SESSION_BRANCH_ENV = "SKC_COORDINATOR_SESSION_BRANCH";
+const SKC_SESSION_PROMPT_ACCEPTED_JSON_ENV = "SKC_SESSION_PROMPT_ACCEPTED_JSON";
+const SKC_SESSION_WORKTREE_BASELINE_DIRTY_ENV = "SKC_SESSION_WORKTREE_BASELINE_DIRTY";
 
 export type RuntimeState = "ready_for_input" | "running" | "needs_user_input" | "completed" | "errored";
 
 type FinalResponseSource = "agent_end" | "launch_error";
 const MAX_PUBLIC_ERROR_MESSAGE_LENGTH = 2000;
+const HEARTBEAT_MS = 1000;
+
+type LastPayloadCacheEntry = { mtimeMs: number; size: number; payload: Record<string, unknown> };
+const lastPayloadByStateFile = new Map<string, LastPayloadCacheEntry>();
+
+/** Test-only counters for runtime sidecar hot-path assertions. */
+export const __sessionStateSidecarPerfCounters = {
+	persistFromEventCalls: 0,
+	reset(): void {
+		this.persistFromEventCalls = 0;
+	},
+};
+
+const lastWrittenPayloadByStateFile = new Map<string, Record<string, unknown>>();
 
 interface RuntimeStateEvent {
 	type: string;
@@ -31,6 +48,7 @@ interface RuntimeStateSidecarPayload {
 	state?: unknown;
 	ready_for_input?: unknown;
 	cwd?: unknown;
+	workdir?: unknown;
 	session_file?: unknown;
 	final_response?: { source?: unknown };
 }
@@ -52,6 +70,11 @@ function sameResolvedPath(left: string, right: string): boolean {
 	return path.resolve(left) === path.resolve(right);
 }
 
+function isCoordinatorOwnedStateFile(stateFile: string): boolean {
+	const coordinatorStateFile = process.env[SKC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim();
+	return !!coordinatorStateFile && sameResolvedPath(coordinatorStateFile, stateFile);
+}
+
 export async function readTerminalRuntimeStateMarker(input: {
 	stateFile?: string | null;
 	sessionId?: string | null;
@@ -124,7 +147,7 @@ function finalResponseForEvent(event: RuntimeStateEvent): {
 	};
 }
 
-function stateForEvent(event: RuntimeStateEvent): RuntimeState | null {
+export function stateForEvent(event: RuntimeStateEvent): RuntimeState | null {
 	if (event.type === "agent_start" || event.type === "turn_start") return "running";
 	if (event.type === "agent_end") {
 		const assistant = lastAssistant(event.messages);
@@ -134,6 +157,10 @@ function stateForEvent(event: RuntimeStateEvent): RuntimeState | null {
 	return null;
 }
 
+export function eventAffectsCoordinatorRuntimeState(event: RuntimeStateEvent): boolean {
+	return stateForEvent(event) !== null;
+}
+
 function readPreviousPayload(stateFile: string): Record<string, unknown> {
 	try {
 		return JSON.parse(fsSync.readFileSync(stateFile, "utf8")) as Record<string, unknown>;
@@ -142,12 +169,92 @@ function readPreviousPayload(stateFile: string): Record<string, unknown> {
 	}
 }
 
-function shouldPreserveTerminalPayload(previous: RuntimeStateSidecarPayload): boolean {
+async function readPreviousPayloadForEvent(stateFile: string): Promise<Record<string, unknown>> {
+	if (!isCoordinatorOwnedStateFile(stateFile)) {
+		const cachedWritten = lastWrittenPayloadByStateFile.get(stateFile);
+		if (cachedWritten) return cachedWritten;
+	}
+	let stat: Awaited<ReturnType<typeof fs.stat>>;
+	try {
+		stat = await fs.stat(stateFile);
+	} catch {
+		lastPayloadByStateFile.delete(stateFile);
+		return {};
+	}
+	const cached = lastPayloadByStateFile.get(stateFile);
+	if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) return cached.payload;
+	try {
+		const payload = JSON.parse(await Bun.file(stateFile).text()) as Record<string, unknown>;
+		lastPayloadByStateFile.set(stateFile, { mtimeMs: stat.mtimeMs, size: stat.size, payload });
+		return payload;
+	} catch {
+		lastPayloadByStateFile.delete(stateFile);
+		return {};
+	}
+}
+
+function withoutUpdatedAt(payload: Record<string, unknown>): Record<string, unknown> {
+	const { updated_at: _updatedAt, ...rest } = payload;
+	return rest;
+}
+
+function shouldSkipRuntimeStateWrite(
+	previous: Record<string, unknown>,
+	payload: Record<string, unknown>,
+	nowMs: number,
+): boolean {
+	if (payload.state === "completed" || payload.state === "errored") return false;
+	if (previous.state !== payload.state) return false;
+	if (previous.state !== "running" || payload.state !== "running") return false;
+	if (JSON.stringify(withoutUpdatedAt(previous)) !== JSON.stringify(withoutUpdatedAt(payload))) return false;
+	const previousUpdatedAt = typeof previous.updated_at === "string" ? Date.parse(previous.updated_at) : NaN;
+	if (!Number.isFinite(previousUpdatedAt)) return false;
+	return nowMs - previousUpdatedAt < HEARTBEAT_MS;
+}
+
+function rememberWrittenPayload(stateFile: string, payload: Record<string, unknown>): void {
+	lastWrittenPayloadByStateFile.set(stateFile, payload);
+	try {
+		const stat = fsSync.statSync(stateFile);
+		lastPayloadByStateFile.set(stateFile, { mtimeMs: stat.mtimeMs, size: stat.size, payload });
+	} catch {
+		lastPayloadByStateFile.delete(stateFile);
+	}
+}
+function shouldPreserveTerminalPayload(
+	previous: RuntimeStateSidecarPayload,
+	input: { sessionId: string; cwd: string; sessionFile?: string | null },
+): boolean {
 	if (previous.state !== "completed" && previous.state !== "errored") return false;
 	const source = previous.final_response?.source;
-	return source === "agent_end" || source === "launch_error";
+	if (source !== "agent_end" && source !== "launch_error") return false;
+	if (typeof previous.session_id === "string" && previous.session_id !== input.sessionId) return false;
+	if (typeof previous.cwd === "string" && !sameResolvedPath(previous.cwd, input.cwd)) return false;
+	if (typeof previous.workdir === "string" && !sameResolvedPath(previous.workdir, input.cwd)) return false;
+	if (
+		input.sessionFile &&
+		typeof previous.session_file === "string" &&
+		!sameResolvedPath(previous.session_file, input.sessionFile)
+	) {
+		return false;
+	}
+	return true;
 }
 
+function cachedTerminalPayload(
+	stateFile: string,
+	input: { sessionId: string; cwd: string; sessionFile?: string | null },
+): RuntimeStateSidecarPayload | null {
+	const cached = lastWrittenPayloadByStateFile.get(stateFile) as RuntimeStateSidecarPayload | undefined;
+	return cached && shouldPreserveTerminalPayload(cached, input) ? cached : null;
+}
+
+function runtimeStateFileForContext(context: RuntimeStateContext): string | null {
+	const explicit = process.env[SKC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim();
+	if (explicit) return explicit;
+	if (!context.sessionId.trim()) return null;
+	return path.join(sessionRuntimeDir(context.cwd, context.sessionId), "runtime-state.json");
+}
 function branchForContext(context: RuntimeStateContext): string | null {
 	return context.branch ?? (process.env[SKC_COORDINATOR_SESSION_BRANCH_ENV]?.trim() || null);
 }
@@ -160,10 +267,11 @@ function basePayload(input: {
 	source: string;
 	event: string;
 	reason: string | null;
+	sessionId: string;
 }): Record<string, unknown> {
 	return {
 		schema_version: 1,
-		session_id: process.env[SKC_COORDINATOR_SESSION_ID_ENV]?.trim() || input.context.sessionId,
+		session_id: input.sessionId,
 		state: input.state,
 		ready_for_input: input.state === "completed" || input.state === "ready_for_input",
 		updated_at: input.now,
@@ -179,6 +287,56 @@ function basePayload(input: {
 		session_file: input.context.sessionFile ?? null,
 	};
 }
+function booleanFromUnknown(value: unknown): boolean | null {
+	if (typeof value === "boolean") return value;
+	if (typeof value === "string") {
+		const normalized = value.trim().toLowerCase();
+		if (normalized === "true") return true;
+		if (normalized === "false") return false;
+	}
+	return null;
+}
+
+function promptAcceptedFromEnv(): boolean {
+	const promptAcceptedJson = process.env[SKC_SESSION_PROMPT_ACCEPTED_JSON_ENV]?.trim();
+	if (!promptAcceptedJson) return false;
+	try {
+		return fsSync.statSync(promptAcceptedJson).size > 0;
+	} catch {
+		return false;
+	}
+}
+
+function readJsonFileSync(file: string): Record<string, unknown> | null {
+	try {
+		return JSON.parse(fsSync.readFileSync(file, "utf8")) as Record<string, unknown>;
+	} catch {
+		return null;
+	}
+}
+
+function worktreeBaselineDirtyFromEnvOrMarker(): boolean | null {
+	const promptAcceptedJson = process.env[SKC_SESSION_PROMPT_ACCEPTED_JSON_ENV]?.trim();
+	if (promptAcceptedJson) {
+		const promptAccepted = readJsonFileSync(promptAcceptedJson);
+		const promptBaseline = booleanFromUnknown(promptAccepted?.worktreeBaselineDirty);
+		if (promptBaseline !== null) return promptBaseline;
+	}
+	const envValue = booleanFromUnknown(process.env[SKC_SESSION_WORKTREE_BASELINE_DIRTY_ENV]);
+	if (envValue !== null) return envValue;
+	return null;
+}
+
+function observedRecoverableWorktreeChanges(cwd: string): boolean {
+	if (!cwd.trim()) return false;
+	try {
+		const proc = Bun.spawnSync(["git", "status", "--porcelain"], { cwd, stdout: "pipe", stderr: "pipe" });
+		return proc.exitCode === 0 && proc.stdout.byteLength > 0;
+	} catch {
+		return false;
+	}
+}
+
 function publicSafeErrorMessage(message: string): string {
 	const normalized = message.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, " ").trim();
 	if (normalized.length <= MAX_PUBLIC_ERROR_MESSAGE_LENGTH) return normalized;
@@ -193,32 +351,75 @@ function numericProcessExitCode(defaultCode: number | null): number | null {
 	return typeof process.exitCode === "number" ? process.exitCode : defaultCode;
 }
 
-function postmortemExitDetails(reason: postmortem.Reason): {
+function postmortemExitDetails(
+	reason: postmortem.Reason,
+	previous: RuntimeStateSidecarPayload,
+	cwd: string,
+): {
 	state: RuntimeState;
 	reason: string;
 	exitKind: string;
 	exitCode: number | null;
 	signal: string | null;
 	error?: { code: string; message: string; recoverable: true };
+	recovery?: { action: string; reason: string };
+	promptAccepted: boolean;
+	observedRecoverableWorktreeChanges: boolean;
+	worktreeBaselineDirty: boolean | null;
+	worktreeChangedSinceBaseline: boolean;
 } {
+	const promptAccepted = promptAcceptedFromEnv();
+	const observedChanges = observedRecoverableWorktreeChanges(typeof previous.cwd === "string" ? previous.cwd : cwd);
+	const worktreeBaselineDirty = worktreeBaselineDirtyFromEnvOrMarker();
+	const worktreeChangedSinceBaseline = worktreeBaselineDirty === false && observedChanges;
 	if (reason === postmortem.Reason.EXIT || reason === postmortem.Reason.MANUAL) {
 		const exitCode = numericProcessExitCode(0) ?? 0;
-		const state: RuntimeState = exitCode === 0 ? "completed" : "errored";
+		const exitedBeforeTerminalState =
+			exitCode === 0 && reason === postmortem.Reason.EXIT && previous.state === "running";
+		const state: RuntimeState = exitCode === 0 && !exitedBeforeTerminalState ? "completed" : "errored";
+		const exitReason = exitedBeforeTerminalState
+			? "process_exit_before_terminal_state"
+			: reason === postmortem.Reason.EXIT
+				? "process_exit"
+				: "manual_cleanup";
+		let classifiedReason = exitReason;
+		if (exitedBeforeTerminalState) {
+			if (!promptAccepted) classifiedReason = "process_exit_before_prompt_acceptance";
+			else if (worktreeChangedSinceBaseline)
+				classifiedReason = "accepted_prompt_observed_recoverable_worktree_changes";
+			else if (observedChanges)
+				classifiedReason = "accepted_prompt_dirty_worktree_observed_without_new_change_proof";
+			else classifiedReason = "accepted_prompt_no_useful_output";
+		}
 		return {
 			state,
-			reason: reason === postmortem.Reason.EXIT ? "process_exit" : "manual_cleanup",
+			reason: classifiedReason,
 			exitKind: reason,
 			exitCode,
 			signal: null,
 			...(state === "errored"
 				? {
 						error: {
-							code: "process_exit",
-							message: publicSafeErrorMessage(`SKC process exited with code ${exitCode}`),
+							code: classifiedReason,
+							message: publicSafeErrorMessage(
+								exitedBeforeTerminalState
+									? "SKC process exited before emitting terminal agent state"
+									: `SKC process exited with code ${exitCode}`,
+							),
 							recoverable: true,
 						},
+						recovery: {
+							action: "recover_or_resume_session",
+							reason: exitedBeforeTerminalState
+								? "previous runtime state was non-terminal; preserve the worktree and inspect the session before retrying"
+								: "process exited with a non-zero status",
+						},
 					}
 				: {}),
+			promptAccepted,
+			observedRecoverableWorktreeChanges: observedChanges,
+			worktreeBaselineDirty,
+			worktreeChangedSinceBaseline,
 		};
 	}
 	const signalByReason: Partial<Record<postmortem.Reason, string>> = {
@@ -233,32 +434,53 @@ function postmortemExitDetails(reason: postmortem.Reason): {
 		exitCode: numericProcessExitCode(null),
 		signal: signalByReason[reason] ?? null,
 		error: { code: reason, message: errorMessageForPostmortem(reason), recoverable: true },
+		recovery: { action: "recover_or_resume_session", reason: "process cleanup ran before terminal agent state" },
+		promptAccepted,
+		observedRecoverableWorktreeChanges: observedChanges,
+		worktreeBaselineDirty,
+		worktreeChangedSinceBaseline,
 	};
 }
 
 function writeStateFileSync(stateFile: string, payload: Record<string, unknown>): void {
 	fsSync.mkdirSync(path.dirname(stateFile), { recursive: true });
-	fsSync.writeFileSync(stateFile, `${JSON.stringify(payload, null, 2)}\n`);
+	fsSync.writeFileSync(stateFile, `${JSON.stringify(payload)}\n`);
+	rememberWrittenPayload(stateFile, payload);
 }
 
 async function writeStateFile(stateFile: string, payload: Record<string, unknown>): Promise<void> {
 	await fs.mkdir(path.dirname(stateFile), { recursive: true });
-	await Bun.write(stateFile, `${JSON.stringify(payload, null, 2)}\n`);
+	await Bun.write(stateFile, `${JSON.stringify(payload)}\n`);
+	rememberWrittenPayload(stateFile, payload);
 }
 
 export async function persistCoordinatorRuntimeStateFromEvent(
 	event: RuntimeStateEvent,
 	context: RuntimeStateContext,
 ): Promise<void> {
-	const stateFile = process.env[SKC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim();
+	__sessionStateSidecarPerfCounters.persistFromEventCalls += 1;
+	const stateFile = runtimeStateFileForContext(context);
 	if (!stateFile) return;
 	const state = stateForEvent(event);
 	if (!state) return;
-	const now = new Date().toISOString();
-	const previous = readPreviousPayload(stateFile);
+	const nowMs = Date.now();
+	const now = new Date(nowMs).toISOString();
+	const previous = await readPreviousPayloadForEvent(stateFile);
 	const finalResponse = finalResponseForEvent(event);
+	const sessionId = process.env[SKC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim()
+		? process.env[SKC_COORDINATOR_SESSION_ID_ENV]?.trim() || context.sessionId
+		: context.sessionId;
 	const payload = {
-		...basePayload({ context, previous, state, now, source: "agent_session_event", event: event.type, reason: null }),
+		...basePayload({
+			context,
+			previous,
+			state,
+			now,
+			source: "agent_session_event",
+			event: event.type,
+			reason: null,
+			sessionId,
+		}),
 		...(state === "completed" || state === "errored" ? { ended_at: now } : {}),
 		...(finalResponse ? { final_response: finalResponse } : {}),
 		...(state === "errored"
@@ -271,7 +493,9 @@ export async function persistCoordinatorRuntimeStateFromEvent(
 				}
 			: {}),
 	};
+	if (state === "completed" || state === "errored") rememberWrittenPayload(stateFile, payload);
 	try {
+		if (shouldSkipRuntimeStateWrite(previous, payload, nowMs)) return;
 		await writeStateFile(stateFile, payload);
 	} catch (error) {
 		logger.warn("Failed to persist coordinator runtime state", { error: String(error), stateFile });
@@ -282,12 +506,24 @@ export function persistCoordinatorRuntimeStateFromPostmortem(
 	reason: postmortem.Reason,
 	context: RuntimeStateContext,
 ): void {
-	const stateFile = process.env[SKC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim();
+	const stateFile = runtimeStateFileForContext(context);
 	if (!stateFile) return;
-	const previous = readPreviousPayload(stateFile);
-	if (shouldPreserveTerminalPayload(previous as RuntimeStateSidecarPayload)) return;
+	const sessionId = process.env[SKC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim()
+		? process.env[SKC_COORDINATOR_SESSION_ID_ENV]?.trim() || context.sessionId
+		: context.sessionId;
+	const preserveInput = { sessionId, cwd: context.cwd, sessionFile: context.sessionFile };
+	const cachedTerminal = cachedTerminalPayload(stateFile, preserveInput);
+	const previous: Record<string, unknown> = cachedTerminal
+		? (cachedTerminal as unknown as Record<string, unknown>)
+		: readPreviousPayload(stateFile);
+	if (cachedTerminal || shouldPreserveTerminalPayload(previous as RuntimeStateSidecarPayload, preserveInput)) return;
+	const previousForDetails: RuntimeStateSidecarPayload =
+		(previous as RuntimeStateSidecarPayload).state === "completed" ||
+		(previous as RuntimeStateSidecarPayload).state === "errored"
+			? { ...(previous as RuntimeStateSidecarPayload), state: "running" }
+			: (previous as RuntimeStateSidecarPayload);
 	const now = new Date().toISOString();
-	const details = postmortemExitDetails(reason);
+	const details = postmortemExitDetails(reason, previousForDetails, context.cwd);
 	const payload = {
 		...basePayload({
 			context,
@@ -297,6 +533,7 @@ export function persistCoordinatorRuntimeStateFromPostmortem(
 			source: "process_postmortem",
 			event: "process_exit",
 			reason: details.reason,
+			sessionId,
 		}),
 		ended_at: now,
 		detected_at: now,
@@ -304,6 +541,12 @@ export function persistCoordinatorRuntimeStateFromPostmortem(
 		exit_code: details.exitCode,
 		signal: details.signal,
 		...(details.error ? { error: details.error } : {}),
+		...(details.recovery ? { recovery: details.recovery } : {}),
+		previous_runtime_state: typeof previous.state === "string" ? previous.state : null,
+		prompt_accepted: details.promptAccepted,
+		observed_recoverable_worktree_changes: details.observedRecoverableWorktreeChanges,
+		worktree_baseline_dirty: details.worktreeBaselineDirty,
+		worktree_changed_since_baseline: details.worktreeChangedSinceBaseline,
 	};
 	try {
 		writeStateFileSync(stateFile, payload);
@@ -313,7 +556,7 @@ export function persistCoordinatorRuntimeStateFromPostmortem(
 }
 
 export function registerCoordinatorRuntimeStateFinalizer(context: RuntimeStateContext): () => void {
-	if (!process.env[SKC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim()) return () => {};
+	if (!runtimeStateFileForContext(context)) return () => {};
 	return postmortem.register("coordinator-runtime-state", reason => {
 		persistCoordinatorRuntimeStateFromPostmortem(reason, context);
 	});

package/src/skc-runtime/state-runtime.ts

@@ -26,6 +26,7 @@ import {
 	type WorkflowStateReceipt,
 } from "../skill-state/workflow-state-contract";
 import { renderCliWriteReceipt } from "./cli-write-receipt";
+import { applyAmbiguityFloorToEnvelope } from "./deep-interview-ambiguity";
 import { mergeDeepInterviewEnvelope, normalizeDeepInterviewEnvelope } from "./deep-interview-state";
 import { activeSnapshotPath, auditPath, modeStatePath, sessionStateDir } from "./session-layout";
 import {
@@ -1158,7 +1159,12 @@ export async function reconcileWorkflowSkillState(options: {
 
 	const merged =
 		mode === "deep-interview"
-			? (mergeDeepInterviewEnvelope(existingPayload, payload) as Record<string, unknown>)
+			? // Enforce the deterministic ambiguity floor on every reconcile so a
+				// self-reported score can never undercut persisted contradiction evidence.
+				(applyAmbiguityFloorToEnvelope(mergeDeepInterviewEnvelope(existingPayload, payload)).envelope as Record<
+					string,
+					unknown
+				>)
 			: mergeWithNullDelete(existingPayload, payload);
 	merged.skill = mode;
 	merged.current_phase = trimmedPhase;
@@ -1355,7 +1361,11 @@ async function handleWrite(
 	if (mode === "deep-interview") {
 		// Deep-interview keeps interview data nested under `state` and merges rounds
 		// losslessly by durable key; never flatten or delete `state` (that drops recorder history).
-		merged = mergeDeepInterviewEnvelope(existingPayload, payload, { replace: hasFlag(args, "--replace") });
+		// The deterministic ambiguity floor is applied after the merge so a reported
+		// score written through the CLI can never undercut persisted contradiction evidence.
+		merged = applyAmbiguityFloorToEnvelope(
+			mergeDeepInterviewEnvelope(existingPayload, payload, { replace: hasFlag(args, "--replace") }),
+		).envelope;
 	} else if (hasFlag(args, "--replace")) {
 		merged = { ...payload };
 	} else {

package/src/skc-runtime/state-writer.ts

@@ -304,6 +304,18 @@ function activeStateDir(cwd: string, sessionScope?: string | ActiveSessionScope)
 	return layoutActiveStateDir(cwd, requireSessionId(sessionScope, "activeStateDir"));
 }
 
+type ActiveStateCacheInvalidator = (cwd?: string, sessionId?: string) => void;
+var activeStateCacheInvalidator: ActiveStateCacheInvalidator | undefined;
+
+export function setActiveStateCacheInvalidator(invalidator: ActiveStateCacheInvalidator): void {
+	activeStateCacheInvalidator = invalidator;
+}
+
+function invalidateActiveStateCacheForScope(cwd: string, sessionScope?: string | ActiveSessionScope): void {
+	const sessionId = typeof sessionScope === "string" ? sessionScope : sessionScope?.sessionId;
+	activeStateCacheInvalidator?.(cwd, sessionId);
+}
+
 function activeSnapshotPath(cwd: string, sessionScope?: string | ActiveSessionScope): string {
 	return layoutActiveSnapshotPath(cwd, requireSessionId(sessionScope, "activeSnapshotPath"));
 }
@@ -979,6 +991,7 @@ export async function writeActiveEntry(
 				persistedSourceRevision(entry) || persistedSourceRevision(await readJsonIfPresent(filePath)) + 1,
 		},
 	);
+	invalidateActiveStateCacheForScope(cwd, sessionScope);
 	return filePath;
 }
 
@@ -1003,6 +1016,7 @@ export async function removeActiveEntry(
 			}
 			const deleted = await atomicRemove(filePath);
 			if (deleted) await maybeAudit(filePath, options);
+			if (deleted) invalidateActiveStateCacheForScope(cwd, sessionScope);
 			return { path: filePath, deleted };
 		},
 		options?.lock,
@@ -1049,6 +1063,7 @@ export async function rebuildActiveSnapshot(
 			...entries.map(entry => persistedSourceRevision(entry)),
 		),
 	});
+	invalidateActiveStateCacheForScope(cwd, sessionScope);
 	return snapshotPath;
 }
 

package/src/skc-runtime/tmux-common.ts

@@ -4,6 +4,7 @@ import { resolveSkcTmuxBinary } from "./psmux-detect";
 export const SKC_DEFAULT_TMUX_SESSION = "sayknow_cli";
 export const SKC_TMUX_SESSION_PREFIX = `${SKC_DEFAULT_TMUX_SESSION}_`;
 export const SKC_TMUX_COMMAND_ENV = "SKC_TMUX_COMMAND";
+export const SKC_TMUX_ACTIVE_SESSION_ENV = "SKC_TMUX_ACTIVE_SESSION";
 export const SKC_TMUX_PROFILE_ENV = "SKC_TMUX_PROFILE";
 export const SKC_TMUX_MOUSE_ENV = "SKC_MOUSE";
 export const SKC_TMUX_PROFILE_OPTION = "@skc-profile";