fix(gastown): patrol pour+assign must set --status=in_progress or wisps orphan past the resume-check

.github/workflows/ci.yml

@@ -35,10 +35,52 @@ jobs:
         run: python3 -m pip install PyYAML pytest jsonschema
 
       - name: Validate registry
-        run: python3 validate_registry.py
+        # --require-git: without git, no commit or content-hash verification runs at
+        # all, so a missing worktree must fail rather than silently downgrade this to
+        # a format-only check. (checkout above uses fetch-depth: 0, as it must.)
+        run: python3 validate_registry.py --require-git
 
       - name: Run Python pack tests
-        run: python3 -m pytest tests contributing/tests gascity/tests discord/tests github/tests slack-full/tests slack-channel/tests pr-pipeline/tests -q
+        run: python3 -m pytest tests contributing/tests gascity/tests discord/tests github/tests oversight-rig/tests slack-full/tests slack-channel/tests pr-pipeline/tests profiler/tests -q
+
+      - name: Lint and exercise shared role prompt composition
+        run: |
+          go install github.com/gastownhall/gascity/cmd/gc@latest
+          GC_BIN="$(go env GOPATH)/bin/gc"
+          # oversight-rig is deliberately absent. Under the gc this step
+          # installs it reports four bd-unknown-flag findings for `gc bd list
+          # --rig`, which is valid: `gc bd` strips --rig in extractBdScopeFlags
+          # before forwarding, and the scanner validated against bare bd's
+          # manifest alone. Same upstream defect as the `pre-5220` section of
+          # tests/gastown_lint_upstream_defects.txt, fixed by gascity 7724983de
+          # and not in v1.4.1. Add oversight-rig here in the same change that
+          # deletes that section. A dev gc already reports zero for it, so
+          # pinning them would waive findings most contributors never see.
+          # Refute: gc lint oversight-rig  (0 findings on main, 4 on v1.4.1)
+          for pack in gascity gascity/roles bmad compound-engineering gstack superpowers profiler \
+                      pr-pipeline slack-channel slack-full slack-mini; do
+            "$GC_BIN" lint "$pack"
+          done
+          GC_TEST_BIN="$GC_BIN" python3 -m pytest tests/test_gc_role_prompt_integration.py -q
+
+      # Installed, not parsed. `gc lint` above reads each pack on its own and
+      # the per-pack suites read their own TOML; neither can say what gc does
+      # when a city loads the pack, which is where a user meets it. pr-pipeline
+      # linted clean for months while putting a deprecation warning into every
+      # importing city's `gc doctor`.
+      - name: Stand each maintained pack up against gc
+        run: |
+          GC_TEST_BIN="$(go env GOPATH)/bin/gc" \
+            python3 -m pytest tests/test_maintained_packs_live_gc.py -q
+
+      # gastown is not in the lint loop above because seven of its findings are
+      # defects in gc's linter rather than in the pack; see
+      # tests/gastown_lint_upstream_defects.txt. This pins the finding set
+      # instead, so a new one fails and a fixed one has to be un-waived.
+      - name: Check gastown lint findings against the pinned set
+        run: |
+          GC_TEST_BIN="$(go env GOPATH)/bin/gc" \
+            python3 -m pytest tests/test_gastown_lint_findings.py -q
 
       - name: Run Gastown shell tests
         run: |

.github/workflows/gascity-pack-inference.yml

@@ -54,17 +54,19 @@ permissions:
   contents: read
 
 env:
-  DOLT_VERSION: "2.1.0"
-  BD_VERSION: "v1.0.4"
+  DOLT_VERSION: "2.1.7"
+  BD_VERSION: "v1.1.0"
   CLAUDE_VERSION: "2.1.123"
-  ANTHROPIC_BASE_URL: https://ollama.com
-  ANTHROPIC_API_KEY: ${{ secrets.OLLAMA_API_KEY }}
-  ANTHROPIC_AUTH_TOKEN: ${{ secrets.OLLAMA_API_KEY }}
+  # Claude Code appends /v1/messages itself, so this base URL intentionally
+  # does not end in /v1.
+  ANTHROPIC_BASE_URL: https://works.gascity.com/manifold-api
+  ANTHROPIC_AUTH_TOKEN: ${{ secrets.MANIFOLD_AUTH_TOKEN }}
   OLLAMA_API_KEY: ${{ secrets.OLLAMA_API_KEY }}
