@faapi/faapi 6.26.0 → 6.28.0

package/dist/{routeTypes-DlD6nnbT.d.ts → routeTypes-0rwuIws-.d.ts}

@@ -1,4 +1,4 @@
-import { F as FaapiContext } from './contextTypes-gYf84EXF.js';
+import { F as FaapiContext } from './contextTypes-DhagvRH_.js';
 
 /**
  * faapi 中间件（洋葱模型）

package/dist/testing.d.ts

@@ -1,5 +1,5 @@
-import { F as FaapiContext } from './contextTypes-gYf84EXF.js';
-import { F as FaapiMiddleware, I as InjectorMap, R as RouteManifest, W as WsRouteManifest, C as CorsOptions, H as HelmetOptions } from './routeTypes-DlD6nnbT.js';
+import { F as FaapiContext } from './contextTypes-DhagvRH_.js';
+import { F as FaapiMiddleware, I as InjectorMap, R as RouteManifest, W as WsRouteManifest, C as CorsOptions, H as HelmetOptions } from './routeTypes-0rwuIws-.js';
 import { Server } from 'node:http';
 import { WebSocket } from 'ws';
 
@@ -30,7 +30,7 @@ interface CreateTestContextOptions {
      * 运行时资源根目录（可选）
      *
      * 传入时同时做两件事：绑定全局 readResource 读取根（handler 直调
-     * `readResource('x.md')` 依赖）+ 挂到 ctx.resourcesDir 数据字段
+     * `readResource('x.md')` 依赖）；ctx 上无 resourcesDir 数据字段（已删除）
      */
     resourcesDir?: string;
     /** 请求方法，默认 'GET' */

package/dist/testing.js

