diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1b44b7ec0..279b2e9476 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,6 +21,9 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
+      # PMOVES: the catwalk replace directive in go.mod points at this submodule;
+      # every job that runs the go toolchain must init it first.
+      - run: git submodule update --init pmoves-catwalk
       - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
           go-version-file: go.mod
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6d8b9e2560..703ad2ce94 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,3 +11,5 @@ jobs:
       golangci_path: .golangci.yml
       golangci_version: v2.13.1
       timeout: 10m
+      # PMOVES: catwalk replace needs the submodule present before golangci
+      pre-run: git submodule update --init pmoves-catwalk
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ca58f195e2..1b3a831b74 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -23,6 +23,9 @@ jobs:
           else
             echo "should_run=true" >> $GITHUB_OUTPUT
           fi
+  # NOTE (PMOVES): meta's nightly workflow does not init submodules; with the
+  # catwalk replace active a nightly build would fail (currently moot — this
+  # job startup-fails on the missing goreleaser_key secret before any build).
   nightly:
     needs: check
     if: needs.check.outputs.should_run == 'true'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 650e382330..a4619794fa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,11 @@ concurrency:
   group: goreleaser
   cancel-in-progress: true
 
+# NOTE (PMOVES): this delegates to charmbracelet/meta's goreleaser workflow,
+# which does NOT init submodules — with the catwalk replace active in go.mod a
+# release build would fail. Never run to date on this fork (no tags, no
+# goreleaser_key secret). If a release is ever cut here, inline the job with
+# `git submodule update --init pmoves-catwalk` after checkout.
 jobs:
   goreleaser:
     uses: charmbracelet/meta/.github/workflows/goreleaser.yml@main
diff --git a/.github/workflows/schema-update.yml b/.github/workflows/schema-update.yml
index ea8ad84e39..8042631a6b 100644
--- a/.github/workflows/schema-update.yml
+++ b/.github/workflows/schema-update.yml
@@ -15,6 +15,9 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+      # PMOVES: the catwalk replace in go.mod points at this submodule;
+      # every job that runs the go toolchain must init it first.
+      - run: git submodule update --init pmoves-catwalk
       - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
           go-version-file: go.mod
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index a0c2a77db8..4452607ddc 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -65,6 +65,9 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
+      # PMOVES: the catwalk replace in go.mod points at this submodule;
+      # every job that runs the go toolchain must init it first.
+      - run: git submodule update --init pmoves-catwalk
       - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
           go-version: stable
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index bd0a9bc046..1510dc86ea 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -22,6 +22,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      # PMOVES: the catwalk replace in go.mod points at this submodule;
+      # every job that runs the go toolchain must init it first.
+      - run: git submodule update --init pmoves-catwalk
       - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
           go-version-file: go.mod
diff --git a/go.mod b/go.mod
index 2ba04ea71c..040a08b878 100644
--- a/go.mod
+++ b/go.mod
@@ -218,3 +218,9 @@ require (
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )
+
+// PMOVES: route catwalk at the pmoves-catwalk fork submodule, which carries
+// the TensorZero provider for PMOVES gateway routing. Every workflow that
+// runs the go toolchain must init this submodule first (see build.yml):
+// with the replace active, go mod tidy fails on a bare checkout.
+replace charm.land/catwalk => ./pmoves-catwalk
diff --git a/go.sum b/go.sum
index 8a13af56b4..0e26041800 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,6 @@ charm.land/bubbles/v2 v2.2.1 h1:Fq1+qm5hV6GkvzLQDhCBpXXE5tLgvh1PRriCLwSvIQU=
 charm.land/bubbles/v2 v2.2.1/go.mod h1:wdMgn+sje1KNXdwFizIWjbf328fIUBxqEmJ/vYPo8yc=
 charm.land/bubbletea/v2 v2.0.9 h1:DpJCMWKgzQK8SJv4zbKKFHAI10ymWy/evClPFk0k0f8=
 charm.land/bubbletea/v2 v2.0.9/go.mod h1:2SkdgoTXluXJHOUwAoRlRXF/28vklb1rFl6GcgV1/ss=
-charm.land/catwalk v0.52.8 h1:Spd18CdJjhuxQ8FB/AoudqDthRfhTWmFdI9E8t2bGQw=
-charm.land/catwalk v0.52.8/go.mod h1:T0YPUZkPd60T9bvvHwEqALivY+0FoHmMWvaUGTJalHk=
 charm.land/fang/v2 v2.0.1 h1:zQCM8JQJ1JnQX/66B5jlCYBUxL2as5JXQZ2KJ6EL0mY=
 charm.land/fang/v2 v2.0.1/go.mod h1:S1GmkpcvK+OB5w9caywUnJcsMew45Ot8FXqoz8ALrII=
 charm.land/fantasy v0.41.3 h1:MuzL/7iSF1M9LiB+mHQHFYL9oXyYxI5yWQxOu2PaAX4=