-  ANTHROPIC_DEFAULT_HAIKU_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_HAIKU_MODEL }}
-  ANTHROPIC_DEFAULT_SONNET_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_SONNET_MODEL }}
-  ANTHROPIC_DEFAULT_OPUS_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_OPUS_MODEL }}
-  CLAUDE_CODE_SUBAGENT_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_SUBAGENT_MODEL }}
+  ANTHROPIC_DEFAULT_HAIKU_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_HAIKU_MODEL }}
+  ANTHROPIC_DEFAULT_SONNET_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_SONNET_MODEL }}
+  ANTHROPIC_DEFAULT_OPUS_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_OPUS_MODEL }}
+  CLAUDE_CODE_SUBAGENT_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_SUBAGENT_MODEL }}
+  GC_INFERENCE_EXPECTED_MODEL: kimi-k2.7-code
   CLAUDE_CODE_EFFORT_LEVEL: auto
   CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1"
 
@@ -96,7 +98,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff
         with:
-          go-version: "1.25.10"
+          go-version: "1.26.5"
 
       - name: Set up Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
@@ -126,20 +128,22 @@ jobs:
       - name: Run inference runner unit tests
         run: python3 -m pytest tests/test_gascity_pack_inference_gate.py -q
 
-      - name: Validate Ollama Claude configuration
+      - name: Validate Manifold Claude configuration
         run: |
           test -n "$OLLAMA_API_KEY" || { echo "Missing OLLAMA_API_KEY GitHub secret" >&2; exit 1; }
-          test -n "$ANTHROPIC_API_KEY" || { echo "ANTHROPIC_API_KEY resolved empty" >&2; exit 1; }
-          test -n "$ANTHROPIC_AUTH_TOKEN" || { echo "ANTHROPIC_AUTH_TOKEN resolved empty" >&2; exit 1; }
+          test -n "$ANTHROPIC_AUTH_TOKEN" || { echo "Missing MANIFOLD_AUTH_TOKEN GitHub secret" >&2; exit 1; }
+          test "$ANTHROPIC_BASE_URL" = "https://works.gascity.com/manifold-api" || { echo "ANTHROPIC_BASE_URL must be the Manifold base URL without /v1" >&2; exit 1; }
           test -n "$ANTHROPIC_DEFAULT_HAIKU_MODEL" || { echo "ANTHROPIC_DEFAULT_HAIKU_MODEL resolved empty" >&2; exit 1; }
           test -n "$ANTHROPIC_DEFAULT_SONNET_MODEL" || { echo "ANTHROPIC_DEFAULT_SONNET_MODEL resolved empty" >&2; exit 1; }
           test -n "$ANTHROPIC_DEFAULT_OPUS_MODEL" || { echo "ANTHROPIC_DEFAULT_OPUS_MODEL resolved empty" >&2; exit 1; }
           test -n "$CLAUDE_CODE_SUBAGENT_MODEL" || { echo "CLAUDE_CODE_SUBAGENT_MODEL resolved empty" >&2; exit 1; }
+          test "$GC_INFERENCE_EXPECTED_MODEL" = "kimi-k2.7-code" || { echo "GC_INFERENCE_EXPECTED_MODEL must pin kimi-k2.7-code" >&2; exit 1; }
           printf 'ANTHROPIC_BASE_URL=%s\n' "$ANTHROPIC_BASE_URL"
           printf 'ANTHROPIC_DEFAULT_HAIKU_MODEL=%s\n' "$ANTHROPIC_DEFAULT_HAIKU_MODEL"
           printf 'ANTHROPIC_DEFAULT_SONNET_MODEL=%s\n' "$ANTHROPIC_DEFAULT_SONNET_MODEL"
           printf 'ANTHROPIC_DEFAULT_OPUS_MODEL=%s\n' "$ANTHROPIC_DEFAULT_OPUS_MODEL"
           printf 'CLAUDE_CODE_SUBAGENT_MODEL=%s\n' "$CLAUDE_CODE_SUBAGENT_MODEL"
+          printf 'GC_INFERENCE_EXPECTED_MODEL=%s\n' "$GC_INFERENCE_EXPECTED_MODEL"
 
       - name: Run supported pack inference gates
         env:

.github/workflows/supported-pack-nightly.yml

@@ -27,10 +27,8 @@ on:
         type: choice
         options:
           - all
-          - review
           - build
-          - build-basic
-          - gastown-orchestration
+          - smoke
         default: all
       pack:
         description: "Supported pack or group to exercise for manual subset checks."
