@jeger-ai/opengantry 2.6.0 → 3.0.0
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.
- package/README.md +132 -327
- package/dist/cli/commands/arch.d.ts +1 -0
- package/dist/cli/commands/arch.d.ts.map +1 -1
- package/dist/cli/commands/arch.js +56 -93
- package/dist/cli/commands/arch.js.map +1 -1
- package/dist/cli/commands/blueprint.d.ts +7 -0
- package/dist/cli/commands/blueprint.d.ts.map +1 -0
- package/dist/cli/commands/blueprint.js +69 -0
- package/dist/cli/commands/blueprint.js.map +1 -0
- package/dist/cli/commands/init.d.ts +3 -0
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +30 -25
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/onboarding.js +1 -1
- package/dist/cli/commands/onboarding.js.map +1 -1
- package/dist/cli/commands/perimeter.d.ts.map +1 -1
- package/dist/cli/commands/perimeter.js +3 -6
- package/dist/cli/commands/perimeter.js.map +1 -1
- package/dist/cli/commands/planner.d.ts.map +1 -1
- package/dist/cli/commands/planner.js +5 -17
- package/dist/cli/commands/planner.js.map +1 -1
- package/dist/cli/commands/upgrade.d.ts.map +1 -1
- package/dist/cli/commands/upgrade.js +6 -14
- package/dist/cli/commands/upgrade.js.map +1 -1
- package/dist/cli/commands/verify.d.ts.map +1 -1
- package/dist/cli/commands/verify.js +19 -27
- package/dist/cli/commands/verify.js.map +1 -1
- package/dist/cli/lib/architecture-drift-doctor.d.ts +4 -0
- package/dist/cli/lib/architecture-drift-doctor.d.ts.map +1 -0
- package/dist/cli/lib/architecture-drift-doctor.js +58 -0
- package/dist/cli/lib/architecture-drift-doctor.js.map +1 -0
- package/dist/cli/lib/blueprint-engine.d.ts +22 -0
- package/dist/cli/lib/blueprint-engine.d.ts.map +1 -0
- package/dist/cli/lib/blueprint-engine.js +127 -0
- package/dist/cli/lib/blueprint-engine.js.map +1 -0
- package/dist/cli/lib/command-boundary.d.ts +16 -0
- package/dist/cli/lib/command-boundary.d.ts.map +1 -0
- package/dist/cli/lib/command-boundary.js +45 -0
- package/dist/cli/lib/command-boundary.js.map +1 -0
- package/dist/cli/lib/command-reporter.d.ts +3 -3
- package/dist/cli/lib/command-reporter.d.ts.map +1 -1
- package/dist/cli/lib/context-feed-remediation.d.ts +1 -1
- package/dist/cli/lib/context-feed-remediation.d.ts.map +1 -1
- package/dist/cli/lib/defensive-guard.d.ts +2 -3
- package/dist/cli/lib/defensive-guard.d.ts.map +1 -1
- package/dist/cli/lib/defensive-guard.js +56 -69
- package/dist/cli/lib/defensive-guard.js.map +1 -1
- package/dist/cli/lib/discovery-proposal.d.ts +19 -0
- package/dist/cli/lib/discovery-proposal.d.ts.map +1 -0
- package/dist/cli/lib/discovery-proposal.js +110 -0
- package/dist/cli/lib/discovery-proposal.js.map +1 -0
- package/dist/cli/lib/discovery-scanner.d.ts +47 -0
- package/dist/cli/lib/discovery-scanner.d.ts.map +1 -0
- package/dist/cli/lib/discovery-scanner.js +81 -0
- package/dist/cli/lib/discovery-scanner.js.map +1 -0
- package/dist/cli/lib/doctor-core.d.ts.map +1 -1
- package/dist/cli/lib/doctor-core.js +2 -0
- package/dist/cli/lib/doctor-core.js.map +1 -1
- package/dist/cli/lib/domains/domain-adapter.d.ts +38 -0
- package/dist/cli/lib/domains/domain-adapter.d.ts.map +1 -0
- package/dist/cli/lib/domains/domain-adapter.js +20 -0
- package/dist/cli/lib/domains/domain-adapter.js.map +1 -0
- package/dist/cli/lib/domains/domain-code.d.ts +3 -0
- package/dist/cli/lib/domains/domain-code.d.ts.map +1 -0
- package/dist/cli/lib/domains/domain-code.js +171 -0
- package/dist/cli/lib/domains/domain-code.js.map +1 -0
- package/dist/cli/lib/domains/domain-content.d.ts +3 -0
- package/dist/cli/lib/domains/domain-content.d.ts.map +1 -0
- package/dist/cli/lib/domains/domain-content.js +190 -0
- package/dist/cli/lib/domains/domain-content.js.map +1 -0
- package/dist/cli/lib/domains/index.d.ts +5 -0
- package/dist/cli/lib/domains/index.d.ts.map +1 -0
- package/dist/cli/lib/domains/index.js +5 -0
- package/dist/cli/lib/domains/index.js.map +1 -0
- package/dist/cli/lib/errors.d.ts +2 -2
- package/dist/cli/lib/errors.d.ts.map +1 -1
- package/dist/cli/lib/errors.js +8 -8
- package/dist/cli/lib/errors.js.map +1 -1
- package/dist/cli/lib/executor-log-line-map.d.ts +0 -2
- package/dist/cli/lib/executor-log-line-map.d.ts.map +1 -1
- package/dist/cli/lib/executor-log-line-map.js +0 -5
- package/dist/cli/lib/executor-log-line-map.js.map +1 -1
- package/dist/cli/lib/git-proof.js +2 -2
- package/dist/cli/lib/gxt-error-codes.d.ts +2 -2
- package/dist/cli/lib/gxt-error-codes.js +7 -7
- package/dist/cli/lib/init-discover.d.ts +14 -0
- package/dist/cli/lib/init-discover.d.ts.map +1 -0
- package/dist/cli/lib/init-discover.js +45 -0
- package/dist/cli/lib/init-discover.js.map +1 -0
- package/dist/cli/lib/init-plan.d.ts +3 -1
- package/dist/cli/lib/init-plan.d.ts.map +1 -1
- package/dist/cli/lib/init-plan.js +2 -5
- package/dist/cli/lib/init-plan.js.map +1 -1
- package/dist/cli/lib/init-tutorial.js +1 -1
- package/dist/cli/lib/init-tutorial.js.map +1 -1
- package/dist/cli/lib/kpi-engine.d.ts +2 -2
- package/dist/cli/lib/kpi-engine.d.ts.map +1 -1
- package/dist/cli/lib/kpi-engine.js +3 -2
- package/dist/cli/lib/kpi-engine.js.map +1 -1
- package/dist/cli/lib/mcp-governance.d.ts.map +1 -1
- package/dist/cli/lib/mcp-governance.js +15 -15
- package/dist/cli/lib/mcp-governance.js.map +1 -1
- package/dist/cli/lib/mcp-runtime.d.ts +2 -2
- package/dist/cli/lib/mcp-runtime.d.ts.map +1 -1
- package/dist/cli/lib/mcp-runtime.js +1 -1
- package/dist/cli/lib/mcp-runtime.js.map +1 -1
- package/dist/cli/lib/mcp-upgrade.js +2 -2
- package/dist/cli/lib/mcp-write-guard.d.ts +2 -2
- package/dist/cli/lib/mcp-write-guard.js +2 -2
- package/dist/cli/lib/missions/parser.js +4 -4
- package/dist/cli/lib/surgeons/registry.d.ts +3 -2
- package/dist/cli/lib/surgeons/registry.d.ts.map +1 -1
- package/dist/cli/lib/surgeons/registry.js.map +1 -1
- package/dist/cli/lib/target-architecture.d.ts +12 -3
- package/dist/cli/lib/target-architecture.d.ts.map +1 -1
- package/dist/cli/lib/target-architecture.js +108 -8
- package/dist/cli/lib/target-architecture.js.map +1 -1
- package/dist/cli/lib/trace.d.ts +2 -1
- package/dist/cli/lib/trace.d.ts.map +1 -1
- package/dist/cli/lib/trace.js +21 -27
- package/dist/cli/lib/trace.js.map +1 -1
- package/dist/cli/lib/upgrade-apply.js +7 -7
- package/dist/cli/lib/verification-plan.d.ts +22 -0
- package/dist/cli/lib/verification-plan.d.ts.map +1 -0
- package/dist/cli/lib/verification-plan.js +26 -0
- package/dist/cli/lib/verification-plan.js.map +1 -0
- package/dist/cli/lib/verify-defensive-phase.d.ts +2 -13
- package/dist/cli/lib/verify-defensive-phase.d.ts.map +1 -1
- package/dist/cli/lib/verify-defensive-phase.js +11 -11
- package/dist/cli/lib/verify-defensive-phase.js.map +1 -1
- package/dist/cli/lib/verify-engine.d.ts +4 -36
- package/dist/cli/lib/verify-engine.d.ts.map +1 -1
- package/dist/cli/lib/verify-engine.js +28 -24
- package/dist/cli/lib/verify-engine.js.map +1 -1
- package/dist/cli/lib/verify-export.d.ts +1 -1
- package/dist/cli/lib/verify-export.d.ts.map +1 -1
- package/dist/cli/lib/verify-export.js +27 -17
- package/dist/cli/lib/verify-export.js.map +1 -1
- package/dist/cli/lib/verify-failure-normalize.d.ts +5 -10
- package/dist/cli/lib/verify-failure-normalize.d.ts.map +1 -1
- package/dist/cli/lib/verify-failure-normalize.js +128 -13
- package/dist/cli/lib/verify-failure-normalize.js.map +1 -1
- package/dist/cli/lib/verify-failure.d.ts +57 -0
- package/dist/cli/lib/verify-failure.d.ts.map +1 -0
- package/dist/cli/lib/verify-failure.js +2 -0
- package/dist/cli/lib/verify-failure.js.map +1 -0
- package/dist/cli/lib/verify-finding.d.ts +16 -0
- package/dist/cli/lib/verify-finding.d.ts.map +1 -0
- package/dist/cli/lib/verify-finding.js +11 -0
- package/dist/cli/lib/verify-finding.js.map +1 -0
- package/dist/cli/lib/verify-hints.d.ts +5 -18
- package/dist/cli/lib/verify-hints.d.ts.map +1 -1
- package/dist/cli/lib/verify-hints.js +40 -61
- package/dist/cli/lib/verify-hints.js.map +1 -1
- package/dist/cli/lib/verify-payload.d.ts +39 -2
- package/dist/cli/lib/verify-payload.d.ts.map +1 -1
- package/dist/cli/lib/verify-payload.js +1 -1
- package/dist/cli/lib/verify-payload.js.map +1 -1
- package/dist/cli/lib/verify-presenters.d.ts +3 -0
- package/dist/cli/lib/verify-presenters.d.ts.map +1 -1
- package/dist/cli/lib/verify-presenters.js +18 -5
- package/dist/cli/lib/verify-presenters.js.map +1 -1
- package/dist/cli/lib/verify-run.d.ts +0 -2
- package/dist/cli/lib/verify-run.d.ts.map +1 -1
- package/dist/cli/lib/verify-run.js +2 -2
- package/dist/cli/lib/version.gen.d.ts +1 -1
- package/dist/cli/lib/version.gen.js +1 -1
- package/dist/cli/program-blueprint.d.ts +3 -0
- package/dist/cli/program-blueprint.d.ts.map +1 -0
- package/dist/cli/program-blueprint.js +12 -0
- package/dist/cli/program-blueprint.js.map +1 -0
- package/dist/cli/program-core.d.ts.map +1 -1
- package/dist/cli/program-core.js +5 -1
- package/dist/cli/program-core.js.map +1 -1
- package/dist/cli/program-workflow.d.ts.map +1 -1
- package/dist/cli/program-workflow.js +19 -1
- package/dist/cli/program-workflow.js.map +1 -1
- package/dist/cli/program.d.ts.map +1 -1
- package/dist/cli/program.js +2 -0
- package/dist/cli/program.js.map +1 -1
- package/package.json +1 -1
- package/templates/.gitagent/foreman/SUBSTRATE.version.json +1 -1
- package/templates/integrations/compatibility.json +1 -1
- package/dist/cli/lib/verify-failure-normalize-phases.d.ts +0 -9
- package/dist/cli/lib/verify-failure-normalize-phases.d.ts.map +0 -1
- package/dist/cli/lib/verify-failure-normalize-phases.js +0 -84
- package/dist/cli/lib/verify-failure-normalize-phases.js.map +0 -1
- package/dist/cli/lib/verify-payload-types.d.ts +0 -36
- package/dist/cli/lib/verify-payload-types.d.ts.map +0 -1
- package/dist/cli/lib/verify-payload-types.js +0 -2
- package/dist/cli/lib/verify-payload-types.js.map +0 -1
- package/dist/cli/lib/verify-presentation.d.ts +0 -15
- package/dist/cli/lib/verify-presentation.d.ts.map +0 -1
- package/dist/cli/lib/verify-presentation.js +0 -12
- package/dist/cli/lib/verify-presentation.js.map +0 -1
|
@@ -4,7 +4,7 @@ import YAML from "yaml";
|
|
|
4
4
|
import { CLI_NAME, DEFAULT_ACTIVE_MISSION, DEFAULT_KPI_REPORT_DIR, LEGISLATE_TRACE_PLACEHOLDER, MSN_ID_PATTERN, REL_MISSION_SCHEMA } from "../constants.js";
|
|
5
5
|
import { readEnvWithLegacy } from "../config-namespace.js";
|
|
6
6
|
import { formatRepoRelative } from "../cli-io.js";
|
|
7
|
-
import {
|
|
7
|
+
import { GantryUserError } from "../errors.js";
|
|
8
8
|
import { hintMissionNoGate } from "../fix-hints.js";
|
|
9
9
|
import { normalizeTraceStatus } from "../trace.js";
|
|
10
10
|
import { assertMissionSchemaValid } from "./validator.js";
|
|
@@ -213,7 +213,7 @@ export function parseMissionFile(root, filePath) {
|
|
|
213
213
|
}
|
|
214
214
|
export function assertMissionGatePresent(mission) {
|
|
215
215
|
if (!mission.gate?.command?.trim()) {
|
|
216
|
-
throw new
|
|
216
|
+
throw new GantryUserError("MISSION_NO_GATE", `${CLI_NAME} verify: MISSION_NO_GATE — no deterministic gate (Command) found in ${mission.rawPath}`, hintMissionNoGate(mission.rawPath));
|
|
217
217
|
}
|
|
218
218
|
}
|
|
219
219
|
const ACTIVE_MISSION_YAML = ".gitagent/missions/ACTIVE_MISSION.yaml";
|
|
@@ -257,7 +257,7 @@ export function resolveMissionPathRequired(repoRoot, options = {}) {
|
|
|
257
257
|
const abs = resolveMissionFilePath(repoRoot, explicit);
|
|
258
258
|
if (fs.existsSync(abs))
|
|
259
259
|
return abs;
|
|
260
|
-
throw new
|
|
260
|
+
throw new GantryUserError(options.errorCode ?? "MISSION_NOT_FOUND", `gantry: mission not found at ${explicit}`);
|
|
261
261
|
}
|
|
262
262
|
const rel = resolvePinnedMission(repoRoot, { ...options, profile: "upgrade_apply" });
|
|
263
263
|
if (rel) {
|
|
@@ -265,7 +265,7 @@ export function resolveMissionPathRequired(repoRoot, options = {}) {
|
|
|
265
265
|
if (fs.existsSync(abs))
|
|
266
266
|
return abs;
|
|
267
267
|
}
|
|
268
|
-
throw new
|
|
268
|
+
throw new GantryUserError("UPGRADE_MISSION_REQUIRED", "gantry upgrade --apply: pass --mission <path> to the signed upgrade mission YAML", "Example: gantry upgrade --apply --mission .gitagent/missions/MSN-9001.upgrade-v0.8.1.yaml");
|
|
269
269
|
}
|
|
270
270
|
export function formatResolvedMissionRel(repoRoot, absPath) {
|
|
271
271
|
return formatRepoRelative(repoRoot, absPath);
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import type { GxtErrorCode } from "../gxt-error-codes.js";
|
|
2
|
-
import type { VerifyPhaseFailure } from "../verify-engine.js";
|
|
2
|
+
import type { GateFailure, VerifyPhaseFailure } from "../verify-engine.js";
|
|
3
3
|
import type { Manifest } from "../types.js";
|
|
4
4
|
export interface SurgeonMutationResult {
|
|
5
5
|
mutated: boolean;
|
|
6
6
|
summary: string;
|
|
7
7
|
}
|
|
8
|
+
/** Surgeons operate exclusively on gate failures (they parse gate output). */
|
|
8
9
|
export interface SurgeonContext {
|
|
9
10
|
root: string;
|
|
10
|
-
failure:
|
|
11
|
+
failure: GateFailure;
|
|
11
12
|
manifest: Manifest;
|
|
12
13
|
executorLogPath: string;
|
|
13
14
|
errorCode: GxtErrorCode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/cli/lib/surgeons/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAI1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/cli/lib/surgeons/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAI1D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,8EAA8E;AAC9E,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,YAAY,CAAC;IACxB,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACxE;AAID,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,GAAG,SAAS,CAElF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI,CAaxF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/cli/lib/surgeons/registry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAG/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/cli/lib/surgeons/registry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAG/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAqBvD,MAAM,QAAQ,GAAkB,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;AAE1E,MAAM,UAAU,sBAAsB,CAAC,IAAkB;IACvD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,OAA2B;IACjE,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,GAAG,MAAM,KAAK,MAAM,EAAE,CAAC;IAExC,IAAI,8BAA8B,CAAC,MAAM,CAAC,IAAI,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAC;QACrF,OAAO,SAAS,CAAC,sBAAsB,CAAC;IAC1C,CAAC;IACD,IAAI,+BAA+B,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpF,OAAO,SAAS,CAAC,sBAAsB,CAAC;IAC1C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export declare const TARGET_ARCHITECTURE_FILENAME: "TARGET_ARCHITECTURE.yaml";
|
|
2
|
-
export declare const TARGET_ARCHITECTURE_SCHEMA_VERSION: "0.2.0";
|
|
3
2
|
export declare const TARGET_ARCHITECTURE_LEGACY_SCHEMA_VERSION: "0.1.0";
|
|
4
|
-
export declare const
|
|
3
|
+
export declare const TARGET_ARCHITECTURE_SCHEMA_VERSION: "0.2.0";
|
|
4
|
+
export declare const TARGET_ARCHITECTURE_V3_SCHEMA_VERSION: "0.3.0";
|
|
5
|
+
export declare const SUPPORTED_TARGET_ARCHITECTURE_SCHEMA_VERSIONS: readonly ["0.1.0", "0.2.0", "0.3.0"];
|
|
5
6
|
export type TargetArchitectureSchemaVersion = (typeof SUPPORTED_TARGET_ARCHITECTURE_SCHEMA_VERSIONS)[number];
|
|
6
7
|
export interface ArchLayerSpec {
|
|
7
8
|
id: string;
|
|
@@ -13,9 +14,15 @@ export interface ArchRuleSpec {
|
|
|
13
14
|
forbid_import_layer?: string;
|
|
14
15
|
forbid_specifier_substring?: string;
|
|
15
16
|
forbid_resolved_path_substring?: string;
|
|
17
|
+
/** Schema 0.3.0: glob(s) for pattern rules (content domain). */
|
|
18
|
+
applies_to?: string[];
|
|
19
|
+
forbid_pattern?: string;
|
|
20
|
+
require_pattern?: string;
|
|
16
21
|
}
|
|
17
22
|
export interface TargetArchitectureSpec {
|
|
18
23
|
schema_version: TargetArchitectureSchemaVersion;
|
|
24
|
+
/** Schema 0.3.0: domain adapter key (code | content). */
|
|
25
|
+
domain?: string;
|
|
19
26
|
/** Explicit scan roots (schema 0.2.0+). When absent, derived from layer globs. */
|
|
20
27
|
scan_roots?: string[];
|
|
21
28
|
/** Supported languages for boundary checks (default: typescript). */
|
|
@@ -48,5 +55,7 @@ export declare function checkArchBoundariesForFiles(spec: TargetArchitectureSpec
|
|
|
48
55
|
export declare function runArchCheck(repoRoot: string, files: readonly string[], options?: {
|
|
49
56
|
manifestTmvcRoots?: readonly string[];
|
|
50
57
|
}): ArchCheckResult;
|
|
51
|
-
export declare function formatArchCheckHuman(result: ArchCheckResult): string;
|
|
58
|
+
export declare function formatArchCheckHuman(result: ArchCheckResult, label?: "arch" | "perimeter"): string;
|
|
59
|
+
/** Walk all files under scan_roots for the spec's domain. */
|
|
60
|
+
export declare function walkPerimeterFiles(repoRoot: string, spec: TargetArchitectureSpec): string[];
|
|
52
61
|
//# sourceMappingURL=target-architecture.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-architecture.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/target-architecture.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"target-architecture.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/target-architecture.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,16 @@ import { CLI_NAME } from "./constants.js";
|
|
|
5
5
|
import { toPosixRel } from "./cli-io.js";
|
|
6
6
|
import { normalizeRepoRelativePath } from "./tmvc-path.js";
|
|
7
7
|
import { extractBindingsFromSnippet, extractImportsWithMeta, } from "./import-scanner.js";
|
|
8
|
+
import { walkDomainFiles } from "./discovery-scanner.js";
|
|
9
|
+
import { getDomainAdapter } from "./domains/index.js";
|
|
8
10
|
export const TARGET_ARCHITECTURE_FILENAME = "TARGET_ARCHITECTURE.yaml";
|
|
9
|
-
export const TARGET_ARCHITECTURE_SCHEMA_VERSION = "0.2.0";
|
|
10
11
|
export const TARGET_ARCHITECTURE_LEGACY_SCHEMA_VERSION = "0.1.0";
|
|
12
|
+
export const TARGET_ARCHITECTURE_SCHEMA_VERSION = "0.2.0";
|
|
13
|
+
export const TARGET_ARCHITECTURE_V3_SCHEMA_VERSION = "0.3.0";
|
|
11
14
|
export const SUPPORTED_TARGET_ARCHITECTURE_SCHEMA_VERSIONS = [
|
|
12
15
|
TARGET_ARCHITECTURE_LEGACY_SCHEMA_VERSION,
|
|
13
16
|
TARGET_ARCHITECTURE_SCHEMA_VERSION,
|
|
17
|
+
TARGET_ARCHITECTURE_V3_SCHEMA_VERSION,
|
|
14
18
|
];
|
|
15
19
|
function globMatches(repoRel, glob) {
|
|
16
20
|
const norm = normalizeRepoRelativePath(repoRel);
|
|
@@ -83,7 +87,12 @@ export function targetArchitectureMigrationHint(version) {
|
|
|
83
87
|
/** Derive scan roots from spec layers or optional manifest TMVC fallback. */
|
|
84
88
|
export function resolveArchScanRoots(spec, manifestTmvcRoots) {
|
|
85
89
|
if (spec.scan_roots && spec.scan_roots.length > 0) {
|
|
86
|
-
return spec.scan_roots.map(
|
|
90
|
+
return spec.scan_roots.map((root) => {
|
|
91
|
+
const norm = normalizeRepoRelativePath(root);
|
|
92
|
+
if (norm.includes("*"))
|
|
93
|
+
return norm;
|
|
94
|
+
return `${norm.replace(/\/$/, "")}/**`;
|
|
95
|
+
});
|
|
87
96
|
}
|
|
88
97
|
const fromLayers = spec.layers.flatMap((layer) => layer.globs.map(normalizeRepoRelativePath));
|
|
89
98
|
if (fromLayers.length > 0)
|
|
@@ -105,8 +114,75 @@ function fileMatchesScanRoots(repoRel, scanRoots) {
|
|
|
105
114
|
const norm = normalizeRepoRelativePath(repoRel);
|
|
106
115
|
return scanRoots.some((root) => globMatches(norm, root));
|
|
107
116
|
}
|
|
108
|
-
function
|
|
117
|
+
function fileMatchesAppliesTo(repoRel, appliesTo, scanRoots) {
|
|
118
|
+
if (appliesTo && appliesTo.length > 0) {
|
|
119
|
+
return appliesTo.some((g) => globMatches(repoRel, g));
|
|
120
|
+
}
|
|
121
|
+
return fileMatchesScanRoots(repoRel, scanRoots);
|
|
122
|
+
}
|
|
123
|
+
function isImportRule(rule) {
|
|
124
|
+
return (rule.forbid_import_layer != null ||
|
|
125
|
+
rule.forbid_specifier_substring != null ||
|
|
126
|
+
rule.forbid_resolved_path_substring != null);
|
|
127
|
+
}
|
|
128
|
+
function isPatternRule(rule) {
|
|
129
|
+
return rule.forbid_pattern != null || rule.require_pattern != null;
|
|
130
|
+
}
|
|
131
|
+
function shouldEvaluateImportRules(spec) {
|
|
132
|
+
const domain = spec.domain?.toLowerCase();
|
|
133
|
+
return domain == null || domain === "" || domain === "code";
|
|
134
|
+
}
|
|
135
|
+
function compilePerimeterPattern(pattern) {
|
|
136
|
+
try {
|
|
137
|
+
if (pattern.startsWith("(?i)")) {
|
|
138
|
+
return new RegExp(pattern.slice(4), "im");
|
|
139
|
+
}
|
|
140
|
+
return new RegExp(pattern, "m");
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
function findPatternMatchLine(body, pattern) {
|
|
147
|
+
const re = compilePerimeterPattern(pattern);
|
|
148
|
+
if (!re)
|
|
149
|
+
return null;
|
|
150
|
+
const m = re.exec(body);
|
|
151
|
+
if (!m || m.index == null)
|
|
152
|
+
return null;
|
|
153
|
+
const before = body.slice(0, m.index);
|
|
154
|
+
const line = before.split(/\r?\n/).length;
|
|
155
|
+
const lastNl = before.lastIndexOf("\n");
|
|
156
|
+
const column = m.index - (lastNl === -1 ? 0 : lastNl + 1) + 1;
|
|
157
|
+
return { line, column, match: m[0] ?? "" };
|
|
158
|
+
}
|
|
159
|
+
function checkPatternRulesForFile(violations, repoRel, body, rules, scanRoots) {
|
|
160
|
+
for (const rule of rules) {
|
|
161
|
+
if (!isPatternRule(rule))
|
|
162
|
+
continue;
|
|
163
|
+
if (!fileMatchesAppliesTo(repoRel, rule.applies_to, scanRoots))
|
|
164
|
+
continue;
|
|
165
|
+
if (rule.forbid_pattern) {
|
|
166
|
+
const hit = findPatternMatchLine(body, rule.forbid_pattern);
|
|
167
|
+
if (hit) {
|
|
168
|
+
recordViolation(violations, repoRel, rule.id, hit.match, [], hit.line, hit.column);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
if (rule.require_pattern) {
|
|
172
|
+
const hit = findPatternMatchLine(body, rule.require_pattern);
|
|
173
|
+
if (!hit) {
|
|
174
|
+
recordViolation(violations, repoRel, rule.id, `(missing: ${rule.require_pattern})`, [], 1, 1);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
function fileMatchesLanguage(repoRel, languages, domain) {
|
|
109
180
|
const norm = normalizeRepoRelativePath(repoRel).toLowerCase();
|
|
181
|
+
if (domain === "content") {
|
|
182
|
+
return /\.(md|html|htm|txt|json)$/i.test(norm);
|
|
183
|
+
}
|
|
184
|
+
if (languages.includes("typescript") && /\.tsx?$/i.test(norm))
|
|
185
|
+
return true;
|
|
110
186
|
if (languages.includes("typescript") && norm.endsWith(".ts"))
|
|
111
187
|
return true;
|
|
112
188
|
return false;
|
|
@@ -125,6 +201,7 @@ export function validateTargetArchitecture(raw) {
|
|
|
125
201
|
}
|
|
126
202
|
const scan_roots = parseStringArrayField(o.scan_roots, "scan_roots");
|
|
127
203
|
const languages = parseStringArrayField(o.languages, "languages");
|
|
204
|
+
const domain = typeof o.domain === "string" ? o.domain.trim() : undefined;
|
|
128
205
|
const layers = o.layers.map((layer, i) => {
|
|
129
206
|
if (layer == null || typeof layer !== "object") {
|
|
130
207
|
throw new Error(`TARGET_ARCHITECTURE.yaml: layers[${String(i)}] invalid`);
|
|
@@ -159,10 +236,16 @@ export function validateTargetArchitecture(raw) {
|
|
|
159
236
|
...(r.forbid_resolved_path_substring != null
|
|
160
237
|
? { forbid_resolved_path_substring: String(r.forbid_resolved_path_substring) }
|
|
161
238
|
: {}),
|
|
239
|
+
...(parseStringArrayField(r.applies_to, "applies_to")
|
|
240
|
+
? { applies_to: parseStringArrayField(r.applies_to, "applies_to") }
|
|
241
|
+
: {}),
|
|
242
|
+
...(r.forbid_pattern != null ? { forbid_pattern: String(r.forbid_pattern) } : {}),
|
|
243
|
+
...(r.require_pattern != null ? { require_pattern: String(r.require_pattern) } : {}),
|
|
162
244
|
};
|
|
163
245
|
});
|
|
164
246
|
return {
|
|
165
247
|
schema_version,
|
|
248
|
+
...(domain ? { domain } : {}),
|
|
166
249
|
...(scan_roots ? { scan_roots } : {}),
|
|
167
250
|
...(languages ? { languages } : {}),
|
|
168
251
|
layers,
|
|
@@ -185,23 +268,29 @@ export function checkArchBoundariesForFiles(spec, repoRoot, files, options = {})
|
|
|
185
268
|
const root = path.resolve(repoRoot);
|
|
186
269
|
const scanRoots = resolveArchScanRoots(spec, options.manifestTmvcRoots);
|
|
187
270
|
const languages = resolveArchLanguages(spec);
|
|
271
|
+
const evaluateImports = shouldEvaluateImportRules(spec);
|
|
188
272
|
for (const file of files) {
|
|
189
273
|
const abs = path.isAbsolute(file) ? path.resolve(file) : path.join(root, file);
|
|
190
274
|
const repoRel = toPosixRel(root, abs);
|
|
191
275
|
if (!fileMatchesScanRoots(repoRel, scanRoots))
|
|
192
276
|
continue;
|
|
193
|
-
if (!fileMatchesLanguage(repoRel, languages))
|
|
277
|
+
if (!fileMatchesLanguage(repoRel, languages, spec.domain))
|
|
194
278
|
continue;
|
|
195
279
|
if (!fs.existsSync(abs))
|
|
196
280
|
continue;
|
|
197
|
-
const fromLayer = layerForFile(spec, repoRel);
|
|
198
281
|
const src = fs.readFileSync(abs, "utf8");
|
|
282
|
+
checkPatternRulesForFile(violations, repoRel, src, spec.rules, scanRoots);
|
|
283
|
+
if (!evaluateImports)
|
|
284
|
+
continue;
|
|
285
|
+
const fromLayer = layerForFile(spec, repoRel);
|
|
199
286
|
const imports = extractImportsWithMeta(src, true);
|
|
200
287
|
for (const imp of imports) {
|
|
201
288
|
const bindings = extractBindingsFromSnippet(imp.snippet);
|
|
202
289
|
const resolved = resolveImportPath(repoRel, imp.spec);
|
|
203
290
|
const targetLayer = resolved ? layerForFile(spec, resolved) : "other";
|
|
204
291
|
for (const rule of spec.rules) {
|
|
292
|
+
if (!isImportRule(rule))
|
|
293
|
+
continue;
|
|
205
294
|
if (rule.from_layer !== fromLayer)
|
|
206
295
|
continue;
|
|
207
296
|
if (rule.forbid_import_layer && targetLayer === rule.forbid_import_layer) {
|
|
@@ -224,10 +313,21 @@ export function runArchCheck(repoRoot, files, options = {}) {
|
|
|
224
313
|
const absFiles = files.map((f) => path.isAbsolute(f) ? f : path.join(repoRoot, f.replace(/\\/g, path.sep)));
|
|
225
314
|
return checkArchBoundariesForFiles(spec, repoRoot, absFiles, options);
|
|
226
315
|
}
|
|
227
|
-
export function formatArchCheckHuman(result) {
|
|
316
|
+
export function formatArchCheckHuman(result, label = "arch") {
|
|
228
317
|
if (result.ok)
|
|
229
|
-
return `${CLI_NAME}
|
|
318
|
+
return `${CLI_NAME} ${label} check: OK`;
|
|
230
319
|
const lines = result.violations.map((v) => `${v.file}:${String(v.line)}:${String(v.column)} ${v.rule_id} ${v.module_specifier}`);
|
|
231
|
-
return [`${CLI_NAME}
|
|
320
|
+
return [`${CLI_NAME} ${label} check: ${String(result.violations.length)} violation(s)`, ...lines].join("\n");
|
|
321
|
+
}
|
|
322
|
+
/** Walk all files under scan_roots for the spec's domain. */
|
|
323
|
+
export function walkPerimeterFiles(repoRoot, spec) {
|
|
324
|
+
const domain = spec.domain?.toLowerCase() ?? "code";
|
|
325
|
+
const adapter = getDomainAdapter(domain);
|
|
326
|
+
const scanRoots = resolveArchScanRoots(spec);
|
|
327
|
+
const all = walkDomainFiles(repoRoot, adapter.fileExtensions);
|
|
328
|
+
return all.filter((abs) => {
|
|
329
|
+
const rel = toPosixRel(repoRoot, abs);
|
|
330
|
+
return fileMatchesScanRoots(rel, scanRoots);
|
|
331
|
+
});
|
|
232
332
|
}
|
|
233
333
|
//# sourceMappingURL=target-architecture.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-architecture.js","sourceRoot":"","sources":["../../../src/cli/lib/target-architecture.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"target-architecture.js","sourceRoot":"","sources":["../../../src/cli/lib/target-architecture.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/lib/trace.d.ts
CHANGED
|
@@ -7,7 +7,6 @@ export declare function isPassStatus(status: NormalizedTraceStatus): boolean;
|
|
|
7
7
|
export declare function isPendingStatus(status: NormalizedTraceStatus): boolean;
|
|
8
8
|
/** Typed trace verification failure — control flow must branch on this, not UI strings. */
|
|
9
9
|
export type TraceFailureKind = "ambiguous" | "quote_missing" | "executor_log_missing" | "placeholder_quote" | "strict_line_drift" | "empty_quote" | "anchor_mismatch" | "stale_evidence" | "other";
|
|
10
|
-
export declare function classifyTraceFailure(reason: string, traceQuote: string, strictTrace: boolean): TraceFailureKind;
|
|
11
10
|
export declare const UNCOMMITTED_BLAME_COMMIT = "0000000000000000000000000000000000000000";
|
|
12
11
|
export interface TraceEvidenceFailure {
|
|
13
12
|
row: TraceRow;
|
|
@@ -28,6 +27,8 @@ export declare function verifyTraceEvidenceFreshness(repoRoot: string, manifest:
|
|
|
28
27
|
};
|
|
29
28
|
export interface TraceVerifyFailure {
|
|
30
29
|
row: TraceRow;
|
|
30
|
+
/** Set at construction — every failure site knows its own kind. */
|
|
31
|
+
kind: TraceFailureKind;
|
|
31
32
|
reason: string;
|
|
32
33
|
}
|
|
33
34
|
export interface TraceVerifyWarning {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/trace.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/trace.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/lib/trace.js
CHANGED
|
@@ -2,7 +2,7 @@ import path from "node:path";
|
|
|
2
2
|
import { LEGISLATE_TRACE_PLACEHOLDER, EXECUTOR_LOG_FILENAME } from "./constants.js";
|
|
3
3
|
import { toPosixRel } from "./cli-io.js";
|
|
4
4
|
import { gitDiffNameOnlySinceCommit, gitRun } from "./git.js";
|
|
5
|
-
import {
|
|
5
|
+
import { quoteLineNumbers, buildExecutorLogLineMapForQuotes } from "./executor-log-line-map.js";
|
|
6
6
|
import { tmvcRootsForSkill } from "./tmvc-path.js";
|
|
7
7
|
export function normalizeTraceStatus(status) {
|
|
8
8
|
const upper = status.trim().toUpperCase();
|
|
@@ -20,27 +20,8 @@ export function isPassStatus(status) {
|
|
|
20
20
|
export function isPendingStatus(status) {
|
|
21
21
|
return status === "PENDING";
|
|
22
22
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
return "executor_log_missing";
|
|
26
|
-
if (reason.includes("Ambiguous"))
|
|
27
|
-
return "ambiguous";
|
|
28
|
-
if (reason.includes("not found verbatim")) {
|
|
29
|
-
if (traceQuote.trim() === LEGISLATE_TRACE_PLACEHOLDER)
|
|
30
|
-
return "placeholder_quote";
|
|
31
|
-
return "quote_missing";
|
|
32
|
-
}
|
|
33
|
-
if (reason.includes("PASS row has empty"))
|
|
34
|
-
return "empty_quote";
|
|
35
|
-
if (strictTrace && isLineDriftFailure(reason))
|
|
36
|
-
return "strict_line_drift";
|
|
37
|
-
if (reason.includes("Trace quote not on anchored line") ||
|
|
38
|
-
reason.includes("No line contains both anchor")) {
|
|
39
|
-
return "anchor_mismatch";
|
|
40
|
-
}
|
|
41
|
-
if (reason.startsWith("Trace STALE"))
|
|
42
|
-
return "stale_evidence";
|
|
43
|
-
return "other";
|
|
23
|
+
function missingQuoteKind(traceQuote) {
|
|
24
|
+
return traceQuote.trim() === LEGISLATE_TRACE_PLACEHOLDER ? "placeholder_quote" : "quote_missing";
|
|
44
25
|
}
|
|
45
26
|
export const UNCOMMITTED_BLAME_COMMIT = "0000000000000000000000000000000000000000";
|
|
46
27
|
function executorLogRelPath(executorLogPath, repoRoot) {
|
|
@@ -192,11 +173,12 @@ function verifyNumericAnchorExact(map, row, lineNumber) {
|
|
|
192
173
|
if (line === undefined) {
|
|
193
174
|
return {
|
|
194
175
|
row,
|
|
176
|
+
kind: "strict_line_drift",
|
|
195
177
|
reason: `Anchor line ${lineNumber} out of range (file has ${map.lines.length} lines)`,
|
|
196
178
|
};
|
|
197
179
|
}
|
|
198
180
|
if (!line.includes(row.traceQuote)) {
|
|
199
|
-
return { row, reason: `Trace quote not on anchored line ${lineNumber}` };
|
|
181
|
+
return { row, kind: "strict_line_drift", reason: `Trace quote not on anchored line ${lineNumber}` };
|
|
200
182
|
}
|
|
201
183
|
return null;
|
|
202
184
|
}
|
|
@@ -204,7 +186,11 @@ function resolveDriftFromMap(map, row, lineNumber) {
|
|
|
204
186
|
const matches = quoteLineNumbers(map, row.traceQuote);
|
|
205
187
|
if (matches.length === 0) {
|
|
206
188
|
return {
|
|
207
|
-
failure: {
|
|
189
|
+
failure: {
|
|
190
|
+
row,
|
|
191
|
+
kind: missingQuoteKind(row.traceQuote),
|
|
192
|
+
reason: "Trace quote not found verbatim in EXECUTOR_LOG.md",
|
|
193
|
+
},
|
|
208
194
|
warning: null,
|
|
209
195
|
};
|
|
210
196
|
}
|
|
@@ -218,6 +204,7 @@ function resolveDriftFromMap(map, row, lineNumber) {
|
|
|
218
204
|
return {
|
|
219
205
|
failure: {
|
|
220
206
|
row,
|
|
207
|
+
kind: "ambiguous",
|
|
221
208
|
reason: `Ambiguous trace quote: found on lines ${matches.join(", ")}; re-run a clean flight`,
|
|
222
209
|
},
|
|
223
210
|
warning: null,
|
|
@@ -234,6 +221,7 @@ function verifyFreeformAnchor(map, row, anchor) {
|
|
|
234
221
|
if (!found) {
|
|
235
222
|
return {
|
|
236
223
|
row,
|
|
224
|
+
kind: "anchor_mismatch",
|
|
237
225
|
reason: `No line contains both anchor "${anchor}" and trace quote`,
|
|
238
226
|
};
|
|
239
227
|
}
|
|
@@ -250,6 +238,7 @@ export function verifyTraceRows(executorLogPath, rows, options = {}) {
|
|
|
250
238
|
return {
|
|
251
239
|
failures: passRows.map((row) => ({
|
|
252
240
|
row,
|
|
241
|
+
kind: "executor_log_missing",
|
|
253
242
|
reason: `EXECUTOR_LOG missing: ${executorLogPath}`,
|
|
254
243
|
})),
|
|
255
244
|
warnings: [],
|
|
@@ -261,11 +250,15 @@ export function verifyTraceRows(executorLogPath, rows, options = {}) {
|
|
|
261
250
|
const warnings = [];
|
|
262
251
|
for (const row of passRows) {
|
|
263
252
|
if (!row.traceQuote.trim()) {
|
|
264
|
-
failures.push({ row, reason: "PASS row has empty trace quote" });
|
|
253
|
+
failures.push({ row, kind: "empty_quote", reason: "PASS row has empty trace quote" });
|
|
265
254
|
continue;
|
|
266
255
|
}
|
|
267
256
|
if (!map.content.includes(row.traceQuote)) {
|
|
268
|
-
failures.push({
|
|
257
|
+
failures.push({
|
|
258
|
+
row,
|
|
259
|
+
kind: missingQuoteKind(row.traceQuote),
|
|
260
|
+
reason: "Trace quote not found verbatim in EXECUTOR_LOG.md",
|
|
261
|
+
});
|
|
269
262
|
continue;
|
|
270
263
|
}
|
|
271
264
|
const anchor = row.anchor.trim();
|
|
@@ -282,7 +275,8 @@ export function verifyTraceRows(executorLogPath, rows, options = {}) {
|
|
|
282
275
|
const exactFailure = verifyNumericAnchorExact(map, row, lineNumber);
|
|
283
276
|
if (exactFailure === null)
|
|
284
277
|
continue;
|
|
285
|
-
|
|
278
|
+
// Exact numeric-anchor failures are always line drift; auto-fuzzy retries them.
|
|
279
|
+
if (autoFuzzy) {
|
|
286
280
|
const { failure, warning } = resolveDriftFromMap(map, row, lineNumber);
|
|
287
281
|
if (failure)
|
|
288
282
|
failures.push(failure);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/cli/lib/trace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/cli/lib/trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ import { assertMcpSubstrateUpgradeWritePaths, McpWriteDeniedError } from "./mcp-
|
|
|
14
14
|
import { loadManifest } from "./manifest.js";
|
|
15
15
|
import { writeSubstrateVersionFile } from "./substrate-version.js";
|
|
16
16
|
import { parseUpgradePayloadFromMissionBody, REL_UPGRADE_TMP, } from "./upgrade-plan.js";
|
|
17
|
-
import {
|
|
17
|
+
import { GantryUserError } from "./errors.js";
|
|
18
18
|
export const REL_UPGRADE_APPLY_TMP = ".gitagent/.upgrade-apply-tmp";
|
|
19
19
|
function sha256File(absPath) {
|
|
20
20
|
return crypto.createHash("sha256").update(fs.readFileSync(absPath)).digest("hex");
|
|
@@ -22,20 +22,20 @@ function sha256File(absPath) {
|
|
|
22
22
|
function verifyStagedHashes(repoRoot, payload) {
|
|
23
23
|
const tmpRoot = path.join(repoRoot, fromPosix(REL_UPGRADE_TMP));
|
|
24
24
|
if (!fs.existsSync(tmpRoot)) {
|
|
25
|
-
throw new
|
|
25
|
+
throw new GantryUserError("UPGRADE_STAGING_MISSING", `${CLI_NAME} upgrade --apply: staging directory missing at ${REL_UPGRADE_TMP}/ — re-run gantry upgrade`, `Run \`gantry upgrade\` to regenerate staged files before apply.`);
|
|
26
26
|
}
|
|
27
27
|
const entries = Object.entries(payload.staged_hashes);
|
|
28
28
|
if (entries.length === 0) {
|
|
29
|
-
throw new
|
|
29
|
+
throw new GantryUserError("UPGRADE_EMPTY_MANIFEST", `${CLI_NAME} upgrade --apply: upgrade_payload.staged_hashes is empty`);
|
|
30
30
|
}
|
|
31
31
|
for (const [relPath, expectedHash] of entries) {
|
|
32
32
|
const stageAbs = path.join(tmpRoot, fromPosix(relPath));
|
|
33
33
|
if (!fs.existsSync(stageAbs)) {
|
|
34
|
-
throw new
|
|
34
|
+
throw new GantryUserError("UPGRADE_STAGING_DRIFT", `${CLI_NAME} upgrade --apply: missing staged file ${relPath} under ${REL_UPGRADE_TMP}/`, "Re-run gantry upgrade to regenerate staging after mission was signed.");
|
|
35
35
|
}
|
|
36
36
|
const actual = sha256File(stageAbs);
|
|
37
37
|
if (actual !== expectedHash) {
|
|
38
|
-
throw new
|
|
38
|
+
throw new GantryUserError("UPGRADE_HASH_MISMATCH", `${CLI_NAME} upgrade --apply: staged file hash mismatch for ${relPath}`, "Staging directory was modified after plan. Re-run gantry upgrade and re-sign the mission.");
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -78,7 +78,7 @@ export async function runUpgradeApply(options) {
|
|
|
78
78
|
payload = parseUpgradePayloadFromMissionBody(missionBody);
|
|
79
79
|
}
|
|
80
80
|
catch (e) {
|
|
81
|
-
throw new
|
|
81
|
+
throw new GantryUserError("UPGRADE_INVALID_MISSION", errorMessage(e));
|
|
82
82
|
}
|
|
83
83
|
try {
|
|
84
84
|
assertPlannerMissionProof(repoRoot, missionAbs);
|
|
@@ -95,7 +95,7 @@ export async function runUpgradeApply(options) {
|
|
|
95
95
|
}
|
|
96
96
|
catch (e) {
|
|
97
97
|
if (e instanceof McpWriteDeniedError) {
|
|
98
|
-
throw new
|
|
98
|
+
throw new GantryUserError(e.code, e.message, e.hint);
|
|
99
99
|
}
|
|
100
100
|
throw e;
|
|
101
101
|
}
|