diff --git a/extensions/bonjour/manifest.test.ts b/extensions/bonjour/manifest.test.ts
index 8ae64c5759c..a48f5f3db6b 100644
--- a/extensions/bonjour/manifest.test.ts
+++ b/extensions/bonjour/manifest.test.ts
@@ -16,7 +16,7 @@ describe("bonjour package manifest", () => {
     ) as PackageManifest;
 
     expect(pluginPackageJson.dependencies?.["@homebridge/ciao"]).toBe("^1.3.7");
-    expect(rootPackageJson.dependencies?.["@homebridge/ciao"]).toBe("^1.3.7");
+    expect(rootPackageJson.dependencies?.["@homebridge/ciao"]).toBeUndefined();
     expect(pluginPackageJson.devDependencies?.["@homebridge/ciao"]).toBeUndefined();
   });
 });
diff --git a/package.json b/package.json
index de3fdc5b488..c08cea4455f 100644
--- a/package.json
+++ b/package.json
@@ -1615,7 +1615,6 @@
   "dependencies": {
     "@agentclientprotocol/sdk": "0.21.0",
     "@clack/prompts": "^1.3.0",
-    "@homebridge/ciao": "^1.3.7",
     "@lydell/node-pty": "1.2.0-beta.12",
     "@mariozechner/pi-agent-core": "0.71.1",
     "@mariozechner/pi-ai": "0.71.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bbee6f9b46c..95159470884 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,9 +49,6 @@ importers:
       '@clack/prompts':
         specifier: ^1.3.0
         version: 1.3.0
-      '@homebridge/ciao':
-        specifier: ^1.3.7
-        version: 1.3.7
       '@lydell/node-pty':
         specifier: 1.2.0-beta.12
         version: 1.2.0-beta.12
diff --git a/src/commands/agent-command.test-mocks.ts b/src/commands/agent-command.test-mocks.ts
index d57d27e9fe7..bbaf3c0a00d 100644
--- a/src/commands/agent-command.test-mocks.ts
+++ b/src/commands/agent-command.test-mocks.ts
@@ -49,6 +49,7 @@ vi.mock("../agents/pi-embedded.js", () => ({
 }));
 
 vi.mock("../agents/model-catalog.js", () => ({
+  loadManifestModelCatalog: vi.fn(() => []),
   loadModelCatalog: vi.fn(),
 }));
 
diff --git a/src/commands/agent.test.ts b/src/commands/agent.test.ts
index 347561a49bd..820ceb1d688 100644
--- a/src/commands/agent.test.ts
+++ b/src/commands/agent.test.ts
@@ -5,7 +5,7 @@ import { beforeEach, describe, expect, it, type MockInstance, vi } from "vitest"
 import "./agent-command.test-mocks.js";
 import { __testing as acpManagerTesting } from "../acp/control-plane/manager.js";
 import * as authProfileStoreModule from "../agents/auth-profiles/store.js";
-import { loadModelCatalog } from "../agents/model-catalog.js";
+import { loadManifestModelCatalog, loadModelCatalog } from "../agents/model-catalog.js";
 import * as modelSelectionModule from "../agents/model-selection.js";
 import { runEmbeddedPiAgent } from "../agents/pi-embedded.js";
 import * as runtimeSnapshotModule from "../config/runtime-snapshot.js";
@@ -607,11 +607,13 @@ describe("agentCommand", () => {
         },
       });
 
-      vi.mocked(loadModelCatalog).mockResolvedValueOnce([
+      const catalog = [
         { id: "claude-opus-4-6", name: "Opus", provider: "anthropic" },
         { id: "gpt-4.1-mini", name: "GPT-4.1 Mini", provider: "openai" },
         { id: "gpt-5.4", name: "GPT-5.2", provider: "openai" },
-      ]);
+      ];
+      vi.mocked(loadModelCatalog).mockResolvedValueOnce(catalog);
+      vi.mocked(loadManifestModelCatalog).mockReturnValueOnce(catalog);
       vi.mocked(runEmbeddedPiAgent)
         .mockRejectedValueOnce(Object.assign(new Error("rate limited"), { status: 429 }))
         .mockResolvedValueOnce({
@@ -665,11 +667,13 @@ describe("agentCommand", () => {
         },
       });
 
-      vi.mocked(loadModelCatalog).mockResolvedValueOnce([
+      const catalog = [
         { id: "qwen3.5:27b", name: "Qwen 3.5", provider: "ollama" },
         { id: "gpt-4.1-mini", name: "GPT-4.1 Mini", provider: "openai" },
         { id: "gpt-5.4", name: "GPT-5.4", provider: "openai" },
-      ]);
+      ];
+      vi.mocked(loadModelCatalog).mockResolvedValueOnce(catalog);
+      vi.mocked(loadManifestModelCatalog).mockReturnValueOnce(catalog);
       vi.mocked(runEmbeddedPiAgent).mockRejectedValueOnce(new Error("connect ECONNREFUSED"));
 
       await expect(
@@ -714,10 +718,12 @@ describe("agentCommand", () => {
         },
       });
 
-      vi.mocked(loadModelCatalog).mockResolvedValueOnce([
+      const catalog = [
         { id: "claude-opus-4-6", name: "Opus", provider: "anthropic" },
         { id: "gpt-4.1-mini", name: "GPT-4.1 Mini", provider: "openai" },
-      ]);
+      ];
+      vi.mocked(loadModelCatalog).mockResolvedValueOnce(catalog);
+      vi.mocked(loadManifestModelCatalog).mockReturnValueOnce(catalog);
 
       await runAgentWithSessionKey("agent:main:subagent:clear-overrides");
 
@@ -871,14 +877,16 @@ describe("agentCommand", () => {
           "openai/gpt-4.1-mini": {},
         },
       });
-      vi.mocked(loadModelCatalog).mockResolvedValueOnce([
+      const catalog = [
         {
           id: "gpt-4.1-mini",
           name: "GPT-4.1 Mini",
           provider: "openai",
           reasoning: true,
         },
-      ]);
+      ];
+      vi.mocked(loadModelCatalog).mockResolvedValueOnce(catalog);
+      vi.mocked(loadManifestModelCatalog).mockReturnValueOnce(catalog);
 
       await agentCommand({ message: "hi", to: "+1555" }, runtime);