@@ -39,6 +37,7 @@ on:
         options:
           - all-supported
           - methodology
+          - model-smoke
           - gascity
           - superpowers
           - compound-engineering
@@ -51,14 +50,14 @@ permissions:
   contents: read
 
 env:
-  DOLT_VERSION: "2.1.0"
-  BD_VERSION: "v1.0.4"
+  DOLT_VERSION: "2.1.7"
+  BD_VERSION: "v1.1.0"
   CLAUDE_VERSION: "2.1.123"
 
 jobs:
   static-contracts:
     name: static pack flow contracts
-    runs-on: blacksmith-32vcpu-ubuntu-2404
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     timeout-minutes: 15
     steps:
       - name: Check out gascity-packs
@@ -85,62 +84,47 @@ jobs:
     timeout-minutes: ${{ matrix.timeout_minutes }}
     strategy:
       fail-fast: false
-      max-parallel: 1
+      # The managed Ollama pool has two credentials. Keep one real full E2E
+      # canary while running the direct pack smokes in bounded pairs.
+      max-parallel: 2
       matrix:
         include:
           - pack: gascity
-            gate: review
-            timeout_minutes: 45
+            # Full E2E canary: artifacts, implementation worktree, and pytest.
+            gate: build
+            timeout_minutes: 30
             gate_timeout: 30m
-          - pack: gascity
-            gate: build-basic
-            timeout_minutes: 110
-            gate_timeout: 90m
           - pack: superpowers
-            gate: review
-            timeout_minutes: 60
-            gate_timeout: 45m
-          - pack: superpowers
-            gate: build
-            timeout_minutes: 120
-            gate_timeout: 100m
-          - pack: compound-engineering
-            gate: review
-            timeout_minutes: 60
-            gate_timeout: 45m
+            gate: smoke
+            timeout_minutes: 25
+            gate_timeout: 25m
           - pack: compound-engineering
-            gate: build
-            timeout_minutes: 120
-            gate_timeout: 100m
-          - pack: gstack
-            gate: review
-            timeout_minutes: 75
-            gate_timeout: 60m
+            gate: smoke
+            timeout_minutes: 25
+            gate_timeout: 25m
           - pack: gstack
-            gate: build
-            timeout_minutes: 150
-            gate_timeout: 130m
+            gate: smoke
+            timeout_minutes: 25
+            gate_timeout: 25m
           - pack: bmad
-            gate: review
-            timeout_minutes: 60
-            gate_timeout: 45m
-          - pack: bmad
-            gate: build
-            timeout_minutes: 120
-            gate_timeout: 100m
+            gate: smoke
+            timeout_minutes: 25
+            gate_timeout: 25m
           - pack: gastown
-            gate: gastown-orchestration
-            timeout_minutes: 120
-            gate_timeout: 110m
+            gate: smoke
+            timeout_minutes: 25
+            gate_timeout: 25m
     env:
-      ANTHROPIC_BASE_URL: https://ollama.com
-      ANTHROPIC_API_KEY: ${{ secrets.OLLAMA_API_KEY }}
-      ANTHROPIC_AUTH_TOKEN: ${{ secrets.OLLAMA_API_KEY }}
+      # Claude Code appends /v1/messages itself, so this base URL intentionally
+      # does not end in /v1.
+      ANTHROPIC_BASE_URL: https://works.gascity.com/manifold-api
+      ANTHROPIC_AUTH_TOKEN: ${{ secrets.MANIFOLD_AUTH_TOKEN }}
       OLLAMA_API_KEY: ${{ secrets.OLLAMA_API_KEY }}
-      ANTHROPIC_DEFAULT_HAIKU_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_HAIKU_MODEL }}
-      ANTHROPIC_DEFAULT_SONNET_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_SONNET_MODEL }}
-      ANTHROPIC_DEFAULT_OPUS_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_OPUS_MODEL }}
-      CLAUDE_CODE_SUBAGENT_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_OLLAMA_SUBAGENT_MODEL }}
+      ANTHROPIC_DEFAULT_HAIKU_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_HAIKU_MODEL }}
+      ANTHROPIC_DEFAULT_SONNET_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_SONNET_MODEL }}
+      ANTHROPIC_DEFAULT_OPUS_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_OPUS_MODEL }}
+      CLAUDE_CODE_SUBAGENT_MODEL: ${{ vars.GC_WORKER_INFERENCE_CLAUDE_MANIFOLD_SUBAGENT_MODEL }}
+      GC_INFERENCE_EXPECTED_MODEL: kimi-k2.7-code
       CLAUDE_CODE_EFFORT_LEVEL: auto
       CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1"
       PYTHONUNBUFFERED: "1"
