diff --git a/alchemy/bin/commands/login.ts b/alchemy/bin/commands/login.ts
index 1ae0be537..c0d3b7fbc 100644
--- a/alchemy/bin/commands/login.ts
+++ b/alchemy/bin/commands/login.ts
@@ -1,9 +1,9 @@
 import { cancel, intro, log, outro } from "@clack/prompts";
 import pc from "picocolors";
-import { zod as z } from "trpc-cli";
+import { z } from "zod";
 import { DEFAULT_SCOPES, wranglerLogin } from "../../src/cloudflare/oauth.ts";
 import { throwWithContext } from "../errors.ts";
-import { loggedProcedure, ExitSignal } from "../trpc.ts";
+import { ExitSignal, loggedProcedure } from "../trpc.ts";
 
 export const login = loggedProcedure
   .meta({
diff --git a/alchemy/bin/trpc.ts b/alchemy/bin/trpc.ts
index 66cdd5d55..2c4f3226f 100644
--- a/alchemy/bin/trpc.ts
+++ b/alchemy/bin/trpc.ts
@@ -1,7 +1,7 @@
-import { trpcServer } from "trpc-cli";
+import { initTRPC } from "@trpc/server";
 import { TelemetryClient } from "../src/util/telemetry/client.ts";
 
-export const t = trpcServer.initTRPC.create();
+export const t = initTRPC.create();
 
 export class ExitSignal extends Error {
   constructor(public code: 0 | 1 = 0) {
diff --git a/alchemy/package.json b/alchemy/package.json
index 733ddf4e5..c914277f5 100644
--- a/alchemy/package.json
+++ b/alchemy/package.json
@@ -240,6 +240,7 @@
     "@react-router/dev": "^7.7.1",
     "@sentry/cloudflare": "^9.43.0",
     "@sveltejs/adapter-cloudflare": "^7.1.2",
+    "@trpc/server": "^11.4.4",
     "@types/bun": "latest",
     "@types/diff": "^5.0.0",
     "@types/fs-extra": "^11.0.4",
@@ -266,7 +267,7 @@
     "openpgp": "^6.1.0",
     "prettier": "^3.5.3",
     "rwsdk": "^0.1.28",
-    "trpc-cli": "^0.10.2",
+    "trpc-cli": "https://pkg.pr.new/mmkal/trpc-cli@146",
     "ts-morph": "^26.0.0",
     "tsdown": "^0.13.0",
     "turndown": "^7.2.0",
diff --git a/bun.lock b/bun.lock
index a7b263327..75c38b833 100644
--- a/bun.lock
+++ b/bun.lock
@@ -73,6 +73,7 @@
         "@react-router/dev": "^7.7.1",
         "@sentry/cloudflare": "^9.43.0",
         "@sveltejs/adapter-cloudflare": "^7.1.2",
+        "@trpc/server": "^11.4.4",
         "@types/bun": "latest",
         "@types/diff": "^5.0.0",
         "@types/fs-extra": "^11.0.4",
@@ -99,7 +100,7 @@
         "openpgp": "^6.1.0",
         "prettier": "^3.5.3",
         "rwsdk": "^0.1.28",
-        "trpc-cli": "^0.10.2",
+        "trpc-cli": "https://pkg.pr.new/mmkal/trpc-cli@146",
         "ts-morph": "^26.0.0",
         "tsdown": "^0.13.0",
         "turndown": "^7.2.0",
@@ -2102,8 +2103,6 @@
 
     "@types/normalize-package-data": ["@types/normalize-package-data@2.4.4", "", {}, "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="],
 
-    "@types/omelette": ["@types/omelette@0.4.5", "", {}, "sha512-zUCJpVRwfMcZfkxSCGp73mgd3/xesvPz5tQJIORlfP/zkYEyp9KUfF7IP3RRjyZR3DwxkPs96/IFf70GmYZYHQ=="],
-
     "@types/parse-path": ["@types/parse-path@7.1.0", "", { "dependencies": { "parse-path": "*" } }, "sha512-EULJ8LApcVEPbrfND0cRQqutIOdiIgJ1Mgrhpy755r14xMohPTEpkV/k28SJvuOs9bHRFW8x+KeDAEPiGQPB9Q=="],
 
     "@types/react": ["@types/react@19.1.9", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-WmdoynAX8Stew/36uTSVMcLJJ1KRh6L3IZRx1PZ7qJtBqT3dYTgyDTx8H1qoRghErydW7xw9mSJ3wS//tCRpFA=="],
@@ -4662,7 +4661,7 @@
 
     "trough": ["trough@2.2.0", "", {}, "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw=="],
 
-    "trpc-cli": ["trpc-cli@0.10.2", "", { "dependencies": { "@trpc/server": "^11.1.1", "@types/omelette": "^0.4.4", "commander": "^14.0.0", "picocolors": "^1.0.1", "zod": "^3.25.3", "zod-to-json-schema": "^3.23.0" }, "peerDependencies": { "@inquirer/prompts": "*", "omelette": "*" }, "optionalPeers": ["@inquirer/prompts", "omelette"], "bin": { "trpc-cli": "dist/bin.js" } }, "sha512-zBkL88AeX0vQLXwEAcX6WUoT4Sopr97nFDFeD1zmW33wHQwBKbszylplNVk6BO/cuhgm/iq8/cG27NokqKA1mw=="],
+    "trpc-cli": ["trpc-cli@https://pkg.pr.new/mmkal/trpc-cli@146", { "dependencies": { "commander": "^14.0.0" }, "peerDependencies": { "@orpc/server": "^1.0.0", "@trpc/server": "^10.45.2 || ^11.0.1", "@valibot/to-json-schema": "^1.1.0", "effect": "^3.14.2 || ^4.0.0", "valibot": "^1.1.0", "zod": "^3.24.0 || ^4.0.0" }, "optionalPeers": ["@orpc/server", "@trpc/server", "@valibot/to-json-schema", "effect", "valibot", "zod"], "bin": "dist/bin.js" }],
 
     "ts-api-utils": ["ts-api-utils@2.1.0", "", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ=="],