npm - agentic-engineering-harness - Versions diffs - 0.8.18 → 0.8.20 - Mend

agentic-engineering-harness 0.8.18 → 0.8.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1905) hide show

package/dist/current CHANGED Viewed

	@@ -1 +1 @@
1	- release-~~1791074210975~~-~~16771~~-~~12d2b308~~
1	+ release-1791099378041-16591-4864d877

package/dist/releases/release-1791099353761-16452-cbaa7139/build-identity.json ADDED Viewed

@@ -0,0 +1,8 @@
+{
+  "version": 1,
+  "packageVersion": "0.8.20",
+  "gitSha": "810ac14b40373eb6ace3f4f1cf0a2dbaacf8d5fd",
+  "releaseId": "release-1791099353761-16452-cbaa7139",
+  "buildDigest": "9549d6d933667f65d493537d59d3f13b769b4a00412294bea953a03aad8094c9",
+  "dirty": true
+}

package/dist/releases/{release-1791074210975-16771-12d2b308 → release-1791099353761-16452-cbaa7139}/operations/supervisor.d.ts RENAMED Viewed

@@ -75,6 +75,9 @@ export declare function operationSupervisorContextPolicy(config: HarnessProjectC
 export declare function operationSupervisorInitializationTimeoutSeconds(config: HarnessProjectConfig): number;
 export declare function operationSupervisorTurnTimeoutSeconds(config: HarnessProjectConfig): number;
 export declare function supervisorTurnTimedOutV1(session: Pick<WorkerSession, "exitCode" | "stdout" | "stderr">): boolean;
+/** A provider lifecycle failure leaves a durable lease fenced; retrying with a new session
+ * at the same controller epoch cannot make progress and must not create another actor. */
+export declare function supervisorInitializationRetryBlockedByProviderLeaseV1(error: string): boolean;
 export declare function ensureOperationSupervisor(root: string, config: HarnessProjectConfig, contract: TaskContract, selection: AgentExecutionSelection | undefined, options?: EnsureSupervisorOptions): Promise<OperationSupervisorHandle | undefined>;
 export declare function consolidateWithOperationSupervisor(root: string, config: HarnessProjectConfig, contract: TaskContract, supervisorSelection: AgentExecutionSelection | undefined, input: SupervisorConsolidationInput): Promise<SupervisorConsolidationResult>;
 export declare function maybeRotateOperationSupervisor(root: string, config: HarnessProjectConfig, contract: TaskContract, selection: AgentExecutionSelection | undefined): Promise<OperationSupervisorHandle | undefined>;

package/dist/releases/{release-1791074210975-16771-12d2b308 → release-1791099353761-16452-cbaa7139}/operations/supervisor.js RENAMED Viewed

@@ -108,6 +108,11 @@ export function operationSupervisorTurnTimeoutSeconds(config) {
 export function supervisorTurnTimedOutV1(session) {
     return session.exitCode === 124 || /timed out|timeout/i.test(`${session.stderr} ${session.stdout}`);
 }
+/** A provider lifecycle failure leaves a durable lease fenced; retrying with a new session
+ * at the same controller epoch cannot make progress and must not create another actor. */
+export function supervisorInitializationRetryBlockedByProviderLeaseV1(error) {
+    return /PASEO_PROVIDER_LIFECYCLE_UNCERTAIN|PASEO_PROVIDER_LEASE_TAKEOVER_BLOCKED/.test(error);
+}
 export async function ensureOperationSupervisor(root, config, contract, selection, options = {}) {
     const operationId = currentOperationContext().id;
     if (!operationId)
@@ -129,7 +134,9 @@ async function ensureOperationSupervisorUnlocked(root, config, contract, selecti
     if (active?.agentId)
         return { operationId, generation: active.generation, agentId: active.agentId, materialized: true, selection };
     let lastError;
+    let attempts = 0;
     for (let attempt = 1; attempt <= SUPERVISOR_INITIALIZATION_ATTEMPTS; attempt += 1) {
+        attempts = attempt;
         operation = await loadOperation(stateRoot, operationId);
         const initSelection = eventSelection(selection, contract, "initialize", operation.kind);
         const materialized = await materializeAgentPrompt(root, config, contract, initSelection, { phase: "supervision", operationKind: operation.kind, parentAgentId: operation.lead?.agentId, supervisorAgent: true });
@@ -157,11 +164,17 @@ async function ensureOperationSupervisorUnlocked(root, config, contract, selecti
         catch (error) {
             lastError = error instanceof Error ? error.message : String(error);
             await updateSupervisorGeneration(stateRoot, operationId, generation, { status: "FAILED", error: `initialization failed: ${lastError}` }).catch(() => undefined);
-            await archivePaseoSdkAgent(root, materialized.id).catch(() => undefined);
+            const providerLeaseFenced = supervisorInitializationRetryBlockedByProviderLeaseV1(lastError);
+            // Keep an uncertain provider session untouched: archiving it could change the lifecycle
+            // whose quiescence has not been established.
+            if (!providerLeaseFenced)
+                await archivePaseoSdkAgent(root, materialized.id).catch(() => undefined);
             await recordPaseoTrace(stateRoot, "operation.supervisor.initialization-failed", { operationId, generation, agentId: materialized.id, attempt, error: lastError, timeoutSeconds: operationSupervisorInitializationTimeoutSeconds(config) }).catch(() => undefined);
+            if (providerLeaseFenced)
+                break;
         }
     }
-    throw new Error(`AEH_OPERATION_SUPERVISOR_UNAVAILABLE: initialization failed after ${SUPERVISOR_INITIALIZATION_ATTEMPTS} bounded attempt(s): ${lastError ?? "unknown error"}`);
+    throw new Error(`AEH_OPERATION_SUPERVISOR_UNAVAILABLE: initialization failed after ${attempts} bounded attempt(s): ${lastError ?? "unknown error"}`);
 }
 export async function consolidateWithOperationSupervisor(root, config, contract, supervisorSelection, input) {
     const stateRoot = resolveOperationStateRoot(root);

package/dist/releases/release-1791099353761-16452-cbaa7139/operations/supervisor.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/operations/supervisor.ts"],"names":[],"mappings":"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"}

package/dist/releases/{release-1791074210975-16771-12d2b308 → release-1791099353761-16452-cbaa7139}/package.json RENAMED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "agentic-engineering-harness",
-  "version": "0.8.18",
+  "version": "0.8.20",
   "description": "OSS-first engineering harness for deterministic, spec-driven, issue-driven, audit-governed and orchestration-first multi-agent software delivery.",
   "type": "module",
   "workspaces": [

package/dist/releases/{release-1791074183231-16621-90a2fe00 → release-1791099353761-16452-cbaa7139}/validators/external.js RENAMED Viewed

@@ -10,7 +10,8 @@ const browserLanes = { playwright: "BROWSER", visual: "VISUAL" };
 export async function runExternalToolValidator(context) {
     const adapter = context.spec.adapter;
     const lane = browserLanes[adapter];
-    const configured = context.spec.command?.trim();
+    const options = { ...(context.providerSpec?.options ?? {}), ...(context.spec.options ?? {}) };
+    const configured = (context.providerSpec?.command ?? context.spec.command)?.trim();
     const defaults = {
         opengrep: { tool: "opengrep", command: "opengrep scan --json --error .", category: "security" },
         trivy: { tool: "trivy", command: "trivy fs --format json --exit-code 1 --severity HIGH,CRITICAL --scanners vuln,misconfig,secret .", category: "security" },
@@ -32,17 +33,17 @@ export async function runExternalToolValidator(context) {
     }
     let visualBinding;
     if (lane === "VISUAL") {
-        const resolved = await resolveVisualComparisonBinding(context);
+        const resolved = await resolveVisualComparisonBinding(context, options);
         if ("blocker" in resolved) {
             return { id: context.spec.id, category: definition.category, status: context.spec.required === false ? "SKIP" : "FAIL", message: `${resolved.blocker}: ${resolved.message}`, details: { blocker: resolved.blocker, lane, referenceRequired: true } };
         }
         visualBinding = resolved;
     }
     const command = configured ?? (lane && pinnedPlaywright ? `${quote(pinnedPlaywright)} test --grep "${context.contract.task.id}" --reporter=json` : definition.command);
-    const providerVersion = lane ? await playwrightVersion(configured ?? pinnedPlaywright, context.root) : "unknown";
+    const providerVersion = lane ? await playwrightVersion(pinnedPlaywright, context.root) : "unknown";
     const rendered = command.replaceAll("{taskId}", context.contract.task.id).replaceAll("{baseRef}", context.baseRef).replaceAll("{acceptance}", context.contract.source?.acceptance ?? "");
-    const cwd = path.resolve(context.root, context.spec.workingDirectory ?? ".");
-    const timeoutMs = (context.spec.timeoutSeconds ?? 900) * 1000;
+    const cwd = path.resolve(context.root, context.providerSpec?.workingDirectory ?? context.spec.workingDirectory ?? ".");
+    const timeoutMs = (context.spec.timeoutSeconds ?? context.providerSpec?.timeoutSeconds ?? 900) * 1000;
     const isolationRequired = validatorIsolationRequired(context.config, context.spec);
     if (isolationRequired) {
         try {
@@ -73,9 +74,13 @@ export async function runExternalToolValidator(context) {
         }
     }
     else {
-        result = await runShell(rendered, { cwd, timeoutMs });
+        result = await runShell(rendered, {
+            cwd,
+            timeoutMs,
+            ...(context.candidate ? { env: { AEH_VALIDATION_CANDIDATE_JSON: JSON.stringify(context.candidate) } } : {})
+        });
     }
-    const evidenceFile = typeof context.spec.options?.evidenceFile === "string" ? path.resolve(cwd, context.spec.options.evidenceFile) : undefined;
+    const evidenceFile = typeof options.evidenceFile === "string" ? path.resolve(cwd, options.evidenceFile) : undefined;
     const evidenceText = evidenceFile ? await fs.readFile(evidenceFile, "utf8").catch(() => result.stdout) : result.stdout;
     const parsedEvidence = parseToolEvidenceResult(adapter, evidenceText);
     const findings = parsedEvidence.findings;
@@ -90,7 +95,7 @@ export async function runExternalToolValidator(context) {
     const malformedEvidence = ["opengrep", "trivy", "playwright", "visual", "pact"].includes(adapter) && !parsedEvidence.valid;
     const failed = result.exitCode !== 0 || failedByEvidence || malformedEvidence;
     const status = failed ? context.spec.required === false ? "WARN" : "FAIL" : "PASS";
-    if (lane && !context.candidate && context.spec.required === true && context.spec.options?.requireCandidateBoundEvidence === true) {
+    if (lane && !context.candidate && context.spec.required === true && options.requireCandidateBoundEvidence === true) {
         return { id: context.spec.id, category: definition.category, status: "FAIL", message: `${PROVIDER_LANE_CANDIDATE_BINDING_REQUIRED}: required ${adapter} validator ran without a current CandidateRevision binding.`, details: { command: rendered, blocker: PROVIDER_LANE_CANDIDATE_BINDING_REQUIRED, lane, candidateBoundRequired: true } };
     }
     let laneEvidence;
@@ -122,7 +127,7 @@ export async function runExternalToolValidator(context) {
         }
     }
     const sastAdapter = SAST_ADAPTERS.includes(adapter) ? adapter : undefined;
-    if (sastAdapter && !context.candidate && context.spec.required === true && context.spec.options?.requireCandidateBoundEvidence === true) {
+    if (sastAdapter && !context.candidate && context.spec.required === true && options.requireCandidateBoundEvidence === true) {
         return { id: context.spec.id, category: definition.category, status: "FAIL", message: `${SAST_CANDIDATE_BINDING_REQUIRED}: required ${adapter} validator ran without a current CandidateRevision binding.`, details: { command: rendered, blocker: SAST_CANDIDATE_BINDING_REQUIRED, candidateBoundRequired: true } };
     }
     let sastEvidence;
@@ -159,7 +164,7 @@ export async function runExternalToolValidator(context) {
         details: {
             command: rendered,
             rawArtifact: path.relative(context.root, rawPath).replaceAll("\\", "/"),
-            evidenceFormat: evidenceFile ? context.spec.options?.evidenceFormat ?? "json-or-junit" : "stdout-json",
+            evidenceFormat: evidenceFile ? options.evidenceFormat ?? "json-or-junit" : "stdout-json",
             exitCode: result.exitCode,
             stderr: boundedDiagnostic(result.stderr),
             findings,
@@ -217,8 +222,7 @@ function playwrightUnavailableReason(output) {
  * comparison configuration into its lane evidence. A missing or malformed
  * binding fails closed and never generates a baseline from the candidate.
  */
-async function resolveVisualComparisonBinding(context) {
-    const options = context.spec.options ?? {};
+async function resolveVisualComparisonBinding(context, options) {
     const configured = typeof options.referenceBaseline === "string" ? options.referenceBaseline.trim() : "";
     if (!configured)
         return { blocker: VISUAL_REFERENCE_BASELINE_REQUIRED, message: "a required VISUAL check must declare options.referenceBaseline naming the committed baseline image it compares against; a baseline is never auto-generated from the candidate under validation." };
@@ -310,7 +314,8 @@ function validatorWritablePaths(context, cwd) {
     const paths = new Set();
     const evidenceDir = path.resolve(context.root, context.config.evidence?.outputDir ?? ".harness/evidence");
     paths.add(evidenceDir);
-    const evidenceFile = typeof context.spec.options?.evidenceFile === "string" ? path.resolve(cwd, context.spec.options.evidenceFile) : undefined;
+    const options = { ...(context.providerSpec?.options ?? {}), ...(context.spec.options ?? {}) };
+    const evidenceFile = typeof options.evidenceFile === "string" ? path.resolve(cwd, options.evidenceFile) : undefined;
     if (evidenceFile && path.resolve(evidenceFile).startsWith(`${path.resolve(context.root)}${path.sep}`))
         paths.add(path.dirname(evidenceFile));
     return [...paths].sort();

package/dist/releases/release-1791099353761-16452-cbaa7139/validators/external.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"external.js","sourceRoot":"","sources":["../../src/validators/external.ts"],"names":[],"mappings":"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"}

package/dist/releases/release-1791099378041-16591-4864d877/build-identity.json ADDED Viewed

@@ -0,0 +1,8 @@
+{
+  "version": 1,
+  "packageVersion": "0.8.20",
+  "gitSha": "cb3081bcc23209b740460a8022e3b86587c891d8",
+  "releaseId": "release-1791099378041-16591-4864d877",
+  "buildDigest": "9549d6d933667f65d493537d59d3f13b769b4a00412294bea953a03aad8094c9",
+  "dirty": true
+}

package/dist/releases/{release-1791074183231-16621-90a2fe00 → release-1791099378041-16591-4864d877}/operations/supervisor.d.ts RENAMED Viewed

@@ -75,6 +75,9 @@ export declare function operationSupervisorContextPolicy(config: HarnessProjectC
 export declare function operationSupervisorInitializationTimeoutSeconds(config: HarnessProjectConfig): number;
 export declare function operationSupervisorTurnTimeoutSeconds(config: HarnessProjectConfig): number;
 export declare function supervisorTurnTimedOutV1(session: Pick<WorkerSession, "exitCode" | "stdout" | "stderr">): boolean;
+/** A provider lifecycle failure leaves a durable lease fenced; retrying with a new session
+ * at the same controller epoch cannot make progress and must not create another actor. */
+export declare function supervisorInitializationRetryBlockedByProviderLeaseV1(error: string): boolean;
 export declare function ensureOperationSupervisor(root: string, config: HarnessProjectConfig, contract: TaskContract, selection: AgentExecutionSelection | undefined, options?: EnsureSupervisorOptions): Promise<OperationSupervisorHandle | undefined>;
 export declare function consolidateWithOperationSupervisor(root: string, config: HarnessProjectConfig, contract: TaskContract, supervisorSelection: AgentExecutionSelection | undefined, input: SupervisorConsolidationInput): Promise<SupervisorConsolidationResult>;
 export declare function maybeRotateOperationSupervisor(root: string, config: HarnessProjectConfig, contract: TaskContract, selection: AgentExecutionSelection | undefined): Promise<OperationSupervisorHandle | undefined>;

package/dist/releases/{release-1791074183231-16621-90a2fe00 → release-1791099378041-16591-4864d877}/operations/supervisor.js RENAMED Viewed

@@ -108,6 +108,11 @@ export function operationSupervisorTurnTimeoutSeconds(config) {
 export function supervisorTurnTimedOutV1(session) {
     return session.exitCode === 124 || /timed out|timeout/i.test(`${session.stderr} ${session.stdout}`);
 }
+/** A provider lifecycle failure leaves a durable lease fenced; retrying with a new session
+ * at the same controller epoch cannot make progress and must not create another actor. */
+export function supervisorInitializationRetryBlockedByProviderLeaseV1(error) {
+    return /PASEO_PROVIDER_LIFECYCLE_UNCERTAIN|PASEO_PROVIDER_LEASE_TAKEOVER_BLOCKED/.test(error);
+}
 export async function ensureOperationSupervisor(root, config, contract, selection, options = {}) {
     const operationId = currentOperationContext().id;
     if (!operationId)
@@ -129,7 +134,9 @@ async function ensureOperationSupervisorUnlocked(root, config, contract, selecti
     if (active?.agentId)
         return { operationId, generation: active.generation, agentId: active.agentId, materialized: true, selection };
     let lastError;
+    let attempts = 0;
     for (let attempt = 1; attempt <= SUPERVISOR_INITIALIZATION_ATTEMPTS; attempt += 1) {
+        attempts = attempt;
         operation = await loadOperation(stateRoot, operationId);
         const initSelection = eventSelection(selection, contract, "initialize", operation.kind);
         const materialized = await materializeAgentPrompt(root, config, contract, initSelection, { phase: "supervision", operationKind: operation.kind, parentAgentId: operation.lead?.agentId, supervisorAgent: true });
@@ -157,11 +164,17 @@ async function ensureOperationSupervisorUnlocked(root, config, contract, selecti
         catch (error) {
             lastError = error instanceof Error ? error.message : String(error);
             await updateSupervisorGeneration(stateRoot, operationId, generation, { status: "FAILED", error: `initialization failed: ${lastError}` }).catch(() => undefined);
-            await archivePaseoSdkAgent(root, materialized.id).catch(() => undefined);
+            const providerLeaseFenced = supervisorInitializationRetryBlockedByProviderLeaseV1(lastError);
+            // Keep an uncertain provider session untouched: archiving it could change the lifecycle
+            // whose quiescence has not been established.
+            if (!providerLeaseFenced)
+                await archivePaseoSdkAgent(root, materialized.id).catch(() => undefined);
             await recordPaseoTrace(stateRoot, "operation.supervisor.initialization-failed", { operationId, generation, agentId: materialized.id, attempt, error: lastError, timeoutSeconds: operationSupervisorInitializationTimeoutSeconds(config) }).catch(() => undefined);
+            if (providerLeaseFenced)
+                break;
         }
     }
-    throw new Error(`AEH_OPERATION_SUPERVISOR_UNAVAILABLE: initialization failed after ${SUPERVISOR_INITIALIZATION_ATTEMPTS} bounded attempt(s): ${lastError ?? "unknown error"}`);
+    throw new Error(`AEH_OPERATION_SUPERVISOR_UNAVAILABLE: initialization failed after ${attempts} bounded attempt(s): ${lastError ?? "unknown error"}`);
 }
 export async function consolidateWithOperationSupervisor(root, config, contract, supervisorSelection, input) {
     const stateRoot = resolveOperationStateRoot(root);

package/dist/releases/release-1791099378041-16591-4864d877/operations/supervisor.js.map ADDED Viewed

@@ -0,0 +1 @@

package/dist/releases/{release-1791074183231-16621-90a2fe00 → release-1791099378041-16591-4864d877}/package.json RENAMED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "agentic-engineering-harness",
-  "version": "0.8.18",
+  "version": "0.8.20",
   "description": "OSS-first engineering harness for deterministic, spec-driven, issue-driven, audit-governed and orchestration-first multi-agent software delivery.",
   "type": "module",
   "workspaces": [

package/dist/releases/{release-1791074210975-16771-12d2b308 → release-1791099378041-16591-4864d877}/validators/external.js RENAMED Viewed

@@ -10,7 +10,8 @@ const browserLanes = { playwright: "BROWSER", visual: "VISUAL" };
 export async function runExternalToolValidator(context) {
     const adapter = context.spec.adapter;
     const lane = browserLanes[adapter];
-    const configured = context.spec.command?.trim();
+    const options = { ...(context.providerSpec?.options ?? {}), ...(context.spec.options ?? {}) };
+    const configured = (context.providerSpec?.command ?? context.spec.command)?.trim();
     const defaults = {
         opengrep: { tool: "opengrep", command: "opengrep scan --json --error .", category: "security" },
         trivy: { tool: "trivy", command: "trivy fs --format json --exit-code 1 --severity HIGH,CRITICAL --scanners vuln,misconfig,secret .", category: "security" },
@@ -32,17 +33,17 @@ export async function runExternalToolValidator(context) {
     }
     let visualBinding;
     if (lane === "VISUAL") {
-        const resolved = await resolveVisualComparisonBinding(context);
+        const resolved = await resolveVisualComparisonBinding(context, options);
         if ("blocker" in resolved) {
             return { id: context.spec.id, category: definition.category, status: context.spec.required === false ? "SKIP" : "FAIL", message: `${resolved.blocker}: ${resolved.message}`, details: { blocker: resolved.blocker, lane, referenceRequired: true } };
         }
         visualBinding = resolved;
     }
     const command = configured ?? (lane && pinnedPlaywright ? `${quote(pinnedPlaywright)} test --grep "${context.contract.task.id}" --reporter=json` : definition.command);
-    const providerVersion = lane ? await playwrightVersion(configured ?? pinnedPlaywright, context.root) : "unknown";
+    const providerVersion = lane ? await playwrightVersion(pinnedPlaywright, context.root) : "unknown";
     const rendered = command.replaceAll("{taskId}", context.contract.task.id).replaceAll("{baseRef}", context.baseRef).replaceAll("{acceptance}", context.contract.source?.acceptance ?? "");
-    const cwd = path.resolve(context.root, context.spec.workingDirectory ?? ".");
-    const timeoutMs = (context.spec.timeoutSeconds ?? 900) * 1000;
+    const cwd = path.resolve(context.root, context.providerSpec?.workingDirectory ?? context.spec.workingDirectory ?? ".");
+    const timeoutMs = (context.spec.timeoutSeconds ?? context.providerSpec?.timeoutSeconds ?? 900) * 1000;
     const isolationRequired = validatorIsolationRequired(context.config, context.spec);
     if (isolationRequired) {
         try {
@@ -73,9 +74,13 @@ export async function runExternalToolValidator(context) {
         }
     }
     else {
-        result = await runShell(rendered, { cwd, timeoutMs });
+        result = await runShell(rendered, {
+            cwd,
+            timeoutMs,
+            ...(context.candidate ? { env: { AEH_VALIDATION_CANDIDATE_JSON: JSON.stringify(context.candidate) } } : {})
+        });
     }
-    const evidenceFile = typeof context.spec.options?.evidenceFile === "string" ? path.resolve(cwd, context.spec.options.evidenceFile) : undefined;
+    const evidenceFile = typeof options.evidenceFile === "string" ? path.resolve(cwd, options.evidenceFile) : undefined;
     const evidenceText = evidenceFile ? await fs.readFile(evidenceFile, "utf8").catch(() => result.stdout) : result.stdout;
     const parsedEvidence = parseToolEvidenceResult(adapter, evidenceText);
     const findings = parsedEvidence.findings;
@@ -90,7 +95,7 @@ export async function runExternalToolValidator(context) {
     const malformedEvidence = ["opengrep", "trivy", "playwright", "visual", "pact"].includes(adapter) && !parsedEvidence.valid;
     const failed = result.exitCode !== 0 || failedByEvidence || malformedEvidence;
     const status = failed ? context.spec.required === false ? "WARN" : "FAIL" : "PASS";
-    if (lane && !context.candidate && context.spec.required === true && context.spec.options?.requireCandidateBoundEvidence === true) {
+    if (lane && !context.candidate && context.spec.required === true && options.requireCandidateBoundEvidence === true) {
         return { id: context.spec.id, category: definition.category, status: "FAIL", message: `${PROVIDER_LANE_CANDIDATE_BINDING_REQUIRED}: required ${adapter} validator ran without a current CandidateRevision binding.`, details: { command: rendered, blocker: PROVIDER_LANE_CANDIDATE_BINDING_REQUIRED, lane, candidateBoundRequired: true } };
     }
     let laneEvidence;
@@ -122,7 +127,7 @@ export async function runExternalToolValidator(context) {
         }
     }
     const sastAdapter = SAST_ADAPTERS.includes(adapter) ? adapter : undefined;
-    if (sastAdapter && !context.candidate && context.spec.required === true && context.spec.options?.requireCandidateBoundEvidence === true) {
+    if (sastAdapter && !context.candidate && context.spec.required === true && options.requireCandidateBoundEvidence === true) {
         return { id: context.spec.id, category: definition.category, status: "FAIL", message: `${SAST_CANDIDATE_BINDING_REQUIRED}: required ${adapter} validator ran without a current CandidateRevision binding.`, details: { command: rendered, blocker: SAST_CANDIDATE_BINDING_REQUIRED, candidateBoundRequired: true } };
     }
     let sastEvidence;
@@ -159,7 +164,7 @@ export async function runExternalToolValidator(context) {
         details: {
             command: rendered,
             rawArtifact: path.relative(context.root, rawPath).replaceAll("\\", "/"),
-            evidenceFormat: evidenceFile ? context.spec.options?.evidenceFormat ?? "json-or-junit" : "stdout-json",
+            evidenceFormat: evidenceFile ? options.evidenceFormat ?? "json-or-junit" : "stdout-json",
             exitCode: result.exitCode,
             stderr: boundedDiagnostic(result.stderr),
             findings,
@@ -217,8 +222,7 @@ function playwrightUnavailableReason(output) {
  * comparison configuration into its lane evidence. A missing or malformed
  * binding fails closed and never generates a baseline from the candidate.
  */
-async function resolveVisualComparisonBinding(context) {
-    const options = context.spec.options ?? {};
+async function resolveVisualComparisonBinding(context, options) {
     const configured = typeof options.referenceBaseline === "string" ? options.referenceBaseline.trim() : "";
     if (!configured)
         return { blocker: VISUAL_REFERENCE_BASELINE_REQUIRED, message: "a required VISUAL check must declare options.referenceBaseline naming the committed baseline image it compares against; a baseline is never auto-generated from the candidate under validation." };
@@ -310,7 +314,8 @@ function validatorWritablePaths(context, cwd) {
     const paths = new Set();
     const evidenceDir = path.resolve(context.root, context.config.evidence?.outputDir ?? ".harness/evidence");
     paths.add(evidenceDir);
-    const evidenceFile = typeof context.spec.options?.evidenceFile === "string" ? path.resolve(cwd, context.spec.options.evidenceFile) : undefined;
+    const options = { ...(context.providerSpec?.options ?? {}), ...(context.spec.options ?? {}) };
+    const evidenceFile = typeof options.evidenceFile === "string" ? path.resolve(cwd, options.evidenceFile) : undefined;
     if (evidenceFile && path.resolve(evidenceFile).startsWith(`${path.resolve(context.root)}${path.sep}`))
         paths.add(path.dirname(evidenceFile));
     return [...paths].sort();

package/dist/releases/release-1791099378041-16591-4864d877/validators/external.js.map ADDED Viewed

@@ -0,0 +1 @@

package/docs/ENGINEERING_LEDGER.md CHANGED Viewed

@@ -71,6 +71,7 @@ Findings, commands, counts, and status labels below are historical at their reco
 | AEH-V2-0058 | P2 | Candidate digest reproducibility, docs citations, and integration cleanup semantics | The independent S11 review found that `computeWorktreeDigest` included the untracked `docs/evidence/s11/browser-visual-campaign.json` while the campaign rewrote that file after computing the candidate digest, so every campaign run changed the candidate identity (prior dirs 682e53f/9e350e0/d662dae/3f5d878c/77df7aba), the recorded source digest no longer matched the tree, and docs cited digests matching nothing. It also found `INTEGRATION_CLEANUP_REQUIRED` emitted even when provisioning failed and no resources were created. | The campaign wrote a generated summary into the source inventory after binding the candidate; the integration normalizer gated cleanup only on the failed predicate and never distinguished zero resources from a missing cleanup mechanism. | src/core/git.ts (read-only observation), scripts/s11BrowserVisualCampaign.ts, src/providers/validation/integrationEnvironment.ts, src/providers/validation/types.ts, schemas/validation-result.schema.json, tests/validation/failClosedProviders.test.ts, docs/evidence/s11/browser-visual-campaign.rejected-pre-repair.json | A fresh post-campaign `computeWorktreeDigest` recomputation equals the recorded candidate source digest and `assertWorkspaceMatchesCandidate` returns `status: MATCH`; cleanup semantics are pinned by two new `failClosedProviders.test.ts` regressions (provision failure creates nothing and yields no cleanup blocker; provisioned resources without a cleanup mechanism yield `INTEGRATION_CLEANUP_REQUIRED`); docs now cite the exact repaired digests. | The campaign's machine summary now lives in the ignored configured evidence directory (`.harness/evidence/s11/browser-visual-campaign.json`); the campaign recomputes the worktree digest before and after the summary write and fails unless both equal the candidate source digest. The integration lifecycle records `cleanupRequired: provisioned` and emits `INTEGRATION_CLEANUP_REQUIRED` only when resources were provisioned without a cleanup command. The rejected pre-repair summary is preserved as `docs/evidence/s11/browser-visual-campaign.rejected-pre-repair.json`. | Campaign evidence: candidate `CAND-S11-BROWSER-VISUAL` r1 identity digest `986c1daadb6ed8fe030badc5e9cd8215d2a182cc63f45fdad0760b3269528d73`, workspace source digest `73c33007e15d4fdc5516d49a02dfc6cf3a9cd0d5a995778e5e3460aaa6cf465a`; BROWSER evidence digest `9c166b826992119a44cf61f064c57e34a464e059bf251aecf3275e2ffea63ac2`, VISUAL evidence digest `b9c187ddd52092a4c23816289f7616e6e41ee63f00ebb140c7811e3405193355`. | `npm run test:browser-visual` exit 0 with both lanes verified; `git diff --check` clean. No REAL_PROVIDER claim. | FIXED_AND_DETERMINISTICALLY_VERIFIED (S11 remediation; round-1 repairs verified by R2; independently accepted 2026-09-26 by R3, checkpoint 78de9c5) |
 | AEH-V2-0059 | P1 | Declared BDD/gherkin route bypassed the capability provider | The R2 review found that a required declared `bdd` capability with no runner returned `FAIL` with the bare message `bdd-runner acceptance was skipped.` and no typed blocker (the normalized `SKIP` was only coerced by `required`), a configured `bdd` provider `{capability:"bdd", command:<passing runner>}` was ignored in favor of the package.json `bdd` script, and no candidate-bound CONTRACT evidence could be persisted on the declared route. | `src/validators/registry.ts` routed `case "gherkin"/"bdd"` to `runGherkinValidator`, which built a `ValidationProviderContext` without `providerSpec` or `candidate` and returned the generic `resultCheck(...)` instead of the typed `runCapabilityValidator` BDD path (`CONTRACT_PROVIDER_UNAVAILABLE` + `finalizeLaneCheck`). | src/validators/registry.ts, deleted src/validators/gherkin.ts, maturity/components.yaml, docs/component-maturity.json, tests/validation/failClosedProviders.test.ts | Three new `failClosedProviders` regressions: declared `bdd` with no runner → FAIL + `CONTRACT_PROVIDER_UNAVAILABLE` and never the bare skip message; a declared `bdd` with a configured passing runner → configured runner executes (configured marker present, package `bdd` script marker absent) and candidate-bound CONTRACT evidence verifies; a configured failing runner → FAIL. The real BDD campaign test and the BDD provider unit tests still pass. | `gherkin`/`bdd` now route through `runCapabilityValidator` with `providerSpec` and `candidate`; the superseded `runGherkinValidator`/`src/validators/gherkin.ts` adapter is deleted (no alias), and the maturity inventory migrates its adapter-source evidence to `src/validators/registry.ts`. Reqnroll and the S4 impact-path BDD routes are unchanged. | Focused S11 set 9 files / 57 tests passed; full non-system 177 files passed / 1 skipped (1161 passed / 7 skipped) with only the known `tests/paseoSdkResolve.test.ts` mise drift failing; four deterministic system suites 4 files / 23 tests passed; `npm run typecheck` exit 0. | Local deterministic BDD runners only; no REAL_PROVIDER claim. The round-2 `npm run test:browser-visual` rerun also passed (release-1790457526805-146084-3114256d). | FIXED_AND_DETERMINISTICALLY_VERIFIED (S11 R2 remediation; independently accepted 2026-09-26 by R3, checkpoint 78de9c5) |
 | AEH-V2-0060 | P3 | Browser/visual lane output durability across candidates | The R2 review found the per-lane Playwright `--output` directory was not candidate-scoped, so a later campaign run against a different candidate deleted the prior candidate's screenshot artifacts and its `ProviderLaneEvidenceV1` failed verification (observed for candidate `986c1daadb6e` after a newer run). | `scripts/s11BrowserVisualCampaign.ts` removed and reused a flat `.harness/evidence/playwright-s11-output/<lane>` path for every candidate. | scripts/s11BrowserVisualCampaign.ts | The earlier `a20fd933b163` candidate evidence still verifies `ok=true` after the newer `7ad7d70b2ef1` run; the campaign still fails if either lane does not verify and still checks for digest stability before/after the summary write. | Each lane now writes to `.harness/evidence/playwright-s11-output/<lane>/<candidateId>-r<revision>-<identity12>` and only removes its own candidate-scoped directory, so later candidates cannot delete prior candidate artifacts. | Round-2 campaign: BROWSER digest `d98c455a87ddcff72214d4100fb0938628496e1407300ef3a783e3d800aef932`, VISUAL digest `409aca8d6deb4758f55b437ae4a92c18a6943b4b9fca66d7d164099c2b9b6515`, both `ok=true`, workspace `MATCH`; prior-candidate retention independently re-verified. | `npm run test:browser-visual` exit 0 (release-1790457526805-146084-3114256d); not REAL_PROVIDER or packed certification. | FIXED_AND_REAL_LOCAL_BROWSER_VERIFIED (S11 R2 remediation; independently accepted 2026-09-26 by R3, checkpoint 78de9c5) |
+| AEH-V2-0131 | P1 | Candidate-bound S11 visual provider route | The required `visual-test` requirement resolved to the generic `test:browser-visual` project script, which ran a standalone campaign with a synthetic `CAND-S11-BROWSER-VISUAL` identity. Its matching source digest did not bind evidence to the outer operation candidate, so the deterministic assurance gate correctly rejected it. | `.harness/project.yaml` had no configured `visual-test` provider; standalone campaign identity was minted inside `scripts/s11BrowserVisualCampaign.ts`. | `.harness/project.yaml`, `src/validators/external.ts`, `scripts/s11BrowserVisualCampaign.ts`, `tests/validation/requiredLaneEvidence.test.ts` | Project-script-only VISUAL remains blocked with `PROVIDER_LANE_EVIDENCE_REQUIRED`; the configured visual adapter persists lane evidence with exact candidate identity, committed baseline digest and comparison configuration; same-source evidence for another candidate is rejected. | The S11 project config now resolves `visual-test` through the configured `playwright` provider and its committed baseline/comparison. The adapter passes its frozen CandidateRevision to the command environment. The campaign recognizes that provider invocation, runs only the real S11 visual Playwright journey, and returns Playwright JSON; the adapter persists and verifies VISUAL evidence against the outer identity. The standalone two-lane campaign remains an independent local evidence entrypoint. | Local focused provider tests and build/typecheck; browser launch/runtime still depends on the pinned Playwright Chromium being provisioned on the executing machine. No REAL_PROVIDER or cross-platform pixel certification is claimed. | FIXED_AND_DETERMINISTICALLY_VERIFIED (candidate-bound provider route) |
 | AEH-V2-0061 | P1 | Telemetry identity, metric instruments, and advisory eval corpus | Telemetry events and spans carried `taskId`/`operationId` but no candidate/revision/identity-digest/execution-revision/policy/epoch/participant/runtime-session correlation and had no stale-attribution detector; no metric instruments or local metric export existed; `evals/corpus/` did not exist and the runner recorded no corpus identity or reproducibility check; no local export verification lane or adversarial proof that eval/telemetry output cannot influence policy, authority, acceptance, permissions, or routing existed. | The S12 audit snapshot recorded NDJSON/OTel spans and an eval runner only; identity existed in operation state but was not projected into telemetry, and eval results were unbound observations with no corpus contract. | src/telemetry/identity.ts, src/telemetry/events.ts, src/telemetry/metrics.ts, src/evals/runner.ts, src/evals/scoring.ts, src/evals/advisoryInvariant.ts, src/evals/types.ts, src/core/run.ts, src/core/verify.ts, src/workers/agentPrompt.ts, src/paseo/sessionBinding.ts, src/core/config.ts, src/core/types.ts, templates/project.yaml, package.json, package-lock.json, evals/corpus/, evals/fixtures/, evals/scenarios/, scripts/s12ObservabilityCampaign.ts, tests/telemetry/, tests/evals/corpus.test.ts, tests/evals/advisoryInvariant.test.ts, tests/helpers/otlpReceiver.ts | `TelemetryCorrelationV1` gives one canonical identity and domain-separated digest across NDJSON events, OTel spans, and metric points; `recordEvent` resolves current durable identity at emission time and marks supplied stale/unresolved identity with explicit violations instead of silently re-attributing it. Real OTel counters/histograms cover operation/participant/runtime-session/validation signals with canonical local NDJSON export. The versioned corpus records corpus/case digests and scores reproducibly. The advisory-invariant guard proves no authority decision module imports observation modules, and fabricated eval/telemetry artifacts cannot change validation, durable operation truth, acceptance, or routing. | Focused S12 set 9 files / 25 tests passed; `npm run typecheck` exit 0; `npm run build` exit 0 (`release-1790460335620-200076-486c0202`); full non-system Vitest 185 files passed / 1 failed (`tests/paseoSdkResolve.test.ts`, 3 pre-existing mise environment-drift tests) with 1,182 passed / 3 failed / 7 pending; scenario matrix + concurrency + contract/integration 3 files / 20 tests passed; isolation campaign 1 file / 3 tests passed; adversarial suite 26 passed with its two long-recorded S6 fixture failures unchanged; `npx tsx scripts/s12ObservabilityCampaign.ts` wrote `docs/evidence/s12/s12-observability-evals-campaign.json` (corpus digest `e46fa3e1996b0cd70e62eb4069ae108836264ba8fbb57987340a748d896ef71e`, reproducible metric snapshot digests, verified local OTLP/HTTP JSON payload against an in-process loopback receiver). **Superseded by AEH-V2-0062 (S12-R1):** the reviewer rejected gate B because the corpus/case digest did not bind the executable scenario harness and the campaign canonical metric digest was not reproducible across executions; the file-status total was also misstated. | Local file/NDJSON plus local loopback OTLP verification only; no hosted collector, REAL_PROVIDER, BROWSER, or PACKED_E2E claim. | SUPERSEDED by AEH-V2-0062 (S12; independently accepted 2026-09-26 by S12-REVIEW-R2, checkpoint ff1f420) |
 | AEH-V2-0062 | P1 | S12 corpus scenario binding, campaign cross-execution reproducibility, and metric correlation trust | The S12-REVIEW rejected gate B: (F1) `computeEvalCorpusIdentity` digested only `corpus.json`, each `eval.yaml`, and fixture files, so the declared but never-consumed `scenarios[].scenario` harness could change while `digest`/`caseDigest` stayed `e46fa3e1…`; a scored result could change under an identical recorded corpus digest. (F2) the campaign used `mkdtemp` for the operation root, and candidate identity binds `projectId`/`worktree`, so the canonical metric digest `a91916f4…` became `724b58d4…` on an independent run; `metrics.reproducible:true` was intra-process only. (F3) docs overstated the full non-system file counts. INFO: metric recording APIs trusted a caller-supplied correlation with no mismatch detection. | F1: scenario path was declared in the manifest and parsed by the eval schema but never resolved into the identity computation. F2: `src/operations/state.ts` derives project/candidate identity from the source root path, so a random temp root changed candidate → policy → correlation → metric attributes. F3: file-status totals were copied from the earlier JSON aggregation instead of the observed 186-file total. INFO: event recording had current-identity mismatch detection but metric recording did not. | src/evals/runner.ts, src/evals/types.ts, src/evals/scoring.ts, src/telemetry/metrics.ts, src/core/run.ts, src/core/verify.ts, src/workers/agentPrompt.ts, src/paseo/sessionBinding.ts, scripts/s12ObservabilityCampaign.ts, tests/evals/corpus.test.ts, tests/telemetry/metrics.test.ts, docs/CORE_ARCHITECTURE_V2_STATUS.md, docs/CORE_ARCHITECTURE_V2_CONFORMANCE.md, docs/OBSERVABILITY.md, docs/CORE_ARCHITECTURE_V2_S12_WORKGRAPH.md | F1: `tests/evals/corpus.test.ts` appends to `evals/scenarios/scopeGovernance.ts` and asserts the case and corpus digests change while another case is unchanged, then restoring the file restores the digest; a declared-but-missing scenario now fails with `EVAL_CORPUS_SCENARIO_MISSING`; each result also records `EvalBuildIdentityV1`. F2: the campaign recreates the fixed repo-relative `.harness/s12-campaign-scenario` root per execution; six independent executions in separate processes produced identical candidate `698e397a…`, policy `b1c8f1dd…`, participant correlation `20af5760…`, base correlation `ad2d03c5…`, corpus `11e9b972…`, and canonical metric snapshot digest `838305e6…`. The bounded read-only verification then found the digest keying ambiguous (duplicates retained, corpus-dir-relative keys), so the rule was canonicalized to a unique file set keyed by normalized repo-relative path, sorted, hashed as `relativePath\0fileSha256` lines; an independent implementation of that rule now reproduces `11e9b972…` exactly. The artifact `crossExecutionFields` path was corrected to `reproducibility.canonicalMetricSnapshotDigest`. INFO: `record*Telemetry` now resolves current durable identity and records nothing on mismatch; `tests/telemetry/metrics.test.ts` asserts a stale correlation is rejected and the current one records. | F1: scenario closure binding (declared entry plus relative imports inside the project `evals/` tree; production `src/` bound by build identity). F2: fixed ignored scenario root under the repo, removed/recreated per run; artifact records the canonical digest and cross-execution fields. F3: docs corrected to the observed 186 files / 1,195 tests (1,185 passed / 3 failed / 7 pending; the 7 pending are opt-in real-provider contracts reported as skipped by some views). INFO: metric correlation verification documented in OBSERVABILITY.md, including the detached unverified boundary. | Focused S12 set 9 files / 28 tests passed; affected wiring set 13 files / 126 tests passed; `npm run typecheck` exit 0; `npm run build` exit 0; full non-system Vitest ran 186 files and 1,195 tests (1,185 passed / 3 failed / 7 pending; file statuses 185 passed / 1 failed), the only failures being the 3 pre-existing `tests/paseoSdkResolve.test.ts` mise drift tests; system scenario/concurrency/contract 3 files / 20 tests passed; isolation 1 file / 3 tests passed; adversarial 26 passed / 2 long-recorded S6 fixture failures; campaign run twice per pair in separate processes, six total executions in separate processes identical; regenerated artifact SHA-256 `285e78ff74ca9bfe64bd3ece8d4018387e4508ba2597fbad94a9871f867398af`. | Local OTLP loopback only; no REAL_PROVIDER, hosted-collector, BROWSER, or PACKED_E2E claim. The fresh independent reviewer owns re-verification and acceptance. | FIXED_AND_DETERMINISTICALLY_VERIFIED (S12-R1 repair; independently accepted 2026-09-26 by S12-REVIEW-R2, checkpoint ff1f420) |