theokit 0.15.2 → 0.17.0

package/dist/{chunk-UOR6JTCI.js → chunk-X6COGWHN.js}

@@ -6,9 +6,11 @@ import {
   broadcastToDevtools
 } from "./chunk-7BIM27LV.js";
 import {
+  buildResourceDescriptors,
   loadEnv,
+  readAppResource,
   resolveTransformer
-} from "./chunk-5UUOGAJH.js";
+} from "./chunk-3FNZG6Q3.js";
 import {
   findSuggestion
 } from "./chunk-5QW7IQQU.js";
@@ -984,6 +986,50 @@ function createActionMiddleware(vite, serverDir, options) {
 // src/vite-plugin/agent-middleware.ts
 import { randomUUID as randomUUID2 } from "crypto";
 
+// src/server/agent/agent-card-handler.ts
+import {
+  buildAgentCard,
+  compileAgentModule
+} from "@theokit/agents";
+var WELL_KNOWN = /^\/\.well-known\/([^/]+)\/agent-card\.json$/;
+function isAgentCardPath(urlPath) {
+  const match = WELL_KNOWN.exec(urlPath);
+  return match ? decodeURIComponent(match[1]) : null;
+}
+function toManifestEntry(name, route, mod) {
+  const compiled = compileAgentModule(mod, `agent card for "${name}"`);
+  return {
+    name,
+    route,
+    stream: compiled.stream,
+    mainLoop: { method: "", strategy: "" },
+    guards: [],
+    interceptors: [],
+    tools: compiled.tools.map((t) => ({
+      name: t.name,
+      description: t.description,
+      approval: false,
+      trace: false,
+      audit: false
+    })),
+    subAgents: []
+  };
+}
+function handleAgentCard(mod, name, route, baseUrl) {
+  try {
+    const card = buildAgentCard(toManifestEntry(name, route, mod), { baseUrl });
+    return new Response(JSON.stringify(card), {
+      status: 200,
+      headers: { "content-type": "application/json; charset=utf-8" }
+    });
+  } catch (err) {
+    return new Response(
+      JSON.stringify({ error: { code: "AGENT_CARD_FAILED", message: err instanceof Error ? err.message : "card build failed" } }),
+      { status: 500, headers: { "content-type": "application/json; charset=utf-8" } }
+    );
+  }
+}
+
 // src/server/agent/approval-registry.ts
 var serverRegistry;
 function getApprovalRegistry() {
@@ -995,24 +1041,34 @@ function createInProcessApprovalRegistry() {
   return {
     register(approvalId, opts) {
       return new Promise((resolve10) => {
-        const settle = (approved) => {
+        const settle = (decision) => {
           const entry = pending.get(approvalId);
           if (!entry) return;
           clearTimeout(entry.timer);
           pending.delete(approvalId);
-          resolve10(approved);
+          resolve10(decision);
         };
         const timer = setTimeout(() => {
-          settle(opts.onTimeout === "proceed");
+          settle({ approved: opts.onTimeout === "proceed" });
         }, opts.timeoutMs);
-        pending.set(approvalId, { settle, timer });
+        const info = {
+          approvalId,
+          toolName: opts.toolName,
+          question: opts.question,
+          expiresAt: Date.now() + opts.timeoutMs,
+          ...opts.payloadSchema !== void 0 ? { payloadSchema: opts.payloadSchema } : {}
+        };
+        pending.set(approvalId, { settle, timer, info });
       });
     },
-    resolve(approvalId, approved) {
+    resolve(approvalId, decision) {
       const entry = pending.get(approvalId);
       if (!entry) return false;
-      entry.settle(approved);
+      entry.settle(typeof decision === "boolean" ? { approved: decision } : decision);
       return true;
+    },
+    list() {
+      return [...pending.values()].map((p) => p.info);
     }
   };
 }
@@ -1034,10 +1090,22 @@ function jsonError(status, code, message) {
     headers: { "content-type": "application/json" }
   });
 }
+var MAX_PAYLOAD_BYTES = 16 * 1024;
 function parseApprovalBody(body) {
   if (typeof body !== "object" || body === null) return null;
   const b = body;
-  return typeof b.approved === "boolean" ? { approved: b.approved } : null;
+  if (typeof b.approved !== "boolean") return null;
+  const decision = { approved: b.approved };
+  if (b.reason !== void 0) {
+    if (typeof b.reason !== "string") return null;
+    decision.reason = b.reason;
+  }
+  if (b.payload !== void 0) {
+    if (typeof b.payload !== "object" || b.payload === null || Array.isArray(b.payload)) return null;
+    if (JSON.stringify(b.payload).length > MAX_PAYLOAD_BYTES) return null;
+    decision.payload = b.payload;
+  }
+  return decision;
 }
 async function handleAgentApproval(request, urlPath, registry2, csrfMode = "strict") {
   if (csrfMode !== "off") {
@@ -1059,7 +1127,7 @@ async function handleAgentApproval(request, urlPath, registry2, csrfMode = "stri
   if (parsed === null) {
     return jsonError(400, "BAD_REQUEST", "Request body must contain a boolean `approved`.");
   }
-  const resolved = registry2.resolve(approvalId, parsed.approved);
+  const resolved = registry2.resolve(approvalId, parsed);
   if (!resolved) {
     return jsonError(404, "NOT_PENDING", `No pending approval for id '${approvalId}'.`);
   }
@@ -1069,9 +1137,130 @@ async function handleAgentApproval(request, urlPath, registry2, csrfMode = "stri
   });
 }
 
+// src/server/agent/list-approvals-handler.ts
+var LIST_PATH = /^\/api\/agents\/([^/]+)\/approvals$/;
+function isListApprovalsPath(urlPath) {
+  const match = LIST_PATH.exec(urlPath);
+  return match ? decodeURIComponent(match[1]) : null;
+}
+function handleListApprovals(registry2) {
+  return new Response(JSON.stringify({ approvals: registry2.list() }), {
+    status: 200,
+    headers: { "content-type": "application/json; charset=utf-8" }
+  });
+}
+
+// src/server/agent/mcp-handler.ts
+import {
+  buildMcpToolDescriptors,
+  compileAgentModule as compileAgentModule2,
+  mcpServerInfo
+} from "@theokit/agents";
+var MCP_PATH = /^\/api\/agents\/([^/]+)\/mcp$/;
+function isMcpPath(urlPath) {
+  const match = MCP_PATH.exec(urlPath);
+  return match ? decodeURIComponent(match[1]) : null;
+}
+function isJsonRpcRequest(body) {
+  return typeof body === "object" && body !== null && body.jsonrpc === "2.0" && typeof body.method === "string";
+}
+function jsonResponse(payload) {
+  return new Response(JSON.stringify(payload), {
+    status: 200,
+    headers: { "content-type": "application/json; charset=utf-8" }
+  });
+}
+function toEntry(name, mod) {
+  const compiled = compileAgentModule2(mod, `mcp server for "${name}"`);
+  return {
+    name,
+    route: `/api/agents/${name}`,
+    stream: compiled.stream,
+    mainLoop: { method: "", strategy: "" },
+    guards: [],
+    interceptors: [],
+    tools: compiled.tools.map((t) => ({
+      name: t.name,
+      description: t.description,
+      approval: false,
+      trace: false,
+      audit: false
+    })),
+    subAgents: []
+  };
+}
+function handleMcpJsonRpc(mod, name, body, appResources = []) {
+  if (!isJsonRpcRequest(body)) {
+    return jsonResponse({
+      jsonrpc: "2.0",
+      id: null,
+      error: { code: -32600, message: "Invalid Request" }
+    });
+  }
+  const { id, method, params } = body;
+  try {
+    const entry = toEntry(name, mod);
+    if (method === "initialize") {
+      const info = mcpServerInfo(entry);
+      const capabilities = { tools: {} };
+      if (appResources.length > 0) capabilities.resources = {};
+      return jsonResponse({
+        jsonrpc: "2.0",
+        id,
+        result: {
+          protocolVersion: info.protocolVersion,
+          capabilities,
+          serverInfo: { name: info.name, version: info.version }
+        }
+      });
+    }
+    if (method === "tools/list") {
+      return jsonResponse({ jsonrpc: "2.0", id, result: { tools: buildMcpToolDescriptors(entry) } });
+    }
+    if (method === "resources/list") {
+      return jsonResponse({
+        jsonrpc: "2.0",
+        id,
+        result: { resources: buildResourceDescriptors(appResources) }
+      });
+    }
+    if (method === "resources/read") {
+      const uri = params?.uri;
+      if (typeof uri !== "string") {
+        return jsonResponse({
+          jsonrpc: "2.0",
+          id,
+          error: { code: -32602, message: "resources/read requires a string `uri` param." }
+        });
+      }
+      const contents = readAppResource(appResources, uri);
+      if (contents === null) {
+        return jsonResponse({
+          jsonrpc: "2.0",
+          id,
+          error: { code: -32602, message: `Resource not found: ${uri}` }
+        });
+      }
+      return jsonResponse({ jsonrpc: "2.0", id, result: contents });
+    }
+    return jsonResponse({
+      jsonrpc: "2.0",
+      id,
+      error: { code: -32601, message: `Method not found: ${method}` }
+    });
+  } catch (err) {
+    return jsonResponse({
+      jsonrpc: "2.0",
+      id,
+      error: { code: -32603, message: err instanceof Error ? err.message : "Internal error" }
+    });
+  }
+}
+
 // src/server/agent/mount-agent.ts
 import {
-  compileAgentModule,
+  compileAgentModule as compileAgentModule3,
+  resolveEnabledSkills,
   streamAgentUIMessages
 } from "@theokit/agents";
 function partText(part) {
@@ -1109,7 +1298,11 @@ async function mountAgent(mod, request, apiKey, source = "agent module", csrfMod
       return jsonError2(403, "CSRF_FAILED", `CSRF check failed: ${csrf.reason}`);
     }
   }
-  const compiled = compileAgentModule(mod, source);
+  const compiled = compileAgentModule3(mod, source);
+  if (compiled.skillsResolver) {
+    const enabled = await resolveEnabledSkills(compiled.skillsResolver, compiled.runContext ?? {});
+    if (enabled !== void 0) compiled.skills = { enabled, autoInject: true };
+  }
   let body = null;
   try {
     body = await request.json();
@@ -1123,9 +1316,14 @@ async function mountAgent(mod, request, apiKey, source = "agent module", csrfMod
   const registry2 = getApprovalRegistry();
   const hitl = gated && gated.size > 0 ? {
     gated,
-    awaitApproval: (approvalId, opts) => registry2.register(approvalId, {
+    awaitApproval: (approvalId, opts, toolName) => registry2.register(approvalId, {
       timeoutMs: opts.timeout ?? 3e5,
-      onTimeout: opts.onTimeout ?? "abort"
+      onTimeout: opts.onTimeout ?? "abort",
+      // M14 — surface toolName + question in GET /approvals (the plugin forwards c.name).
+      toolName,
+      question: opts.question,
+      // M20 — carry the declared custom-payload schema into GET /approvals.
+      ...opts.payloadSchema !== void 0 ? { payloadSchema: opts.payloadSchema } : {}
     })
   } : void 0;
   return uiMessageStreamResponse(
@@ -1239,11 +1437,84 @@ function pickHeaderString(value) {
 
 // src/vite-plugin/agent-middleware.ts
 var PREFIX2 = "/api/agents/";
+async function serveApprove(req, res, urlPath, csrfMode, log) {
+  const method = (req.method ?? "POST").toUpperCase();
+  if (method !== "POST") {
+    sendError(res, "METHOD_NOT_ALLOWED", "Approve endpoints accept POST", 405, void 0, log.requestId);
+    logRequest({ method, url: req.url ?? "", status: 405, duration: Date.now() - log.start, requestId: log.requestId });
+    return;
+  }
+  try {
+    const response = await handleAgentApproval(incomingMessageToWebRequest(req), urlPath, getApprovalRegistry(), csrfMode);
+    await writeWebResponseToServerResponse(response, res);
+  } catch (err) {
+    sendError(res, "INTERNAL", err instanceof Error ? err.message : "Approve handler failed", 500, void 0, log.requestId);
+  }
+  logRequest({ method, url: req.url ?? "", status: res.statusCode, duration: Date.now() - log.start, requestId: log.requestId });
+}
+async function serveMcp(req, res, next, mcpAgentName, deps) {
+  const requestId = randomUUID2();
+  const start = Date.now();
+  res.setHeader("x-request-id", requestId);
+  const method = (req.method ?? "POST").toUpperCase();
+  const agent = scanAgents(deps.projectRoot).find((a) => a.name === mcpAgentName);
+  if (method !== "POST" || !agent) {
+    next();
+    return;
+  }
+  try {
+    const body = await incomingMessageToWebRequest(req).json();
+    const mod = await deps.loadModule(agent.filePath);
+    await writeWebResponseToServerResponse(handleMcpJsonRpc(mod, agent.name, body), res);
+  } catch (err) {
+    sendError(res, "INTERNAL", err instanceof Error ? err.message : "MCP handler failed", 500, void 0, requestId);
+  }
+  logRequest({ method, url: req.url ?? "", status: res.statusCode, duration: Date.now() - start, requestId });
+}
+async function serveListApprovals(req, res, next, log) {
+  const method = (req.method ?? "GET").toUpperCase();
+  if (method !== "GET") {
+    next();
+    return;
+  }
+  await writeWebResponseToServerResponse(handleListApprovals(getApprovalRegistry()), res);
+  logRequest({
+    method,
+    url: req.url ?? "",
+    status: res.statusCode,
+    duration: Date.now() - log.start,
+    requestId: log.requestId
+  });
+}
+async function serveAgentCard(req, res, next, cardAgentName, deps) {
+  const requestId = randomUUID2();
+  const start = Date.now();
+  res.setHeader("x-request-id", requestId);
+  const method = (req.method ?? "GET").toUpperCase();
+  const agent = scanAgents(deps.projectRoot).find((a) => a.name === cardAgentName);
+  if (method !== "GET" || !agent) {
+    next();
+    return;
+  }
+  try {
+    const mod = await deps.loadModule(agent.filePath);
+    const baseUrl = `http://${req.headers.host ?? "localhost"}`;
+    await writeWebResponseToServerResponse(handleAgentCard(mod, agent.name, agent.agentPath, baseUrl), res);
+  } catch (err) {
+    sendError(res, "INTERNAL", err instanceof Error ? err.message : "Agent card failed", 500, void 0, requestId);
+  }
+  logRequest({ method, url: req.url ?? "", status: res.statusCode, duration: Date.now() - start, requestId });
+}
 function createAgentMiddleware(vite, projectRoot, csrfMode = "strict") {
   const loadModule = createViteLoader(vite);
   return (req, res, next) => {
     void (async () => {
       const url = req.url ?? "";
+      const cardAgentName = isAgentCardPath(url.split("?")[0]);
+      if (cardAgentName) {
+        await serveAgentCard(req, res, next, cardAgentName, { projectRoot, loadModule });
+        return;
+      }
       if (!url.startsWith(PREFIX2)) {
         next();
         return;
@@ -1253,39 +1524,16 @@ function createAgentMiddleware(vite, projectRoot, csrfMode = "strict") {
       res.setHeader("x-request-id", requestId);
       const urlPath = url.split("?")[0];
       if (isApprovalPath(urlPath)) {
-        const method2 = (req.method ?? "POST").toUpperCase();
-        if (method2 !== "POST") {
-          sendError(
-            res,
-            "METHOD_NOT_ALLOWED",
-            "Approve endpoints accept POST",
-            405,
-            void 0,
-            requestId
-          );
-          logRequest({ method: method2, url, status: 405, duration: Date.now() - start, requestId });
-          return;
-        }
-        try {
-          const request = incomingMessageToWebRequest(req);
-          const response = await handleAgentApproval(
-            request,
-            urlPath,
-            getApprovalRegistry(),
-            csrfMode
-          );
-          await writeWebResponseToServerResponse(response, res);
-        } catch (err) {
-          sendError(
-            res,
-            "INTERNAL",
-            err instanceof Error ? err.message : "Approve handler failed",
-            500,
-            void 0,
-            requestId
-          );
-        }
-        logRequest({ method: method2, url, status: res.statusCode, duration: Date.now() - start, requestId });
+        await serveApprove(req, res, urlPath, csrfMode, { requestId, start });
+        return;
+      }
+      if (isListApprovalsPath(urlPath)) {
+        await serveListApprovals(req, res, next, { requestId, start });
+        return;
+      }
+      const mcpAgentName = isMcpPath(urlPath);
+      if (mcpAgentName) {
+        await serveMcp(req, res, next, mcpAgentName, { projectRoot, loadModule });
         return;
       }
       const agent = scanAgents(projectRoot).find((a) => a.agentPath === urlPath);
@@ -2699,7 +2947,7 @@ async function theoPluginAsync(rootOrOptions) {
     serverDir: resolve9(projectRoot, "server"),
     distDir: resolve9(projectRoot, ".theokit")
   });
-  const { agentsTypedClientPlugin } = await import("./agents-typed-client-SAWAAH7K.js");
+  const { agentsTypedClientPlugin } = await import("./agents-typed-client-D3LXWGCF.js");
   const { generateManifest } = await import("./internal-api-5BDI6N5U.js");
   const agentsClientPlugin = agentsTypedClientPlugin({
     projectRoot,
@@ -2878,4 +3126,4 @@ export {
   theoPluginAsync,
   theoPlugin
 };
-//# sourceMappingURL=chunk-UOR6JTCI.js.map
+//# sourceMappingURL=chunk-X6COGWHN.js.map