@jeger-ai/opengantry 1.1.1 → 2.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 +8 -2
- package/dist/cli/commands/arch.js +7 -7
- package/dist/cli/commands/arch.js.map +1 -1
- package/dist/cli/commands/check-imports.d.ts +7 -0
- package/dist/cli/commands/check-imports.d.ts.map +1 -0
- package/dist/cli/commands/check-imports.js +33 -0
- package/dist/cli/commands/check-imports.js.map +1 -0
- package/dist/cli/commands/doctor.js +2 -2
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/init.js +5 -5
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/metrics.js +2 -2
- package/dist/cli/commands/metrics.js.map +1 -1
- package/dist/cli/commands/mission.js +1 -1
- package/dist/cli/commands/mission.js.map +1 -1
- package/dist/cli/commands/onboarding.d.ts +4 -1
- package/dist/cli/commands/onboarding.d.ts.map +1 -1
- package/dist/cli/commands/onboarding.js +73 -43
- package/dist/cli/commands/onboarding.js.map +1 -1
- package/dist/cli/commands/perimeter.d.ts +7 -0
- package/dist/cli/commands/perimeter.d.ts.map +1 -0
- package/dist/cli/commands/perimeter.js +50 -0
- package/dist/cli/commands/perimeter.js.map +1 -0
- package/dist/cli/commands/register.d.ts +7 -0
- package/dist/cli/commands/register.d.ts.map +1 -0
- package/dist/cli/commands/register.js +22 -0
- package/dist/cli/commands/register.js.map +1 -0
- package/dist/cli/commands/runtime.js +3 -3
- package/dist/cli/commands/runtime.js.map +1 -1
- package/dist/cli/commands/scan.d.ts +7 -0
- package/dist/cli/commands/scan.d.ts.map +1 -0
- package/dist/cli/commands/scan.js +27 -0
- package/dist/cli/commands/scan.js.map +1 -0
- package/dist/cli/commands/triage.d.ts +1 -1
- package/dist/cli/commands/triage.d.ts.map +1 -1
- package/dist/cli/commands/triage.js +2 -14
- package/dist/cli/commands/triage.js.map +1 -1
- package/dist/cli/commands/upgrade.js +3 -3
- 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 +69 -4
- package/dist/cli/commands/verify.js.map +1 -1
- package/dist/cli/lib/architecture-pointer-doctor.d.ts.map +1 -1
- package/dist/cli/lib/architecture-pointer-doctor.js +4 -3
- package/dist/cli/lib/architecture-pointer-doctor.js.map +1 -1
- package/dist/cli/lib/architecture-pointer-schema.d.ts.map +1 -1
- package/dist/cli/lib/architecture-pointer-schema.js +2 -1
- package/dist/cli/lib/architecture-pointer-schema.js.map +1 -1
- package/dist/cli/lib/ast-discovery.d.ts +16 -0
- package/dist/cli/lib/ast-discovery.d.ts.map +1 -0
- package/dist/cli/lib/ast-discovery.js +97 -0
- package/dist/cli/lib/ast-discovery.js.map +1 -0
- package/dist/cli/lib/cli-io.d.ts +2 -0
- package/dist/cli/lib/cli-io.d.ts.map +1 -1
- package/dist/cli/lib/cli-io.js +4 -0
- package/dist/cli/lib/cli-io.js.map +1 -1
- package/dist/cli/lib/command-reporter.d.ts +8 -1
- package/dist/cli/lib/command-reporter.d.ts.map +1 -1
- package/dist/cli/lib/command-reporter.js +52 -2
- package/dist/cli/lib/command-reporter.js.map +1 -1
- package/dist/cli/lib/constants.d.ts +2 -0
- package/dist/cli/lib/constants.d.ts.map +1 -1
- package/dist/cli/lib/constants.js +2 -0
- package/dist/cli/lib/constants.js.map +1 -1
- package/dist/cli/lib/doctor-integration-checks.d.ts.map +1 -1
- package/dist/cli/lib/doctor-integration-checks.js +2 -1
- package/dist/cli/lib/doctor-integration-checks.js.map +1 -1
- package/dist/cli/lib/draft-token.d.ts.map +1 -1
- package/dist/cli/lib/draft-token.js +3 -2
- package/dist/cli/lib/draft-token.js.map +1 -1
- package/dist/cli/lib/fix-hints.d.ts +0 -21
- package/dist/cli/lib/fix-hints.d.ts.map +1 -1
- package/dist/cli/lib/fix-hints.js +1 -106
- package/dist/cli/lib/fix-hints.js.map +1 -1
- package/dist/cli/lib/git-proof.d.ts.map +1 -1
- package/dist/cli/lib/git-proof.js +6 -2
- package/dist/cli/lib/git-proof.js.map +1 -1
- package/dist/cli/lib/gxt-error-codes.d.ts +5 -0
- package/dist/cli/lib/gxt-error-codes.d.ts.map +1 -1
- package/dist/cli/lib/gxt-error-codes.js +5 -0
- package/dist/cli/lib/gxt-error-codes.js.map +1 -1
- package/dist/cli/lib/init-asset-catalog.d.ts +10 -5
- package/dist/cli/lib/init-asset-catalog.d.ts.map +1 -1
- package/dist/cli/lib/init-asset-catalog.js +26 -139
- package/dist/cli/lib/init-asset-catalog.js.map +1 -1
- package/dist/cli/lib/init-plan.d.ts +1 -1
- package/dist/cli/lib/init-plan.d.ts.map +1 -1
- package/dist/cli/lib/init-tutorial.js +4 -4
- package/dist/cli/lib/init-tutorial.js.map +1 -1
- package/dist/cli/lib/integration-compat.d.ts +2 -0
- package/dist/cli/lib/integration-compat.d.ts.map +1 -1
- package/dist/cli/lib/integration-compat.js.map +1 -1
- package/dist/cli/lib/kpi-phase.d.ts +7 -0
- package/dist/cli/lib/kpi-phase.d.ts.map +1 -0
- package/dist/cli/lib/kpi-phase.js +80 -0
- package/dist/cli/lib/kpi-phase.js.map +1 -0
- package/dist/cli/lib/kpi-report-stale.d.ts +18 -0
- package/dist/cli/lib/kpi-report-stale.d.ts.map +1 -0
- package/dist/cli/lib/kpi-report-stale.js +91 -0
- package/dist/cli/lib/kpi-report-stale.js.map +1 -0
- package/dist/cli/lib/kpi-report.d.ts +13 -0
- package/dist/cli/lib/kpi-report.d.ts.map +1 -0
- package/dist/cli/lib/kpi-report.js +115 -0
- package/dist/cli/lib/kpi-report.js.map +1 -0
- package/dist/cli/lib/kpi-scan.d.ts +16 -0
- package/dist/cli/lib/kpi-scan.d.ts.map +1 -0
- package/dist/cli/lib/kpi-scan.js +122 -0
- package/dist/cli/lib/kpi-scan.js.map +1 -0
- package/dist/cli/lib/legislate-core.js +1 -1
- package/dist/cli/lib/legislate-core.js.map +1 -1
- package/dist/cli/lib/manifest.d.ts.map +1 -1
- package/dist/cli/lib/manifest.js +30 -15
- package/dist/cli/lib/manifest.js.map +1 -1
- package/dist/cli/lib/mcp-legislation-mission.d.ts.map +1 -1
- package/dist/cli/lib/mcp-legislation-mission.js.map +1 -1
- package/dist/cli/lib/mcp-legislation-types.d.ts +2 -1
- package/dist/cli/lib/mcp-legislation-types.d.ts.map +1 -1
- package/dist/cli/lib/mcp-legislation-types.js.map +1 -1
- package/dist/cli/lib/mcp-orchestration-types.d.ts +28 -0
- package/dist/cli/lib/mcp-orchestration-types.d.ts.map +1 -0
- package/dist/cli/lib/mcp-orchestration-types.js +2 -0
- package/dist/cli/lib/mcp-orchestration-types.js.map +1 -0
- package/dist/cli/lib/mcp-orchestration.d.ts +3 -1
- package/dist/cli/lib/mcp-orchestration.d.ts.map +1 -1
- package/dist/cli/lib/mcp-orchestration.js +1 -1
- package/dist/cli/lib/mcp-orchestration.js.map +1 -1
- package/dist/cli/lib/mcp-runtime.d.ts +14 -4
- package/dist/cli/lib/mcp-runtime.d.ts.map +1 -1
- package/dist/cli/lib/mcp-runtime.js +25 -3
- package/dist/cli/lib/mcp-runtime.js.map +1 -1
- package/dist/cli/lib/mcp-tools-register.d.ts.map +1 -1
- package/dist/cli/lib/mcp-tools-register.js +7 -2
- package/dist/cli/lib/mcp-tools-register.js.map +1 -1
- package/dist/cli/lib/mcp-upgrade-types.d.ts +12 -0
- package/dist/cli/lib/mcp-upgrade-types.d.ts.map +1 -0
- package/dist/cli/lib/mcp-upgrade-types.js +2 -0
- package/dist/cli/lib/mcp-upgrade-types.js.map +1 -0
- package/dist/cli/lib/mcp-upgrade.d.ts +4 -2
- package/dist/cli/lib/mcp-upgrade.d.ts.map +1 -1
- package/dist/cli/lib/mcp-upgrade.js +24 -17
- package/dist/cli/lib/mcp-upgrade.js.map +1 -1
- package/dist/cli/lib/mission-markdown.d.ts.map +1 -1
- package/dist/cli/lib/mission-markdown.js +5 -1
- package/dist/cli/lib/mission-markdown.js.map +1 -1
- package/dist/cli/lib/mission-msn.d.ts +1 -2
- package/dist/cli/lib/mission-msn.d.ts.map +1 -1
- package/dist/cli/lib/mission-msn.js +3 -2
- package/dist/cli/lib/mission-msn.js.map +1 -1
- package/dist/cli/lib/mission-schema-validate.d.ts +3 -0
- package/dist/cli/lib/mission-schema-validate.d.ts.map +1 -0
- package/dist/cli/lib/mission-schema-validate.js +40 -0
- package/dist/cli/lib/mission-schema-validate.js.map +1 -0
- package/dist/cli/lib/mission-yaml.d.ts.map +1 -1
- package/dist/cli/lib/mission-yaml.js +131 -3
- package/dist/cli/lib/mission-yaml.js.map +1 -1
- package/dist/cli/lib/msn-allocate.js +1 -1
- package/dist/cli/lib/msn-allocate.js.map +1 -1
- package/dist/cli/lib/perimeter.d.ts +26 -0
- package/dist/cli/lib/perimeter.d.ts.map +1 -0
- package/dist/cli/lib/perimeter.js +156 -0
- package/dist/cli/lib/perimeter.js.map +1 -0
- package/dist/cli/lib/program-stdin.d.ts +3 -0
- package/dist/cli/lib/program-stdin.d.ts.map +1 -0
- package/dist/cli/lib/program-stdin.js +15 -0
- package/dist/cli/lib/program-stdin.js.map +1 -0
- package/dist/cli/lib/prompts-loader.d.ts +3 -0
- package/dist/cli/lib/prompts-loader.d.ts.map +1 -0
- package/dist/cli/lib/prompts-loader.js +5 -0
- package/dist/cli/lib/prompts-loader.js.map +1 -0
- package/dist/cli/lib/register-proposals-format.d.ts +2 -0
- package/dist/cli/lib/register-proposals-format.d.ts.map +1 -0
- package/dist/cli/lib/register-proposals-format.js +6 -0
- package/dist/cli/lib/register-proposals-format.js.map +1 -0
- package/dist/cli/lib/register-proposals.d.ts +13 -0
- package/dist/cli/lib/register-proposals.d.ts.map +1 -0
- package/dist/cli/lib/register-proposals.js +34 -0
- package/dist/cli/lib/register-proposals.js.map +1 -0
- package/dist/cli/lib/runtime-exec-orchestrator.d.ts.map +1 -1
- package/dist/cli/lib/runtime-exec-orchestrator.js +2 -1
- package/dist/cli/lib/runtime-exec-orchestrator.js.map +1 -1
- package/dist/cli/lib/start-orchestration.js +1 -1
- package/dist/cli/lib/start-orchestration.js.map +1 -1
- package/dist/cli/lib/substrate-version.d.ts.map +1 -1
- package/dist/cli/lib/substrate-version.js +4 -3
- package/dist/cli/lib/substrate-version.js.map +1 -1
- package/dist/cli/lib/teacher-identity.d.ts.map +1 -1
- package/dist/cli/lib/teacher-identity.js +4 -3
- package/dist/cli/lib/teacher-identity.js.map +1 -1
- package/dist/cli/lib/trace-status.d.ts +3 -3
- package/dist/cli/lib/trace-status.d.ts.map +1 -1
- package/dist/cli/lib/trace-status.js +8 -8
- package/dist/cli/lib/trace-status.js.map +1 -1
- package/dist/cli/lib/trace.js +2 -2
- package/dist/cli/lib/trace.js.map +1 -1
- package/dist/cli/lib/triage-logic.d.ts.map +1 -1
- package/dist/cli/lib/triage-logic.js +23 -6
- package/dist/cli/lib/triage-logic.js.map +1 -1
- package/dist/cli/lib/types.d.ts +65 -1
- package/dist/cli/lib/types.d.ts.map +1 -1
- package/dist/cli/lib/upgrade-apply.js +11 -11
- package/dist/cli/lib/upgrade-apply.js.map +1 -1
- package/dist/cli/lib/upgrade-eligible-assets.d.ts +2 -2
- package/dist/cli/lib/upgrade-eligible-assets.d.ts.map +1 -1
- package/dist/cli/lib/upgrade-eligible-assets.js +3 -3
- package/dist/cli/lib/upgrade-eligible-assets.js.map +1 -1
- package/dist/cli/lib/upgrade-plan-preview.d.ts +13 -0
- package/dist/cli/lib/upgrade-plan-preview.d.ts.map +1 -0
- package/dist/cli/lib/upgrade-plan-preview.js +51 -0
- package/dist/cli/lib/upgrade-plan-preview.js.map +1 -0
- package/dist/cli/lib/upgrade-plan.d.ts +3 -0
- package/dist/cli/lib/upgrade-plan.d.ts.map +1 -1
- package/dist/cli/lib/upgrade-plan.js +20 -7
- package/dist/cli/lib/upgrade-plan.js.map +1 -1
- package/dist/cli/lib/user-error.js +2 -2
- package/dist/cli/lib/user-error.js.map +1 -1
- package/dist/cli/lib/verify-changed-missions.d.ts +3 -0
- package/dist/cli/lib/verify-changed-missions.d.ts.map +1 -0
- package/dist/cli/lib/verify-changed-missions.js +30 -0
- package/dist/cli/lib/verify-changed-missions.js.map +1 -0
- package/dist/cli/lib/verify-engine.d.ts +10 -1
- package/dist/cli/lib/verify-engine.d.ts.map +1 -1
- package/dist/cli/lib/verify-engine.js +52 -41
- package/dist/cli/lib/verify-engine.js.map +1 -1
- package/dist/cli/lib/verify-failure-presentation.d.ts +2 -2
- package/dist/cli/lib/verify-failure-presentation.d.ts.map +1 -1
- package/dist/cli/lib/verify-failure-presentation.js +15 -32
- package/dist/cli/lib/verify-failure-presentation.js.map +1 -1
- package/dist/cli/lib/verify-present.d.ts +20 -0
- package/dist/cli/lib/verify-present.d.ts.map +1 -0
- package/dist/cli/lib/verify-present.js +123 -0
- package/dist/cli/lib/verify-present.js.map +1 -0
- package/dist/cli/lib/verify-remediation.d.ts +19 -5
- package/dist/cli/lib/verify-remediation.d.ts.map +1 -1
- package/dist/cli/lib/verify-remediation.js +148 -3
- package/dist/cli/lib/verify-remediation.js.map +1 -1
- package/dist/cli/lib/verify-result-payload.d.ts +4 -0
- package/dist/cli/lib/verify-result-payload.d.ts.map +1 -1
- package/dist/cli/lib/verify-result-payload.js +20 -4
- package/dist/cli/lib/verify-result-payload.js.map +1 -1
- package/dist/cli/lib/verify-run.d.ts +1 -7
- package/dist/cli/lib/verify-run.d.ts.map +1 -1
- package/dist/cli/lib/verify-run.js +41 -48
- package/dist/cli/lib/verify-run.js.map +1 -1
- package/dist/cli/lib/verify-types.d.ts +7 -1
- package/dist/cli/lib/verify-types.d.ts.map +1 -1
- package/dist/cli/lib/version.gen.d.ts +1 -1
- package/dist/cli/lib/version.gen.js +1 -1
- package/dist/cli/program-arch.js +2 -2
- package/dist/cli/program-arch.js.map +1 -1
- package/dist/cli/program-core.d.ts.map +1 -1
- package/dist/cli/program-core.js +6 -18
- 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 +46 -13
- package/dist/cli/program-workflow.js.map +1 -1
- package/package.json +3 -1
- package/templates/.gitagent/foreman/MANIFEST.json +6 -1
- package/templates/.gitagent/teacher/KPI-REPORT.schema.yaml +48 -0
- package/templates/.gitagent/teacher/MISSION.schema.yaml +70 -0
- package/templates/.githooks/pre-push +5 -0
- package/templates/.github/workflows/gxt-validate.yml +6 -0
- package/templates/integrations/asset-catalog.json +45 -0
- package/templates/integrations/compatibility.json +11 -10
- package/dist/cli/lib/git-proof-errors.d.ts +0 -3
- package/dist/cli/lib/git-proof-errors.d.ts.map +0 -1
- package/dist/cli/lib/git-proof-errors.js +0 -7
- package/dist/cli/lib/git-proof-errors.js.map +0 -1
- package/dist/cli/lib/init-assets.d.ts +0 -8
- package/dist/cli/lib/init-assets.d.ts.map +0 -1
- package/dist/cli/lib/init-assets.js +0 -3
- package/dist/cli/lib/init-assets.js.map +0 -1
- package/dist/cli/lib/msn.d.ts +0 -2
- package/dist/cli/lib/msn.d.ts.map +0 -1
- package/dist/cli/lib/msn.js +0 -5
- package/dist/cli/lib/msn.js.map +0 -1
- package/dist/cli/lib/verify-flow.d.ts +0 -23
- package/dist/cli/lib/verify-flow.d.ts.map +0 -1
- package/dist/cli/lib/verify-flow.js +0 -93
- package/dist/cli/lib/verify-flow.js.map +0 -1
- package/dist/cli/lib/verify-repair.d.ts +0 -4
- package/dist/cli/lib/verify-repair.d.ts.map +0 -1
- package/dist/cli/lib/verify-repair.js +0 -58
- package/dist/cli/lib/verify-repair.js.map +0 -1
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
export function normalizeTraceStatus(status) {
|
|
2
|
-
const upper = status.toUpperCase();
|
|
3
|
-
if (upper
|
|
2
|
+
const upper = status.trim().toUpperCase();
|
|
3
|
+
if (upper === "PASS")
|
|
4
4
|
return "PASS";
|
|
5
|
-
if (upper
|
|
6
|
-
return "PENDING";
|
|
7
|
-
if (upper.includes("FAIL"))
|
|
5
|
+
if (upper === "FAIL")
|
|
8
6
|
return "FAIL";
|
|
7
|
+
if (upper === "PENDING")
|
|
8
|
+
return "PENDING";
|
|
9
9
|
return "PENDING";
|
|
10
10
|
}
|
|
11
11
|
export function isPassStatus(status) {
|
|
12
|
-
return
|
|
12
|
+
return status === "PASS";
|
|
13
13
|
}
|
|
14
14
|
export function isPendingStatus(status) {
|
|
15
|
-
return
|
|
15
|
+
return status === "PENDING";
|
|
16
16
|
}
|
|
17
17
|
export function isFailStatus(status) {
|
|
18
|
-
return
|
|
18
|
+
return status === "FAIL";
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=trace-status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-status.js","sourceRoot":"","sources":["../../../src/cli/lib/trace-status.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,oBAAoB,CAAC,MAAc;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"trace-status.js","sourceRoot":"","sources":["../../../src/cli/lib/trace-status.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,oBAAoB,CAAC,MAAc;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACpC,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACpC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAA6B;IACxD,OAAO,MAAM,KAAK,MAAM,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAA6B;IAC3D,OAAO,MAAM,KAAK,SAAS,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAA6B;IACxD,OAAO,MAAM,KAAK,MAAM,CAAC;AAC3B,CAAC"}
|
package/dist/cli/lib/trace.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { WORKER_LOG_FILENAME } from "./constants.js";
|
|
3
|
-
import { isPassStatus } from "./trace-status.js";
|
|
3
|
+
import { isPassStatus, normalizeTraceStatus } from "./trace-status.js";
|
|
4
4
|
import { buildWorkerLogLineMapForQuotes, isLineDriftFailure, quoteLineNumbers, } from "./worker-log-line-map.js";
|
|
5
5
|
export function isPassTraceRow(status) {
|
|
6
|
-
return isPassStatus(status);
|
|
6
|
+
return isPassStatus(normalizeTraceStatus(status));
|
|
7
7
|
}
|
|
8
8
|
export function resolveQuoteLineNumber(map, row, resolvedLineByDodId) {
|
|
9
9
|
const override = resolvedLineByDodId.get(row.dodId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/cli/lib/trace.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/cli/lib/trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triage-logic.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/triage-logic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"triage-logic.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/triage-logic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA0EzD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,YAAY,CA0C/F;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAE7D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAwB9D"}
|
|
@@ -36,7 +36,7 @@ function withAdrHints(root, intent, result) {
|
|
|
36
36
|
return result;
|
|
37
37
|
return { ...result, adr_hints: hints };
|
|
38
38
|
}
|
|
39
|
-
function legislativeEscalation(reason) {
|
|
39
|
+
function legislativeEscalation(reason, matchReasons, confidence) {
|
|
40
40
|
return {
|
|
41
41
|
action: "LEGISLATIVE_ESCALATION",
|
|
42
42
|
skill_key: "NONE",
|
|
@@ -44,9 +44,11 @@ function legislativeEscalation(reason) {
|
|
|
44
44
|
tmvc_roots: [],
|
|
45
45
|
forbidden_zones: [],
|
|
46
46
|
reason,
|
|
47
|
+
confidence,
|
|
48
|
+
match_reasons: matchReasons,
|
|
47
49
|
};
|
|
48
50
|
}
|
|
49
|
-
function directExecution(skillKey, manifest) {
|
|
51
|
+
function directExecution(skillKey, manifest, matchReasons) {
|
|
50
52
|
const skill = manifest.skills[skillKey];
|
|
51
53
|
return {
|
|
52
54
|
action: "DIRECT_EXECUTION",
|
|
@@ -55,6 +57,8 @@ function directExecution(skillKey, manifest) {
|
|
|
55
57
|
tmvc_roots: [...skill.tmvc_roots],
|
|
56
58
|
forbidden_zones: [...skill.forbidden_zones],
|
|
57
59
|
reason: `Single confident skill match: ${skillKey}`,
|
|
60
|
+
confidence: 1,
|
|
61
|
+
match_reasons: matchReasons,
|
|
58
62
|
};
|
|
59
63
|
}
|
|
60
64
|
function matchingSkillKeys(intentNorm, manifest) {
|
|
@@ -67,19 +71,25 @@ function matchingSkillKeys(intentNorm, manifest) {
|
|
|
67
71
|
* overlap intent; routing remains binary.
|
|
68
72
|
*/
|
|
69
73
|
export function triageIntent(repoRoot, intent, manifest) {
|
|
74
|
+
const matchReasons = [];
|
|
70
75
|
const risk = shouldEscalateForRisk(intent, manifest);
|
|
71
76
|
if (risk.escalate) {
|
|
72
|
-
|
|
77
|
+
matchReasons.push(risk.reason);
|
|
78
|
+
return withAdrHints(repoRoot, intent, legislativeEscalation(risk.reason, matchReasons, 0.2));
|
|
73
79
|
}
|
|
74
80
|
const intentNorm = normalizeIntent(intent);
|
|
75
81
|
const matches = matchingSkillKeys(intentNorm, manifest);
|
|
76
82
|
if (matches.length === 1) {
|
|
77
|
-
|
|
83
|
+
const key = matches[0];
|
|
84
|
+
matchReasons.push(`Intent mentions skill key "${key}"`);
|
|
85
|
+
return withAdrHints(repoRoot, intent, directExecution(key, manifest, matchReasons));
|
|
78
86
|
}
|
|
79
87
|
if (matches.length === 0) {
|
|
80
|
-
|
|
88
|
+
matchReasons.push("No manifest skill key matched intent text");
|
|
89
|
+
return withAdrHints(repoRoot, intent, legislativeEscalation("No confident skill_key match in intent (ambiguous or missing)", matchReasons, 0.1));
|
|
81
90
|
}
|
|
82
|
-
|
|
91
|
+
matchReasons.push(`Multiple skill matches: ${matches.join(", ")}`);
|
|
92
|
+
return withAdrHints(repoRoot, intent, legislativeEscalation(`Multiple skill matches: ${matches.join(", ")} — escalate to Teacher`, matchReasons, 0.3));
|
|
83
93
|
}
|
|
84
94
|
export function formatTriageJson(result) {
|
|
85
95
|
return JSON.stringify(result, null, 2);
|
|
@@ -89,10 +99,17 @@ export function formatTriageHuman(result) {
|
|
|
89
99
|
`Action: ${result.action}`,
|
|
90
100
|
`Skill_key: ${result.skill_key}`,
|
|
91
101
|
`Risk_tier: ${result.risk_tier}`,
|
|
102
|
+
`Confidence: ${result.confidence.toFixed(2)}`,
|
|
92
103
|
`tmvc_roots: ${JSON.stringify(result.tmvc_roots)}`,
|
|
93
104
|
`forbidden_zones: ${JSON.stringify(result.forbidden_zones)}`,
|
|
94
105
|
`Reason: ${result.reason}`,
|
|
95
106
|
];
|
|
107
|
+
if (result.match_reasons.length) {
|
|
108
|
+
lines.push("Match_reasons:");
|
|
109
|
+
for (const r of result.match_reasons) {
|
|
110
|
+
lines.push(` - ${r}`);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
96
113
|
if (result.adr_hints?.length) {
|
|
97
114
|
lines.push("ADR_hints (non-binding; Teacher confirms):");
|
|
98
115
|
for (const h of result.adr_hints) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triage-logic.js","sourceRoot":"","sources":["../../../src/cli/lib/triage-logic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,SAAS,eAAe,CAAC,IAAY;IACnC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;AAC5B,CAAC;AAED,SAAS,wBAAwB,CAAC,UAAkB,EAAE,QAAgB;IACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC1E,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAc,EAAE,QAAkB;IAC/D,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC3C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACxD,IAAI,wBAAwB,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;YACnD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,4CAA4C,QAAQ,EAAE,EAAE,CAAC;QAC5F,CAAC;IACH,CAAC;IACD,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;QACxC,IAAI,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC7C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,iCAAiC,EAAE,EAAE,EAAE,CAAC;QAC3E,CAAC;IACH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAkB,EAAE,QAAgB;IAClE,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,YAAY,IAAI,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,IAAY,EAAE,MAAc,EAAE,MAAoB;IACtE,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACvE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IACtC,OAAO,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAc;
|
|
1
|
+
{"version":3,"file":"triage-logic.js","sourceRoot":"","sources":["../../../src/cli/lib/triage-logic.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/lib/types.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { NormalizedTraceStatus } from "./trace-status.js";
|
|
1
2
|
export type TrustThreshold = "Tier-1" | "Tier-2" | "Tier-3" | string;
|
|
2
3
|
export interface SkillEntry {
|
|
3
4
|
desc?: string;
|
|
@@ -10,6 +11,8 @@ export interface Manifest {
|
|
|
10
11
|
skills: Record<string, SkillEntry>;
|
|
11
12
|
path_risks: Record<string, string>;
|
|
12
13
|
risk_keywords: string[];
|
|
14
|
+
/** Globs requiring Teacher-stamped (CI: signed) commits to modify. */
|
|
15
|
+
perimeter_protected?: string[];
|
|
13
16
|
}
|
|
14
17
|
export type TriageAction = "DIRECT_EXECUTION" | "LEGISLATIVE_ESCALATION";
|
|
15
18
|
/** Non-binding ADR hint from `.gitagent/out-of-scope/` (Foreman does not route on this). */
|
|
@@ -25,6 +28,10 @@ export interface TriageResult {
|
|
|
25
28
|
tmvc_roots: string[];
|
|
26
29
|
forbidden_zones: string[];
|
|
27
30
|
reason: string;
|
|
31
|
+
/** 0–1 routing confidence (1 = single unambiguous skill match). */
|
|
32
|
+
confidence: number;
|
|
33
|
+
/** Human-readable signals that informed routing. */
|
|
34
|
+
match_reasons: string[];
|
|
28
35
|
/** Optional; never changes `action` — Teacher resolves ADRs during legislation. */
|
|
29
36
|
adr_hints?: AdrHint[];
|
|
30
37
|
}
|
|
@@ -32,16 +39,54 @@ export interface GateSpec {
|
|
|
32
39
|
command: string;
|
|
33
40
|
successSubstring: string | null;
|
|
34
41
|
}
|
|
42
|
+
export type KpiThresholdOp = "<=" | ">=" | "==" | "<" | ">";
|
|
43
|
+
export interface KpiThreshold {
|
|
44
|
+
metric: string;
|
|
45
|
+
op: KpiThresholdOp;
|
|
46
|
+
value: number;
|
|
47
|
+
}
|
|
48
|
+
export interface KpiGateSpec {
|
|
49
|
+
reportPath: string;
|
|
50
|
+
thresholds: KpiThreshold[];
|
|
51
|
+
}
|
|
52
|
+
export type KpiAggregatorOp = "max" | "min" | "sum";
|
|
53
|
+
export interface KpiAggregator {
|
|
54
|
+
key: string;
|
|
55
|
+
op: KpiAggregatorOp;
|
|
56
|
+
sources: string[];
|
|
57
|
+
}
|
|
58
|
+
export interface LlmVerifierSpec {
|
|
59
|
+
id: string;
|
|
60
|
+
command: string;
|
|
61
|
+
provider?: string;
|
|
62
|
+
required: boolean;
|
|
63
|
+
}
|
|
64
|
+
export interface KpiFinding {
|
|
65
|
+
severity: "info" | "warn" | "error";
|
|
66
|
+
path: string;
|
|
67
|
+
line?: number;
|
|
68
|
+
message: string;
|
|
69
|
+
}
|
|
70
|
+
export interface KpiReport {
|
|
71
|
+
msn_id: string;
|
|
72
|
+
generated_at: string;
|
|
73
|
+
exit_code: number;
|
|
74
|
+
metrics: Record<string, number | boolean>;
|
|
75
|
+
findings?: KpiFinding[];
|
|
76
|
+
}
|
|
35
77
|
export interface TraceRow {
|
|
36
78
|
dodId: string;
|
|
37
79
|
traceQuote: string;
|
|
38
80
|
anchor: string;
|
|
39
|
-
status:
|
|
81
|
+
status: NormalizedTraceStatus;
|
|
40
82
|
}
|
|
41
83
|
export interface ParsedMission {
|
|
42
84
|
msnId: string | null;
|
|
43
85
|
skillKey: string | null;
|
|
44
86
|
gate: GateSpec | null;
|
|
87
|
+
kpiGate: KpiGateSpec | null;
|
|
88
|
+
llmVerifiers: LlmVerifierSpec[];
|
|
89
|
+
aggregators: KpiAggregator[];
|
|
45
90
|
traceRows: TraceRow[];
|
|
46
91
|
rawPath: string;
|
|
47
92
|
}
|
|
@@ -52,6 +97,25 @@ export interface YamlMission {
|
|
|
52
97
|
skill_key: string;
|
|
53
98
|
gate_command: string;
|
|
54
99
|
gate_success_substring?: string | null;
|
|
100
|
+
kpi_gate?: {
|
|
101
|
+
report_path?: string;
|
|
102
|
+
thresholds: Array<{
|
|
103
|
+
metric: string;
|
|
104
|
+
op: string;
|
|
105
|
+
value: number;
|
|
106
|
+
}>;
|
|
107
|
+
};
|
|
108
|
+
llm_verifiers?: Array<{
|
|
109
|
+
id: string;
|
|
110
|
+
command: string;
|
|
111
|
+
provider?: string;
|
|
112
|
+
required?: boolean;
|
|
113
|
+
}>;
|
|
114
|
+
aggregators?: Array<{
|
|
115
|
+
key: string;
|
|
116
|
+
op: string;
|
|
117
|
+
sources: string[];
|
|
118
|
+
}>;
|
|
55
119
|
trace_rows?: Array<{
|
|
56
120
|
dod_id: string;
|
|
57
121
|
trace_quote: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AAErE,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,cAAc,CAAC;IAChC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,aAAa,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import crypto from "node:crypto";
|
|
|
2
2
|
import fs from "node:fs";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { CLI_NAME } from "./constants.js";
|
|
5
|
-
import { logInfo } from "./cli-io.js";
|
|
5
|
+
import { errorMessage, fromPosix, logInfo } from "./cli-io.js";
|
|
6
6
|
import { promoteFileAtomic } from "./atomic-fs.js";
|
|
7
7
|
import { assertTeacherMissionProof } from "./git-proof.js";
|
|
8
8
|
import { mergeGitignoreFromTemplate, mergePrettierignoreFromTemplate, } from "./file-merge-gxt.js";
|
|
@@ -16,7 +16,7 @@ function sha256File(absPath) {
|
|
|
16
16
|
return crypto.createHash("sha256").update(fs.readFileSync(absPath)).digest("hex");
|
|
17
17
|
}
|
|
18
18
|
function verifyStagedHashes(repoRoot, payload) {
|
|
19
|
-
const tmpRoot = path.join(repoRoot, REL_UPGRADE_TMP
|
|
19
|
+
const tmpRoot = path.join(repoRoot, fromPosix(REL_UPGRADE_TMP));
|
|
20
20
|
if (!fs.existsSync(tmpRoot)) {
|
|
21
21
|
throw new GapmanUserError("UPGRADE_STAGING_MISSING", `${CLI_NAME} upgrade --apply: staging directory missing at ${REL_UPGRADE_TMP}/ — re-run gapman upgrade`, `Run \`gapman upgrade\` to regenerate staged files before apply.`);
|
|
22
22
|
}
|
|
@@ -25,7 +25,7 @@ function verifyStagedHashes(repoRoot, payload) {
|
|
|
25
25
|
throw new GapmanUserError("UPGRADE_EMPTY_MANIFEST", `${CLI_NAME} upgrade --apply: upgrade_payload.staged_hashes is empty`);
|
|
26
26
|
}
|
|
27
27
|
for (const [relPath, expectedHash] of entries) {
|
|
28
|
-
const stageAbs = path.join(tmpRoot, relPath
|
|
28
|
+
const stageAbs = path.join(tmpRoot, fromPosix(relPath));
|
|
29
29
|
if (!fs.existsSync(stageAbs)) {
|
|
30
30
|
throw new GapmanUserError("UPGRADE_STAGING_DRIFT", `${CLI_NAME} upgrade --apply: missing staged file ${relPath} under ${REL_UPGRADE_TMP}/`, "Re-run gapman upgrade to regenerate staging after mission was signed.");
|
|
31
31
|
}
|
|
@@ -41,15 +41,15 @@ function cleanupApplyTmp(applyTmpRoot) {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
async function stageWritesForApply(repoRoot, payload) {
|
|
44
|
-
const tmpRoot = path.join(repoRoot, REL_UPGRADE_TMP
|
|
45
|
-
const applyTmpRoot = path.join(repoRoot, REL_UPGRADE_APPLY_TMP
|
|
44
|
+
const tmpRoot = path.join(repoRoot, fromPosix(REL_UPGRADE_TMP));
|
|
45
|
+
const applyTmpRoot = path.join(repoRoot, fromPosix(REL_UPGRADE_APPLY_TMP));
|
|
46
46
|
cleanupApplyTmp(applyTmpRoot);
|
|
47
47
|
fs.mkdirSync(applyTmpRoot, { recursive: true });
|
|
48
48
|
const promotions = [];
|
|
49
49
|
for (const relPath of payload.planned_writes) {
|
|
50
|
-
const sourceAbs = path.join(tmpRoot, relPath
|
|
51
|
-
const stagedAbs = path.join(applyTmpRoot, relPath
|
|
52
|
-
const prodAbs = path.join(repoRoot, relPath
|
|
50
|
+
const sourceAbs = path.join(tmpRoot, fromPosix(relPath));
|
|
51
|
+
const stagedAbs = path.join(applyTmpRoot, fromPosix(relPath));
|
|
52
|
+
const prodAbs = path.join(repoRoot, fromPosix(relPath));
|
|
53
53
|
fs.mkdirSync(path.dirname(stagedAbs), { recursive: true });
|
|
54
54
|
fs.copyFileSync(sourceAbs, stagedAbs);
|
|
55
55
|
promotions.push({ staged: stagedAbs, target: prodAbs });
|
|
@@ -72,7 +72,7 @@ export async function runUpgradeApply(options) {
|
|
|
72
72
|
payload = parseUpgradePayloadFromMissionBody(missionBody);
|
|
73
73
|
}
|
|
74
74
|
catch (e) {
|
|
75
|
-
throw new GapmanUserError("UPGRADE_INVALID_MISSION",
|
|
75
|
+
throw new GapmanUserError("UPGRADE_INVALID_MISSION", errorMessage(e));
|
|
76
76
|
}
|
|
77
77
|
try {
|
|
78
78
|
assertTeacherMissionProof(repoRoot, missionAbs);
|
|
@@ -80,11 +80,11 @@ export async function runUpgradeApply(options) {
|
|
|
80
80
|
catch (e) {
|
|
81
81
|
return {
|
|
82
82
|
status: "blocked",
|
|
83
|
-
message:
|
|
83
|
+
message: errorMessage(e),
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
86
|
verifyStagedHashes(repoRoot, payload);
|
|
87
|
-
const tmpRoot = path.join(repoRoot, REL_UPGRADE_TMP
|
|
87
|
+
const tmpRoot = path.join(repoRoot, fromPosix(REL_UPGRADE_TMP));
|
|
88
88
|
let applyTmpRoot = "";
|
|
89
89
|
try {
|
|
90
90
|
const staged = await stageWritesForApply(repoRoot, payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-apply.js","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-apply.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"upgrade-apply.js","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type InitAssetSpec } from "./init-asset-catalog.js";
|
|
2
2
|
/** managed_strict substrate assets eligible for gapman upgrade (excludes user law / missions). */
|
|
3
3
|
export declare function upgradeEligibleAssets(assets: InitAssetSpec[]): InitAssetSpec[];
|
|
4
|
-
export declare function allUpgradeEligibleFromCatalog(): InitAssetSpec[];
|
|
4
|
+
export declare function allUpgradeEligibleFromCatalog(templatesRoot: string): InitAssetSpec[];
|
|
5
5
|
//# sourceMappingURL=upgrade-eligible-assets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-eligible-assets.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-eligible-assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"upgrade-eligible-assets.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-eligible-assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAEnF,kGAAkG;AAClG,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAE9E;AAED,wBAAgB,6BAA6B,CAAC,aAAa,EAAE,MAAM,GAAG,aAAa,EAAE,CAEpF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { loadInitAssetCatalog } from "./init-asset-catalog.js";
|
|
2
2
|
/** managed_strict substrate assets eligible for gapman upgrade (excludes user law / missions). */
|
|
3
3
|
export function upgradeEligibleAssets(assets) {
|
|
4
4
|
return assets.filter((a) => a.mode === "managed_strict");
|
|
5
5
|
}
|
|
6
|
-
export function allUpgradeEligibleFromCatalog() {
|
|
7
|
-
return upgradeEligibleAssets([...
|
|
6
|
+
export function allUpgradeEligibleFromCatalog(templatesRoot) {
|
|
7
|
+
return upgradeEligibleAssets([...loadInitAssetCatalog(templatesRoot)]);
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=upgrade-eligible-assets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-eligible-assets.js","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-eligible-assets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upgrade-eligible-assets.js","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-eligible-assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,kGAAkG;AAClG,MAAM,UAAU,qBAAqB,CAAC,MAAuB;IAC3D,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,aAAqB;IACjE,OAAO,qBAAqB,CAAC,CAAC,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { PlannedWrite } from "./init-plan.js";
|
|
2
|
+
export interface UpgradeFileChange {
|
|
3
|
+
path: string;
|
|
4
|
+
action: "add" | "update";
|
|
5
|
+
bytes_before: number | null;
|
|
6
|
+
bytes_after: number;
|
|
7
|
+
sha256_before: string | null;
|
|
8
|
+
sha256_after: string;
|
|
9
|
+
}
|
|
10
|
+
/** Summarize planned upgrade writes for dry-run / changelog preview. */
|
|
11
|
+
export declare function buildUpgradeFileChanges(repoRoot: string, writes: PlannedWrite[]): UpgradeFileChange[];
|
|
12
|
+
export declare function groupUpgradeChangesByCategory(changes: UpgradeFileChange[]): Record<string, UpgradeFileChange[]>;
|
|
13
|
+
//# sourceMappingURL=upgrade-plan-preview.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade-plan-preview.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-plan-preview.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;CACtB;AAYD,wEAAwE;AACxE,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,EAAE,GACrB,iBAAiB,EAAE,CAcrB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,iBAAiB,EAAE,GAC3B,MAAM,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAgBrC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import crypto from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import { toPosixRel } from "./cli-io.js";
|
|
4
|
+
function sha256Buffer(buf) {
|
|
5
|
+
return crypto.createHash("sha256").update(buf).digest("hex");
|
|
6
|
+
}
|
|
7
|
+
function fileState(absPath) {
|
|
8
|
+
if (!fs.existsSync(absPath))
|
|
9
|
+
return null;
|
|
10
|
+
const buf = fs.readFileSync(absPath);
|
|
11
|
+
return { bytes: buf.length, sha256: sha256Buffer(buf) };
|
|
12
|
+
}
|
|
13
|
+
/** Summarize planned upgrade writes for dry-run / changelog preview. */
|
|
14
|
+
export function buildUpgradeFileChanges(repoRoot, writes) {
|
|
15
|
+
return writes.map((w) => {
|
|
16
|
+
const rel = toPosixRel(repoRoot, w.absoluteTarget);
|
|
17
|
+
const before = fileState(w.absoluteTarget);
|
|
18
|
+
const afterBuf = Buffer.from(w.body, "utf8");
|
|
19
|
+
return {
|
|
20
|
+
path: rel,
|
|
21
|
+
action: before === null ? "add" : "update",
|
|
22
|
+
bytes_before: before?.bytes ?? null,
|
|
23
|
+
bytes_after: afterBuf.length,
|
|
24
|
+
sha256_before: before?.sha256 ?? null,
|
|
25
|
+
sha256_after: sha256Buffer(afterBuf),
|
|
26
|
+
};
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
export function groupUpgradeChangesByCategory(changes) {
|
|
30
|
+
const groups = {
|
|
31
|
+
workflows: [],
|
|
32
|
+
scripts: [],
|
|
33
|
+
hooks: [],
|
|
34
|
+
substrate: [],
|
|
35
|
+
other: [],
|
|
36
|
+
};
|
|
37
|
+
for (const c of changes) {
|
|
38
|
+
if (c.path.startsWith(".github/workflows/"))
|
|
39
|
+
groups.workflows.push(c);
|
|
40
|
+
else if (c.path.startsWith("scripts/"))
|
|
41
|
+
groups.scripts.push(c);
|
|
42
|
+
else if (c.path.startsWith(".githooks/") || c.path.startsWith(".cursor/hooks"))
|
|
43
|
+
groups.hooks.push(c);
|
|
44
|
+
else if (c.path.startsWith(".gitagent/"))
|
|
45
|
+
groups.substrate.push(c);
|
|
46
|
+
else
|
|
47
|
+
groups.other.push(c);
|
|
48
|
+
}
|
|
49
|
+
return groups;
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=upgrade-plan-preview.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade-plan-preview.js","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-plan-preview.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAYzC,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,SAAS,CAAC,OAAe;IAChC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;AAC1D,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,uBAAuB,CACrC,QAAgB,EAChB,MAAsB;IAEtB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO;YACL,IAAI,EAAE,GAAG;YACT,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ;YAC1C,YAAY,EAAE,MAAM,EAAE,KAAK,IAAI,IAAI;YACnC,WAAW,EAAE,QAAQ,CAAC,MAAM;YAC5B,aAAa,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI;YACrC,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC;SACrC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,OAA4B;IAE5B,MAAM,MAAM,GAAwC;QAClD,SAAS,EAAE,EAAE;QACb,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAAE,MAAM,CAAC,SAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAClE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAAE,MAAM,CAAC,OAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAC3D,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;YAAE,MAAM,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjG,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;YAAE,MAAM,CAAC,SAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;YAC/D,MAAM,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type UpgradeFileChange } from "./upgrade-plan-preview.js";
|
|
1
2
|
export declare const REL_UPGRADE_TMP: ".gitagent/.upgrade-tmp";
|
|
2
3
|
export { UPGRADE_MSN_BAND_MIN, UPGRADE_MSN_BAND_MAX } from "./msn-allocate.js";
|
|
3
4
|
export interface UpgradePayload {
|
|
@@ -22,6 +23,8 @@ export interface UpgradePlanResult {
|
|
|
22
23
|
skipped_scaffold_only?: string[];
|
|
23
24
|
unchanged?: string[];
|
|
24
25
|
legacy_warning?: string | null;
|
|
26
|
+
file_changes?: UpgradeFileChange[];
|
|
27
|
+
changes_by_category?: Record<string, UpgradeFileChange[]>;
|
|
25
28
|
}
|
|
26
29
|
export declare function pickNextUpgradeMsn(repoRoot: string): string;
|
|
27
30
|
export declare function resolveUpgradeMsn(repoRoot: string, explicit?: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-plan.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-plan.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upgrade-plan.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/upgrade-plan.ts"],"names":[],"mappings":"AAwBA,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AAEnC,eAAO,MAAM,eAAe,EAAG,wBAAiC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,eAAe,CAAC;IACpC,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,SAAS,GAAG,iBAAiB,GAAG,mBAAmB,GAAG,YAAY,CAAC;IAC3E,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;CAC3D;AAUD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAS7E;AA2BD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,MAAM,CAeT;AAED,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAwC/E;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA6DD,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,iBAAiB,CAsFhF"}
|
|
@@ -3,7 +3,7 @@ import fs from "node:fs";
|
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import YAML from "yaml";
|
|
5
5
|
import { CLI_NAME } from "./constants.js";
|
|
6
|
-
import { logInfo, logWarn, toPosixRel } from "./cli-io.js";
|
|
6
|
+
import { fromPosix, logInfo, logWarn, toPosixRel } from "./cli-io.js";
|
|
7
7
|
import { mergeGitignoreFromTemplate, mergePrettierignoreFromTemplate, } from "./file-merge-gxt.js";
|
|
8
8
|
import { resolveTemplateRootFromModule, loadIntegrationCompat } from "./integration-compat.js";
|
|
9
9
|
import { resolveAssetsFromProfile } from "./init-asset-catalog.js";
|
|
@@ -12,8 +12,9 @@ import { upgradeEligibleAssets } from "./upgrade-eligible-assets.js";
|
|
|
12
12
|
import { inferInitProfileFromRepo } from "./upgrade-profile.js";
|
|
13
13
|
import { alreadyCurrentMessage, compareSemver, legacyVersionWarning, readInstalledSubstrateVersion, } from "./substrate-version.js";
|
|
14
14
|
import { allocateMsn } from "./msn-allocate.js";
|
|
15
|
-
import { isValidMsnId } from "./msn.js";
|
|
15
|
+
import { isValidMsnId } from "./mission-msn.js";
|
|
16
16
|
import { buildLegislativeTraceRows, buildMissionYamlScaffold } from "./mission-yaml.js";
|
|
17
|
+
import { buildUpgradeFileChanges, groupUpgradeChangesByCategory, } from "./upgrade-plan-preview.js";
|
|
17
18
|
export const REL_UPGRADE_TMP = ".gitagent/.upgrade-tmp";
|
|
18
19
|
export { UPGRADE_MSN_BAND_MIN, UPGRADE_MSN_BAND_MAX } from "./msn-allocate.js";
|
|
19
20
|
function sha256Buffer(buf) {
|
|
@@ -36,10 +37,10 @@ export function resolveUpgradeMsn(repoRoot, explicit) {
|
|
|
36
37
|
return pickNextUpgradeMsn(repoRoot);
|
|
37
38
|
}
|
|
38
39
|
function upgradeTmpAbs(repoRoot) {
|
|
39
|
-
return path.join(repoRoot, REL_UPGRADE_TMP
|
|
40
|
+
return path.join(repoRoot, fromPosix(REL_UPGRADE_TMP));
|
|
40
41
|
}
|
|
41
42
|
function stagePathForTarget(repoRoot, targetRel) {
|
|
42
|
-
return path.join(upgradeTmpAbs(repoRoot), targetRel
|
|
43
|
+
return path.join(upgradeTmpAbs(repoRoot), fromPosix(targetRel));
|
|
43
44
|
}
|
|
44
45
|
function writeStagedFiles(repoRoot, writes) {
|
|
45
46
|
const stagedHashes = {};
|
|
@@ -141,6 +142,15 @@ function logUpgradePlanSummary(options, opts) {
|
|
|
141
142
|
logInfo(`${CLI_NAME} upgrade: ${options.dryRun ? "dry-run — would stage" : "staged"} ${opts.plannedWrites.length} file(s) under ${REL_UPGRADE_TMP}/`);
|
|
142
143
|
for (const rel of opts.plannedWrites)
|
|
143
144
|
logInfo(` - ${rel}`);
|
|
145
|
+
if (opts.fileChanges?.length) {
|
|
146
|
+
logInfo("Changelog preview:");
|
|
147
|
+
for (const c of opts.fileChanges) {
|
|
148
|
+
const delta = c.bytes_before === null
|
|
149
|
+
? `new ${c.bytes_after} bytes`
|
|
150
|
+
: `${c.bytes_before} → ${c.bytes_after} bytes`;
|
|
151
|
+
logInfo(` [${c.action}] ${c.path} (${delta})`);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
144
154
|
if (opts.legacyWarning)
|
|
145
155
|
logWarn(opts.legacyWarning);
|
|
146
156
|
logInfo(`${options.dryRun ? "Would write" : "Wrote upgrade"} mission: ${opts.missionRel}`);
|
|
@@ -160,7 +170,7 @@ export function runUpgradePlan(options) {
|
|
|
160
170
|
if (versionGate)
|
|
161
171
|
return versionGate;
|
|
162
172
|
const profile = inferInitProfileFromRepo(repoRoot, templatesRoot);
|
|
163
|
-
const catalogAssets = resolveAssetsFromProfile(profile, compat);
|
|
173
|
+
const catalogAssets = resolveAssetsFromProfile(profile, compat, templatesRoot);
|
|
164
174
|
const assets = upgradeEligibleAssets(catalogAssets);
|
|
165
175
|
const plan = planInitAssets(assets, templatesRoot, repoRoot, true);
|
|
166
176
|
if (!plan.ok) {
|
|
@@ -189,8 +199,9 @@ export function runUpgradePlan(options) {
|
|
|
189
199
|
created_at: new Date().toISOString(),
|
|
190
200
|
};
|
|
191
201
|
const missionRel = `.gitagent/missions/${msnId}.upgrade-v${semverSlug(bundled)}.yaml`;
|
|
192
|
-
const missionAbs = path.join(repoRoot, missionRel
|
|
202
|
+
const missionAbs = path.join(repoRoot, fromPosix(missionRel));
|
|
193
203
|
const suggestedHumanAction = `git add ${missionRel}\ngit commit -m "[${msnId}] approve substrate upgrade to v${bundled}"`;
|
|
204
|
+
const fileChanges = buildUpgradeFileChanges(repoRoot, plan.writes);
|
|
194
205
|
const shared = {
|
|
195
206
|
status: "planned",
|
|
196
207
|
from_version: installed.version,
|
|
@@ -201,9 +212,11 @@ export function runUpgradePlan(options) {
|
|
|
201
212
|
skipped_scaffold_only: plan.skippedUserMutable,
|
|
202
213
|
unchanged: plan.unchanged,
|
|
203
214
|
legacy_warning: legacyWarning,
|
|
215
|
+
file_changes: fileChanges,
|
|
216
|
+
changes_by_category: groupUpgradeChangesByCategory(fileChanges),
|
|
204
217
|
};
|
|
205
218
|
if (options.dryRun) {
|
|
206
|
-
logUpgradePlanSummary(options, { plannedWrites, legacyWarning, missionRel, suggestedHumanAction });
|
|
219
|
+
logUpgradePlanSummary(options, { plannedWrites, legacyWarning, missionRel, suggestedHumanAction, fileChanges });
|
|
207
220
|
return shared;
|
|
208
221
|
}
|
|
209
222
|
payload.staged_hashes = writeStagedFiles(repoRoot, plan.writes);
|