Skip to content

armgit / mso

Public Imported from GitHub
0

Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.

refactor: segment host capability facades

Rahman8a3feed0cf15
diff --git a/app/api/auth/devices/route.test.ts b/app/api/auth/devices/route.test.ts
index 7ff2a2d7..4d332093 100644
--- a/app/api/auth/devices/route.test.ts
+++ b/app/api/auth/devices/route.test.ts
@@ -30,7 +30,7 @@ vi.mock("@/lib/auth/device-store", () => ({
isValidDeviceId: (value: unknown) => typeof value === "string" && /^[a-f0-9-]{16,128}$/i.test(value),
}));
vi.mock("@/lib/camoufox/service", () => ({ terminateCamoufoxSessions: mocks.terminate }));
-vi.mock("@/lib/host", () => ({ audit: mocks.audit }));
+vi.mock("@/lib/host/audit-api", () => ({ audit: mocks.audit }));
const post = (body: unknown) => new NextRequest("https://mso.example/api/auth/devices", {
method: "POST",
diff --git a/app/api/auth/devices/route.ts b/app/api/auth/devices/route.ts
index 738e2ab9..479d0faa 100644
--- a/app/api/auth/devices/route.ts
+++ b/app/api/auth/devices/route.ts
@@ -10,7 +10,7 @@ import {
import { getSessionContext } from "@/lib/auth/require-session";
import { DeviceRoleError, isDeviceRole } from "@/lib/auth/roles";
import { terminateCamoufoxSessions } from "@/lib/camoufox/service";
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/auth/login/route.ts b/app/api/auth/login/route.ts
index 71f691f6..82a4200f 100644
--- a/app/api/auth/login/route.ts
+++ b/app/api/auth/login/route.ts
@@ -3,7 +3,7 @@ import { constantTimeEq, MAX_COMPARE_BYTES, MIN_SECRET_LEN, signSession, type Se
import { SESSION_COOKIE } from "@/lib/auth/require-session";
import { sessionCookieAttrs } from "@/lib/auth/session-cookie";
import { isApproved, isValidDeviceId, recordPending, touchApproved } from "@/lib/auth/device-store";
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
import { IS_DEMO } from "@/lib/demo";
export const runtime = "nodejs";
diff --git a/app/api/auth/logout/route.ts b/app/api/auth/logout/route.ts
index 30df12f0..208d13c3 100644
--- a/app/api/auth/logout/route.ts
+++ b/app/api/auth/logout/route.ts
@@ -1,7 +1,7 @@
import { NextResponse } from "next/server";
import { SESSION_COOKIE, getSessionActor } from "@/lib/auth/require-session";
import { hostOnlyClearHeader, sessionCookieAttrs } from "@/lib/auth/session-cookie";
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
export const runtime = "nodejs";
diff --git a/app/api/auth/session-cookie.test.ts b/app/api/auth/session-cookie.test.ts
index b4ff0345..9675d77c 100644
--- a/app/api/auth/session-cookie.test.ts
+++ b/app/api/auth/session-cookie.test.ts
@@ -6,7 +6,7 @@
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { MIN_SECRET_LEN } from "@/lib/auth/session";
-vi.mock("@/lib/host", () => ({ audit: vi.fn() }));
+vi.mock("@/lib/host/audit-api", () => ({ audit: vi.fn() }));
vi.mock("@/lib/auth/device-store", () => ({
isValidDeviceId: (id: unknown) => typeof id === "string" && /^[a-f0-9-]{16,128}$/i.test(id),
isApproved: async () => true,
diff --git a/app/api/v1/a2a/route-credentials.ts b/app/api/v1/a2a/route-credentials.ts
index 2b685d71..85bebe73 100644
--- a/app/api/v1/a2a/route-credentials.ts
+++ b/app/api/v1/a2a/route-credentials.ts
@@ -11,7 +11,7 @@ import {
removeA2AOutboundCredential,
setA2AAgentCredential,
} from "@/lib/a2a";
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
import { a2aLimited } from "./route-shared";
export async function handleA2ACredentialAction(
diff --git a/app/api/v1/a2a/route-get.ts b/app/api/v1/a2a/route-get.ts
index 46dc45ff..3ee2e37d 100644
--- a/app/api/v1/a2a/route-get.ts
+++ b/app/api/v1/a2a/route-get.ts
@@ -11,7 +11,7 @@ import {
resolveA2AAgent,
} from "@/lib/a2a";
import { a2aInboundConfig } from "@/lib/a2a/inbound-config";
-import { readAuditTail } from "@/lib/host";
+import { readAuditTail } from "@/lib/host/audit-api";
import { a2aLimited } from "./route-shared";
export async function handleA2AGet(req: NextRequest, actor: string) {
diff --git a/app/api/v1/a2a/route-messages.ts b/app/api/v1/a2a/route-messages.ts
index b31114ac..499171ee 100644
--- a/app/api/v1/a2a/route-messages.ts
+++ b/app/api/v1/a2a/route-messages.ts
@@ -8,7 +8,7 @@ import {
sendA2AMessage,
sendA2AStreamingMessage,
} from "@/lib/a2a";
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
import { msoCapabilityRuntime } from "@/lib/mcp/capability-runtime";
import { a2aHash, a2aLimited } from "./route-shared";
diff --git a/app/api/v1/a2a/route-shared.ts b/app/api/v1/a2a/route-shared.ts
index 449c067f..908c7766 100644
--- a/app/api/v1/a2a/route-shared.ts
+++ b/app/api/v1/a2a/route-shared.ts
@@ -1,7 +1,8 @@
import { createHash } from "node:crypto";
import { NextResponse } from "next/server";
import { getSessionContext } from "@/lib/auth/require-session";
-import { audit, rateLimited } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
export async function a2aOwnerContext() {
const context = await getSessionContext();
diff --git a/app/api/v1/a2a/route.test.ts b/app/api/v1/a2a/route.test.ts
index e6a031d3..7d61f530 100644
--- a/app/api/v1/a2a/route.test.ts
+++ b/app/api/v1/a2a/route.test.ts
@@ -62,12 +62,14 @@ vi.mock("@/lib/a2a", () => ({
handoffA2ALocalSession: mocks.localHandoff,
spawnA2ALocalSubagent: mocks.localSpawn,
}));
-vi.mock("@/lib/host", () => ({
- audit: mocks.audit,
- rateLimited: mocks.rate,
- readAuditTail: mocks.auditTail,
+vi.mock("@/lib/host/audit-api", () => ({ audit: mocks.audit, readAuditTail: mocks.auditTail }));
+vi.mock("@/lib/host/limits-api", () => ({ rateLimited: mocks.rate }));
+vi.mock("@/lib/host/request-api", () => ({
readJson: async (req: Request) => req.json().catch(() => null),
}));
+vi.mock("@/lib/mcp/capability-runtime", () => ({
+ msoCapabilityRuntime: { list: () => [], invoke: vi.fn(async () => ({ content: [] })) },
+}));
const { GET, POST } = await import("./route");
const post = (body: object) =>
@@ -234,7 +236,11 @@ describe("A2A CLI API", () => {
}),
);
expect(handoff.status).toBe(200);
- expect(mocks.localHandoff).toHaveBeenCalledWith("bece", "review this");
+ expect(mocks.localHandoff).toHaveBeenCalledWith(
+ "bece",
+ "review this",
+ expect.objectContaining({ list: expect.any(Function), invoke: expect.any(Function) }),
+ );
const spawn = await POST(
post({
diff --git a/app/api/v1/a2a/route.ts b/app/api/v1/a2a/route.ts
index c2512986..1d063cb5 100644
--- a/app/api/v1/a2a/route.ts
+++ b/app/api/v1/a2a/route.ts
@@ -1,5 +1,5 @@
import { NextRequest, NextResponse } from "next/server";
-import { readJson } from "@/lib/host";
+import { readJson } from "@/lib/host/request-api";
import { handleA2ACredentialAction } from "./route-credentials";
import { handleA2AGet } from "./route-get";
import { handleA2AMessageAction } from "./route-messages";
diff --git a/app/api/v1/camoufox/service/route.ts b/app/api/v1/camoufox/service/route.ts
index cb997a69..e77b64a6 100644
--- a/app/api/v1/camoufox/service/route.ts
+++ b/app/api/v1/camoufox/service/route.ts
@@ -1,7 +1,9 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { camoufoxStatus, setCamoufoxEnabled } from "@/lib/camoufox/service";
-import { apiError, audit, rateLimited, readJson } from "@/lib/host";
+import { apiError, readJson } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/editor/exec/route.ts b/app/api/v1/editor/exec/route.ts
index 1042e631..dc45becf 100644
--- a/app/api/v1/editor/exec/route.ts
+++ b/app/api/v1/editor/exec/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, fileStream, statReadable, readFile, writeFile } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { fileStream, statReadable, readFile, writeFile } from "@/lib/host/fs-api";
import {
blankDoc,
buildDocFromImage,
diff --git a/app/api/v1/exec/run/route.test.ts b/app/api/v1/exec/run/route.test.ts
index 07a7eb41..0c329b23 100644
--- a/app/api/v1/exec/run/route.test.ts
+++ b/app/api/v1/exec/run/route.test.ts
@@ -19,14 +19,12 @@ vi.mock("@/lib/auth/require-session", () => ({
// route delegates to it. We stub the host index to simulate each outcome.
const runCommandMock = vi.fn();
const auditMock = vi.fn();
-vi.mock("@/lib/host", async () => {
- const real = await vi.importActual<typeof import("@/lib/host")>("@/lib/host");
- return {
- ...real,
- runCommand: (...args: unknown[]) => runCommandMock(...args),
- audit: (...args: unknown[]) => auditMock(...args),
- };
-});
+vi.mock("@/lib/host/exec-api", () => ({
+ runCommand: (...args: unknown[]) => runCommandMock(...args),
+}));
+vi.mock("@/lib/host/audit-api", () => ({
+ audit: (...args: unknown[]) => auditMock(...args),
+}));
function makeReq(body: unknown): Request {
return new Request("http://localhost/api/v1/exec/run", {
diff --git a/app/api/v1/exec/run/route.ts b/app/api/v1/exec/run/route.ts
index 36854843..471cda24 100644
--- a/app/api/v1/exec/run/route.ts
+++ b/app/api/v1/exec/run/route.ts
@@ -1,16 +1,10 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import {
- apiError,
- audit,
- invalidRequest,
- optionalString,
- rateLimited,
- readJson,
- requireString,
- runCommand,
-} from "@/lib/host";
+import { apiError, invalidRequest, optionalString, readJson, requireString } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
+import { runCommand } from "@/lib/host/exec-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/copy/route.ts b/app/api/v1/fs/copy/route.ts
index 77b6c184..16ba44df 100644
--- a/app/api/v1/fs/copy/route.ts
+++ b/app/api/v1/fs/copy/route.ts
@@ -1,7 +1,10 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { apiError, audit, copy, invalidRequest, rateLimited, readJson, requireString } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireString } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { copy } from "@/lib/host/fs-api";
+import { rateLimited } from "@/lib/host/limits-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/delete/route.ts b/app/api/v1/fs/delete/route.ts
index 863ad06f..198cea16 100644
--- a/app/api/v1/fs/delete/route.ts
+++ b/app/api/v1/fs/delete/route.ts
@@ -1,7 +1,10 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { apiError, audit, invalidRequest, rateLimited, readJson, remove, requireString } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireString } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
+import { remove } from "@/lib/host/fs-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/list/route.ts b/app/api/v1/fs/list/route.ts
index a632b48c..87b441d9 100644
--- a/app/api/v1/fs/list/route.ts
+++ b/app/api/v1/fs/list/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, listDir } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { listDir } from "@/lib/host/fs-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/mkdir/route.ts b/app/api/v1/fs/mkdir/route.ts
index ab322241..e6c17620 100644
--- a/app/api/v1/fs/mkdir/route.ts
+++ b/app/api/v1/fs/mkdir/route.ts
@@ -1,7 +1,10 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { apiError, audit, invalidRequest, makeDir, rateLimited, readJson, requireString } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireString } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { makeDir } from "@/lib/host/fs-api";
+import { rateLimited } from "@/lib/host/limits-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/move/route.ts b/app/api/v1/fs/move/route.ts
index a43b6907..5cec74df 100644
--- a/app/api/v1/fs/move/route.ts
+++ b/app/api/v1/fs/move/route.ts
@@ -1,7 +1,10 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { apiError, audit, invalidRequest, move, rateLimited, readJson, requireString } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireString } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { move } from "@/lib/host/fs-api";
+import { rateLimited } from "@/lib/host/limits-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/raw/route.ts b/app/api/v1/fs/raw/route.ts
index 5764c7c4..4f9135fe 100644
--- a/app/api/v1/fs/raw/route.ts
+++ b/app/api/v1/fs/raw/route.ts
@@ -1,7 +1,8 @@
import { NextResponse } from "next/server";
import { Readable } from "stream";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, fileStream, statReadable } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { fileStream, statReadable } from "@/lib/host/fs-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/read/route.ts b/app/api/v1/fs/read/route.ts
index a894e214..d48d455c 100644
--- a/app/api/v1/fs/read/route.ts
+++ b/app/api/v1/fs/read/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, readFile } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { readFile } from "@/lib/host/fs-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/search/route.ts b/app/api/v1/fs/search/route.ts
index b25e4968..c911156b 100644
--- a/app/api/v1/fs/search/route.ts
+++ b/app/api/v1/fs/search/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, searchFs } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { searchFs } from "@/lib/host/fs-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/upload/route.ts b/app/api/v1/fs/upload/route.ts
index d54de846..a2a69610 100644
--- a/app/api/v1/fs/upload/route.ts
+++ b/app/api/v1/fs/upload/route.ts
@@ -2,17 +2,10 @@ import { NextResponse } from "next/server";
import { text } from "node:stream/consumers";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import {
- apiError,
- audit,
- boundaryFromContentType,
- invalidRequest,
- parseMultipart,
- rateLimited,
- resolveUploadDest,
- streamFileInto,
- UploadTooLargeError,
-} from "@/lib/host";
+import { apiError, invalidRequest } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { boundaryFromContentType, parseMultipart, resolveUploadDest, streamFileInto, UploadTooLargeError } from "@/lib/host/fs-api";
+import { rateLimited } from "@/lib/host/limits-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/usage/route.ts b/app/api/v1/fs/usage/route.ts
index b2cb3b8b..983128a1 100644
--- a/app/api/v1/fs/usage/route.ts
+++ b/app/api/v1/fs/usage/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, usage } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { usage } from "@/lib/host/fs-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/write/route.ts b/app/api/v1/fs/write/route.ts
index 5c8418cc..7121bb43 100644
--- a/app/api/v1/fs/write/route.ts
+++ b/app/api/v1/fs/write/route.ts
@@ -1,7 +1,10 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { apiError, audit, invalidRequest, rateLimited, readJson, requireString, writeFile } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireString } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
+import { writeFile } from "@/lib/host/fs-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/fs/zip/route.ts b/app/api/v1/fs/zip/route.ts
index 0827507c..cf6b8a03 100644
--- a/app/api/v1/fs/zip/route.ts
+++ b/app/api/v1/fs/zip/route.ts
@@ -2,7 +2,10 @@ import { NextResponse } from "next/server";
import { Readable } from "stream";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { apiError, audit, rateLimited, zipStream } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
+import { zipStream } from "@/lib/host/fs-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/infra/providers/route.test.ts b/app/api/v1/infra/providers/route.test.ts
index 55719c82..4adeb995 100644
--- a/app/api/v1/infra/providers/route.test.ts
+++ b/app/api/v1/infra/providers/route.test.ts
@@ -10,7 +10,7 @@ const auditMock = vi.fn();
vi.mock("@/lib/auth/require-session", () => ({
getSessionContext: vi.fn(async () => contextRef.current),
}));
-vi.mock("@/lib/host", () => ({ audit: (...args: unknown[]) => auditMock(...args) }));
+vi.mock("@/lib/host/audit-api", () => ({ audit: (...args: unknown[]) => auditMock(...args) }));
vi.mock("@/lib/infra", () => ({
INFRA_PROVIDER_IDS: ["dokploy", "cloudflare", "hostinger"],
isInfraProviderId: (id: string) => ["dokploy", "cloudflare", "hostinger"].includes(id),
diff --git a/app/api/v1/infra/providers/route.ts b/app/api/v1/infra/providers/route.ts
index 31f6d680..62c6e978 100644
--- a/app/api/v1/infra/providers/route.ts
+++ b/app/api/v1/infra/providers/route.ts
@@ -1,6 +1,6 @@
import { NextRequest, NextResponse } from "next/server";
import { getSessionContext } from "@/lib/auth/require-session";
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
import { INFRA_PROVIDER_IDS, isInfraProviderId, readInfraProvider, removeInfraProvider, setInfraProvider, summarizeInfraProvider } from "@/lib/infra";
export const runtime = "nodejs";
diff --git a/app/api/v1/local-agents/route.test.ts b/app/api/v1/local-agents/route.test.ts
index 996b5fe6..dbb4632a 100644
--- a/app/api/v1/local-agents/route.test.ts
+++ b/app/api/v1/local-agents/route.test.ts
@@ -8,7 +8,8 @@ const mocks = vi.hoisted(() => ({
vi.mock("@/lib/auth/require-session", () => ({
getSessionContext: vi.fn(async () => ({ role: "owner", session: { device_id: "cli-test" } })),
}));
-vi.mock("@/lib/host", () => ({ audit: mocks.audit, rateLimited: mocks.rate }));
+vi.mock("@/lib/host/audit-api", () => ({ audit: mocks.audit }));
+vi.mock("@/lib/host/limits-api", () => ({ rateLimited: mocks.rate }));
vi.mock("@/lib/agent/session-store", () => ({ getAgentSession: mocks.getSession }));
vi.mock("@/lib/agent/local-agent-directory", () => ({ listLocalAgents: mocks.list }));
vi.mock("@/lib/agent/local-agent-presence", () => ({ touchLocalAgentPresence: mocks.touch, endLocalAgentPresence: mocks.end }));
diff --git a/app/api/v1/local-agents/route.ts b/app/api/v1/local-agents/route.ts
index 24eb88fb..2c478121 100644
--- a/app/api/v1/local-agents/route.ts
+++ b/app/api/v1/local-agents/route.ts
@@ -1,6 +1,7 @@
import { NextRequest, NextResponse } from "next/server";
import { getSessionContext } from "@/lib/auth/require-session";
-import { audit, rateLimited } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { getAgentSession } from "@/lib/agent/session-store";
import { listLocalAgents } from "@/lib/agent/local-agent-directory";
import { endLocalAgentPresence, touchLocalAgentPresence } from "@/lib/agent/local-agent-presence";
diff --git a/app/api/v1/managed-apps/[id]/install/route.ts b/app/api/v1/managed-apps/[id]/install/route.ts
index fca1ed61..9563739d 100644
--- a/app/api/v1/managed-apps/[id]/install/route.ts
+++ b/app/api/v1/managed-apps/[id]/install/route.ts
@@ -2,7 +2,9 @@ import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
import { IS_DEMO } from "@/lib/demo";
-import { audit, optionalString, rateLimited, readJson } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
+import { optionalString, readJson } from "@/lib/host/request-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { isManagedAppId } from "@/lib/managed-apps/catalog";
import { startInstall } from "@/lib/managed-apps/install";
import { rememberJobActor } from "@/lib/managed-apps/job-audit";
diff --git a/app/api/v1/managed-apps/[id]/jobs/[jobId]/route.ts b/app/api/v1/managed-apps/[id]/jobs/[jobId]/route.ts
index 3269222c..ca3601c6 100644
--- a/app/api/v1/managed-apps/[id]/jobs/[jobId]/route.ts
+++ b/app/api/v1/managed-apps/[id]/jobs/[jobId]/route.ts
@@ -2,7 +2,8 @@ import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
import { IS_DEMO } from "@/lib/demo";
-import { audit, rateLimited } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { isManagedAppId } from "@/lib/managed-apps/catalog";
import { auditJobCompletion } from "@/lib/managed-apps/job-audit";
import { cancelManagedAppJob, readManagedAppJob } from "@/lib/managed-apps/jobs";
diff --git a/app/api/v1/managed-apps/[id]/route.ts b/app/api/v1/managed-apps/[id]/route.ts
index 1e6addd2..56732e84 100644
--- a/app/api/v1/managed-apps/[id]/route.ts
+++ b/app/api/v1/managed-apps/[id]/route.ts
@@ -1,7 +1,8 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { audit, rateLimited } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { IS_DEMO } from "@/lib/demo";
import { isManagedAppId } from "@/lib/managed-apps/catalog";
import { getManagedApp, performManagedAppAction } from "@/lib/managed-apps/manager";
diff --git a/app/api/v1/managed-apps/[id]/update/route.ts b/app/api/v1/managed-apps/[id]/update/route.ts
index 87fdff4d..bbe4e194 100644
--- a/app/api/v1/managed-apps/[id]/update/route.ts
+++ b/app/api/v1/managed-apps/[id]/update/route.ts
@@ -2,7 +2,9 @@ import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
import { IS_DEMO } from "@/lib/demo";
-import { audit, optionalString, rateLimited, readJson } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
+import { optionalString, readJson } from "@/lib/host/request-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { isManagedAppId } from "@/lib/managed-apps/catalog";
import { rememberJobActor } from "@/lib/managed-apps/job-audit";
import { redact } from "@/lib/managed-apps/redact";
diff --git a/app/api/v1/managed-apps/job-cancel-route.test.ts b/app/api/v1/managed-apps/job-cancel-route.test.ts
index dbffb1d1..23021476 100644
--- a/app/api/v1/managed-apps/job-cancel-route.test.ts
+++ b/app/api/v1/managed-apps/job-cancel-route.test.ts
@@ -21,10 +21,8 @@ vi.mock("@/lib/demo", () => ({
return demo.value;
},
}));
-vi.mock("@/lib/host", async () => {
- const real = await vi.importActual<typeof import("@/lib/host")>("@/lib/host");
- return { ...real, audit: vi.fn(async () => undefined), rateLimited: vi.fn(() => limited.value) };
-});
+vi.mock("@/lib/host/audit-api", () => ({ audit: vi.fn(async () => undefined) }));
+vi.mock("@/lib/host/limits-api", () => ({ rateLimited: vi.fn(() => limited.value) }));
// Mocked wholesale: importing the real one would pull in the job runner, and
// nothing in a route test may be able to spawn or signal a process.
vi.mock("@/lib/managed-apps/jobs", () => ({
@@ -32,7 +30,8 @@ vi.mock("@/lib/managed-apps/jobs", () => ({
readManagedAppJob: vi.fn(async () => null),
}));
-const { audit, rateLimited } = await import("@/lib/host");
+const { audit } = await import("@/lib/host/audit-api");
+const { rateLimited } = await import("@/lib/host/limits-api");
const { cancelManagedAppJob } = await import("@/lib/managed-apps/jobs");
const { DELETE } = await import("./[id]/jobs/[jobId]/route");
diff --git a/app/api/v1/managed-apps/update-route.test.ts b/app/api/v1/managed-apps/update-route.test.ts
index 45115cc1..921dd310 100644
--- a/app/api/v1/managed-apps/update-route.test.ts
+++ b/app/api/v1/managed-apps/update-route.test.ts
@@ -27,10 +27,8 @@ vi.mock("@/lib/demo", () => ({
// one test spends cannot leak into the next (it is process-global and has no
// reset); rate-limit.test.ts covers the counting itself.
const limited = vi.hoisted(() => ({ value: false }));
-vi.mock("@/lib/host", async () => {
- const real = await vi.importActual<typeof import("@/lib/host")>("@/lib/host");
- return { ...real, audit: vi.fn(async () => undefined), rateLimited: vi.fn(() => limited.value) };
-});
+vi.mock("@/lib/host/audit-api", () => ({ audit: vi.fn(async () => undefined) }));
+vi.mock("@/lib/host/limits-api", () => ({ rateLimited: vi.fn(() => limited.value) }));
// The lifecycle route shares this trail (and audited no actor either), so it is
// exercised here rather than left to be the one privileged route with no test.
vi.mock("@/lib/managed-apps/manager", () => ({ getManagedApp: vi.fn(), performManagedAppAction: vi.fn() }));
@@ -43,7 +41,8 @@ vi.mock("@/lib/managed-apps/update", () => ({
startUninstall: vi.fn(),
}));
-const { audit, rateLimited } = await import("@/lib/host");
+const { audit } = await import("@/lib/host/audit-api");
+const { rateLimited } = await import("@/lib/host/limits-api");
const service = await import("@/lib/managed-apps/update");
const { GET, POST } = await import("./[id]/update/route");
const jobRoute = await import("./[id]/jobs/[jobId]/route");
diff --git a/app/api/v1/stock/search/route.ts b/app/api/v1/stock/search/route.ts
index 5d1c3d3f..4bb471c6 100644
--- a/app/api/v1/stock/search/route.ts
+++ b/app/api/v1/stock/search/route.ts
@@ -1,6 +1,6 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, invalidRequest } from "@/lib/host";
+import { apiError, invalidRequest } from "@/lib/host/request-api";
import { searchOpenverse, searchUnsplash } from "../providers";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/sys/audit/route.ts b/app/api/v1/sys/audit/route.ts
index 28e055b4..f88bb130 100644
--- a/app/api/v1/sys/audit/route.ts
+++ b/app/api/v1/sys/audit/route.ts
@@ -1,6 +1,6 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { readAuditTail } from "@/lib/host";
+import { readAuditTail } from "@/lib/host/audit-api";
// The audit trail, read-only. Session-gated like every other /api/v1 route.
//
diff --git a/app/api/v1/sys/cleanup/route.ts b/app/api/v1/sys/cleanup/route.ts
index 9b2a0903..5a808741 100644
--- a/app/api/v1/sys/cleanup/route.ts
+++ b/app/api/v1/sys/cleanup/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, audit, readJson } from "@/lib/host";
+import { apiError, readJson } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
import { scanCleanup, runCleanup } from "@/lib/host/cleanup";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/sys/packages/route.test.ts b/app/api/v1/sys/packages/route.test.ts
index eef1cfc3..72e06777 100644
--- a/app/api/v1/sys/packages/route.test.ts
+++ b/app/api/v1/sys/packages/route.test.ts
@@ -8,7 +8,7 @@ const mocks = vi.hoisted(() => ({
}));
vi.mock("@/lib/agent/server", () => ({ verifyAuth: mocks.verifyAuth }));
vi.mock("@/lib/auth/require-session", () => ({ getSessionActor: mocks.actor }));
-vi.mock("@/lib/host", () => ({ rateLimited: mocks.rateLimited }));
+vi.mock("@/lib/host/limits-api", () => ({ rateLimited: mocks.rateLimited }));
vi.mock("@/lib/host/package-updates", () => ({ packageUpdates: mocks.updates }));
beforeEach(() => {
diff --git a/app/api/v1/sys/packages/route.ts b/app/api/v1/sys/packages/route.ts
index 8caca8af..4efd7df7 100644
--- a/app/api/v1/sys/packages/route.ts
+++ b/app/api/v1/sys/packages/route.ts
@@ -1,6 +1,6 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { rateLimited } from "@/lib/host";
+import { rateLimited } from "@/lib/host/limits-api";
import { packageUpdates } from "@/lib/host/package-updates";
import { getSessionActor } from "@/lib/auth/require-session";
diff --git a/app/api/v1/sys/processes/route.ts b/app/api/v1/sys/processes/route.ts
index 8afbcaa1..65fd506b 100644
--- a/app/api/v1/sys/processes/route.ts
+++ b/app/api/v1/sys/processes/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, processes } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { processes } from "@/lib/host/system-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/sys/services/logs/route.test.ts b/app/api/v1/sys/services/logs/route.test.ts
index e5cde349..5f5e1b3a 100644
--- a/app/api/v1/sys/services/logs/route.test.ts
+++ b/app/api/v1/sys/services/logs/route.test.ts
@@ -8,8 +8,8 @@ const mocks = vi.hoisted(() => ({
}));
vi.mock("@/lib/agent/server", () => ({ verifyAuth: mocks.verifyAuth }));
vi.mock("@/lib/auth/require-session", () => ({ getSessionActor: mocks.actor }));
-vi.mock("@/lib/host", () => ({
- rateLimited: mocks.rateLimited,
+vi.mock("@/lib/host/limits-api", () => ({ rateLimited: mocks.rateLimited }));
+vi.mock("@/lib/host/request-api", () => ({
apiError: (_label: string, error: unknown) => Response.json({ error: String(error) }, { status: 400 }),
}));
vi.mock("@/lib/host/services", () => ({ serviceLogs: mocks.logs }));
diff --git a/app/api/v1/sys/services/logs/route.ts b/app/api/v1/sys/services/logs/route.ts
index ec551d40..10ddbf52 100644
--- a/app/api/v1/sys/services/logs/route.ts
+++ b/app/api/v1/sys/services/logs/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, rateLimited } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { serviceLogs } from "@/lib/host/services";
import { getSessionActor } from "@/lib/auth/require-session";
import type { ServiceScope } from "@/lib/os-api/types";
diff --git a/app/api/v1/sys/services/route.test.ts b/app/api/v1/sys/services/route.test.ts
index 2dcaeb76..57aacdcc 100644
--- a/app/api/v1/sys/services/route.test.ts
+++ b/app/api/v1/sys/services/route.test.ts
@@ -9,9 +9,9 @@ const mocks = vi.hoisted(() => ({
rateLimited: vi.fn(() => false),
}));
vi.mock("@/lib/agent/server", () => ({ verifyAuth: mocks.verifyAuth }));
-vi.mock("@/lib/host", () => ({
- audit: mocks.audit,
- rateLimited: mocks.rateLimited,
+vi.mock("@/lib/host/audit-api", () => ({ audit: mocks.audit }));
+vi.mock("@/lib/host/limits-api", () => ({ rateLimited: mocks.rateLimited }));
+vi.mock("@/lib/host/request-api", () => ({
apiError: (_label: string, error: unknown) => Response.json({ error: error instanceof Error ? error.message : String(error) }, { status: 400 }),
}));
vi.mock("@/lib/host/services", () => ({
diff --git a/app/api/v1/sys/services/route.ts b/app/api/v1/sys/services/route.ts
index e2cf4f9c..aff3410e 100644
--- a/app/api/v1/sys/services/route.ts
+++ b/app/api/v1/sys/services/route.ts
@@ -1,6 +1,8 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, audit, rateLimited } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { listSystemServices, servicePower } from "@/lib/host/services";
import { getSessionActor } from "@/lib/auth/require-session";
import type { ServiceAction, ServiceScope } from "@/lib/os-api/types";
diff --git a/app/api/v1/sys/stats/route.ts b/app/api/v1/sys/stats/route.ts
index 163e270a..11fad1a8 100644
--- a/app/api/v1/sys/stats/route.ts
+++ b/app/api/v1/sys/stats/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, stats } from "@/lib/host";
+import { apiError } from "@/lib/host/request-api";
+import { stats } from "@/lib/host/system-api";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/sys/update/route.test.ts b/app/api/v1/sys/update/route.test.ts
index 0a959b97..b5f44ecd 100644
--- a/app/api/v1/sys/update/route.test.ts
+++ b/app/api/v1/sys/update/route.test.ts
@@ -23,10 +23,9 @@ vi.mock("@/lib/host/self-update", () => ({
}));
const auditMock = vi.fn();
-vi.mock("@/lib/host", async () => {
- const real = await vi.importActual<typeof import("@/lib/host")>("@/lib/host");
- return { ...real, audit: (...args: unknown[]) => auditMock(...args) };
-});
+vi.mock("@/lib/host/audit-api", () => ({
+ audit: (...args: unknown[]) => auditMock(...args),
+}));
const { GET, POST } = await import("./route");
const { HostError } = await import("@/lib/host/host-error");
diff --git a/app/api/v1/sys/update/route.ts b/app/api/v1/sys/update/route.ts
index 64249a34..577eb0c5 100644
--- a/app/api/v1/sys/update/route.ts
+++ b/app/api/v1/sys/update/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, audit, readJson } from "@/lib/host";
+import { apiError, readJson } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
import { getUpdateStatus, startUpdate } from "@/lib/host/self-update";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/temp-share/[id]/route.ts b/app/api/v1/temp-share/[id]/route.ts
index 4c85941a..9fe13ed9 100644
--- a/app/api/v1/temp-share/[id]/route.ts
+++ b/app/api/v1/temp-share/[id]/route.ts
@@ -1,6 +1,6 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { consumeTempShare, inspectTempShare } from "@/lib/host";
+import { consumeTempShare, inspectTempShare } from "@/lib/host/temp-share-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/term/close/route.ts b/app/api/v1/term/close/route.ts
index 26d7c725..67e840a0 100644
--- a/app/api/v1/term/close/route.ts
+++ b/app/api/v1/term/close/route.ts
@@ -1,7 +1,9 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import { apiError, audit, closePty, invalidRequest, readJson, requireString } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireString } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { closePty } from "@/lib/host/terminal-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/term/input/route.ts b/app/api/v1/term/input/route.ts
index f8efa407..a99eb79d 100644
--- a/app/api/v1/term/input/route.ts
+++ b/app/api/v1/term/input/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, invalidRequest, readJson, requireString, writePty } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireString } from "@/lib/host/request-api";
+import { writePty } from "@/lib/host/terminal-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/term/open/route.ts b/app/api/v1/term/open/route.ts
index a61dc4cb..5073abea 100644
--- a/app/api/v1/term/open/route.ts
+++ b/app/api/v1/term/open/route.ts
@@ -1,16 +1,10 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
import { getSessionActor } from "@/lib/auth/require-session";
-import {
- apiError,
- audit,
- invalidRequest,
- openPty,
- optionalString,
- rateLimited,
- readJson,
- requireInt,
-} from "@/lib/host";
+import { apiError, invalidRequest, optionalString, readJson, requireInt } from "@/lib/host/request-api";
+import { audit } from "@/lib/host/audit-api";
+import { openPty } from "@/lib/host/terminal-api";
+import { rateLimited } from "@/lib/host/limits-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/term/resize/route.ts b/app/api/v1/term/resize/route.ts
index c6b8c89d..83417d9a 100644
--- a/app/api/v1/term/resize/route.ts
+++ b/app/api/v1/term/resize/route.ts
@@ -1,6 +1,7 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { apiError, invalidRequest, readJson, requireInt, requireString, resizePty } from "@/lib/host";
+import { apiError, invalidRequest, readJson, requireInt, requireString } from "@/lib/host/request-api";
+import { resizePty } from "@/lib/host/terminal-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/api/v1/term/stream/route.ts b/app/api/v1/term/stream/route.ts
index 61e3b9c2..20795c39 100644
--- a/app/api/v1/term/stream/route.ts
+++ b/app/api/v1/term/stream/route.ts
@@ -1,6 +1,6 @@
import { NextResponse } from "next/server";
import { verifyAuth } from "@/lib/agent/server";
-import { attachPty, hasPty } from "@/lib/host";
+import { attachPty, hasPty } from "@/lib/host/terminal-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/app/mcp/route.test.ts b/app/mcp/route.test.ts
index 1f47a7d2..b70a5176 100644
--- a/app/mcp/route.test.ts
+++ b/app/mcp/route.test.ts
@@ -38,10 +38,13 @@ vi.mock("@/lib/mcp/origin", () => ({
mcpRequestOriginAllowed: mocks.mcpRequestOriginAllowed,
mcpCorsHeaders: mocks.mcpCorsHeaders,
}));
-vi.mock("@/lib/host", () => ({
+vi.mock("@/lib/host/limits-api", () => ({
rateLimited: mocks.rateLimited,
rateLimitedUntrusted: mocks.rateLimitedUntrusted,
}));
+vi.mock("@/lib/mcp/capability-runtime", () => ({
+ msoCapabilityRuntime: { list: () => [], invoke: vi.fn(async () => ({ content: [] })) },
+}));
vi.mock("@/lib/mcp/tools", () => ({ TOOLS: [] }));
vi.mock("@/lib/mcp/toolset", () => ({ toolsetInfo: () => ({}) }));
vi.mock("@/lib/mcp/client-profile", () => ({ detectMcpToolProfile: ({ name }: { name?: string }) => name === "ChatGPT" ? "chatgpt" : "full" }));
@@ -159,7 +162,7 @@ describe("/mcp request boundary", () => {
body,
"read",
`mcp:${token.hash.slice(0, 16)}`,
- { principal: `mcp-client:${token.clientId}`, toolProfile: "full" },
+ expect.objectContaining({ principal: `mcp-client:${token.clientId}`, toolProfile: "full", capabilities: expect.objectContaining({ list: expect.any(Function), invoke: expect.any(Function) }) }),
);
});
@@ -180,7 +183,10 @@ describe("/mcp request boundary", () => {
expect(hash).toMatch(/^[a-f0-9]{64}$/);
expect(hash).not.toContain(rawConversation);
expect(mocks.dispatch).toHaveBeenCalledWith(body, "read", `mcp:${token.hash.slice(0, 16)}`, {
- principal: `mcp-client:${token.clientId}`, sessionId: "20260901_100000_aabbccdd", toolProfile: "chatgpt",
+ principal: `mcp-client:${token.clientId}`,
+ sessionId: "20260901_100000_aabbccdd",
+ toolProfile: "chatgpt",
+ capabilities: expect.objectContaining({ list: expect.any(Function), invoke: expect.any(Function) }),
});
});
diff --git a/app/mcp/route.ts b/app/mcp/route.ts
index 59511d5d..ba14b1df 100644
--- a/app/mcp/route.ts
+++ b/app/mcp/route.ts
@@ -2,7 +2,7 @@ import { dispatch, isNotification, rpcError, UNAUTHORIZED, RATE_LIMITED, type Rp
import { getClient, validateToken, touchToken } from "@/lib/mcp/store";
import { clampScope, mcpEnabled } from "@/lib/mcp/scope";
import { publicOrigin, clientIp, mcpCorsHeaders, mcpRequestOriginAllowed } from "@/lib/mcp/origin";
-import { rateLimited, rateLimitedUntrusted } from "@/lib/host";
+import { rateLimited, rateLimitedUntrusted } from "@/lib/host/limits-api";
import { TOOLS } from "@/lib/mcp/tools";
import { toolsetInfo } from "@/lib/mcp/toolset";
import { detectMcpToolProfile } from "@/lib/mcp/client-profile";
diff --git a/app/oauth/register/route.ts b/app/oauth/register/route.ts
index a032c33a..1a400fef 100644
--- a/app/oauth/register/route.ts
+++ b/app/oauth/register/route.ts
@@ -2,7 +2,7 @@ import { registerClient } from "@/lib/mcp/store";
import { isAllowedRedirect } from "@/lib/mcp/pkce";
import { mcpEnabled } from "@/lib/mcp/scope";
import { clientIp } from "@/lib/mcp/origin";
-import { rateLimitedUntrusted } from "@/lib/host";
+import { rateLimitedUntrusted } from "@/lib/host/limits-api";
// RFC 7591 Dynamic Client Registration. Open by design and safe to be: a
// registered client is INERT until the owner approves it on the consent page and
diff --git a/app/oauth/token/route.test.ts b/app/oauth/token/route.test.ts
index 0e19e511..aa1d4a41 100644
--- a/app/oauth/token/route.test.ts
+++ b/app/oauth/token/route.test.ts
@@ -4,7 +4,7 @@ vi.mock("@/lib/mcp/store", () => ({ consumeCode: mocks.consumeCode, storeOAuthGr
vi.mock("@/lib/mcp/pkce", () => ({ verifyPkce: mocks.verify, randomToken: mocks.random }));
vi.mock("@/lib/mcp/scope", () => ({ mcpEnabled: () => true, oauthScopeString: (scope: string, offline = false) => `${scope}${offline ? " offline_access" : ""}` }));
vi.mock("@/lib/mcp/origin", () => ({ clientIp: () => "127.0.0.1", publicOrigin: () => "https://mso.example.test" }));
-vi.mock("@/lib/host", () => ({ rateLimitedUntrusted: mocks.limited }));
+vi.mock("@/lib/host/limits-api", () => ({ rateLimitedUntrusted: mocks.limited }));
const { POST } = await import("./route");
const post = (body: Record<string, string>) => new Request("https://mso.example.test/oauth/token", { method: "POST", headers: { "content-type": "application/x-www-form-urlencoded" }, body: new URLSearchParams(body) });
diff --git a/app/oauth/token/route.ts b/app/oauth/token/route.ts
index 59e15356..13fb3deb 100644
--- a/app/oauth/token/route.ts
+++ b/app/oauth/token/route.ts
@@ -2,7 +2,7 @@ import { consumeCode, OAUTH_ACCESS_TOKEN_TTL_MS, rotateOAuthGrant, storeOAuthGra
import { verifyPkce, randomToken } from "@/lib/mcp/pkce";
import { mcpEnabled, oauthScopeString } from "@/lib/mcp/scope";
import { clientIp, publicOrigin } from "@/lib/mcp/origin";
-import { rateLimitedUntrusted } from "@/lib/host";
+import { rateLimitedUntrusted } from "@/lib/host/limits-api";
export const runtime = "nodejs";
export const dynamic = "force-dynamic";
diff --git a/architecture.boundaries.json b/architecture.boundaries.json
index 1dbd63cf..c2010acb 100644
--- a/architecture.boundaries.json
+++ b/architecture.boundaries.json
@@ -9,7 +9,8 @@
"appshellSelfBarrelImports": 0,
"nonMcpMcpImports": 0,
"crossProtocolCycles": 0,
- "legacyWorkflowFacadeImports": 0
+ "legacyWorkflowFacadeImports": 0,
+ "hostFacadeImports": 0
},
"notes": {
"policy": "Ratchets may only stay equal or decrease. Raise a baseline only with an explicit architecture decision.",
diff --git a/lib/a2a/server-execution.ts b/lib/a2a/server-execution.ts
index 324a0254..0afbebad 100644
--- a/lib/a2a/server-execution.ts
+++ b/lib/a2a/server-execution.ts
@@ -1,4 +1,4 @@
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
import type { AgentSession } from "@/lib/agent/session-types";
import type { CapabilityRuntime } from "@/lib/capabilities/runtime";
import type { A2AAuthenticatedProfile } from "./server-protocol";
diff --git a/lib/a2a/server.ts b/lib/a2a/server.ts
index 72b99c6a..59f85fdc 100644
--- a/lib/a2a/server.ts
+++ b/lib/a2a/server.ts
@@ -1,4 +1,5 @@
-import { audit, rateLimited } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
+import { rateLimited } from "@/lib/host/limits-api";
import { clientIp } from "@/lib/host/request-ip";
import { resolveAgentSessionOwnerRef } from "@/lib/agent/session-query";
import type { AgentSession } from "@/lib/agent/session-types";
diff --git a/lib/capabilities/execute.ts b/lib/capabilities/execute.ts
index 22e6e43e..b982181a 100644
--- a/lib/capabilities/execute.ts
+++ b/lib/capabilities/execute.ts
@@ -1,4 +1,4 @@
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
import { maybeAutoTitleAgentSession } from "@/lib/agent/session-store";
import { touchLocalAgentPresence } from "@/lib/agent/local-agent-presence";
import { activeWorkflowForActor, recordWorkflowStep } from "@/lib/workflow";
diff --git a/lib/host/audit-api.ts b/lib/host/audit-api.ts
new file mode 100644
index 00000000..b1d1efcd
--- /dev/null
+++ b/lib/host/audit-api.ts
@@ -0,0 +1,2 @@
+export { audit, readAuditTail } from "./audit";
+export type { AuditAction, AuditEntry, AuditRecord } from "./audit";
diff --git a/lib/host/exec-api.ts b/lib/host/exec-api.ts
new file mode 100644
index 00000000..67327c68
--- /dev/null
+++ b/lib/host/exec-api.ts
@@ -0,0 +1,2 @@
+export { runCommand } from "./exec";
+export { startExecJob, getExecJob, cancelExecJob } from "./exec-jobs";
diff --git a/lib/host/fs-api.ts b/lib/host/fs-api.ts
new file mode 100644
index 00000000..34314ecd
--- /dev/null
+++ b/lib/host/fs-api.ts
@@ -0,0 +1,7 @@
+export { listDir, readFile, writeFile, makeDir, remove, move, copy, searchFs, usage, statReadable, fileStream } from "./fs";
+export { uploadInto, resolveUploadDest, streamFileInto } from "./fs-upload";
+export { zipStream } from "./fs-zip";
+export { parseMultipart, boundaryFromContentType, UploadTooLargeError } from "./multipart";
+export type { MultipartPart } from "./multipart";
+export { sha256Text, utf8Bytes } from "./hash";
+export { writeFileGuarded } from "./guarded-write";
diff --git a/lib/host/index.ts b/lib/host/index.ts
index 981a3846..b40bf731 100644
--- a/lib/host/index.ts
+++ b/lib/host/index.ts
@@ -1,35 +1,12 @@
-// Host facade — the single import for /api/v1 route handlers. All host access
-// (fs/exec/sys) is LOCAL: mso runs as a host process, so it touches the
-// filesystem and spawns commands directly. No external agent. Bounds + auth
-// live in paths.ts and the route's verifyAuth() gate.
-export { listDir, readFile, writeFile, makeDir, remove, move, copy, searchFs, usage, statReadable, fileStream } from "./fs";
-export { uploadInto, resolveUploadDest, streamFileInto } from "./fs-upload";
-export { zipStream } from "./fs-zip";
-export { parseMultipart, boundaryFromContentType, UploadTooLargeError } from "./multipart";
-export type { MultipartPart } from "./multipart";
-export { runCommand } from "./exec";
-export { startExecJob, getExecJob, cancelExecJob } from "./exec-jobs";
-export { sha256Text, utf8Bytes } from "./hash";
-export { writeFileGuarded } from "./guarded-write";
-export { resolveProjectHint, inspectProject } from "./projects";
-export { projectGitSnapshot, projectGitEdits, projectGitDiff, readProjectKnowledge, detectProjectConvex, PROJECT_KNOWLEDGE_REL, PROJECT_KNOWLEDGE_MAX_BYTES } from "./project-experience";
-export { projectCapabilities, runProjectFunction, readProjectMcpServers, publicProjectMcpServers, listProjectMcpTools, callProjectMcpTool } from "./project-capabilities";
-export { listProjectConvexTools, callProjectConvexTool, PROJECT_CONVEX_READ_TOOLS, PROJECT_CONVEX_WRITE_TOOLS } from "./project-convex";
-export type { ProjectCapabilities, PublicProjectFunction } from "./project-capabilities";
-export { listProjectDirs, projectRoots, PROJECT_LIMITS } from "./project-roots";
-export type { ProjectRow } from "./project-roots";
-export { listProjects } from "./project-list";
-export type { ListProjectsResult } from "./project-list";
-export { normalizeProjectKey, projectAliasesFor, projectAliasTarget } from "./project-aliases";
-export type { ProjectResolution } from "./projects";
-export { openPty, attachPty, writePty, resizePty, closePty, hasPty } from "./pty";
-export { stats, processes } from "./sys";
-export { captureMsoScreen } from "./screenshot";
-export type { ScreenshotShell, ScreenshotResult } from "./screenshot";
-export { audit, readAuditTail } from "./audit";
-export { createTempShare, inspectTempShare, consumeTempShare, revokeTempShare, tempShareUrl } from "./temp-share";
-export type { TempShareInfo, ConsumedTempShare } from "./temp-share";
-export type { AuditAction, AuditEntry, AuditRecord } from "./audit";
-export { rateLimited, rateLimitedUntrusted } from "./rate-limit";
-export { HostError } from "./host-error";
-export { apiError, readJson, requireString, optionalString, requireInt, invalidRequest } from "./api-error";
+// Compatibility facade. New code imports a capability-specific host API so one
+// native/optional dependency cannot pull every host surface into its graph.
+export * from "./fs-api";
+export * from "./exec-api";
+export * from "./projects-api";
+export * from "./terminal-api";
+export * from "./system-api";
+export * from "./screenshot-api";
+export * from "./audit-api";
+export * from "./temp-share-api";
+export * from "./request-api";
+export * from "./limits-api";
diff --git a/lib/host/limits-api.ts b/lib/host/limits-api.ts
new file mode 100644
index 00000000..0ea4a632
--- /dev/null
+++ b/lib/host/limits-api.ts
@@ -0,0 +1 @@
+export { rateLimited, rateLimitedUntrusted } from "./rate-limit";
diff --git a/lib/host/projects-api.ts b/lib/host/projects-api.ts
new file mode 100644
index 00000000..5d4825a2
--- /dev/null
+++ b/lib/host/projects-api.ts
@@ -0,0 +1,11 @@
+export { resolveProjectHint, inspectProject } from "./projects";
+export type { ProjectResolution } from "./projects";
+export { projectCapabilities, runProjectFunction, readProjectMcpServers, publicProjectMcpServers, listProjectMcpTools, callProjectMcpTool } from "./project-capabilities";
+export type { ProjectCapabilities, PublicProjectFunction } from "./project-capabilities";
+export { projectGitSnapshot, projectGitEdits, projectGitDiff, readProjectKnowledge, detectProjectConvex, PROJECT_KNOWLEDGE_REL, PROJECT_KNOWLEDGE_MAX_BYTES } from "./project-experience";
+export { listProjectConvexTools, callProjectConvexTool, PROJECT_CONVEX_READ_TOOLS, PROJECT_CONVEX_WRITE_TOOLS } from "./project-convex";
+export { listProjectDirs, projectRoots, PROJECT_LIMITS } from "./project-roots";
+export type { ProjectRow } from "./project-roots";
+export { listProjects } from "./project-list";
+export type { ListProjectsResult } from "./project-list";
+export { normalizeProjectKey, projectAliasesFor, projectAliasTarget } from "./project-aliases";
diff --git a/lib/host/request-api.ts b/lib/host/request-api.ts
new file mode 100644
index 00000000..a9318273
--- /dev/null
+++ b/lib/host/request-api.ts
@@ -0,0 +1,2 @@
+export { HostError } from "./host-error";
+export { apiError, readJson, requireString, optionalString, requireInt, invalidRequest } from "./api-error";
diff --git a/lib/host/screenshot-api.ts b/lib/host/screenshot-api.ts
new file mode 100644
index 00000000..695747bc
--- /dev/null
+++ b/lib/host/screenshot-api.ts
@@ -0,0 +1,2 @@
+export { captureMsoScreen } from "./screenshot";
+export type { ScreenshotShell, ScreenshotResult } from "./screenshot";
diff --git a/lib/host/system-api.ts b/lib/host/system-api.ts
new file mode 100644
index 00000000..a5b47489
--- /dev/null
+++ b/lib/host/system-api.ts
@@ -0,0 +1 @@
+export { stats, processes } from "./sys";
diff --git a/lib/host/temp-share-api.ts b/lib/host/temp-share-api.ts
new file mode 100644
index 00000000..cec8871c
--- /dev/null
+++ b/lib/host/temp-share-api.ts
@@ -0,0 +1,2 @@
+export { createTempShare, inspectTempShare, consumeTempShare, revokeTempShare, tempShareUrl } from "./temp-share";
+export type { TempShareInfo, ConsumedTempShare } from "./temp-share";
diff --git a/lib/host/terminal-api.ts b/lib/host/terminal-api.ts
new file mode 100644
index 00000000..17d16a4f
--- /dev/null
+++ b/lib/host/terminal-api.ts
@@ -0,0 +1 @@
+export { openPty, attachPty, writePty, resizePty, closePty, hasPty } from "./pty";
diff --git a/lib/managed-apps/job-audit.ts b/lib/managed-apps/job-audit.ts
index 36b725c2..53013000 100644
--- a/lib/managed-apps/job-audit.ts
+++ b/lib/managed-apps/job-audit.ts
@@ -1,5 +1,5 @@
import "server-only";
-import { audit } from "@/lib/host";
+import { audit } from "@/lib/host/audit-api";
import type { ManagedAppJob, ManagedAppJobSummary } from "./types";
// The other half of the managed-app audit trail: how an operation ENDED.
diff --git a/lib/mcp/dispatch.test.ts b/lib/mcp/dispatch.test.ts
index 88bcce7f..d1446a33 100644
--- a/lib/mcp/dispatch.test.ts
+++ b/lib/mcp/dispatch.test.ts
@@ -10,8 +10,8 @@ vi.mock("@/lib/a2a/local-session", () => localSessionMock);
// @/lib/host stays REAL — the point of these cases is that the dispatcher, not
// each tool, is what records.
const audited: { action: string; actor?: string; target?: string; ok?: boolean }[] = [];
-vi.mock("@/lib/host", async (orig) => {
- const real = await orig<typeof import("@/lib/host")>();
+vi.mock("@/lib/host/audit-api", async (orig) => {
+ const real = await orig<typeof import("@/lib/host/audit-api")>();
return { ...real, audit: (e: { action: string }) => { audited.push(e); return Promise.resolve(); } };
});
diff --git a/lib/mcp/openai-file-upload.test.ts b/lib/mcp/openai-file-upload.test.ts
index 2c40be94..cdd6fdfc 100644
--- a/lib/mcp/openai-file-upload.test.ts
+++ b/lib/mcp/openai-file-upload.test.ts
@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
vi.mock("server-only", () => ({}));
const uploadInto = vi.fn(async () => ({ written: 1, failed: [] as string[] }));
-vi.mock("@/lib/host", async (orig) => {
- const real = await orig<typeof import("@/lib/host")>();
+vi.mock("@/lib/host/fs-api", async (orig) => {
+ const real = await orig<typeof import("@/lib/host/fs-api")>();
return { ...real, uploadInto };
});
diff --git a/lib/mcp/openai-file-upload.ts b/lib/mcp/openai-file-upload.ts
index 6f3c9269..24b18b16 100644
--- a/lib/mcp/openai-file-upload.ts
+++ b/lib/mcp/openai-file-upload.ts
@@ -1,6 +1,7 @@
import { createHash } from "crypto";
import path from "path";
-import { HostError, uploadInto } from "@/lib/host";
+import { HostError } from "@/lib/host/request-api";
+import { uploadInto } from "@/lib/host/fs-api";
export interface OpenAiProvidedFile {
download_url: string;
diff --git a/lib/mcp/tools-discovery.ts b/lib/mcp/tools-discovery.ts
index 02b0c78d..84f4f34c 100644
--- a/lib/mcp/tools-discovery.ts
+++ b/lib/mcp/tools-discovery.ts
@@ -1,4 +1,4 @@
-import { listProjects, projectCapabilities, publicProjectMcpServers, readProjectMcpServers, resolveProjectHint, PROJECT_LIMITS } from "@/lib/host";
+import { listProjects, projectCapabilities, publicProjectMcpServers, readProjectMcpServers, resolveProjectHint, PROJECT_LIMITS } from "@/lib/host/projects-api";
import { catalogSkillsDetailed, resolveSkill, readSkillFile, skillIsExecutableByDefault, SKILL_SCAN_LIMITS } from "@/lib/skills/catalog";
import { type McpTool, str, opt, S, READ_ONLY } from "./tool-kit";
diff --git a/lib/mcp/tools-forge.test.ts b/lib/mcp/tools-forge.test.ts
index e4620b0d..83e8fbf5 100644
--- a/lib/mcp/tools-forge.test.ts
+++ b/lib/mcp/tools-forge.test.ts
@@ -12,7 +12,7 @@ const mocks = vi.hoisted(() => ({
promoteForgeCandidate: vi.fn(async () => ({ at: "x", path: "/tmp/project/.mso/skills/x/SKILL.md", verification: "local" })),
}));
-vi.mock("@/lib/host", () => ({ resolveProjectHint: mocks.resolveProjectHint }));
+vi.mock("@/lib/host/projects-api", () => ({ resolveProjectHint: mocks.resolveProjectHint }));
vi.mock("@/lib/workflow", () => ({ listLearnedRecipes: mocks.listLearnedRecipes }));
vi.mock("@/lib/forge/proposal", () => ({ proposeForgeCandidate: mocks.proposeForgeCandidate }));
vi.mock("@/lib/forge/evaluate", () => ({ evaluateForgeCandidate: mocks.evaluateForgeCandidate }));
diff --git a/lib/mcp/tools-forge.ts b/lib/mcp/tools-forge.ts
index 989006be..acaec636 100644
--- a/lib/mcp/tools-forge.ts
+++ b/lib/mcp/tools-forge.ts
@@ -1,4 +1,4 @@
-import { resolveProjectHint } from "@/lib/host";
+import { resolveProjectHint } from "@/lib/host/projects-api";
import { evaluateForgeCandidate } from "@/lib/forge/evaluate";
import { promoteForgeCandidate } from "@/lib/forge/promote";
import { proposeForgeCandidate } from "@/lib/forge/proposal";
diff --git a/lib/mcp/tools-operator-dashboard.ts b/lib/mcp/tools-operator-dashboard.ts
index c6314348..559e8421 100644
--- a/lib/mcp/tools-operator-dashboard.ts
+++ b/lib/mcp/tools-operator-dashboard.ts
@@ -1,4 +1,4 @@
-import { stats, processes } from "@/lib/host";
+import { stats, processes } from "@/lib/host/system-api";
import { camoufoxStatus } from "@/lib/camoufox/service";
import { listManagedApps } from "@/lib/managed-apps/manager";
import { INFRA_PROVIDER_IDS, readInfraProvider, summarizeInfraProvider } from "@/lib/infra";
diff --git a/lib/mcp/tools-project-mcp.ts b/lib/mcp/tools-project-mcp.ts
index d75e2551..a33c84f3 100644
--- a/lib/mcp/tools-project-mcp.ts
+++ b/lib/mcp/tools-project-mcp.ts
@@ -1,4 +1,4 @@
-import { callProjectMcpTool, listProjectMcpTools, publicProjectMcpServers, readProjectMcpServers, resolveProjectHint } from "@/lib/host";
+import { callProjectMcpTool, listProjectMcpTools, publicProjectMcpServers, readProjectMcpServers, resolveProjectHint } from "@/lib/host/projects-api";
import { type McpTool, S, str } from "./tool-kit";
export const PROJECT_MCP_TOOLS: McpTool[] = [
diff --git a/lib/mcp/tools-project-memory.ts b/lib/mcp/tools-project-memory.ts
index be8ff062..5f9b0b4b 100644
--- a/lib/mcp/tools-project-memory.ts
+++ b/lib/mcp/tools-project-memory.ts
@@ -1,4 +1,4 @@
-import { resolveProjectHint } from "@/lib/host";
+import { resolveProjectHint } from "@/lib/host/projects-api";
import { isReplaySafeTool } from "@/lib/orchestration/automation";
import { ingestManualUserTest, searchRepoMemory, upsertRepoMemory } from "@/lib/orchestration/repo-memory";
import { readAutomationScript, writeAutomationScript } from "@/lib/orchestration/repo-memory-artifacts";
diff --git a/lib/mcp/tools-project-runtime.ts b/lib/mcp/tools-project-runtime.ts
index c050a9bf..45edf13e 100644
--- a/lib/mcp/tools-project-runtime.ts
+++ b/lib/mcp/tools-project-runtime.ts
@@ -1,4 +1,4 @@
-import { detectProjectConvex, listProjectConvexTools, callProjectConvexTool } from "@/lib/host";
+import { detectProjectConvex, listProjectConvexTools, callProjectConvexTool } from "@/lib/host/projects-api";
import { runSessionSubagent } from "@/lib/agent/subagent-runner";
import { createProjectAgentTask, getProjectAgentTask, updateProjectAgentTask } from "@/lib/agent/project-agent-task-store";
import { allows, parseScope } from "./scope";
diff --git a/lib/mcp/tools-project-shared.ts b/lib/mcp/tools-project-shared.ts
index 40baeadd..9466b239 100644
--- a/lib/mcp/tools-project-shared.ts
+++ b/lib/mcp/tools-project-shared.ts
@@ -1,4 +1,4 @@
-import { resolveProjectHint } from "@/lib/host";
+import { resolveProjectHint } from "@/lib/host/projects-api";
import { opt } from "./tool-kit";
export async function selectedProject(value: string) {
diff --git a/lib/mcp/tools-project-state.ts b/lib/mcp/tools-project-state.ts
index b9360ad2..05e84918 100644
--- a/lib/mcp/tools-project-state.ts
+++ b/lib/mcp/tools-project-state.ts
@@ -1,9 +1,10 @@
import path from "node:path";
import {
- detectProjectConvex, inspectProject, makeDir, projectGitDiff, projectGitEdits, projectGitSnapshot,
- publicProjectMcpServers, readProjectKnowledge, readProjectMcpServers, writeFileGuarded,
+ detectProjectConvex, inspectProject, projectGitDiff, projectGitEdits, projectGitSnapshot,
+ publicProjectMcpServers, readProjectKnowledge, readProjectMcpServers,
PROJECT_KNOWLEDGE_MAX_BYTES, PROJECT_KNOWLEDGE_REL,
-} from "@/lib/host";
+} from "@/lib/host/projects-api";
+import { makeDir, writeFileGuarded } from "@/lib/host/fs-api";
import { INFRA_PROVIDER_IDS, readInfraProvider, summarizeInfraProvider } from "@/lib/infra";
import { type McpTool, S, str, opt, READ_ONLY } from "./tool-kit";
import { DIFF_VIEW_URI, PROJECT_STATUS_URI } from "./ui-resources";
diff --git a/lib/mcp/tools-read.ts b/lib/mcp/tools-read.ts
index fd0ecbd1..0aa0cad8 100644
--- a/lib/mcp/tools-read.ts
+++ b/lib/mcp/tools-read.ts
@@ -1,4 +1,7 @@
-import { listDir, readFile, searchFs, usage, stats, processes, captureMsoScreen, createTempShare, tempShareUrl, sha256Text, utf8Bytes } from "@/lib/host";
+import { listDir, readFile, searchFs, usage, sha256Text, utf8Bytes } from "@/lib/host/fs-api";
+import { stats, processes } from "@/lib/host/system-api";
+import { captureMsoScreen } from "@/lib/host/screenshot-api";
+import { createTempShare, tempShareUrl } from "@/lib/host/temp-share-api";
import { camoufoxStatus } from "@/lib/camoufox/service";
import { listManagedApps, getManagedAppLogs } from "@/lib/managed-apps/manager";
import { searchSkillMemory } from "@/lib/skills/search";
diff --git a/lib/mcp/tools-workflow-lifecycle.ts b/lib/mcp/tools-workflow-lifecycle.ts
index 07e0b53c..f266d4bd 100644
--- a/lib/mcp/tools-workflow-lifecycle.ts
+++ b/lib/mcp/tools-workflow-lifecycle.ts
@@ -1,4 +1,4 @@
-import { inspectProject, resolveProjectHint } from "@/lib/host";
+import { inspectProject, resolveProjectHint } from "@/lib/host/projects-api";
import { activeWorkflowForActor, cancelWorkflow, finishWorkflow } from "@/lib/workflow";
import { assessAutomationPromotion, buildAutomationScriptManifest, workflowCleanupGuidance } from "@/lib/orchestration/automation";
import { classifyTask } from "@/lib/orchestration/classifier";
diff --git a/lib/mcp/tools-workflow-start.ts b/lib/mcp/tools-workflow-start.ts
index 003132cc..c1878fce 100644
--- a/lib/mcp/tools-workflow-start.ts
+++ b/lib/mcp/tools-workflow-start.ts
@@ -1,4 +1,4 @@
-import { inspectProject, readProjectKnowledge, resolveProjectHint } from "@/lib/host";
+import { inspectProject, readProjectKnowledge, resolveProjectHint } from "@/lib/host/projects-api";
import { markRecipeUsed, startWorkflow, summarizeProjectContention } from "@/lib/workflow";
import { searchSkillMemory } from "@/lib/skills/search";
import { progressiveVerification } from "@/lib/orchestration/automation";
diff --git a/lib/mcp/tools.ts b/lib/mcp/tools.ts
index f227c611..96fd6c8a 100644
--- a/lib/mcp/tools.ts
+++ b/lib/mcp/tools.ts
@@ -1,4 +1,6 @@
-import { writeFileGuarded, makeDir, remove, move, copy, runCommand, startExecJob, getExecJob, cancelExecJob, resolveProjectHint, runProjectFunction } from "@/lib/host";
+import { writeFileGuarded, makeDir, remove, move, copy } from "@/lib/host/fs-api";
+import { runCommand, startExecJob, getExecJob, cancelExecJob } from "@/lib/host/exec-api";
+import { resolveProjectHint, runProjectFunction } from "@/lib/host/projects-api";
import { type McpTool, str, opt, S, PATH_P } from "./tool-kit";
import { importOpenAiProvidedFile } from "./openai-file-upload";
import { READ_TOOLS } from "./tools-read";
diff --git a/scripts/check-architecture.mjs b/scripts/check-architecture.mjs
index 9975b0a3..3f60180c 100755
--- a/scripts/check-architecture.mjs
+++ b/scripts/check-architecture.mjs
@@ -30,11 +30,15 @@ const legacyWorkflowFacadeImports = imports.filter((row) => {
const from = rel(ROOT, row.from);
return row.spec === "@/lib/skills/memory" && from !== "lib/skills/memory-compat.test.ts";
}).length;
+const hostFacadeImports = sourceFiles.reduce((count, file) => {
+ const source = readFileSync(file, "utf8");
+ return count + (source.match(/from\s+["']@\/lib\/host["']/g)?.length ?? 0);
+}, 0);
const crossProtocol = structural.filter(({ ring }) => {
const domains = new Set(ring.slice(0, -1).map(domain));
return domains.has("lib/mcp") && (domains.has("lib/a2a") || domains.has("lib/agent"));
});
-const metrics = { structuralCycles: structural.length, crossDomainCycles: crossDomain.length, crossProtocolCycles: crossProtocol.length, filesOver220, filesOver500, serverFrontendImports, appshellSelfBarrelImports, nonMcpMcpImports, legacyWorkflowFacadeImports };
+const metrics = { structuralCycles: structural.length, crossDomainCycles: crossDomain.length, crossProtocolCycles: crossProtocol.length, filesOver220, filesOver500, serverFrontendImports, appshellSelfBarrelImports, nonMcpMcpImports, legacyWorkflowFacadeImports, hostFacadeImports };
let failed = false;
console.log("Architecture health");
for (const [key, current] of Object.entries(metrics)) {