@gajae-code/coding-agent 0.11.8 → 0.11.9

package/src/gjc-runtime/ralplan-runtime.ts

@@ -735,7 +735,7 @@ async function handleArtifactWrite(args: readonly string[], cwd: string): Promis
 				`refusing to overwrite ralplan ${resolved.stage} stage ${resolved.stageN} at ${existingArtifact.path}: an artifact with different content already exists (existing sha256=${existingArtifact.sha256}, new sha256=${sha256}). Use a new --stage_n to record another pass.`,
 			);
 		}
-		return buildDeduplicatedResult(resolved, existingArtifact, sha256, cwd);
+		return buildDeduplicatedResult(resolved, existingArtifact, sha256, cwd, repositoryBinding);
 	}
 
 	// Keep run-state `current_phase` coherent with the stage being persisted.
@@ -781,6 +781,7 @@ function buildDeduplicatedResult(
 	existing: ExistingStageArtifact,
 	sha256: string,
 	cwd: string,
+	repositoryBinding: RepositoryBinding,
 ): RalplanCommandResult {
 	const payload: Record<string, unknown> = {
 		run_id: resolved.runId,
@@ -788,6 +789,7 @@ function buildDeduplicatedResult(
 		stage: resolved.stage,
 		stage_n: resolved.stageN,
 		sha256,
+		repository_binding: repositoryBinding,
 		created_at: existing.createdAt,
 		deduplicated: true,
 	};

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

@@ -11,6 +11,7 @@ import {
 	type WorkflowStateMutationOwner,
 	type WorkflowStateReceipt,
 } from "../skill-state/workflow-state-contract";
+import { validateDeepInterviewV1Envelope } from "./deep-interview-state";
 import {
 	activeEntryPath as layoutActiveEntryPath,
 	activeSnapshotPath as layoutActiveSnapshotPath,
@@ -77,6 +78,47 @@ export interface WorkflowEnvelopeIntegrityMismatch {
 	expected: string;
 	actual: string;
 }
+export type WorkflowReceiptVerification =
+	| "legacy"
+	| "native-valid"
+	| "receipt-malformed"
+	| "receipt-missing"
+	| "checksum-mismatch";
+
+export interface GuardedWorkflowEnvelopeTransformOptions extends StateWriterOptions {
+	expectedRevision: number;
+	/** Additional native schema validation applied to both current and candidate envelopes. */
+	validate?: (value: Record<string, unknown>, legacy: boolean) => void;
+	transform: (
+		current: Record<string, unknown>,
+		context: { revision: number; legacy: boolean },
+	) =>
+		| { kind: "noop" }
+		| { kind: "write"; value: Record<string, unknown> }
+		| Promise<{ kind: "noop" } | { kind: "write"; value: Record<string, unknown> }>;
+}
+
+export interface GuardedWorkflowEnvelopeWarning {
+	code: "DI_POST_COMMIT_AUDIT_FAILED";
+	message: string;
+}
+
+export type GuardedWorkflowEnvelopeTransformResult =
+	| { path: string; written: false; reason: "noop"; revision: number; warnings: [] }
+	| {
+			path: string;
+			written: true;
+			revision: number;
+			stamped: Record<string, unknown>;
+			warnings: GuardedWorkflowEnvelopeWarning[];
+	  };
+
+export class GuardedWorkflowEnvelopeError extends Error {
+	constructor(public readonly code: string) {
+		super(code);
+		this.name = "GuardedWorkflowEnvelopeError";
+	}
+}
 
 export interface WorkflowTransactionJournal {
 	version: 1;
@@ -108,6 +150,7 @@ export interface StateWriterOptions {
 	receipt?: StateWriterReceiptContext;
 	audit?: StateWriterAuditContext;
 	sourceRevision?: number;
+	orderingRevision?: number;
 	/**
 	 * Cross-process lock tuning for read-modify-write paths that route through
 	 * `withWorkflowStateLock` / `updateJsonAtomic`. Omit for the hardened
@@ -255,6 +298,49 @@ export function workflowEnvelopeContentSha256(value: unknown): string {
 		.update(JSON.stringify(canonicalizeJson(withoutReceiptChecksum(value))))
 		.digest("hex");
 }
+function isNativeDeepInterviewV1(value: Record<string, unknown>): boolean {
+	if (value.skill !== "deep-interview") return false;
+	return value.schema_version === 1 || (isPlainObject(value.state) && value.state.schema_version === 1);
+}
+
+export function verifyWorkflowEnvelopeReceiptValue(value: unknown, filePath: string): WorkflowReceiptVerification {
+	if (!isPlainObject(value)) return "receipt-malformed";
+	const native = isNativeDeepInterviewV1(value);
+	if (!Object.hasOwn(value, "receipt")) return native ? "receipt-missing" : "legacy";
+	if (!isPlainObject(value.receipt) || !isPlainObject(value.receipt.content_sha256)) return "receipt-malformed";
+
+	const receipt = value.receipt as Record<string, unknown>;
+	const checksum = receipt.content_sha256 as Record<string, unknown>;
+	if (
+		typeof value.skill !== "string" ||
+		receipt.version !== 1 ||
+		receipt.skill !== value.skill ||
+		(receipt.skill !== "deep-interview" &&
+			receipt.skill !== "ralplan" &&
+			receipt.skill !== "ultragoal" &&
+			receipt.skill !== "team") ||
+		(receipt.owner !== "gjc-state-cli" && receipt.owner !== "gjc-runtime" && receipt.owner !== "gjc-hook") ||
+		typeof receipt.command !== "string" ||
+		typeof receipt.state_path !== "string" ||
+		typeof receipt.storage_path !== "string" ||
+		typeof receipt.mutated_at !== "string" ||
+		!Number.isFinite(Date.parse(receipt.mutated_at)) ||
+		typeof receipt.fresh_until !== "string" ||
+		!Number.isFinite(Date.parse(receipt.fresh_until)) ||
+		(receipt.status !== "fresh" && receipt.status !== "stale") ||
+		typeof receipt.mutation_id !== "string" ||
+		checksum.algorithm !== "sha256" ||
+		typeof checksum.value !== "string" ||
+		!/^[0-9a-f]{64}$/.test(checksum.value) ||
+		typeof checksum.covered_path !== "string" ||
+		path.resolve(checksum.covered_path) !== path.resolve(filePath) ||
+		typeof checksum.computed_at !== "string" ||
+		!Number.isFinite(Date.parse(checksum.computed_at))
+	) {
+		return "receipt-malformed";
+	}
+	return workflowEnvelopeContentSha256(value) === checksum.value ? "native-valid" : "checksum-mismatch";
+}
 
 export function stampWorkflowEnvelopeChecksum<T>(value: T, filePath: string, computedAt = new Date().toISOString()): T {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return value;
@@ -421,6 +507,11 @@ function persistedSourceRevision(value: unknown): number {
 	const revision = value.source_state_revision;
 	return typeof revision === "number" && Number.isFinite(revision) ? revision : persistedStateRevision(value);
 }
+function persistedCommittedModeRevision(value: unknown): number {
+	if (!isPlainObject(value)) return 0;
+	const revision = value.committed_mode_state_revision;
+	return typeof revision === "number" && Number.isFinite(revision) ? revision : 0;
+}
 
 function withoutCandidateRevision(value: unknown): unknown {
 	if (!isPlainObject(value)) return value;
@@ -529,7 +620,12 @@ async function writeGuardedResolvedJsonAtomic(
 
 			const incomingSourceRevision =
 				options.sourceRevision ?? (isPlainObject(value) ? persistedStateRevision(value) : 0);
-			if (current !== undefined && incomingSourceRevision <= persistedSourceRevision(current)) {
+			if (
+				current !== undefined &&
+				(options.orderingRevision !== undefined
+					? options.orderingRevision <= persistedCommittedModeRevision(current)
+					: incomingSourceRevision <= persistedSourceRevision(current))
+			) {
 				return { path: filePath, written: false, reason: "stale-skip", revision: currentRevision };
 			}
 			const next = stampStateRevision(
@@ -563,6 +659,7 @@ export async function writeGuardedWorkflowEnvelopeAtomic(
 	const write = async (): Promise<GuardedWriteResult> => {
 		const current = await readJsonIfPresentTolerant(filePath);
 		const currentRevision = persistedStateRevision(current);
+
 		if (options.policy === "source") {
 			if (options.expectedRevision !== undefined && options.expectedRevision !== currentRevision) {
 				throw new StateWriteConflictError(filePath, options.expectedRevision, currentRevision);
@@ -586,9 +683,15 @@ export async function writeGuardedWorkflowEnvelopeAtomic(
 			await maybeAudit(filePath, options);
 			return { path: filePath, written: true, revision: currentRevision + 1, stamped: next };
 		}
+
 		const incomingSourceRevision =
 			options.sourceRevision ?? (isPlainObject(value) ? persistedStateRevision(value) : 0);
-		if (current !== undefined && incomingSourceRevision <= persistedSourceRevision(current)) {
+		if (
+			current !== undefined &&
+			(options.orderingRevision !== undefined
+				? options.orderingRevision <= persistedCommittedModeRevision(current)
+				: incomingSourceRevision <= persistedSourceRevision(current))
+		) {
 			return { path: filePath, written: false, reason: "stale-skip", revision: currentRevision };
 		}
 		const next = stampWorkflowEnvelopeRevisionAndChecksum(
@@ -612,6 +715,67 @@ export async function writeGuardedWorkflowEnvelopeAtomic(
 	};
 	return options.lockHeld ? write() : lockResolvedWorkflowTarget(filePath, write, options.lock);
 }
+export async function transformGuardedWorkflowEnvelopeAtomic(
+	targetPath: string,
+	options: GuardedWorkflowEnvelopeTransformOptions,
+): Promise<GuardedWorkflowEnvelopeTransformResult> {
+	const filePath = resolveGjcTarget(targetPath, cwdForOptions(options));
+	return lockResolvedWorkflowTarget(
+		filePath,
+		async () => {
+			const read = await readExistingStateForMutation(filePath);
+			if (read.kind === "absent") throw new GuardedWorkflowEnvelopeError("DI_STATE_ABSENT");
+			if (read.kind === "corrupt") throw new GuardedWorkflowEnvelopeError("DI_STATE_CORRUPT");
+			const receipt = verifyWorkflowEnvelopeReceiptValue(read.value, filePath);
+			if (receipt === "receipt-malformed") throw new GuardedWorkflowEnvelopeError("DI_RECEIPT_MALFORMED");
+			if (receipt === "receipt-missing") throw new GuardedWorkflowEnvelopeError("DI_RECEIPT_MISSING");
+			if (receipt === "checksum-mismatch") throw new GuardedWorkflowEnvelopeError("DI_RECEIPT_CHECKSUM_MISMATCH");
+			const legacy = receipt === "legacy";
+			try {
+				if (isNativeDeepInterviewV1(read.value)) validateDeepInterviewV1Envelope(read.value);
+				options.validate?.(read.value, legacy);
+			} catch {
+				throw new GuardedWorkflowEnvelopeError("DI_STATE_SCHEMA_INVALID");
+			}
+			const phase = read.value.current_phase;
+			if (phase === "complete" || phase === "handoff" || read.value.active === false) {
+				throw new GuardedWorkflowEnvelopeError("DI_PHASE_NOT_REPAIRABLE");
+			}
+			const revision = persistedStateRevision(read.value);
+			if (revision !== options.expectedRevision) throw new GuardedWorkflowEnvelopeError("DI_REVISION_CONFLICT");
+			const transformed = await options.transform(read.value, { revision, legacy });
+			if (transformed.kind === "noop")
+				return { path: filePath, written: false, reason: "noop", revision, warnings: [] };
+			try {
+				if (isNativeDeepInterviewV1(transformed.value)) validateDeepInterviewV1Envelope(transformed.value);
+				options.validate?.(transformed.value, false);
+			} catch {
+				throw new GuardedWorkflowEnvelopeError("DI_STATE_SCHEMA_INVALID");
+			}
+			const stamped = stampWorkflowEnvelopeRevisionAndChecksum(
+				transformed.value,
+				filePath,
+				revision + 1,
+				undefined,
+				options,
+			) as Record<string, unknown>;
+			const parsed = RequiredOnWriteEnvelopeSchema.safeParse(stamped);
+			if (!parsed.success) throw new GuardedWorkflowEnvelopeError("DI_STATE_SCHEMA_INVALID");
+			await atomicWrite(filePath, jsonText(stamped));
+			const warnings: GuardedWorkflowEnvelopeWarning[] = [];
+			try {
+				await maybeAudit(filePath, options);
+			} catch (error) {
+				warnings.push({
+					code: "DI_POST_COMMIT_AUDIT_FAILED",
+					message: error instanceof Error ? error.message : String(error),
+				});
+			}
+			return { path: filePath, written: true, revision: revision + 1, stamped, warnings };
+		},
+		options.lock,
+	);
+}
 
 export async function writeJsonAtomic(
 	targetPath: string,

package/src/gjc-runtime/workflow-manifest.generated.json

@@ -212,6 +212,21 @@
         "name": "threshold-source",
         "type": "string"
       },
+      {
+        "appliesToVerbs": [
+          "kickoff"
+        ],
+        "name": "trace",
+        "type": "boolean"
+      },
+      {
+        "appliesToVerbs": [
+          "kickoff",
+          "write-spec"
+        ],
+        "name": "json",
+        "type": "boolean"
+      },
       {
         "appliesToVerbs": [
           "write-spec"
@@ -256,11 +271,333 @@
       },
       {
         "appliesToVerbs": [
-          "write-spec"
+          "draft create"
+        ],
+        "name": "session-id",
+        "required": true,
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create"
+        ],
+        "enumValues": [
+          "initialize-context",
+          "confirm-topology",
+          "record-answer",
+          "apply-round-result"
+        ],
+        "name": "for",
+        "required": true,
+        "type": "enum"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create"
+        ],
+        "name": "round-key",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create"
+        ],
+        "name": "round",
+        "type": "number"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create"
+        ],
+        "name": "question-id",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create"
+        ],
+        "name": "round-id",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create"
+        ],
+        "name": "component-id",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create"
+        ],
+        "name": "dimension",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft edit",
+          "draft show",
+          "draft check",
+          "draft rebase",
+          "draft discard",
+          "initialize-context",
+          "confirm-topology",
+          "record-answer",
+          "apply-round-result"
+        ],
+        "name": "draft-id",
+        "required": true,
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft edit",
+          "draft rebase",
+          "draft discard",
+          "initialize-context",
+          "confirm-topology",
+          "record-answer",
+          "apply-round-result"
+        ],
+        "name": "expected-draft-revision",
+        "required": true,
+        "type": "number"
+      },
+      {
+        "appliesToVerbs": [
+          "draft edit"
+        ],
+        "enumValues": [
+          "set",
+          "append",
+          "remove"
+        ],
+        "name": "op",
+        "required": true,
+        "type": "enum"
+      },
+      {
+        "appliesToVerbs": [
+          "draft edit"
+        ],
+        "name": "path",
+        "required": true,
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft edit"
+        ],
+        "name": "value",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft edit"
+        ],
+        "name": "value-file",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "draft edit"
+        ],
+        "name": "null",
+        "type": "boolean"
+      },
+      {
+        "appliesToVerbs": [
+          "draft rebase"
+        ],
+        "name": "to-state-revision",
+        "required": true,
+        "type": "number"
+      },
+      {
+        "appliesToVerbs": [
+          "draft create",
+          "draft edit",
+          "draft show",
+          "draft check",
+          "draft rebase",
+          "draft discard",
+          "initialize-context",
+          "confirm-topology",
+          "record-answer",
+          "apply-round-result",
+          "inspect",
+          "sanity-check"
         ],
         "name": "json",
+        "required": true,
         "type": "boolean"
       },
+      {
+        "appliesToVerbs": [
+          "inspect",
+          "sanity-check"
+        ],
+        "name": "session-id",
+        "required": true,
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "initialize-context",
+          "confirm-topology",
+          "record-answer",
+          "apply-round-result"
+        ],
+        "compatibilityOnly": true,
+        "name": "session-id",
+        "required": true,
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "initialize-context",
+          "confirm-topology",
+          "record-answer",
+          "apply-round-result"
+        ],
+        "compatibilityOnly": true,
+        "name": "schema-version",
+        "required": true,
+        "type": "number"
+      },
+      {
+        "appliesToVerbs": [
+          "initialize-context",
+          "confirm-topology",
+          "record-answer",
+          "apply-round-result"
+        ],
+        "compatibilityOnly": true,
+        "name": "expected-revision",
+        "required": true,
+        "type": "number"
+      },
+      {
+        "appliesToVerbs": [
+          "initialize-context",
+          "confirm-topology"
+        ],
+        "compatibilityOnly": true,
+        "name": "input-json",
+        "required": true,
+        "type": "object"
+      },
+      {
+        "appliesToVerbs": [
+          "record-answer",
+          "apply-round-result"
+        ],
+        "compatibilityOnly": true,
+        "name": "round",
+        "required": true,
+        "type": "number"
+      },
+      {
+        "appliesToVerbs": [
+          "record-answer",
+          "apply-round-result"
+        ],
+        "compatibilityOnly": true,
+        "name": "question-id",
+        "required": true,
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "record-answer",
+          "apply-round-result"
+        ],
+        "compatibilityOnly": true,
+        "name": "round-id",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "record-answer"
+        ],
+        "compatibilityOnly": true,
+        "name": "component-id",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "record-answer"
+        ],
+        "compatibilityOnly": true,
+        "name": "dimension",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "record-answer"
+        ],
+        "compatibilityOnly": true,
+        "name": "answer-json",
+        "required": true,
+        "type": "object"
+      },
+      {
+        "appliesToVerbs": [
+          "record-answer"
+        ],
+        "compatibilityOnly": true,
+        "name": "question-json",
+        "required": true,
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "apply-round-result"
+        ],
+        "compatibilityOnly": true,
+        "name": "result-json",
+        "required": true,
+        "type": "object"
+      },
+      {
+        "appliesToVerbs": [
+          "inspect"
+        ],
+        "enumValues": [
+          "summary",
+          "recent-scored",
+          "pending",
+          "round",
+          "topology",
+          "facts",
+          "triggers",
+          "floor"
+        ],
+        "name": "selector",
+        "required": true,
+        "type": "enum"
+      },
+      {
+        "appliesToVerbs": [
+          "inspect"
+        ],
+        "name": "round-key",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "inspect"
+        ],
+        "name": "cursor",
+        "type": "string"
+      },
+      {
+        "appliesToVerbs": [
+          "inspect"
+        ],
+        "name": "limit",
+        "type": "number"
+      },
       {
         "name": "args",
         "planned": true,
@@ -305,6 +642,54 @@
         "name": "write-spec",
         "surface": "command-flag"
       },
+      {
+        "name": "draft create",
+        "surface": "draft-action"
+      },
+      {
+        "name": "draft edit",
+        "surface": "draft-action"
+      },
+      {
+        "name": "draft show",
+        "surface": "draft-action"
+      },
+      {
+        "name": "draft check",
+        "surface": "draft-action"
+      },
+      {
+        "name": "draft rebase",
+        "surface": "draft-action"
+      },
+      {
+        "name": "draft discard",
+        "surface": "draft-action"
+      },
+      {
+        "name": "initialize-context",
+        "surface": "command-positional"
+      },
+      {
+        "name": "confirm-topology",
+        "surface": "command-positional"
+      },
+      {
+        "name": "record-answer",
+        "surface": "command-positional"
+      },
+      {
+        "name": "apply-round-result",
+        "surface": "command-positional"
+      },
+      {
+        "name": "inspect",
+        "surface": "command-positional"
+      },
+      {
+        "name": "sanity-check",
+        "surface": "command-positional"
+      },
       {
         "name": "graph",
         "planned": true,