@@ -163,7 +147,17 @@ jobs:
                 pack_match=true
                 ;;
               methodology)
-                if [ "$MATRIX_PACK" != "gastown" ]; then
+                case "$MATRIX_PACK" in
+                  superpowers|compound-engineering|gstack|bmad)
+                    pack_match=true
+                    ;;
+                  *)
+                    pack_match=false
+                    ;;
+                esac
+                ;;
+              model-smoke)
+                if [ "$MATRIX_PACK" != "gascity" ]; then
                   pack_match=true
                 else
                   pack_match=false
@@ -222,7 +216,7 @@ jobs:
         if: steps.subset.outputs.run_gate == 'true'
         uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff
         with:
-          go-version: "1.25.10"
+          go-version: "1.26.5"
 
       - name: Set up Node
         if: steps.subset.outputs.run_gate == 'true'
@@ -254,21 +248,23 @@ jobs:
           echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
           "$(go env GOPATH)/bin/gc" version
 
-      - name: Validate Ollama Claude configuration
+      - name: Validate Manifold Claude configuration
         if: steps.subset.outputs.run_gate == 'true'
         run: |
           test -n "$OLLAMA_API_KEY" || { echo "Missing OLLAMA_API_KEY GitHub secret" >&2; exit 1; }
-          test -n "$ANTHROPIC_API_KEY" || { echo "ANTHROPIC_API_KEY resolved empty" >&2; exit 1; }
-          test -n "$ANTHROPIC_AUTH_TOKEN" || { echo "ANTHROPIC_AUTH_TOKEN resolved empty" >&2; exit 1; }
+          test -n "$ANTHROPIC_AUTH_TOKEN" || { echo "Missing MANIFOLD_AUTH_TOKEN GitHub secret" >&2; exit 1; }
+          test "$ANTHROPIC_BASE_URL" = "https://works.gascity.com/manifold-api" || { echo "ANTHROPIC_BASE_URL must be the Manifold base URL without /v1" >&2; exit 1; }
           test -n "$ANTHROPIC_DEFAULT_HAIKU_MODEL" || { echo "ANTHROPIC_DEFAULT_HAIKU_MODEL resolved empty" >&2; exit 1; }
           test -n "$ANTHROPIC_DEFAULT_SONNET_MODEL" || { echo "ANTHROPIC_DEFAULT_SONNET_MODEL resolved empty" >&2; exit 1; }
           test -n "$ANTHROPIC_DEFAULT_OPUS_MODEL" || { echo "ANTHROPIC_DEFAULT_OPUS_MODEL resolved empty" >&2; exit 1; }
           test -n "$CLAUDE_CODE_SUBAGENT_MODEL" || { echo "CLAUDE_CODE_SUBAGENT_MODEL resolved empty" >&2; exit 1; }
+          test "$GC_INFERENCE_EXPECTED_MODEL" = "kimi-k2.7-code" || { echo "GC_INFERENCE_EXPECTED_MODEL must pin kimi-k2.7-code" >&2; exit 1; }
           printf 'ANTHROPIC_BASE_URL=%s\n' "$ANTHROPIC_BASE_URL"
           printf 'ANTHROPIC_DEFAULT_HAIKU_MODEL=%s\n' "$ANTHROPIC_DEFAULT_HAIKU_MODEL"
           printf 'ANTHROPIC_DEFAULT_SONNET_MODEL=%s\n' "$ANTHROPIC_DEFAULT_SONNET_MODEL"
           printf 'ANTHROPIC_DEFAULT_OPUS_MODEL=%s\n' "$ANTHROPIC_DEFAULT_OPUS_MODEL"
           printf 'CLAUDE_CODE_SUBAGENT_MODEL=%s\n' "$CLAUDE_CODE_SUBAGENT_MODEL"
+          printf 'GC_INFERENCE_EXPECTED_MODEL=%s\n' "$GC_INFERENCE_EXPECTED_MODEL"
 
       - name: Run supported-pack nightly inference gate
         if: steps.subset.outputs.run_gate == 'true'
