@svenroth-ai/shipwright 0.24.7-next.0 → 0.26.0

package/server/dist/config/default-actions.json

@@ -1,90 +1,90 @@
-{
-  "schemaVersion": 1,
-  "defaults": {
-    "autonomy": "guided"
-  },
-  "actions": [
-    {
-      "id": "new-task",
-      "label": "New task",
-      "kind": "external_launch",
-      "description": "Plain Claude invocation scoped to a Shipwright phase. Fire-and-forget — no pipeline state.",
-      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs} {task.initial_prompt}",
-      "modal_fields": ["title", "phase", "description", "domain", "priority", "complexityHint", "tags", "blockedBy"],
-      "phase_parameters": {
-        "adopt": [
-          { "name": "dry-run", "type": "boolean", "label": "Dry run", "cli_flag": "--dry-run", "helpText": "Simulate adoption without commits" },
-          { "name": "scope", "type": "enum", "label": "Scope", "enum": ["full_app", "library", "cli"], "cli_flag": "--scope", "value_separator": "space" },
-          { "name": "include-nested", "type": "boolean", "label": "Include nested projects", "cli_flag": "--include-nested" },
-          { "name": "skip-crawl", "type": "boolean", "label": "Skip Playwright crawl", "cli_flag": "--skip-crawl" },
-          { "name": "crawl-base-url", "type": "string", "label": "Crawl base URL", "cli_flag": "--crawl-base-url", "value_separator": "space", "placeholder": "e.g. http://localhost:3000" },
-          { "name": "crawl-auth-token", "type": "string", "label": "Crawl auth token", "cli_flag": "--crawl-auth-token", "value_separator": "space", "sensitive": true },
-          { "name": "crawl-max-depth", "type": "string", "label": "Crawl max depth", "cli_flag": "--crawl-max-depth", "value_separator": "space", "pattern": "^[1-9][0-9]?$", "default": "3" },
-          { "name": "crawl-max-pages", "type": "string", "label": "Crawl max pages", "cli_flag": "--crawl-max-pages", "value_separator": "space", "pattern": "^[1-9][0-9]{0,3}$", "default": "50" },
-          { "name": "no-backfill-events", "type": "boolean", "label": "Skip event backfill", "cli_flag": "--no-backfill-events" },
-          { "name": "no-sync", "type": "boolean", "label": "Skip writing sync config", "cli_flag": "--no-sync" },
-          { "name": "planning-split", "type": "string", "label": "Planning split name", "cli_flag": "--planning-split", "value_separator": "space", "default": "01-adopted", "pattern": "^[A-Za-z0-9_-]+$" }
-        ],
-        "build": [
-          { "name": "section", "type": "string", "label": "Section file (relative to project)", "cli_flag": "@", "value_separator": "none", "pattern": "^[A-Za-z0-9_./-]+\\.md$", "placeholder": "e.g. planning/03-build-feature.md", "required": true, "helpText": "Path relative to your project root — e.g. planning/03-build-feature.md. /shipwright-plan creates these files; pick one to build now." },
-          { "name": "from", "type": "string", "label": "Start from section number", "cli_flag": "--from", "value_separator": "space", "pattern": "^[0-9]+$", "placeholder": "e.g. 03", "helpText": "Resume autonomous build from this section number" }
-        ],
-        "test": [
-          { "name": "fix", "type": "boolean", "label": "Auto-fix failing tests", "cli_flag": "--fix" },
-          { "name": "e2e-only", "type": "boolean", "label": "E2E tests only", "cli_flag": "--e2e-only" },
-          { "name": "design-fidelity", "type": "boolean", "label": "Design-fidelity check only", "cli_flag": "--design-fidelity" }
-        ],
-        "deploy": [
-          { "name": "target", "type": "enum", "label": "Target", "enum": ["dev", "prod", "rollback"], "cli_flag_map": { "prod": "--prod", "rollback": "--rollback" }, "default": "dev", "helpText": "Dev is default — no CLI flag emitted." }
-        ],
-        "changelog": [
-          { "name": "from", "type": "string", "label": "From git tag", "cli_flag": "--from", "value_separator": "space", "pattern": "^[A-Za-z0-9._/-]+$", "placeholder": "e.g. v0.3.1" }
-        ]
-      }
-    },
-    {
-      "id": "new-pipeline",
-      "label": "New pipeline",
-      "kind": "external_launch",
-      "description": "Full Shipwright pipeline — project → design → plan → build → test → deploy → changelog.",
-      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs} {task.initial_prompt}",
-      "modal_fields": ["title", "autonomy", "description"]
-    },
-    {
-      "id": "new-iterate",
-      "label": "New iterate",
-      "kind": "external_launch",
-      "description": "Run the complexity-adaptive iterate skill against an existing project.",
-      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs} {task.initial_prompt}",
-      "modal_fields": ["title", "autonomy", "description", "domain", "priority", "complexityHint", "tags", "blockedBy"],
-      "parameters": [
-        { "name": "type", "type": "enum", "label": "Change type", "enum": ["feature", "change", "bug"], "cli_flag": "--type", "value_separator": "space", "helpText": "Auto-detected if omitted" },
-        { "name": "plan-review-model", "type": "enum", "label": "Plan review", "enum": ["opus", "sonnet", "haiku", "inherit"], "cli_flag": "--plan-review-model", "value_separator": "space" },
-        { "name": "review-model", "type": "enum", "label": "Review", "enum": ["opus", "sonnet", "haiku", "inherit"], "cli_flag": "--review-model", "value_separator": "space" }
-      ]
-    },
-    {
-      "id": "new-plain",
-      "label": "Plain Claude",
-      "kind": "external_launch",
-      "description": "Plain Claude session in this project's directory. No Shipwright skill — just chat.",
-      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs}{task.description?}",
-      "modal_fields": ["title", "description"]
-    }
-  ],
-  "phases": [
-    { "id": "adopt",      "label": "Adopt",      "color": "#64748B" },
-    { "id": "project",    "label": "Project",    "color": "#9ca3af" },
-    { "id": "design",     "label": "Design",     "color": "#A855F7" },
-    { "id": "plan",       "label": "Plan",       "color": "#3B82F6" },
-    { "id": "build",      "label": "Build",      "color": "#F59E0B", "supports_autonomy": true },
-    { "id": "test",       "label": "Test",       "color": "#059669", "supports_autonomy": true },
-    { "id": "deploy",     "label": "Deploy",     "color": "#14B8A6" },
-    { "id": "changelog",  "label": "Changelog",  "color": "#6366F1" },
-    { "id": "compliance", "label": "Compliance", "color": "#0EA5E9" },
-    { "id": "security",   "label": "Security",   "color": "#DC2626", "supports_autonomy": true }
-  ],
-  "preview": {
-    "enabled": "auto"
-  }
-}
+{
+  "schemaVersion": 1,
+  "defaults": {
+    "autonomy": "guided"
+  },
+  "actions": [
+    {
+      "id": "new-task",
+      "label": "New task",
+      "kind": "external_launch",
+      "description": "Plain Claude invocation scoped to a Shipwright phase. Fire-and-forget — no pipeline state.",
+      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs} {task.initial_prompt}",
+      "modal_fields": ["title", "phase", "description", "domain", "priority", "complexityHint", "tags", "blockedBy"],
+      "phase_parameters": {
+        "adopt": [
+          { "name": "dry-run", "type": "boolean", "label": "Dry run", "cli_flag": "--dry-run", "helpText": "Simulate adoption without commits" },
+          { "name": "scope", "type": "enum", "label": "Scope", "enum": ["full_app", "library", "cli"], "cli_flag": "--scope", "value_separator": "space" },
+          { "name": "include-nested", "type": "boolean", "label": "Include nested projects", "cli_flag": "--include-nested" },
+          { "name": "skip-crawl", "type": "boolean", "label": "Skip Playwright crawl", "cli_flag": "--skip-crawl" },
+          { "name": "crawl-base-url", "type": "string", "label": "Crawl base URL", "cli_flag": "--crawl-base-url", "value_separator": "space", "placeholder": "e.g. http://localhost:3000" },
+          { "name": "crawl-auth-token", "type": "string", "label": "Crawl auth token", "cli_flag": "--crawl-auth-token", "value_separator": "space", "sensitive": true },
+          { "name": "crawl-max-depth", "type": "string", "label": "Crawl max depth", "cli_flag": "--crawl-max-depth", "value_separator": "space", "pattern": "^[1-9][0-9]?$", "default": "3" },
+          { "name": "crawl-max-pages", "type": "string", "label": "Crawl max pages", "cli_flag": "--crawl-max-pages", "value_separator": "space", "pattern": "^[1-9][0-9]{0,3}$", "default": "50" },
+          { "name": "no-backfill-events", "type": "boolean", "label": "Skip event backfill", "cli_flag": "--no-backfill-events" },
+          { "name": "no-sync", "type": "boolean", "label": "Skip writing sync config", "cli_flag": "--no-sync" },
+          { "name": "planning-split", "type": "string", "label": "Planning split name", "cli_flag": "--planning-split", "value_separator": "space", "default": "01-adopted", "pattern": "^[A-Za-z0-9_-]+$" }
+        ],
+        "build": [
+          { "name": "section", "type": "string", "label": "Section file (relative to project)", "cli_flag": "@", "value_separator": "none", "pattern": "^[A-Za-z0-9_./-]+\\.md$", "placeholder": "e.g. planning/03-build-feature.md", "required": true, "helpText": "Path relative to your project root — e.g. planning/03-build-feature.md. /shipwright-plan creates these files; pick one to build now." },
+          { "name": "from", "type": "string", "label": "Start from section number", "cli_flag": "--from", "value_separator": "space", "pattern": "^[0-9]+$", "placeholder": "e.g. 03", "helpText": "Resume autonomous build from this section number" }
+        ],
+        "test": [
+          { "name": "fix", "type": "boolean", "label": "Auto-fix failing tests", "cli_flag": "--fix" },
+          { "name": "e2e-only", "type": "boolean", "label": "E2E tests only", "cli_flag": "--e2e-only" },
+          { "name": "design-fidelity", "type": "boolean", "label": "Design-fidelity check only", "cli_flag": "--design-fidelity" }
+        ],
+        "deploy": [
+          { "name": "target", "type": "enum", "label": "Target", "enum": ["dev", "prod", "rollback"], "cli_flag_map": { "prod": "--prod", "rollback": "--rollback" }, "default": "dev", "helpText": "Dev is default — no CLI flag emitted." }
+        ],
+        "changelog": [
+          { "name": "from", "type": "string", "label": "From git tag", "cli_flag": "--from", "value_separator": "space", "pattern": "^[A-Za-z0-9._/-]+$", "placeholder": "e.g. v0.3.1" }
+        ]
+      }
+    },
+    {
+      "id": "new-pipeline",
+      "label": "New pipeline",
+      "kind": "external_launch",
+      "description": "Full Shipwright pipeline — project → design → plan → build → test → deploy → changelog.",
+      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs} {task.initial_prompt}",
+      "modal_fields": ["title", "autonomy", "description"]
+    },
+    {
+      "id": "new-iterate",
+      "label": "New iterate",
+      "kind": "external_launch",
+      "description": "Run the complexity-adaptive iterate skill against an existing project.",
+      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs} {task.initial_prompt}",
+      "modal_fields": ["title", "autonomy", "description", "domain", "priority", "complexityHint", "tags", "blockedBy"],
+      "parameters": [
+        { "name": "type", "type": "enum", "label": "Change type", "enum": ["feature", "change", "bug"], "cli_flag": "--type", "value_separator": "space", "helpText": "Auto-detected if omitted" },
+        { "name": "plan-review-model", "type": "enum", "label": "Plan review", "enum": ["opus", "sonnet", "haiku", "inherit"], "cli_flag": "--plan-review-model", "value_separator": "space" },
+        { "name": "review-model", "type": "enum", "label": "Review", "enum": ["opus", "sonnet", "haiku", "inherit"], "cli_flag": "--review-model", "value_separator": "space" }
+      ]
+    },
+    {
+      "id": "new-plain",
+      "label": "Plain Claude",
+      "kind": "external_launch",
+      "description": "Plain Claude session in this project's directory. No Shipwright skill — just chat.",
+      "command_template": "{cd.prefix}claude --session-id {task.uuid} --name {task.session_name} {plugin.dirs}{task.description?}",
+      "modal_fields": ["title", "description"]
+    }
+  ],
+  "phases": [
+    { "id": "adopt",      "label": "Adopt",      "color": "#64748B" },
+    { "id": "project",    "label": "Project",    "color": "#9ca3af" },
+    { "id": "design",     "label": "Design",     "color": "#A855F7" },
+    { "id": "plan",       "label": "Plan",       "color": "#3B82F6" },
+    { "id": "build",      "label": "Build",      "color": "#F59E0B", "supports_autonomy": true },
+    { "id": "test",       "label": "Test",       "color": "#059669", "supports_autonomy": true },
+    { "id": "deploy",     "label": "Deploy",     "color": "#14B8A6" },
+    { "id": "changelog",  "label": "Changelog",  "color": "#6366F1" },
+    { "id": "compliance", "label": "Compliance", "color": "#0EA5E9" },
+    { "id": "security",   "label": "Security",   "color": "#DC2626", "supports_autonomy": true }
+  ],
+  "preview": {
+    "enabled": "auto"
+  }
+}

