diff --git a/.changeset/fix-next-gate-regressions.md b/.changeset/fix-next-gate-regressions.md
new file mode 100644
index 000000000..ee2ca5b62
--- /dev/null
+++ b/.changeset/fix-next-gate-regressions.md
@@ -0,0 +1,5 @@
+---
+type: Fixed
+pr: 342
+---
+Restore next-branch gate stability by wiring `gsd-tools` to the exported active-workstream resolver, exposing `verify codebase-drift` via command aliases, and syncing inventory docs/manifests to shipped CLI surfaces.
diff --git a/docs/INVENTORY-MANIFEST.json b/docs/INVENTORY-MANIFEST.json
index 8d9973418..d8e6e4c39 100644
--- a/docs/INVENTORY-MANIFEST.json
+++ b/docs/INVENTORY-MANIFEST.json
@@ -1,5 +1,5 @@
 {
-  "generated": "2026-05-25",
+  "generated": "2026-05-26",
   "families": {
     "agents": [
       "gsd-advisor-researcher",
@@ -268,6 +268,7 @@
       "clusters.cjs",
       "code-review-flags.cjs",
       "command-aliases.cjs",
+      "command-arg-projection.cjs",
       "command-routing-hub.cjs",
       "commands.cjs",
       "config-schema.cjs",
diff --git a/docs/INVENTORY.md b/docs/INVENTORY.md
index f6811b054..a785b3b56 100644
--- a/docs/INVENTORY.md
+++ b/docs/INVENTORY.md
@@ -362,7 +362,7 @@ The `gsd-planner` agent is decomposed into a core agent plus reference modules t
 
 ---
 
-## CLI Modules (71 shipped)
+## CLI Modules (72 shipped)
 
 Full listing: `get-shit-done/bin/lib/*.cjs`.
 
@@ -376,6 +376,7 @@ Full listing: `get-shit-done/bin/lib/*.cjs`.
 | `clusters.cjs` | Skill cluster definitions for the runtime surface module (ADR-0011 Phase 2) |
 | `code-review-flags.cjs` | Typed flag parser for `/gsd:code-review`; exports `parseCodeReviewFlags(argv)` (→ `{ fix, all, auto, depth, files }`) and `resolveCodeReviewWorkflow(flags)` (→ `'code-review.md' \| 'code-review-fix.md'`); canonical dispatch seam for `--fix`/`--all`/`--auto` routing |
 | `command-aliases.cjs` | Alias/subcommand metadata for manifest-backed family routers |
+| `command-arg-projection.cjs` | Typed flag and positional argument projection helpers shared across command-family routers |
 | `command-routing-hub.cjs` | Pure-result dispatch hub that centralizes mode decision (SDK vs CJS), error taxonomy, and no-throw contract for all command-family routers (#3788) |
 | `commands.cjs` | Misc CLI commands (slug, timestamp, todos, scaffolding, stats) |
 | `config-schema.cjs` | Single source of truth for `VALID_CONFIG_KEYS` and dynamic key patterns; imported by both the validator and the config-schema-docs parity test |
diff --git a/get-shit-done/bin/gsd-tools.cjs b/get-shit-done/bin/gsd-tools.cjs
index 8c68e74a9..3790e8d95 100755
--- a/get-shit-done/bin/gsd-tools.cjs
+++ b/get-shit-done/bin/gsd-tools.cjs
@@ -170,7 +170,7 @@ const path = require('path');
 const core = require('./lib/core.cjs');
 const { error, findProjectRoot, ERROR_REASON } = core;
 const { getActiveWorkstream } = require('./lib/planning-workspace.cjs');
-const { resolveActiveWorkstreamContext, applyResolvedWorkstreamEnv } = require('./lib/active-workstream-store.cjs');
+const { resolveActiveWorkstream, applyResolvedWorkstreamEnv } = require('./lib/active-workstream-store.cjs');
 const state = require('./lib/state.cjs');
 const phase = require('./lib/phase.cjs');
 const roadmap = require('./lib/roadmap.cjs');
@@ -290,7 +290,7 @@ async function main() {
   let ws = null;
   let workstreamContext = null;
   try {
-    workstreamContext = resolveActiveWorkstreamContext(cwd, args, process.env, {
+    workstreamContext = resolveActiveWorkstream(cwd, args, process.env, {
       getStored: getActiveWorkstream,
     });
     ws = workstreamContext.ws;
diff --git a/get-shit-done/bin/lib/command-aliases.cjs b/get-shit-done/bin/lib/command-aliases.cjs
index c978440e3..ac10ee2e9 100644
--- a/get-shit-done/bin/lib/command-aliases.cjs
+++ b/get-shit-done/bin/lib/command-aliases.cjs
@@ -230,6 +230,14 @@ const VERIFY_COMMAND_ALIASES = [
     ],
     "subcommand": "schema-drift",
     "mutation": false
+  },
+  {
+    "canonical": "verify.codebase-drift",
+    "aliases": [
+      "verify codebase-drift"
+    ],
+    "subcommand": "codebase-drift",
+    "mutation": false
   }
 ];