hoomanjs 1.58.0 → 1.59.0

package/dist/daemon/index.js

@@ -1,30 +1,35 @@
 import { stderr } from "node:process";
-import { Message, TextBlock, } from "@strands-agents/sdk";
+import { CONFIG_ID_EFFORT, CONFIG_ID_MODE, CONFIG_ID_MODEL, CONFIG_ID_YOLO, } from "../acp/session-config.js";
 import { HOOMAN_CHANNEL } from "../core/mcp/index.js";
-import { runWithAgentMemoryScope } from "../core/memory/index.js";
-import { createModelDownloadLogger, subscribeModelDownloadProgress, } from "../core/utils/download-progress.js";
-import { attachmentPathsToPromptBlocks } from "../core/utils/attachments.js";
-import { createQueue } from "./queue.js";
-const MAX_ATTACHMENT_BYTES = 1024 * 1024;
+import { attachmentPathsToAcpBlocks } from "./attachments.js";
+import { KeyedTurnQueue } from "./queue.js";
 function debug(text) {
     stderr.write(`[daemon] ${text}\n`);
 }
-function resolveSessionId(message, fallback) {
-    const raw = message.meta.session?.trim() || fallback;
-    if (!raw)
-        return undefined;
-    // Namespace per `server:channel` so the same chat id coming from two
-    // different MCP servers (or two channels on the same server) never collide.
-    return `${message.meta.subscription.server}:${message.meta.subscription.channel}:${raw}`;
+function resolveExternalKey(message, cliSessionFallback) {
+    const { server, channel } = message.meta.subscription;
+    const raw = message.meta.session?.trim() || cliSessionFallback?.trim();
+    return raw ? `${server}:${channel}:${raw}` : `${server}:${channel}`;
 }
-function resolveUserId(message, session) {
+function resolveUserId(message, externalKey) {
     const raw = message.meta.user?.trim();
-    if (!raw)
-        return session;
-    // Same user id across different servers is not the same human, so scope
-    // user ids by server. Channel is intentionally omitted so user identity
-    // stays consistent across rooms within one server.
-    return `${message.meta.subscription.server}:${raw}`;
+    return raw ? `${message.meta.subscription.server}:${raw}` : externalKey;
+}
+function buildOrigin(message) {
+    return {
+        server: message.meta.subscription.server,
+        ...(message.meta.source ? { source: message.meta.source } : {}),
+        ...(message.meta.user ? { user: message.meta.user } : {}),
+        ...(message.meta.session ? { session: message.meta.session } : {}),
+        ...(message.meta.thread ? { thread: message.meta.thread } : {}),
+    };
+}
+async function toPromptBlocks(message) {
+    const blocks = [{ type: "text", text: message.prompt }];
+    if (message.attachments.length > 0) {
+        blocks.push(...(await attachmentPathsToAcpBlocks(message.attachments)));
+    }
+    return blocks;
 }
 function formatSubscriptions(subscriptions) {
     if (subscriptions.length === 0) {
@@ -35,80 +40,166 @@ function formatSubscriptions(subscriptions) {
     ].sort((left, right) => left.localeCompare(right));
     return `${servers.length} MCP server(s): ${servers.join(", ")}`;
 }
-async function toInvokeInput(message, options) {
-    if (message.attachments.length === 0) {
-        return message.prompt;
+async function applyCliOverrides(acpClient, sessionId, overrides) {
+    const requests = [];
+    if (overrides.mode) {
+        requests.push({
+            sessionId,
+            configId: CONFIG_ID_MODE,
+            value: overrides.mode,
+        });
+    }
+    if (overrides.model) {
+        requests.push({
+            sessionId,
+            configId: CONFIG_ID_MODEL,
+            value: overrides.model,
+        });
+    }
+    if (overrides.effort) {
+        requests.push({
+            sessionId,
+            configId: CONFIG_ID_EFFORT,
+            value: overrides.effort,
+        });
+    }
+    if (overrides.yolo) {
+        requests.push({
+            sessionId,
+            configId: CONFIG_ID_YOLO,
+            type: "boolean",
+            value: true,
+        });
+    }
+    for (const request of requests) {
+        await acpClient.setConfigOption(request);
     }
-    const blocks = [new TextBlock(message.prompt)];
-    const attachmentBlocks = await attachmentPathsToPromptBlocks(message.attachments, {
-        maxBytes: MAX_ATTACHMENT_BYTES,
-        metadata: options.metadata,
-    });
-    blocks.push(...attachmentBlocks);
-    return [new Message({ role: "user", content: blocks })];
 }
 export async function main(options) {
     const channels = [HOOMAN_CHANNEL];
     debug(`starting daemon for channel(s): ${channels.join(", ")}`);
-    // Model weights download progress (llama.cpp GGUF fetch on first use):
-    // live single-line updates on a TTY, coarse `[daemon]` log lines otherwise.
-    const stopDownloadProgress = subscribeModelDownloadProgress(createModelDownloadLogger({ stream: stderr, prefix: "[daemon] " }));
-    let unsubscribe = () => { };
-    const [queue, stop] = await createQueue(async (message) => {
+    const queue = new KeyedTurnQueue();
+    async function ensureAcpSession(externalKey, userId, origin) {
+        if (options.registry.hasRuntime(externalKey)) {
+            options.registry.markBusy(externalKey);
+            return options.registry.acpSessionIdFor(externalKey);
+        }
+        const meta = { "hooman/userId": userId, "hooman/origin": origin };
+        const persisted = options.registry.persistedAcpSessionId(externalKey);
+        let acpSessionId;
+        if (persisted) {
+            try {
+                await options.acpClient.resumeSession({
+                    sessionId: persisted,
+                    cwd: options.cwd,
+                    mcpServers: [options.mcpServer],
+                    meta,
+                });
+                acpSessionId = persisted;
+            }
+            catch {
+                debug(`resume failed for ${externalKey} (${persisted}); creating a replacement session`);
+                const created = await options.acpClient.newSession({
+                    cwd: options.cwd,
+                    mcpServers: [options.mcpServer],
+                    meta,
+                });
+                acpSessionId = created.sessionId;
+                await options.registry.persistBinding({
+                    externalKey,
+                    acpSessionId,
+                    cwd: options.cwd,
+                    userId,
+                });
+            }
+        }
+        else {
+            const created = await options.acpClient.newSession({
+                cwd: options.cwd,
+                mcpServers: [options.mcpServer],
+                meta,
+            });
+            acpSessionId = created.sessionId;
+            await options.registry.persistBinding({
+                externalKey,
+                acpSessionId,
+                cwd: options.cwd,
+                userId,
+            });
+        }
+        await applyCliOverrides(options.acpClient, acpSessionId, options.cliOverrides);
+        options.registry.registerActive({
+            externalKey,
+            acpSessionId,
+            cwd: options.cwd,
+            userId,
+            origin,
+        });
+        return acpSessionId;
+    }
+    async function runTurn(message) {
         const tag = `${message.meta.subscription.server}:${message.meta.subscription.channel}`;
-        const session = resolveSessionId(message, options.session);
-        const user = resolveUserId(message, session);
-        debug(`dequeued → ${tag} session=${session} user=${user}`);
+        const externalKey = resolveExternalKey(message, options.session);
+        const userId = resolveUserId(message, externalKey);
+        const origin = buildOrigin(message);
+        if (options.registry.isShuttingDown) {
+            return;
+        }
+        await options.registry.acquireSlot(externalKey);
+        if (options.registry.isShuttingDown) {
+            return;
+        }
+        options.registry.updateOrigin(externalKey, origin);
+        debug(`dequeued → ${tag} session=${externalKey} user=${userId}`);
         if (options.debug) {
             debug(`raw → ${JSON.stringify(message.meta)}`);
         }
-        options.agent.appState.set("userId", user);
-        options.agent.appState.set("sessionId", session);
-        const origin = {
-            server: message.meta.subscription.server,
-            channel: message.meta.subscription.channel,
-            ...(message.meta.source ? { source: message.meta.source } : {}),
-            ...(message.meta.user ? { user: message.meta.user } : {}),
-            ...(message.meta.session ? { session: message.meta.session } : {}),
-            ...(message.meta.thread ? { thread: message.meta.thread } : {}),
-        };
-        options.agent.appState.set("origin", {
-            ...origin,
-        });
+        let acpSessionId;
         try {
-            debug(`invoking agent → ${tag} session=${session} user=${user}`);
-            const invokeInput = await toInvokeInput(message, {
-                metadata: options.metadata,
+            acpSessionId = await ensureAcpSession(externalKey, userId, origin);
+        }
+        catch (error) {
+            const text = error instanceof Error ? error.message : String(error);
+            debug(`session setup failed → ${externalKey}: ${text}`);
+            options.registry.markIdle(externalKey, queue.length(externalKey) > 1);
+            return;
+        }
+        try {
+            debug(`invoking agent → ${tag} session=${externalKey} acp=${acpSessionId}`);
+            const prompt = await toPromptBlocks(message);
+            await options.acpClient.prompt({
+                sessionId: acpSessionId,
+                prompt,
+                meta: { "hooman/origin": origin },
             });
-            if (typeof invokeInput === "string") {
-                await runWithAgentMemoryScope(options.agent, () => options.agent.invoke(invokeInput));
-            }
-            else {
-                await runWithAgentMemoryScope(options.agent, async () => {
-                    for await (const event of options.agent.stream(invokeInput)) {
-                        void event;
-                    }
-                });
-            }
-            debug(`completed → ${tag} session=${session} user=${user}`);
+            debug(`completed → ${tag} session=${externalKey} acp=${acpSessionId}`);
         }
         catch (error) {
             const text = error instanceof Error ? error.message : String(error);
-            debug(`turn failed → ${tag} session=${session} user=${user}: ${text}`);
+            debug(`turn failed → ${tag} session=${externalKey} acp=${acpSessionId}: ${text}`);
+        }
+        finally {
+            options.registry.markIdle(externalKey, queue.length(externalKey) > 1);
         }
-    }, () => unsubscribe());
+    }
     const handle = await options.manager.subscribeToChannels(channels, (message) => {
         debug(`received notification → ${message.meta.subscription.server}:${message.meta.subscription.channel}`);
-        void queue.push(message);
+        queue.push(resolveExternalKey(message, options.session), () => runTurn(message));
     });
-    unsubscribe = handle.unsubscribe;
     debug(`subscribed → ${formatSubscriptions(handle.subscriptions)}`);
+    const stopper = new Promise((resolve) => {
+        const shutdown = () => resolve();
+        process.once("SIGINT", shutdown);
+        process.once("SIGTERM", shutdown);
+    });
     try {
-        await stop();
+        await stopper;
     }
     finally {
-        stopDownloadProgress();
         debug("stopping daemon");
+        handle.unsubscribe();
+        await queue.drain();
+        await options.registry.shutdown();
     }
 }
 //# sourceMappingURL=index.js.map

package/dist/daemon/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"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"}

package/dist/daemon/mcproxy/catalog.d.ts

@@ -0,0 +1,17 @@
+import type { CallToolResult, Tool } from "@modelcontextprotocol/sdk/types.js";
+import type { Manager as McpManager } from "../../core/mcp/index.js";
+/**
+ * Aggregates tools from every configured MCP server the daemon's `Manager`
+ * already has connected, exposing them under collision-safe proxied names
+ * (`${slugifiedServer}__${wireName}`, deterministically suffixed on slug
+ * collisions) and demultiplexing `tools/call` back to the exact upstream
+ * server + original wire tool name via an explicit route map — never by
+ * parsing caller-controlled names.
+ */
+export declare class DaemonToolCatalog {
+    #private;
+    private readonly manager;
+    constructor(manager: McpManager);
+    listTools(): Promise<Tool[]>;
+    callTool(name: string, args: Record<string, unknown> | undefined, signal?: AbortSignal): Promise<CallToolResult>;
+}

package/dist/daemon/mcproxy/catalog.js

@@ -0,0 +1,71 @@
+import { mcpServerPrefix } from "../../core/mcp/prefixed-mcp-tool.js";
+/**
+ * Aggregates tools from every configured MCP server the daemon's `Manager`
+ * already has connected, exposing them under collision-safe proxied names
+ * (`${slugifiedServer}__${wireName}`, deterministically suffixed on slug
+ * collisions) and demultiplexing `tools/call` back to the exact upstream
+ * server + original wire tool name via an explicit route map — never by
+ * parsing caller-controlled names.
+ */
+export class DaemonToolCatalog {
+    manager;
+    #routes = new Map();
+    constructor(manager) {
+        this.manager = manager;
+    }
+    /** Deterministic proxied-name prefix per server, suffixing slug collisions by sorted server name order. */
+    #resolvePrefixes(serverNames) {
+        const sorted = [...serverNames].sort((a, b) => a.localeCompare(b));
+        const counts = new Map();
+        const prefixes = new Map();
+        for (const server of sorted) {
+            const base = mcpServerPrefix(server);
+            const count = (counts.get(base) ?? 0) + 1;
+            counts.set(base, count);
+            prefixes.set(server, count === 1 ? base : `${base}_${count}`);
+        }
+        return prefixes;
+    }
+    async listTools() {
+        const servers = this.manager.listServers().map((entry) => entry.name);
+        const prefixes = this.#resolvePrefixes(servers);
+        const perServer = await Promise.all(servers.map(async (server) => {
+            try {
+                return { server, tools: await this.manager.listServerTools(server) };
+            }
+            catch {
+                return { server, tools: [] };
+            }
+        }));
+        const routes = new Map();
+        const tools = [];
+        for (const { server, tools: serverTools } of perServer) {
+            const prefix = prefixes.get(server) ?? mcpServerPrefix(server);
+            for (const tool of serverTools) {
+                const name = `${prefix}__${tool.name}`;
+                routes.set(name, { server, wireName: tool.name });
+                tools.push({
+                    ...tool,
+                    name,
+                    description: tool.description
+                        ? `${tool.description} (MCP server: ${server})`
+                        : `MCP server: ${server}`,
+                });
+            }
+        }
+        this.#routes = routes;
+        return tools;
+    }
+    async callTool(name, args, signal) {
+        let route = this.#routes.get(name);
+        if (!route) {
+            await this.listTools();
+            route = this.#routes.get(name);
+        }
+        if (!route) {
+            throw new Error(`Unknown tool "${name}".`);
+        }
+        return this.manager.callServerTool(route.server, { name: route.wireName, arguments: args }, signal);
+    }
+}
+//# sourceMappingURL=catalog.js.map

package/dist/daemon/mcproxy/catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/daemon/mcproxy/catalog.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAItE;;;;;;;GAOG;AACH,MAAM,OAAO,iBAAiB;IAGQ;IAFpC,OAAO,GAAG,IAAI,GAAG,EAAwB,CAAC;IAE1C,YAAoC,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IAE3D,2GAA2G;IAC3G,gBAAgB,CAAC,WAA8B;QAC7C,MAAM,MAAM,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3C,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YAC1C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACxB,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,SAAS;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3B,IAAI,CAAC;gBACH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YACvE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,EAAY,EAAE,CAAC;YACzC,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC/C,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,KAAK,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,SAAS,EAAE,CAAC;YACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC/D,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,GAAG,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClD,KAAK,CAAC,IAAI,CAAC;oBACT,GAAG,IAAI;oBACP,IAAI;oBACJ,WAAW,EAAE,IAAI,CAAC,WAAW;wBAC3B,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,iBAAiB,MAAM,GAAG;wBAC/C,CAAC,CAAC,eAAe,MAAM,EAAE;iBAC5B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,QAAQ,CACnB,IAAY,EACZ,IAAyC,EACzC,MAAoB;QAEpB,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACvB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,IAAI,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAChC,KAAK,CAAC,MAAM,EACZ,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,EACzC,MAAM,CACP,CAAC;IACJ,CAAC;CACF"}

package/dist/daemon/mcproxy/http-server.d.ts

@@ -0,0 +1,15 @@
+import type { Server as McpServerInstance } from "@modelcontextprotocol/sdk/server/index.js";
+export type DaemonMcpHttpHandle = {
+    /** `http://127.0.0.1:<port>/mcp` for the resolved (fixed or ephemeral) port. */
+    url: string;
+    close(): Promise<void>;
+};
+/**
+ * Hand-rolled loopback-only Streamable HTTP host for the daemon's aggregate
+ * MCP proxy: one stateful session per initialize handshake, no auth (the
+ * service is process-local and never reachable off-host), no CORS/legacy SSE.
+ */
+export declare function startDaemonMcpHttpServer(options: {
+    port: number;
+    createSession: () => McpServerInstance;
+}): Promise<DaemonMcpHttpHandle>;

package/dist/daemon/mcproxy/http-server.js

@@ -0,0 +1,150 @@
+import { randomUUID } from "node:crypto";
+import { createServer, } from "node:http";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
+const ENDPOINT = "/mcp";
+const MAX_BODY_BYTES = 1024 * 1024;
+function jsonRpcError(id, code, message) {
+    return JSON.stringify({
+        jsonrpc: "2.0",
+        id: id ?? null,
+        error: { code, message },
+    });
+}
+function requestId(body) {
+    if (typeof body !== "object" ||
+        body === null ||
+        Array.isArray(body) ||
+        !("id" in body)) {
+        return null;
+    }
+    return body.id;
+}
+async function readJsonBody(req) {
+    const chunks = [];
+    let size = 0;
+    for await (const chunk of req) {
+        size += chunk.length;
+        if (size > MAX_BODY_BYTES) {
+            throw new Error("Request body exceeds the 1 MiB limit.");
+        }
+        chunks.push(chunk);
+    }
+    const raw = Buffer.concat(chunks).toString("utf8").trim();
+    return raw ? JSON.parse(raw) : undefined;
+}
+/**
+ * Hand-rolled loopback-only Streamable HTTP host for the daemon's aggregate
+ * MCP proxy: one stateful session per initialize handshake, no auth (the
+ * service is process-local and never reachable off-host), no CORS/legacy SSE.
+ */
+export async function startDaemonMcpHttpServer(options) {
+    const sessions = new Map();
+    async function handleInitialize(req, res, body) {
+        if (!isInitializeRequest(body)) {
+            res
+                .writeHead(400, { "Content-Type": "application/json" })
+                .end(jsonRpcError(requestId(body), -32600, "Missing Mcp-Session-Id and body is not an initialize request."));
+            return;
+        }
+        const mcpServer = options.createSession();
+        const transport = new StreamableHTTPServerTransport({
+            sessionIdGenerator: () => randomUUID(),
+            onsessioninitialized: (sessionId) => {
+                sessions.set(sessionId, { server: mcpServer, transport });
+            },
+            onsessionclosed: (sessionId) => {
+                sessions.delete(sessionId);
+                void mcpServer.close().catch(() => undefined);
+            },
+        });
+        await mcpServer.connect(transport);
+        await transport.handleRequest(req, res, body);
+    }
+    async function handle(req, res) {
+        let url;
+        try {
+            url = new URL(req.url ?? "/", "http://127.0.0.1");
+        }
+        catch {
+            res.writeHead(400).end();
+            return;
+        }
+        if (url.pathname !== ENDPOINT) {
+            res.writeHead(404).end();
+            return;
+        }
+        if (req.method !== "POST" &&
+            req.method !== "GET" &&
+            req.method !== "DELETE") {
+            res.writeHead(405, { Allow: "POST, GET, DELETE" }).end();
+            return;
+        }
+        const sessionIdHeader = req.headers["mcp-session-id"];
+        const sessionId = Array.isArray(sessionIdHeader)
+            ? sessionIdHeader[0]
+            : sessionIdHeader;
+        if (req.method === "POST") {
+            let body;
+            try {
+                body = await readJsonBody(req);
+            }
+            catch (error) {
+                res
+                    .writeHead(400, { "Content-Type": "application/json" })
+                    .end(jsonRpcError(null, -32700, error instanceof Error ? error.message : "Invalid JSON body."));
+                return;
+            }
+            if (!sessionId) {
+                await handleInitialize(req, res, body);
+                return;
+            }
+            const entry = sessions.get(sessionId);
+            if (!entry) {
+                res
+                    .writeHead(404, { "Content-Type": "application/json" })
+                    .end(jsonRpcError(requestId(body), -32001, "Unknown session."));
+                return;
+            }
+            await entry.transport.handleRequest(req, res, body);
+            return;
+        }
+        // GET (SSE stream) / DELETE (session termination) require a known session.
+        if (!sessionId) {
+            res.writeHead(400).end();
+            return;
+        }
+        const entry = sessions.get(sessionId);
+        if (!entry) {
+            res.writeHead(404).end();
+            return;
+        }
+        await entry.transport.handleRequest(req, res);
+    }
+    const httpServer = createServer((req, res) => {
+        handle(req, res).catch(() => {
+            if (!res.headersSent) {
+                res.writeHead(500).end();
+            }
+        });
+    });
+    await new Promise((resolve, reject) => {
+        httpServer.once("error", reject);
+        httpServer.listen(options.port, "127.0.0.1", () => {
+            httpServer.off("error", reject);
+            resolve();
+        });
+    });
+    const address = httpServer.address();
+    return {
+        url: `http://127.0.0.1:${address.port}${ENDPOINT}`,
+        async close() {
+            await Promise.all([...sessions.values()].map(({ transport }) => transport.close().catch(() => undefined)));
+            sessions.clear();
+            await new Promise((resolve) => {
+                httpServer.close(() => resolve());
+            });
+        },
+    };
+}
+//# sourceMappingURL=http-server.js.map

package/dist/daemon/mcproxy/http-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-server.js","sourceRoot":"","sources":["../../../src/daemon/mcproxy/http-server.ts"],"names":[],"mappings":"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"}

package/dist/daemon/mcproxy/index.d.ts

@@ -0,0 +1,23 @@
+import type { Manager as McpManager } from "../../core/mcp/index.js";
+/** ACP protocol `McpServerHttp` shape for the daemon's aggregate proxy (no auth/headers). */
+export type DaemonMcpProxyServer = {
+    name: "daemon";
+    type: "http";
+    url: string;
+    headers: [];
+};
+export type DaemonMcpProxy = {
+    /** Session-scoped `mcpServers` entry to pass on every `session/new` / `session/resume` for daemon-hosted ACP sessions. */
+    mcpServer: DaemonMcpProxyServer;
+    close(): Promise<void>;
+};
+/**
+ * Starts the daemon's local, loopback-only aggregate MCP tool proxy in front
+ * of the parent `Manager`'s already-connected upstream servers. Call once,
+ * after the parent has connected/subscribed to channels and before creating
+ * any ACP session; every daemon-hosted ACP session gets the one returned
+ * `mcpServer` entry instead of loading local `mcp.json`.
+ */
+export declare function startDaemonMcpProxy(manager: McpManager, options?: {
+    port?: number;
+}): Promise<DaemonMcpProxy>;

package/dist/daemon/mcproxy/index.js

@@ -0,0 +1,23 @@
+import { DaemonToolCatalog } from "./catalog.js";
+import { startDaemonMcpHttpServer } from "./http-server.js";
+import { createDaemonProxyServer } from "./session.js";
+/**
+ * Starts the daemon's local, loopback-only aggregate MCP tool proxy in front
+ * of the parent `Manager`'s already-connected upstream servers. Call once,
+ * after the parent has connected/subscribed to channels and before creating
+ * any ACP session; every daemon-hosted ACP session gets the one returned
+ * `mcpServer` entry instead of loading local `mcp.json`.
+ */
+export async function startDaemonMcpProxy(manager, options = {}) {
+    const catalog = new DaemonToolCatalog(manager);
+    const instructions = (await manager.listServerInstructions()).join("\n\n");
+    const handle = await startDaemonMcpHttpServer({
+        port: options.port ?? 0,
+        createSession: () => createDaemonProxyServer(catalog, instructions),
+    });
+    return {
+        mcpServer: { name: "daemon", type: "http", url: handle.url, headers: [] },
+        close: handle.close,
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/daemon/mcproxy/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/daemon/mcproxy/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAgBvD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAmB,EACnB,UAA6B,EAAE;IAE/B,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,CAAC,MAAM,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC;QAC5C,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC;QACvB,aAAa,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,OAAO,EAAE,YAAY,CAAC;KACpE,CAAC,CAAC;IACH,OAAO;QACL,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE;QACzE,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC;AACJ,CAAC"}