package/server/dist/core/grade-runner.d.ts

@@ -39,7 +39,7 @@ export interface RunGradeInput {
     target: string;
 }
 export interface RunGradeDeps {
-    /** `--version` runner used by resolvePython (test seam). */
+    /** `--version` runner used by resolveUv (test seam). */
     run?: RunFn;
     /** grade.py spawn (test seam — CI mocks it; no live grade.py). */
     spawn?: SpawnGradeFn;
@@ -55,9 +55,9 @@ export interface RunGradeDeps {
     baseEnv?: NodeJS.ProcessEnv;
 }
 /**
- * Validate → resolve engine → spawn `grade.py <target> --format json` → map the
- * outcome to an honest {@link GradeOutcome}. Never throws for a grade failure;
- * only a programming error would reject.
+ * Validate → resolve engine → spawn `uv run --project <plugin-root> grade.py
+ * <target> --format json` → map the outcome to an honest {@link GradeOutcome}.
+ * Never throws for a grade failure; only a programming error would reject.
  */
 export declare function runGrade(input: RunGradeInput, deps?: RunGradeDeps): Promise<GradeOutcome>;
 //# sourceMappingURL=grade-runner.d.ts.map

package/server/dist/core/grade-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grade-runner.d.ts","sourceRoot":"","sources":["../../src/core/grade-runner.ts"],"names":[],"mappings":"AAsCA,OAAO,EAIL,KAAK,KAAK,EACX,MAAM,sBAAsB,CAAC;AAU9B;iFACiF;AACjF,eAAO,MAAM,wBAAwB,SAAU,CAAC;AAEhD,sFAAsF;AACtF,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB;;iEAE6D;IAC7D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,MAAM,WAAW,WAAW;IAC1B,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,iBAAiB,KACpB,OAAO,CAAC,WAAW,CAAC,CAAC;AAE1B;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,YAgC5B,CAAC;AAIL,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,4DAA4D;IAC5D,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ,kEAAkE;IAClE,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,gEAAgE;IAChE,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CAC7B;AAWD;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,aAAa,EACpB,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,YAAY,CAAC,CA6FvB"}
+{"version":3,"file":"grade-runner.d.ts","sourceRoot":"","sources":["../../src/core/grade-runner.ts"],"names":[],"mappings":"AAyDA,OAAO,EAAwC,KAAK,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAYxF;iFACiF;AACjF,eAAO,MAAM,wBAAwB,SAAU,CAAC;AAEhD,sFAAsF;AACtF,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,cAAc,GACd,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB;;iEAE6D;IAC7D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID,MAAM,WAAW,WAAW;IAC1B,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,iBAAiB,KACpB,OAAO,CAAC,WAAW,CAAC,CAAC;AAE1B;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,YAgC5B,CAAC;AAIL,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,wDAAwD;IACxD,GAAG,CAAC,EAAE,KAAK,CAAC;IACZ,kEAAkE;IAClE,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,gEAAgE;IAChE,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CAC7B;AAWD;;;;GAIG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,aAAa,EACpB,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,YAAY,CAAC,CAkGvB"}

package/server/dist/core/grade-runner.js

@@ -6,13 +6,17 @@
  * + the outcome mapping.
  *
  * ── IO / injection boundary (the reason A09 was split) ──────────────────────
- * `grade.py <target> --format json` is spawned with **shell:false** and a
- * **fixed-literal python binary** (resolved by TEST-RUN, python3→python→py,
- * reusing `readiness-probe.resolvePython`). The target is passed as a **fixed
- * argv position** — never interpolated into a shell string, so no shell
- * metacharacter in a user-entered path/URL can reach a shell (there is none).
- * Mirrors the ADR-044 #9 / `pr-status.ts` spawn discipline. Must NOT trip
- * Semgrep `spawn-shell-true`.
+ * `grade.py` is spawned via `uv run --project <plugin-root> <script>
+ * --format json -- <target>` with **shell:false** (the plugin's OWN declared
+ * environment — grade.py needs `defusedxml` + Python 3.11+, per its
+ * pyproject.toml, and never gets it from an ambient system interpreter; see
+ * `uv-runner.ts`'s header for the incident this replaced). uv is resolved by
+ * TEST-RUN (`resolveUv`, reusing the readiness probe's PATH augmentation) —
+ * missing uv is an honest engine-unavailable, never a silent python fallback.
+ * The target is passed as a **fixed argv position** — never interpolated into
+ * a shell string, so no shell metacharacter in a user-entered path/URL can
+ * reach a shell (there is none). Mirrors the ADR-044 #9 / `pr-status.ts` spawn
+ * discipline. Must NOT trip Semgrep `spawn-shell-true`.
  *
  * READ-ONLY: grade is a pure read of a repo. It registers no project, writes
  * nothing to the graded repo, and never touches `~/.claude/projects/**`,
@@ -20,6 +24,21 @@
  * A remote URL is shallow-cloned into a throwaway tempdir *by grade.py* and
  * purged when it exits — webui does not clone.
  *
+ * "Read-only" is about the GRADED repo and webui's own state, not about
+ * `uv`'s own bookkeeping (Stage-3 doubt review, 2026-08-26): `uv run
+ * --project` DOES write into the plugin's OWN cache directory
+ * (`~/.claude/plugins/cache/shipwright/shipwright-grade/<version>/.venv/`) the
+ * first time it syncs that project's declared dependencies — verified on a
+ * real cache. This is uv's own environment-sync mechanism (cross-process
+ * locked by uv itself), scoped to the plugin's own directory, and one-time
+ * per version; it is not a new write surface this module owns or must guard.
+ *
+ * `uv run --python ">=3.11"` also passes `--no-project` in the
+ * triage-cli-runner sibling (see that module's header) so a bare `--python`
+ * invocation never walks up from the spawning process's cwd looking for an
+ * ambient project to activate; grade-runner's `--project <plugin-root>` is
+ * already explicit and has no such ambient-discovery exposure.
+ *
  * Every grade.py outcome maps to an HONEST state (never a fabricated grade):
  *   exit 0 + JSON            → report-ready (raw model; the CLIENT reportShape
  *                              guard is the cross-repo contract check, ADR-045)
@@ -34,8 +53,9 @@
  * subprocess — no live grade.py).
  */
 import { execFile } from "node:child_process";
-import { defaultRun, READINESS_REPAIR_COMMAND, resolvePython, } from "./readiness-probe.js";
-import { defaultStatDir, ENV_COMPLIANCE_ROOT, resolveComplianceRoot, resolveGradeScript, validateGradeTarget, } from "./grade-target.js";
+import { defaultRun, READINESS_REPAIR_COMMAND } from "./readiness-probe.js";
+import { defaultStatDir, ENV_COMPLIANCE_ROOT, resolveComplianceRoot, resolveGradePluginRoot, resolveGradeScript, validateGradeTarget, } from "./grade-target.js";
+import { resolveUv } from "./uv-runner.js";
 /** grade.py can shallow-clone + read a whole history; a remote target needs
  *  headroom over a local one. Generous, but bounded (a hung clone is killed). */
 export const DEFAULT_GRADE_TIMEOUT_MS = 120_000;
@@ -79,9 +99,9 @@ function cleanStderr(stderr) {
     return line.replace(/^shipwright-grade:\s*/i, "").trim();
 }
 /**
- * Validate → resolve engine → spawn `grade.py <target> --format json` → map the
- * outcome to an honest {@link GradeOutcome}. Never throws for a grade failure;
- * only a programming error would reject.
+ * Validate → resolve engine → spawn `uv run --project <plugin-root> grade.py
+ * <target> --format json` → map the outcome to an honest {@link GradeOutcome}.
+ * Never throws for a grade failure; only a programming error would reject.
  */
 export async function runGrade(input, deps = {}) {
     const statDir = deps.statDir ?? defaultStatDir;
@@ -98,8 +118,10 @@ export async function runGrade(input, deps = {}) {
     if (!v.ok)
         return { status: "grade-failed", reason: v.reason };
     const target = input.target.trim();
-    // 2 — resolve the engine: grade.py + a working python. Either missing is an
-    //     honest "engine unavailable — run npx …" (reuse the readiness repair).
+    // 2 — resolve the engine: grade.py + uv. Either missing is an honest
+    //     "engine unavailable — run npx …" (reuse the readiness repair). uv
+    //     missing is NEVER a reason to fall back to a bare system python — that
+    //     silent fallback is the root cause this replaced (uv-runner.ts).
     const script = resolveGradeScript({ ...resolveDeps, scriptOverride: deps.scriptOverride });
     if (!script) {
         return {
@@ -108,11 +130,12 @@ export async function runGrade(input, deps = {}) {
             repairCommand: READINESS_REPAIR_COMMAND,
         };
     }
-    const py = await resolvePython(run);
-    if (!py) {
+    const baseEnv = deps.baseEnv ?? process.env;
+    const uv = await resolveUv({ run, homeDir: deps.homeDir, baseEnv });
+    if (!uv) {
         return {
             status: "engine-unavailable",
-            reason: "No working Python (3.11+) was found.",
+            reason: "uv isn't installed — grade needs it to run in the plugin's own environment.",
             repairCommand: READINESS_REPAIR_COMMAND,
         };
     }
@@ -122,22 +145,24 @@ export async function runGrade(input, deps = {}) {
         ...resolveDeps,
         complianceOverride: deps.complianceOverride,
     });
-    const baseEnv = deps.baseEnv ?? process.env;
-    const env = { ...baseEnv };
+    const env = { ...uv.env };
     if (complianceRoot)
         env[ENV_COMPLIANCE_ROOT] = complianceRoot;
-    // Fixed argv: options first, then a `--` END-OF-OPTIONS separator, then the
-    // target as the sole positional. shell:false already blocks shell injection;
-    // the `--` additionally blocks ARGUMENT injection — a target like `--no-clone`
-    // or `--allow-network-private` is treated as a path, never a grade.py flag
+    // `uv run --project <plugin-root>` resolves grade.py's own declared deps
+    // (defusedxml, Python 3.11+) instead of an ambient interpreter. Fixed argv:
+    // options first, then a `--` END-OF-OPTIONS separator, then the target as
+    // the sole positional. shell:false already blocks shell injection; the `--`
+    // additionally blocks ARGUMENT injection — a target like `--no-clone` or
+    // `--allow-network-private` is treated as a path, never a grade.py flag
     // (mirrors the pr-status.ts `--` discipline; verified against argparse).
-    const args = [script, "--format", "json", "--", target];
-    const r = await spawn(py.bin, args, { env, timeoutMs });
+    const pluginRoot = resolveGradePluginRoot(script);
+    const args = ["run", "--project", pluginRoot, script, "--format", "json", "--", target];
+    const r = await spawn(uv.bin, args, { env, timeoutMs });
     // 4 — map the outcome.
     if (r.code === -1) {
         return {
             status: "engine-unavailable",
-            reason: "Python couldn't start on this machine.",
+            reason: "uv couldn't start on this machine.",
             repairCommand: READINESS_REPAIR_COMMAND,
         };
     }

package/server/dist/core/grade-runner.js.map

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

package/server/dist/core/grade-target.d.ts

@@ -35,6 +35,14 @@ export interface PluginResolveDeps {
 export declare function resolveGradeScript(deps?: PluginResolveDeps & {
     scriptOverride?: string;
 }): string | null;
+/**
+ * The `shipwright-grade` plugin root that owns `resolveGradeScript`'s result —
+ * three levels up from `scripts/tools/grade.py`. This is the plugin's own
+ * `pyproject.toml`/`uv.lock`/`.venv` directory, so `uv run --project
+ * <pluginRoot>` resolves grade.py's declared dependencies (defusedxml, etc.)
+ * instead of whatever bare interpreter happened to answer `--version` first.
+ */
+export declare function resolveGradePluginRoot(script: string): string;
 /** Resolve the shipwright-compliance plugin root (the dir carrying
  *  `scripts/lib/control_grade.py`), which grade.py's engine_bridge needs. */
 export declare function resolveComplianceRoot(deps?: PluginResolveDeps & {

package/server/dist/core/grade-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grade-target.d.ts","sourceRoot":"","sources":["../../src/core/grade-target.ts"],"names":[],"mappings":"AA6BA;;kEAEkE;AAClE,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAQtE,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,aAAyD,CAAC;AAkB3F;;iFAEiF;AACjF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGnD;AAUD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAC9B,gBAAgB,CAmClB;AAED,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAMjD;AAMD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;CACrC;AA4BD,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAChC,IAAI,GAAE,iBAAiB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAO,GACzD,MAAM,GAAG,IAAI,CAIf;AAED;6EAC6E;AAC7E,wBAAgB,qBAAqB,CACnC,IAAI,GAAE,iBAAiB,GAAG;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7D,MAAM,GAAG,IAAI,CAQf"}
+{"version":3,"file":"grade-target.d.ts","sourceRoot":"","sources":["../../src/core/grade-target.ts"],"names":[],"mappings":"AA6BA;;kEAEkE;AAClE,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAQtE,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,aAAyD,CAAC;AAkB3F;;iFAEiF;AACjF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGnD;AAUD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAC9B,gBAAgB,CAmClB;AAED,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAMjD;AAMD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;CACrC;AA4BD,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAChC,IAAI,GAAE,iBAAiB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAO,GACzD,MAAM,GAAG,IAAI,CAIf;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;6EAC6E;AAC7E,wBAAgB,qBAAqB,CACnC,IAAI,GAAE,iBAAiB,GAAG;IAAE,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7D,MAAM,GAAG,IAAI,CAQf"}

package/server/dist/core/grade-target.js

@@ -151,6 +151,16 @@ export function resolveGradeScript(deps = {}) {
         return existsFn(deps.scriptOverride) ? deps.scriptOverride : null;
     return resolveVersionedFile("shipwright-grade", ["scripts", "tools", "grade.py"], deps);
 }
+/**
+ * The `shipwright-grade` plugin root that owns `resolveGradeScript`'s result —
+ * three levels up from `scripts/tools/grade.py`. This is the plugin's own
+ * `pyproject.toml`/`uv.lock`/`.venv` directory, so `uv run --project
+ * <pluginRoot>` resolves grade.py's declared dependencies (defusedxml, etc.)
+ * instead of whatever bare interpreter happened to answer `--version` first.
+ */
+export function resolveGradePluginRoot(script) {
+    return path.dirname(path.dirname(path.dirname(script)));
+}
 /** Resolve the shipwright-compliance plugin root (the dir carrying
  *  `scripts/lib/control_grade.py`), which grade.py's engine_bridge needs. */
 export function resolveComplianceRoot(deps = {}) {

package/server/dist/core/grade-target.js.map

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

package/server/dist/core/mission-context/association.d.ts

@@ -24,4 +24,50 @@ export declare function setMissionContextOnce(store: Pick<SdkSessionsStore, "get
  * concurrent writer's value is never clobbered.
  */
 export declare function revertMissionContext(store: Pick<SdkSessionsStore, "get" | "patch">, taskId: string, attempted: MissionContextAssociation): void;
+/**
+ * Evidence-gated UPDATE of an association ALREADY on file — the one
+ * deliberate exception to the once-only doctrine above (external code
+ * review, openai HIGH, iterate-2026-08-31-mission-feed-gaps).
+ *
+ * Without this, scenario.ts rule 2b's supersession is provably decorative:
+ * the ONCE-only write above makes every corrected `associateRunId` it returns
+ * unreachable, so a long-lived task's stale association never durably
+ * corrects — and once the newer run's `Run-ID:` footer scrolls past this
+ * task's (narrower, associated-task) reach-back window, rule 2b's per-poll
+ * scan stops finding it too, and the Mission tab is stuck on the stale run
+ * for good. Persisting the correction closes both holes.
+ *
+ * Narrow on purpose — this is a correction, not a general-purpose write: the
+ * caller only ever offers a `transcript_run_id`-sourced association, and only
+ * after scenario.ts rule 2b has required a corroborated footer naming a
+ * PROVABLY newer run than the one on file (`isProvablyNewerRunId`). This
+ * function does not re-derive that recency itself — it trusts the one caller
+ * that computes it, the same posture `setMissionContextOnce` already takes
+ * toward its own caller's pointer validation.
+ *
+ * Compare-and-set against `expectedPrevious` (external code review, openai
+ * MEDIUM): without it, this is a blind overwrite of "whatever is currently
+ * stored", not of the specific stale association the resolver actually
+ * decided against. Two polls can race on the same stale association — poll
+ * A resolves against it and decides to supersede with run X, poll B resolves
+ * against the SAME stale read (a later poll interval, different transcript
+ * snapshot) and decides to supersede with run Y — and whichever write lands
+ * second would clobber the other's answer even though it is validating a read
+ * that is no longer current. Requiring the stored value to still equal what
+ * THIS caller read before writing turns that into a no-op instead: the loser
+ * skips its write and the next resolve operates on whatever is now current.
+ */
+export declare function supersedeMissionContext(store: Pick<SdkSessionsStore, "get" | "patch">, taskId: string, association: MissionContextAssociation, expectedPrevious: MissionContextAssociation): boolean;
+/**
+ * Roll back a supersession that was set in memory but FAILED to persist — the
+ * supersede counterpart to `revertMissionContext`. Restores the PREVIOUS
+ * association rather than clearing the field: unlike a first association,
+ * there was already a valid, durable value here, and losing it to a
+ * transient lock contention would be a second, worse regression stacked on
+ * top of the one this whole mechanism exists to fix.
+ *
+ * Only reverts when the field still holds the association WE just set, so a
+ * concurrent writer's value is never clobbered.
+ */
+export declare function revertSupersession(store: Pick<SdkSessionsStore, "get" | "patch">, taskId: string, attempted: MissionContextAssociation, previous: MissionContextAssociation): void;
 //# sourceMappingURL=association.d.ts.map

package/server/dist/core/mission-context/association.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"association.d.ts","sourceRoot":"","sources":["../../../src/core/mission-context/association.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAA+B,KAAK,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEzF;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,CAAC,EAC9C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,yBAAyB,GACrC,OAAO,CAOT;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,CAAC,EAC9C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,yBAAyB,GACnC,IAAI,CAMN"}
+{"version":3,"file":"association.d.ts","sourceRoot":"","sources":["../../../src/core/mission-context/association.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAA+B,KAAK,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEzF;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,CAAC,EAC9C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,yBAAyB,GACrC,OAAO,CAOT;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,CAAC,EAC9C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,yBAAyB,GACnC,IAAI,CAMN;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,CAAC,EAC9C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,yBAAyB,EACtC,gBAAgB,EAAE,yBAAyB,GAC1C,OAAO,CAST;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,CAAC,EAC9C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,yBAAyB,EACpC,QAAQ,EAAE,yBAAyB,GAClC,IAAI,CAMN"}

package/server/dist/core/mission-context/association.js

@@ -66,4 +66,73 @@ export function revertMissionContext(store, taskId, attempted) {
         return;
     store.patch(taskId, { missionContext: undefined });
 }
+/**
+ * Evidence-gated UPDATE of an association ALREADY on file — the one
+ * deliberate exception to the once-only doctrine above (external code
+ * review, openai HIGH, iterate-2026-08-31-mission-feed-gaps).
+ *
+ * Without this, scenario.ts rule 2b's supersession is provably decorative:
+ * the ONCE-only write above makes every corrected `associateRunId` it returns
+ * unreachable, so a long-lived task's stale association never durably
+ * corrects — and once the newer run's `Run-ID:` footer scrolls past this
+ * task's (narrower, associated-task) reach-back window, rule 2b's per-poll
+ * scan stops finding it too, and the Mission tab is stuck on the stale run
+ * for good. Persisting the correction closes both holes.
+ *
+ * Narrow on purpose — this is a correction, not a general-purpose write: the
+ * caller only ever offers a `transcript_run_id`-sourced association, and only
+ * after scenario.ts rule 2b has required a corroborated footer naming a
+ * PROVABLY newer run than the one on file (`isProvablyNewerRunId`). This
+ * function does not re-derive that recency itself — it trusts the one caller
+ * that computes it, the same posture `setMissionContextOnce` already takes
+ * toward its own caller's pointer validation.
+ *
+ * Compare-and-set against `expectedPrevious` (external code review, openai
+ * MEDIUM): without it, this is a blind overwrite of "whatever is currently
+ * stored", not of the specific stale association the resolver actually
+ * decided against. Two polls can race on the same stale association — poll
+ * A resolves against it and decides to supersede with run X, poll B resolves
+ * against the SAME stale read (a later poll interval, different transcript
+ * snapshot) and decides to supersede with run Y — and whichever write lands
+ * second would clobber the other's answer even though it is validating a read
+ * that is no longer current. Requiring the stored value to still equal what
+ * THIS caller read before writing turns that into a no-op instead: the loser
+ * skips its write and the next resolve operates on whatever is now current.
+ */
+export function supersedeMissionContext(store, taskId, association, expectedPrevious) {
+    const task = store.get(taskId);
+    if (!task?.missionContext)
+        return false;
+    if (task.missionContext.runId !== expectedPrevious.runId)
+        return false;
+    if (task.missionContext.observedAt !== expectedPrevious.observedAt)
+        return false;
+    if (association.source !== "transcript_run_id")
+        return false;
+    if (!isMissionContextAssociation(association))
+        return false;
+    store.patch(taskId, { missionContext: association });
+    return true;
+}
+/**
+ * Roll back a supersession that was set in memory but FAILED to persist — the
+ * supersede counterpart to `revertMissionContext`. Restores the PREVIOUS
+ * association rather than clearing the field: unlike a first association,
+ * there was already a valid, durable value here, and losing it to a
+ * transient lock contention would be a second, worse regression stacked on
+ * top of the one this whole mechanism exists to fix.
+ *
+ * Only reverts when the field still holds the association WE just set, so a
+ * concurrent writer's value is never clobbered.
+ */
+export function revertSupersession(store, taskId, attempted, previous) {
+    const task = store.get(taskId);
+    if (!task?.missionContext)
+        return;
+    if (task.missionContext.runId !== attempted.runId)
+        return;
+    if (task.missionContext.observedAt !== attempted.observedAt)
+        return;
+    store.patch(taskId, { missionContext: previous });
+}
 //# sourceMappingURL=association.js.map

package/server/dist/core/mission-context/association.js.map

@@ -1 +1 @@
-{"version":3,"file":"association.js","sourceRoot":"","sources":["../../../src/core/mission-context/association.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,2BAA2B,EAAkC,MAAM,YAAY,CAAC;AAEzF;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,KAA8C,EAC9C,MAAc,EACd,WAAsC;IAEtC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,IAAI,IAAI,CAAC,cAAc;QAAE,OAAO,KAAK,CAAC;IACtC,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5D,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAA8C,EAC9C,MAAc,EACd,SAAoC;IAEpC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE,cAAc;QAAE,OAAO;IAClC,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK;QAAE,OAAO;IAC1D,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU;QAAE,OAAO;IACpE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"association.js","sourceRoot":"","sources":["../../../src/core/mission-context/association.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,2BAA2B,EAAkC,MAAM,YAAY,CAAC;AAEzF;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CACnC,KAA8C,EAC9C,MAAc,EACd,WAAsC;IAEtC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,IAAI,IAAI,CAAC,cAAc;QAAE,OAAO,KAAK,CAAC;IACtC,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5D,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAA8C,EAC9C,MAAc,EACd,SAAoC;IAEpC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE,cAAc;QAAE,OAAO;IAClC,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK;QAAE,OAAO;IAC1D,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU;QAAE,OAAO;IACpE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAA8C,EAC9C,MAAc,EACd,WAAsC,EACtC,gBAA2C;IAE3C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE,cAAc;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,gBAAgB,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACvE,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,KAAK,gBAAgB,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC;IACjF,IAAI,WAAW,CAAC,MAAM,KAAK,mBAAmB;QAAE,OAAO,KAAK,CAAC;IAC7D,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5D,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kBAAkB,CAChC,KAA8C,EAC9C,MAAc,EACd,SAAoC,EACpC,QAAmC;IAEnC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE,cAAc;QAAE,OAAO;IAClC,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK;QAAE,OAAO;IAC1D,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU;QAAE,OAAO;IACpE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC;AACpD,CAAC"}