@@ -312,14 +312,14 @@ var ValidationError = class extends FaapiError {
   issues;
 };
 var RouteNotFoundError = class extends FaapiError {
-  constructor(path18) {
-    super("ROUTE_NOT_FOUND", `Route not found: ${path18}`, 404);
+  constructor(path17) {
+    super("ROUTE_NOT_FOUND", `Route not found: ${path17}`, 404);
     this.name = "RouteNotFoundError";
   }
 };
 var MethodNotAllowedError = class extends FaapiError {
-  constructor(method, path18, allowedMethods) {
-    super("METHOD_NOT_ALLOWED", `Method ${method} not allowed for ${path18}`, 405);
+  constructor(method, path17, allowedMethods) {
+    super("METHOD_NOT_ALLOWED", `Method ${method} not allowed for ${path17}`, 405);
     this.allowedMethods = allowedMethods;
     this.name = "MethodNotAllowedError";
   }
@@ -628,18 +628,10 @@ function formatSetCookie(name, value, options) {
   if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
   return cookie;
 }
-function createContext(request, params, config = {}, ip = "", registries, resourcesDir) {
-  return createContextFromUrl(
-    request,
-    new URL(request.url),
-    params,
-    config,
-    ip,
-    registries,
-    resourcesDir
-  );
+function createContext(request, params, config = {}, ip = "", registries) {
+  return createContextFromUrl(request, new URL(request.url), params, config, ip, registries);
 }
-function createContextFromUrl(request, url, params, config = {}, ip = "", registries, resourcesDir) {
+function createContextFromUrl(request, url, params, config = {}, ip = "", registries) {
   const meta = { headers: {}, setCookies: [] };
   const parsedCookies = parseCookies(request.headers.get("cookie") ?? "");
   const cookiesObj = {};
@@ -667,9 +659,6 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
     ua: request.headers.get("user-agent") ?? "",
     cookies: cookiesObj,
     config,
-    // 运行时资源根目录（HTTP/WS 链路由 createServer/handleWsUpgrade 传入；
-    // testing 直调未传时为 undefined，见 contextTypes.resourcesDir 注释）
-    resourcesDir,
     meta,
     setStatus(status) {
       meta.status = status;
@@ -775,7 +764,7 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
 function createTestContext(options) {
   const {
     method = "GET",
-    path: path18,
+    path: path17,
     query,
     headers,
     params = {},
@@ -784,7 +773,7 @@ function createTestContext(options) {
     registries,
     resourcesDir
   } = options;
-  const url = new URL(`http://localhost${path18}`);
+  const url = new URL(`http://localhost${path17}`);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       if (Array.isArray(value)) {
@@ -803,7 +792,7 @@ function createTestContext(options) {
   if (resourcesDir) {
     setActiveResourcesDir(resourcesDir);
   }
-  return createContext(request, params, config, ip, registries, resourcesDir);
+  return createContext(request, params, config, ip, registries);
 }
 
 // src/response/pendingMeta.ts
@@ -1066,6 +1055,19 @@ function createTaskRegistry() {
   };
 }
 
+// src/injection/subAgentToolName.ts
+var LLM_TOOL_NAME_PATTERN = /^[a-zA-Z0-9_-]+$/;
+var SUB_AGENT_TOOL_PREFIX = "agent-";
+function subAgentToolName(agentName) {
+  const toolName = SUB_AGENT_TOOL_PREFIX + agentName;
+  if (!LLM_TOOL_NAME_PATTERN.test(toolName)) {
+    throw new Error(
+      `Sub-agent tool name "${toolName}" (from agent name "${agentName}") violates the LLM tool name pattern ${LLM_TOOL_NAME_PATTERN} \u2014 rename the agent (allowed: a-z A-Z 0-9 '-' '_'; file-based agent directory segments allow a-z A-Z 0-9 '-' only, '_' is the nesting separator)`
+    );
+  }
+  return toolName;
+}
+
 // src/injection/registries.ts
 function createToolRegistry() {
   let registry = /* @__PURE__ */ new Map();
@@ -1113,7 +1115,7 @@ function createAgentRegistry(tool) {
       if (!agent) return void 0;
       return {
         kind: "agent",
-        name: `agent.${agent.name}`,
+        name: subAgentToolName(agent.name),
         agentName: agent.name,
         description: agent.description,
         metadata: agent
@@ -1386,9 +1388,9 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
 }
 
 // src/testServer.ts
-import path17 from "path";
+import path16 from "path";
 import os from "os";
-import fs14 from "fs/promises";
+import fs13 from "fs/promises";
 
 // src/router/scanRoutes.ts
 import fg from "fast-glob";
@@ -1400,9 +1402,9 @@ var HTTP_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"];
 var HTTP_METHOD_SET = new Set(HTTP_METHODS);
 
 // src/utils/normalizePath.ts
-function normalizePath(path18) {
-  if (!path18) return "";
-  let result = path18.replace(/\\/g, "/");
+function normalizePath(path17) {
+  if (!path17) return "";
+  let result = path17.replace(/\\/g, "/");
   result = result.replace(/\/+/g, "/");
   result = result.replace(/\/+$/, "");
   if (result && !result.startsWith("/")) {
@@ -3851,9 +3853,9 @@ async function validateInput(schemaPath, method, inputType, input) {
 function mapZodIssues(error) {
   return error.issues.map((issue) => {
     const code = mapZodCode(issue);
-    const path18 = issue.path.map(String).join(".") || "";
+    const path17 = issue.path.map(String).join(".") || "";
     return {
-      path: path18,
+      path: path17,
       code,
       expected: issue.expected ?? mapExpectedFromMessage(issue.message),
       received: issue.received ?? mapReceivedFromMessage(issue.message),
@@ -3903,7 +3905,7 @@ import {
 import { createSecureServer as createHttp2SecureServer } from "http2";
 import { readFileSync } from "fs";
 import { Readable as Readable2 } from "stream";
-import path16 from "path";
+import path15 from "path";
 
 // src/router/matchRoute.ts
 var httpIndexCache = /* @__PURE__ */ new WeakMap();
@@ -3945,25 +3947,25 @@ function getWsIndex(routes) {
   wsIndexCache.set(routes, index);
   return index;
 }
-function matchRoute(routes, method, path18) {
+function matchRoute(routes, method, path17) {
   const index = getHttpIndex(routes);
   const upper = method.toUpperCase();
-  const hit = matchByMethod(index, upper, path18);
+  const hit = matchByMethod(index, upper, path17);
   if (hit) return hit;
   if (upper === "HEAD") {
-    return matchByMethod(index, "GET", path18);
+    return matchByMethod(index, "GET", path17);
   }
   return null;
 }
-function matchByMethod(index, method, path18) {
-  const staticHit = index.static.get(`${method}|${path18}`);
+function matchByMethod(index, method, path17) {
+  const staticHit = index.static.get(`${method}|${path17}`);
   if (staticHit) {
     return { route: staticHit, params: {} };
   }
   if (index.dynamics.length === 0) {
     return null;
   }
-  const pathSegments = path18.split("/").filter(Boolean);
+  const pathSegments = path17.split("/").filter(Boolean);
   for (const entry of index.dynamics) {
     const route = entry.route;
     if (route.method !== method) {
@@ -3976,31 +3978,31 @@ function matchByMethod(index, method, path18) {
   }
   return null;
 }
-function matchWsRoute(wsRoutes, path18) {
+function matchWsRoute(wsRoutes, path17) {
   const index = getWsIndex(wsRoutes);
-  const staticHit = index.static.get(path18);
+  const staticHit = index.static.get(path17);
   if (staticHit) {
     return { route: staticHit, params: {} };
   }
   for (const route of index.dynamics) {
-    const params = matchDynamicPath(route.urlPath, path18, route.paramNames, route.isCatchAll);
+    const params = matchDynamicPath(route.urlPath, path17, route.paramNames, route.isCatchAll);
     if (params !== null) {
       return { route, params };
     }
   }
   return null;
 }
-function findAllowedMethods(routes, path18) {
+function findAllowedMethods(routes, path17) {
   const index = getHttpIndex(routes);
   const methods = /* @__PURE__ */ new Set();
-  const staticMethods = index.methodsByStaticPath.get(path18);
+  const staticMethods = index.methodsByStaticPath.get(path17);
   if (staticMethods) {
     for (const method of staticMethods) {
       methods.add(method);
     }
   }
   if (index.dynamics.length > 0) {
-    const pathSegments = path18.split("/").filter(Boolean);
+    const pathSegments = path17.split("/").filter(Boolean);
     for (const entry of index.dynamics) {
       const params = matchSegments(
         entry.segments,
@@ -4018,10 +4020,10 @@ function findAllowedMethods(routes, path18) {
   }
   return Array.from(methods);
 }
-function matchDynamicPath(pattern, path18, paramNames, isCatchAll) {
+function matchDynamicPath(pattern, path17, paramNames, isCatchAll) {
   return matchSegments(
     pattern.split("/").filter(Boolean),
-    path18.split("/").filter(Boolean),
+    path17.split("/").filter(Boolean),
     paramNames,
     isCatchAll
   );
@@ -4643,17 +4645,9 @@ function logger(options = {}) {
 }
 
 // src/server/handleWsUpgrade.ts
-import fs13 from "fs";
+import fs12 from "fs";
 import { WebSocketServer, WebSocket } from "ws";
-import path15 from "path";
-
-// src/cli/copyResources.ts
 import path14 from "path";
-import fs12 from "fs";
-var RESOURCES_OUTPUT_DIR = "resources";
-function resolveResourcesDir(rootDir, dist) {
-  return path14.resolve(rootDir, dist, RESOURCES_OUTPUT_DIR);
-}
 
 // src/server/serverUtils.ts
 function nodeHttpToWebHeaders(req) {
@@ -4711,7 +4705,7 @@ async function loadWsHandler(filePath, ctx, rootDir) {
     const dist = getDevDist();
     if (dist) {
       const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-      if (sourcePath && fs13.existsSync(sourcePath)) {
+      if (sourcePath && fs12.existsSync(sourcePath)) {
         await ensureCompiled(sourcePath, rootDir, dist);
       }
     }
@@ -4809,7 +4803,6 @@ function attachWebSocket(options) {
     trustedProxy = false,
     registries
   } = options;
-  const resourcesDir = resolveResourcesDir(rootDir, dist);
   const wss = new WebSocketServer({ noServer: true });
   server.on("upgrade", async (req, socket, head) => {
     try {
@@ -4841,19 +4834,12 @@ function attachWebSocket(options) {
     const host = req.headers.host ?? "localhost";
     const fullUrl = new URL(`http://${host}${req.url ?? "/"}`);
     const request = new Request(fullUrl.toString(), { method: "GET", headers });
-    const ctx = createContext(
-      request,
-      params,
-      config,
-      getClientIp(req, trustedProxy),
-      registries,
-      resourcesDir
-    );
+    const ctx = createContext(request, params, config, getClientIp(req, trustedProxy), registries);
     const meta = ctx.meta;
     let upgraded = false;
     const finalHandler = async () => {
       const schemaPath = getRuntimeSchemaPath(route.filePath, dist, rootDir);
-      if (fs13.existsSync(schemaPath)) {
+      if (fs12.existsSync(schemaPath)) {
         if (isDevOnDemandEnabled()) {
           const devDist = getDevDist();
           if (devDist) {
@@ -4892,7 +4878,7 @@ function attachWebSocket(options) {
       }
       let handlers;
       try {
-        const absoluteFilePath = path15.resolve(rootDir, route.filePath);
+        const absoluteFilePath = path14.resolve(rootDir, route.filePath);
         handlers = await loadWsHandler(absoluteFilePath, ctx, rootDir);
       } catch (err) {
         const reason = err instanceof Error ? err.message : String(err);
@@ -5051,7 +5037,6 @@ function createServer(options) {
     trustedProxy = false
   } = options;
   const routesRef = { current: routes, wsCurrent: wsRoutes ?? [] };
-  const resourcesDir = resolveResourcesDir(rootDir, dist);
   const configMiddlewares = [];
   if (compressionOption) {
     const compOpts = typeof compressionOption === "object" ? compressionOption : {};
@@ -5098,8 +5083,7 @@ function createServer(options) {
       bodyLimit,
       trustedProxy,
       registries,
-      routesRef.wsCurrent,
-      resourcesDir
+      routesRef.wsCurrent
     ).catch((err) => {
       console.error("[faapi] Request pipeline failed after error response attempt:", err);
       try {
@@ -5125,7 +5109,7 @@ function createServer(options) {
   });
   return { server, routesRef };
 }
-function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched, resourcesDir) {
+function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched) {
   const method = request.method.toUpperCase();
   const urlPath = url.pathname;
   const ctx = createContextFromUrl(
@@ -5134,8 +5118,7 @@ function prepareRequest(req, request, url, config, trustedProxy, registries, pre
     preMatched?.params ?? {},
     config,
     getClientIp(req, trustedProxy),
-    registries,
-    resourcesDir
+    registries
   );
   const meta = ctx.meta;
   return { request, url, ctx, meta, method, urlPath };
@@ -5154,7 +5137,7 @@ function getRoutePaths(route, rootDir, dist) {
   let cached = routePathCache.get(route);
   if (!cached) {
     cached = {
-      absFilePath: path16.resolve(rootDir, route.filePath),
+      absFilePath: path15.resolve(rootDir, route.filePath),
       schemaPath: getRuntimeSchemaPath(route.filePath, dist, rootDir)
     };
     routePathCache.set(route, cached);
@@ -5277,7 +5260,7 @@ async function sendErrorResponse(err, meta, res, onError, ctx) {
     }
   }
 }
-async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries, wsRoutes, resourcesDir) {
+async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries, wsRoutes) {
   let meta = { headers: {}, setCookies: [] };
   let ctx;
   let sseEarlySent = false;
@@ -5297,8 +5280,7 @@ async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares,
       config,
       trustedProxy,
       registries,
-      preMatched,
-      resourcesDir
+      preMatched
     );
     ctx = prepared.ctx;
     meta = prepared.meta;
@@ -5363,7 +5345,7 @@ async function createTestServer(options) {
   } = options;
   const { routes, wsRoutes } = await scanRoutes(rootDir, patterns);
   const sorted = sortRoutes(routes);
-  const schemaDist = dist ? path17.isAbsolute(dist) ? dist : path17.resolve(rootDir, dist) : await fs14.mkdtemp(path17.join(os.tmpdir(), "faapi-test-schema-"));
+  const schemaDist = dist ? path16.isAbsolute(dist) ? dist : path16.resolve(rootDir, dist) : await fs13.mkdtemp(path16.join(os.tmpdir(), "faapi-test-schema-"));
   await generateSchemaFiles(sorted, rootDir, schemaDist);
   const { server } = createServer({
     routes: sorted,
@@ -5395,7 +5377,7 @@ async function createTestServer(options) {
       await new Promise((resolve) => {
         server.close(() => resolve());
       });
-      await fs14.rm(schemaDist, { recursive: true, force: true }).catch(() => {
+      await fs13.rm(schemaDist, { recursive: true, force: true }).catch(() => {
       });
       invalidateSchemaCache();
     }