@@ -287,6 +283,9 @@ jobs:
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: supported-pack-nightly-${{ matrix.pack }}-${{ matrix.gate }}
-          path: ${{ runner.temp }}/supported-pack-nightly/${{ matrix.pack }}
+          path: |
+            ${{ runner.temp }}/supported-pack-nightly/${{ matrix.pack }}
+            !${{ runner.temp }}/supported-pack-nightly/${{ matrix.pack }}/gc-home/.dolt/eventsData/**
+            !${{ runner.temp }}/supported-pack-nightly/${{ matrix.pack }}/**/.beads/eventsData/**
           if-no-files-found: ignore
           include-hidden-files: true

.gitignore

@@ -1,5 +1,5 @@
 
-# Beads / Dolt files (added by bd init)
+# Beads / Dolt files (added by gc bd init)
 .dolt/
 *.db
 .beads-credential-key
@@ -10,7 +10,7 @@
 !.beads/config.yaml
 !.beads/metadata.json
 
-# bd export artifact auto-staged by pre-commit hook (export.git-add: true in
+# gc bd export artifact auto-staged by pre-commit hook (export.git-add: true in
 # /home/ds/gascity-packs/.beads/config.yaml). Keep it out of repo history —
 # beads issues canonical store is the Dolt DB, not this file.
 /issues.jsonl

README.md

@@ -150,6 +150,13 @@ Browse the tree for the current set; each pack has its own README.
 - [cass](./cass) adds a shared `cass-search` prompt fragment and Claude skill
   overlay for searching past coding-agent sessions.
 
+### Oversight packs
+
+- [oversight-rig](./oversight-rig) adds one rig-scoped project lead per rig and
+  includes an optional `city-executive-status` skill for maintaining a
+  shareable, Obsidian-compatible portfolio brief. Its status schedules are
+  examples only and remain inactive until configured by the consuming city.
+
 ### Build methodology packs
 
 Raw-framework subagents become Gas City fanouts. The vendored methodology text
@@ -250,6 +257,14 @@ GC=/path/to/gc make registry-validate
 
 ### Publishing a pack to the registry
 
+> **`registry.toml` describes packs that live in this repository only.** Its
+> `source` must be a `https://github.com/gastownhall/gascity-packs/tree/<ref>/<dir>`
+> URL (or the bare repository URL for a root pack) — anything else is rejected,
+> because the content hash can only be verified against this repository's own
+> history. If your pack lives in **your** repo, you do not need a PR here: publish
+> it directly to the Gas City registry under a scoped `<owner>/<pack>` name and you
+> keep ownership of it.
+
 `registry.toml` is the public catalog. Each `[[pack.release]]` carries a
 content hash that `validate_registry.py` enforces against the pack tree at the
 pinned `commit`. To register a new pack, commit it on your branch, then mint a

bmad/REQUIREMENTS.md

@@ -98,10 +98,9 @@ for every derived pack.
   `bmad-review` runs write the adapter-consumable report to `{{report_path}}`
   without posting comments, pushing branches, or finalizing external state.
 - Prompt hygiene: all agent prompt templates under
-  `agents/*/prompt.template.md` include the shared `gc-role-worker` fragment,
-  which carries the Gas City claim protocol; every per-agent nested fragment
-  copy is identical to the pack-level
-  `bmad/template-fragments/gc-role-worker.template.md`. Agent prompts and
+  `agents/*/prompt.template.md` include the public `gc-role-worker` fragment
+  supplied by the `gc` import; BMAD does not override that shared claim
+  protocol. Agent prompts and
   skill-adopting lane assets carry explicit "Do not invoke provider-native
   subagents, slash commands, task tools, or the upstream BMAD runtime"
   guards. The skill texts under `skills/` are methodology source material
@@ -125,7 +124,7 @@ grep -n -E '^extends' bmad/formulas/bmad-planning.formula.toml bmad/formulas/bma
 grep -n -E '^id = |needs = ' bmad/formulas/bmad-build.formula.toml  # implementation-readiness sits between decompose and both drains
 grep -rn 'gc.run_target' bmad/formulas/*.toml  # expect only bmad.* agents, gc.run-operator, or {implementation_target}
 grep -rL 'gc-role-worker' bmad/agents/*/prompt.template.md  # expect no output
-for f in bmad/agents/*/template-fragments/gc-role-worker.template.md; do diff bmad/template-fragments/gc-role-worker.template.md "$f"; done  # expect no output
+gc lint bmad
 grep -rn 'provider-native' bmad/agents bmad/assets | wc -l  # expect >= 30
 grep -rho 'gc\.build\.[a-z_.]*' bmad/assets bmad/formulas | sort -u
 ls gascity/schemas/build