@faapi/faapi 6.22.0 → 6.24.0

package/dist/index.js

@@ -2362,7 +2362,11 @@ async function runTaskInWorker(options) {
       worker.postMessage({
         type: "run",
         payload,
-        taskCtx: { config: safeConfig(taskCtx.config), job: taskCtx.job },
+        taskCtx: {
+          config: safeConfig(taskCtx.config),
+          resourcesDir: taskCtx.resourcesDir,
+          job: taskCtx.job
+        },
         registries: options.registries,
         log: options.log
       });
@@ -2712,6 +2716,7 @@ function createTaskQueue(deps) {
           payload: job.payload,
           taskCtx: {
             config: deps.config,
+            resourcesDir: deps.resourcesDir,
             job: { id: job.id, name: job.name, attempt: job.attempt }
           },
           registries: snapshotRegistries(),
@@ -2742,6 +2747,7 @@ function createTaskQueue(deps) {
         const taskCtx = {
           signal: job.signal,
           config: deps.config,
+          resourcesDir: deps.resourcesDir,
           job: { id: job.id, name: job.name, attempt: job.attempt },
           registries: registriesView,
           log: createLogger(`task:${job.name}`, {
@@ -3086,7 +3092,7 @@ function listSkills() {
   return defaultRegistries.skill.list();
 }
 
-// src/loader/loadAgentModule.ts
+// src/loader/loadToolModule.ts
 import fs12 from "fs";
 
 // src/loader/resolveExports.ts
@@ -3442,13 +3448,14 @@ function buildAliasPlugins(rootDir) {
 }
 
 // src/cli/compileSourceFiles.ts
+var SOURCE_IGNORE = ["**/*.test.ts", "**/*.e2e.test.ts", "**/*.d.ts", `${APP_DIR}/resources/**`];
 async function compileSourceFiles(options) {
   const { rootDir, dist, files, logLevel = "silent", production, atomicWrite } = options;
   const entryPoints = files ?? await fg2([`${APP_DIR}/**/*.ts`], {
     cwd: rootDir,
     onlyFiles: true,
     absolute: true,
-    ignore: ["**/*.test.ts", "**/*.e2e.test.ts", "**/*.d.ts"]
+    ignore: SOURCE_IGNORE
   });
   if (entryPoints.length === 0) {
     return { compiledFiles: [] };
@@ -3736,52 +3743,13 @@ function getDevDist() {
   return state.distDir;
 }
 
-// src/loader/loadAgentModule.ts
-async function loadAgentModule(filePath, hasRun, rootDir) {
-  if (isDevOnDemandEnabled() && rootDir) {
-    const dist = getDevDist();
-    if (dist) {
-      const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-      if (sourcePath && fs12.existsSync(sourcePath)) {
-        try {
-          await ensureCompiled(sourcePath, rootDir, dist);
-        } catch (compileErr) {
-          const reason = compileErr instanceof Error ? compileErr.message : String(compileErr);
-          throw new Error(`Failed to compile agent module "${sourcePath}": ${reason}`, {
-            cause: compileErr
-          });
-        }
-      }
-    }
-  }
-  let module;
-  try {
-    module = await importWithCacheBust(filePath, isDevOnDemandEnabled());
-  } catch (err) {
-    const reason = err instanceof Error ? err.message : String(err);
-    throw new Error(`Failed to load agent module "${filePath}": ${reason}`, { cause: err });
-  }
-  let run;
-  if (hasRun) {
-    const runExport = resolveExport(module, "run");
-    if (typeof runExport !== "function") {
-      throw new Error(
-        `Agent module "${filePath}" does not export a valid "run" function (hasRun=true). Expected a function, got ${runExport === void 0 ? "undefined" : typeof runExport}.`
-      );
-    }
-    run = runExport;
-  }
-  return { run };
-}
-
 // src/loader/loadToolModule.ts
-import fs13 from "fs";
 async function loadToolModule(filePath, functionName, rootDir) {
   if (isDevOnDemandEnabled() && rootDir) {
     const dist = getDevDist();
     if (dist) {
       const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-      if (sourcePath && fs13.existsSync(sourcePath)) {
+      if (sourcePath && fs12.existsSync(sourcePath)) {
         try {
           await ensureCompiled(sourcePath, rootDir, dist);
         } catch (compileErr) {
@@ -4253,15 +4221,15 @@ function helmet(options = {}) {
 
 // src/config/loadConfig.ts
 import path16 from "path";
-import fs14 from "fs";
+import fs13 from "fs";
 var CONFIG_PRODUCT_FILE = "faapi-config.js";
 async function loadConfig(rootDir, dist) {
   const configProductPath = path16.resolve(rootDir, dist, CONFIG_PRODUCT_FILE);
-  if (fs14.existsSync(configProductPath)) {
+  if (fs13.existsSync(configProductPath)) {
     const module = await importWithCacheBust(configProductPath);
     return module.default ?? {};
   }
-  const hasSourceConfig = fs14.existsSync(path16.join(rootDir, "faapi.config.ts")) || fs14.existsSync(path16.join(rootDir, "faapi.config.js"));
+  const hasSourceConfig = fs13.existsSync(path16.join(rootDir, "faapi.config.ts")) || fs13.existsSync(path16.join(rootDir, "faapi.config.js"));
   if (hasSourceConfig) {
     throw new Error(
       `[faapi] ${dist}/${CONFIG_PRODUCT_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
@@ -4271,7 +4239,7 @@ async function loadConfig(rootDir, dist) {
 }
 
 // src/cli/loadEnv.ts
-import fs15 from "fs";
+import fs14 from "fs";
 import path17 from "path";
 function resolveEnv() {
   return process.env.NODE_ENV || "development";
@@ -4340,8 +4308,8 @@ function loadEnv(rootDir) {
   const merged = {};
   for (const file of files) {
     const filePath = path17.join(rootDir, file);
-    if (!fs15.existsSync(filePath)) continue;
-    const content = fs15.readFileSync(filePath, "utf-8");
+    if (!fs14.existsSync(filePath)) continue;
+    const content = fs14.readFileSync(filePath, "utf-8");
     const parsed = parseEnvFile(content, merged);
     Object.assign(merged, parsed);
   }
@@ -4354,7 +4322,7 @@ function loadEnv(rootDir) {
 
 // src/cli/createAppCore.ts
 import fs21 from "fs";
-import path26 from "path";
+import path27 from "path";
 
 // src/router/sortRoutes.ts
 function sortRoutes(routes) {
@@ -4418,7 +4386,7 @@ import {
 import { createSecureServer as createHttp2SecureServer } from "http2";
 import { readFileSync } from "fs";
 import { Readable as Readable2 } from "stream";
-import path19 from "path";
+import path20 from "path";
 
 // src/router/matchRoute.ts
 var httpIndexCache = /* @__PURE__ */ new WeakMap();
@@ -5039,10 +5007,18 @@ function formatSetCookie(name, value, options) {
   if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
   return cookie;
 }
-function createContext(request, params, config = {}, ip = "", registries) {
-  return createContextFromUrl(request, new URL(request.url), params, config, ip, registries);
+function createContext(request, params, config = {}, ip = "", registries, resourcesDir) {
+  return createContextFromUrl(
+    request,
+    new URL(request.url),
+    params,
+    config,
+    ip,
+    registries,
+    resourcesDir
+  );
 }
-function createContextFromUrl(request, url, params, config = {}, ip = "", registries) {
+function createContextFromUrl(request, url, params, config = {}, ip = "", registries, resourcesDir) {
   const meta = { headers: {}, setCookies: [] };
   const parsedCookies = parseCookies(request.headers.get("cookie") ?? "");
   const cookiesObj = {};
@@ -5070,6 +5046,9 @@ 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;
@@ -5889,7 +5868,15 @@ function etag(options = {}) {
 // src/server/handleWsUpgrade.ts
 import fs16 from "fs";
 import { WebSocketServer, WebSocket } from "ws";
+import path19 from "path";
+
+// src/cli/copyResources.ts
 import path18 from "path";
+import fs15 from "fs";
+var RESOURCES_OUTPUT_DIR = "resources";
+function resolveResourcesDir(rootDir, dist) {
+  return path18.resolve(rootDir, dist, RESOURCES_OUTPUT_DIR);
+}
 
 // src/server/serverUtils.ts
 function nodeHttpToWebHeaders(req) {
@@ -6127,6 +6114,7 @@ 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 {
@@ -6158,7 +6146,14 @@ 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);
+    const ctx = createContext(
+      request,
+      params,
+      config,
+      getClientIp(req, trustedProxy),
+      registries,
+      resourcesDir
+    );
     const meta = ctx.meta;
     let upgraded = false;
     const finalHandler = async () => {
@@ -6202,7 +6197,7 @@ function attachWebSocket(options) {
       }
       let handlers;
       try {
-        const absoluteFilePath = path18.resolve(rootDir, route.filePath);
+        const absoluteFilePath = path19.resolve(rootDir, route.filePath);
         handlers = await loadWsHandler(absoluteFilePath, ctx, rootDir);
       } catch (err) {
         const reason = err instanceof Error ? err.message : String(err);
@@ -6362,6 +6357,7 @@ 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 : {};
@@ -6408,7 +6404,8 @@ function createServer(options) {
       bodyLimit,
       trustedProxy,
       registries,
-      routesRef.wsCurrent
+      routesRef.wsCurrent,
+      resourcesDir
     ).catch((err) => {
       console.error("[faapi] Request pipeline failed after error response attempt:", err);
       try {
@@ -6434,7 +6431,7 @@ function createServer(options) {
   });
   return { server, routesRef };
 }
-function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched) {
+function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched, resourcesDir) {
   const method = request.method.toUpperCase();
   const urlPath = url.pathname;
   const ctx = createContextFromUrl(
@@ -6443,7 +6440,8 @@ function prepareRequest(req, request, url, config, trustedProxy, registries, pre
     preMatched?.params ?? {},
     config,
     getClientIp(req, trustedProxy),
-    registries
+    registries,
+    resourcesDir
   );
   const meta = ctx.meta;
   return { request, url, ctx, meta, method, urlPath };
@@ -6462,7 +6460,7 @@ function getRoutePaths(route, rootDir, dist) {
   let cached = routePathCache.get(route);
   if (!cached) {
     cached = {
-      absFilePath: path19.resolve(rootDir, route.filePath),
+      absFilePath: path20.resolve(rootDir, route.filePath),
       schemaPath: getRuntimeSchemaPath(route.filePath, dist, rootDir)
     };
     routePathCache.set(route, cached);
@@ -6585,7 +6583,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) {
+async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries, wsRoutes, resourcesDir) {
   let meta = { headers: {}, setCookies: [] };
   let ctx;
   let sseEarlySent = false;
@@ -6605,7 +6603,8 @@ async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares,
       config,
       trustedProxy,
       registries,
-      preMatched
+      preMatched,
+      resourcesDir
     );
     ctx = prepared.ctx;
     meta = prepared.meta;
@@ -6682,7 +6681,7 @@ function applyPluginWrappers(server, handlerWrappers, upgradeWrappers) {
 
 // src/cli/generateRoutes.ts
 import fs17 from "fs";
-import path20 from "path";
+import path21 from "path";
 async function hydrateRoutes(manifest) {
   const hydrateRoute = (serialized) => ({
     method: serialized.method,
@@ -6726,18 +6725,18 @@ function createIdleTaskDriver() {
 }
 
 // src/cli/loadPlugins.ts
-import path22 from "path";
+import path23 from "path";
 import fs19 from "fs";
 import { pathToFileURL as pathToFileURL3 } from "url";
 
 // src/cli/compileConfig.ts
-import path21 from "path";
+import path22 from "path";
 import fs18 from "fs";
 async function compileProjectModules(entryPoints, rootDir, dist) {
   const { insideFiles, outsideFiles } = await collectRelativeImports(entryPoints, rootDir);
   const esbuild = await import("esbuild");
   const aliasPlugins = buildAliasPlugins(rootDir);
-  const absDist = path21.resolve(rootDir, dist);
+  const absDist = path22.resolve(rootDir, dist);
   await esbuild.build({
     entryPoints: [...entryPoints, ...outsideFiles],
     outdir: absDist,
@@ -6751,7 +6750,7 @@ async function compileProjectModules(entryPoints, rootDir, dist) {
     logLevel: "silent"
   });
   if (insideFiles.length > 0) {
-    const appOutbase = path21.resolve(rootDir, "src");
+    const appOutbase = path22.resolve(rootDir, "src");
     await esbuild.build({
       entryPoints: insideFiles,
       outdir: absDist,
@@ -6832,7 +6831,7 @@ async function loadPlugins(declarations, ctx, rootDir, dist) {
 var TS_EXTS = /\.(ts|tsx|mts|cts)$/;
 var JS_EXTS = /\.(js|mjs|cjs|jsx)$/;
 function resolveLocalPluginSource(specifier, baseDir) {
-  const base = path22.isAbsolute(specifier) ? specifier : path22.resolve(baseDir, specifier);
+  const base = path23.isAbsolute(specifier) ? specifier : path23.resolve(baseDir, specifier);
   if ((TS_EXTS.test(base) || JS_EXTS.test(base)) && fs19.existsSync(base)) return base;
   for (const ext of [".ts", ".js"]) {
     if (fs19.existsSync(base + ext)) return base + ext;
@@ -6843,16 +6842,16 @@ function resolveLocalPluginSource(specifier, baseDir) {
   return null;
 }
 function mirrorProductPath(sourcePath, baseDir, distDir) {
-  let rel = path22.relative(baseDir, sourcePath).replace(/\\/g, "/");
+  let rel = path23.relative(baseDir, sourcePath).replace(/\\/g, "/");
   if (rel.startsWith("src/")) rel = rel.slice(4);
-  return path22.resolve(distDir, rel.replace(TS_EXTS, ".js"));
+  return path23.resolve(distDir, rel.replace(TS_EXTS, ".js"));
 }
 async function importPluginModule(specifier, baseDir, dist) {
   const isRelative = specifier.startsWith("./") || specifier.startsWith("../");
-  if (!isRelative && !path22.isAbsolute(specifier)) {
+  if (!isRelative && !path23.isAbsolute(specifier)) {
     return import(specifier);
   }
-  const distDir = dist ? path22.resolve(baseDir, dist) : null;
+  const distDir = dist ? path23.resolve(baseDir, dist) : null;
   const sourcePath = resolveLocalPluginSource(specifier, baseDir);
   const productPath = sourcePath && distDir ? mirrorProductPath(sourcePath, baseDir, distDir) : null;
   if (productPath !== null && fs19.existsSync(productPath) && (sourcePath === null || isProductFresh(sourcePath, productPath))) {
@@ -6864,7 +6863,7 @@ async function importPluginModule(specifier, baseDir, dist) {
         `Local plugin "${specifier}" has no up-to-date build artifact (dist is stale or missing). Run "faapi build" first, or use "faapi dev" for on-demand compilation.`
       );
     }
-    const relFromRoot = path22.relative(baseDir, sourcePath).replace(/\\/g, "/");
+    const relFromRoot = path23.relative(baseDir, sourcePath).replace(/\\/g, "/");
     if (relFromRoot.startsWith("src/")) {
       await ensureCompiled(sourcePath, baseDir, dist);
     } else {
@@ -6882,7 +6881,7 @@ async function importPluginModule(specifier, baseDir, dist) {
     `${specifier}/index.ts`,
     `${specifier}.js`,
     `${specifier}/index.js`
-  ].map((c) => path22.isAbsolute(c) ? c : path22.join(baseDir, c));
+  ].map((c) => path23.isAbsolute(c) ? c : path23.join(baseDir, c));
   throw new Error(
     `Cannot find local plugin "${specifier}" (resolved from ${baseDir}). Expected one of:
   ${candidates.join("\n  ")}
@@ -6908,10 +6907,10 @@ function resolveDeclaration(decl) {
 
 // src/cli/manifestLoader.ts
 import fs20 from "fs";
-import path25 from "path";
+import path26 from "path";
 
 // src/cli/generateAgentArtifacts.ts
-import path23 from "path";
+import path24 from "path";
 
 // src/ast/extractAgentMetadata.ts
 import ts11 from "typescript";
@@ -6919,12 +6918,21 @@ init_resolveTypeNode();
 function extractAgentMetadata(program, filePath, pathMeta) {
   const sourceFile = program.getSourceFile(filePath);
   if (!sourceFile) return null;
+  const runOwner = findRunExportOwner(sourceFile);
+  if (runOwner) {
+    throw SchemaExtractionError.at(
+      runOwner,
+      "run",
+      "agent \u81EA\u5B9A\u4E49 run \u5DF2\u79FB\u9664\u2014\u2014agent \u7EDF\u4E00\u4E3A\u58F0\u660E\u5F0F\u6267\u884C\uFF08config + \u9ED8\u8BA4 reactLoop\uFF09\u3002\u7F16\u6392\u573A\u666F\u8BF7\u6CE8\u518C tool\uFF08src/tools/ \u4E0B\u5BFC\u51FA\u51FD\u6570\uFF0C\u6709 schema/trace/\u9274\u6743\u94A9\u5B50\uFF09\uFF0C\u591A agent \u534F\u4F5C\u7528 config.agents \u58F0\u660E sub-agent",
+      sourceFile
+    );
+  }
   const configFound = findConfigExport(sourceFile);
   if (!configFound) {
     throw SchemaExtractionError.at(
       sourceFile,
       "config.systemPrompt",
-      "agent \u5FC5\u586B\u2014\u2014\u8BF7\u5728 config \u5757\u58F0\u660E\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF08\u5B57\u7B26\u4E32\u5B57\u9762\u91CF\u3001\u65E0\u63D2\u503C\u6A21\u677F\u5B57\u7B26\u4E32\u6216\u5176 + \u62FC\u63A5\uFF09",
+      "agent \u5FC5\u586B\u2014\u2014\u8BF7\u5728 config \u5757\u58F0\u660E systemPrompt\uFF08\u5B57\u7B26\u4E32\u5B57\u9762\u91CF\u3001\u65E0\u63D2\u503C\u6A21\u677F\u5B57\u7B26\u4E32\u6216\u5176 + \u62FC\u63A5\uFF09\u6216 systemPromptFile\uFF08\u76F8\u5BF9 resources \u76EE\u5F55\u7684\u8DEF\u5F84\u5B57\u9762\u91CF\uFF09\u4E8C\u9009\u4E00",
       sourceFile
     );
   }
@@ -6940,16 +6948,13 @@ function extractAgentMetadata(program, filePath, pathMeta) {
   const jsDoc = getJSDocFromNode(configFound.jsDocOwner);
   const description = extractDescription(jsDoc);
   const agentNameOverride = extractJSDocTagValue(jsDoc, "agent");
-  const { systemPrompt, tools, agents, model, maxTurns, inputDescription } = extractConfigFields(
-    objectLiteral,
-    sourceFile
-  );
+  const { systemPrompt, systemPromptFile, tools, agents, model, maxTurns, inputDescription } = extractConfigFields(objectLiteral, sourceFile);
   return {
     name: agentNameOverride ?? pathMeta.name,
     description,
     filePath: pathMeta.filePath,
-    hasRun: pathMeta.hasRun,
     systemPrompt,
+    systemPromptFile,
     tools,
     agents,
     model,
@@ -6957,6 +6962,25 @@ function extractAgentMetadata(program, filePath, pathMeta) {
     inputDescription
   };
 }
+function findRunExportOwner(sourceFile) {
+  let result = null;
+  ts11.forEachChild(sourceFile, (node) => {
+    if (result) return;
+    if (ts11.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === "run") {
+      result = node;
+      return;
+    }
+    if (ts11.isVariableStatement(node) && hasExportModifier(node)) {
+      for (const decl of node.declarationList.declarations) {
+        if (ts11.isIdentifier(decl.name) && decl.name.text === "run") {
+          result = node;
+          return;
+        }
+      }
+    }
+  });
+  return result;
+}
 function findConfigExport(sourceFile) {
   let result = null;
   ts11.forEachChild(sourceFile, (node) => {
@@ -6999,6 +7023,7 @@ function getReturnObjectLiteral(fn) {
 }
 function extractConfigFields(objLit, sourceFile) {
   let systemPrompt;
+  let systemPromptFile;
   let tools;
   let agents;
   let model;
@@ -7022,6 +7047,9 @@ function extractConfigFields(objLit, sourceFile) {
       case "systemPrompt":
         systemPrompt = requireStringValue(prop, "systemPrompt", sourceFile);
         break;
+      case "systemPromptFile":
+        systemPromptFile = requireStringValue(prop, "systemPromptFile", sourceFile);
+        break;
       case "tools":
         tools = requireStringArrayValue(prop, "tools", sourceFile);
         break;
@@ -7041,20 +7069,28 @@ function extractConfigFields(objLit, sourceFile) {
         throw SchemaExtractionError.at(
           prop,
           `config.${propName}`,
-          "\u672A\u77E5 config \u5B57\u6BB5\u2014\u2014\u4EC5\u652F\u6301 systemPrompt / tools / agents / model / maxTurns / inputDescription",
+          "\u672A\u77E5 config \u5B57\u6BB5\u2014\u2014\u4EC5\u652F\u6301 systemPrompt / systemPromptFile / tools / agents / model / maxTurns / inputDescription",
           sourceFile
         );
     }
   }
-  if (systemPrompt === void 0) {
+  if (systemPrompt !== void 0 && systemPromptFile !== void 0) {
     throw SchemaExtractionError.at(
       objLit,
       "config.systemPrompt",
-      "agent \u5FC5\u586B\u2014\u2014\u8BF7\u5728 config \u5757\u58F0\u660E\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF08\u5B57\u7B26\u4E32\u5B57\u9762\u91CF\u3001\u65E0\u63D2\u503C\u6A21\u677F\u5B57\u7B26\u4E32\u6216\u5176 + \u62FC\u63A5\uFF09",
+      "systemPrompt \u4E0E systemPromptFile \u4E92\u65A5\u2014\u2014\u5185\u8054\u7CFB\u7EDF\u63D0\u793A\u8BCD\u4E0E resources \u6587\u4EF6\u4E8C\u9009\u4E00",
       sourceFile
     );
   }
-  return { systemPrompt, tools, agents, model, maxTurns, inputDescription };
+  if (systemPrompt === void 0 && systemPromptFile === void 0) {
+    throw SchemaExtractionError.at(
+      objLit,
+      "config.systemPrompt",
+      "agent \u5FC5\u586B\u2014\u2014\u8BF7\u5728 config \u5757\u58F0\u660E systemPrompt\uFF08\u5B57\u7B26\u4E32\u5B57\u9762\u91CF\u3001\u65E0\u63D2\u503C\u6A21\u677F\u5B57\u7B26\u4E32\u6216\u5176 + \u62FC\u63A5\uFF09\u6216 systemPromptFile\uFF08\u76F8\u5BF9 resources \u76EE\u5F55\u7684\u8DEF\u5F84\u5B57\u9762\u91CF\uFF09\u4E8C\u9009\u4E00",
+      sourceFile
+    );
+  }
+  return { systemPrompt, systemPromptFile, tools, agents, model, maxTurns, inputDescription };
 }
 function getPropertyName(name) {
   if (ts11.isIdentifier(name)) return name.text;
@@ -7137,8 +7173,8 @@ function serializeAgents(agents, dist = "dist") {
   return agents.map((a) => ({
     name: a.name,
     description: a.description,
-    hasRun: a.hasRun,
     systemPrompt: a.systemPrompt,
+    systemPromptFile: a.systemPromptFile,
     tools: a.tools,
     agents: a.agents,
     model: a.model,
@@ -7158,8 +7194,8 @@ function hydrateAgents(manifest) {
     name: a.name,
     description: a.description ?? void 0,
     filePath: a.filePath,
-    hasRun: a.hasRun,
     systemPrompt: a.systemPrompt ?? void 0,
+    systemPromptFile: a.systemPromptFile ?? void 0,
     tools: a.tools ?? void 0,
     agents: a.agents ?? void 0,
     model: a.model ?? void 0,
@@ -7191,14 +7227,13 @@ function validateAgentList(metadata) {
 }
 async function generateAgentArtifacts(agents, rootDir, dist) {
   const metadata = [];
-  const programByFile = createPrograms(agents.map((m) => path23.resolve(rootDir, m.filePath)));
+  const programByFile = createPrograms(agents.map((m) => path24.resolve(rootDir, m.filePath)));
   for (const manifest of agents) {
-    const absPath = path23.resolve(rootDir, manifest.filePath);
+    const absPath = path24.resolve(rootDir, manifest.filePath);
     const program = programByFile.get(absPath);
     const result = extractAgentMetadata(program, absPath, {
       name: manifest.name,
-      filePath: manifest.filePath,
-      hasRun: manifest.hasRun
+      filePath: manifest.filePath
     });
     if (!result) {
       throw new Error(
@@ -7209,14 +7244,14 @@ async function generateAgentArtifacts(agents, rootDir, dist) {
   }
   validateAgentList(metadata);
   const serialized = serializeAgents(metadata, dist);
-  const agentsPath = path23.resolve(rootDir, dist, AGENTS_FILE);
+  const agentsPath = path24.resolve(rootDir, dist, AGENTS_FILE);
   await writeAgentsModule(serialized, agentsPath);
   return metadata;
 }
 
 // src/cli/generateTaskArtifacts.ts
 init_generateZodArtifacts();
-import path24 from "path";
+import path25 from "path";
 init_createProgram();
 init_atomicWrite();
 init_extractHandlerTypes();
@@ -7254,7 +7289,7 @@ function collectTaskSchemaSources(tasks, rootDir) {
   const tasksByFile = /* @__PURE__ */ new Map();
   for (const task of tasks) {
     if (!task.inputTypeName) continue;
-    const absPath = path24.resolve(rootDir, task.filePath);
+    const absPath = path25.resolve(rootDir, task.filePath);
     let list = tasksByFile.get(absPath);
     if (!list) {
       list = [];
@@ -7311,9 +7346,9 @@ function generateTaskSchemaFileSource(sources, resolveType, helpersImportPath) {
 async function generateTaskArtifacts(manifests, rootDir, dist) {
   const metadata = [];
   if (manifests.length > 0) {
-    const programByFile = createPrograms(manifests.map((m) => path24.resolve(rootDir, m.filePath)));
+    const programByFile = createPrograms(manifests.map((m) => path25.resolve(rootDir, m.filePath)));
     for (const manifest of manifests) {
-      const absPath = path24.resolve(rootDir, manifest.filePath);
+      const absPath = path25.resolve(rootDir, manifest.filePath);
       const result = extractToolMetadata(programByFile.get(absPath), absPath, "run", {
         name: manifest.name,
         filePath: manifest.filePath
@@ -7324,7 +7359,7 @@ async function generateTaskArtifacts(manifests, rootDir, dist) {
     }
   }
   const serialized = serializeTasks(manifests, dist);
-  const tasksPath = path24.resolve(rootDir, dist, TASKS_FILE);
+  const tasksPath = path25.resolve(rootDir, dist, TASKS_FILE);
   await writeTasksModule(serialized, tasksPath);
   if (metadata.length === 0) {
     return hydrateTasks(serialized);
@@ -7346,7 +7381,7 @@ async function generateTaskArtifacts(manifests, rootDir, dist) {
 var TOOLS_FILE2 = "faapi-tools.js";
 var AGENTS_FILE2 = "faapi-agents.js";
 async function loadAndHydrateTools(rootDir, dist, registries = defaultRegistries) {
-  const toolsPath = path25.resolve(rootDir, dist, TOOLS_FILE2);
+  const toolsPath = path26.resolve(rootDir, dist, TOOLS_FILE2);
   if (!fs20.existsSync(toolsPath)) {
     return [];
   }
@@ -7356,7 +7391,7 @@ async function loadAndHydrateTools(rootDir, dist, registries = defaultRegistries
   return hydrated;
 }
 async function loadAndHydrateAgents(rootDir, dist, registries = defaultRegistries) {
-  const agentsPath = path25.resolve(rootDir, dist, AGENTS_FILE2);
+  const agentsPath = path26.resolve(rootDir, dist, AGENTS_FILE2);
   if (!fs20.existsSync(agentsPath)) {
     return [];
   }
@@ -7372,7 +7407,7 @@ function getTaskDriverOptions(config) {
   return void 0;
 }
 async function loadAndHydrateTasks(rootDir, dist, registries = defaultRegistries) {
-  const tasksPath = path25.resolve(rootDir, dist, TASKS_FILE);
+  const tasksPath = path26.resolve(rootDir, dist, TASKS_FILE);
   if (!fs20.existsSync(tasksPath)) {
     return [];
   }
@@ -7550,8 +7585,7 @@ function logStartupSummary(routes, wsRoutes, tools, agents, taskMetas, p) {
   if (agents.length > 0) {
     console.log(`- Loaded ${agents.length} agent(s):`);
     for (const agent of agents) {
-      const exports = agent.hasRun ? "run" : "-";
-      console.log(`  ${agent.name} [${exports}]  ${agent.filePath}`);
+      console.log(`  ${agent.name}  ${agent.filePath}`);
     }
   }
   if (taskMetas.length > 0) {
@@ -7565,7 +7599,8 @@ function logStartupSummary(routes, wsRoutes, tools, agents, taskMetas, p) {
 async function createAppBase(options) {
   const rootDir = options?.rootDir ?? process.cwd();
   const dist = options?.dist ?? process.env.FAAPI_DIST ?? DEFAULT_DIST;
-  const routesPath = path26.resolve(rootDir, dist, ROUTES_FILE);
+  const resourcesDir = resolveResourcesDir(rootDir, dist);
+  const routesPath = path27.resolve(rootDir, dist, ROUTES_FILE);
   if (!fs21.existsSync(routesPath)) {
     throw new Error(
       `[faapi] ${dist}/${ROUTES_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
@@ -7587,6 +7622,7 @@ async function createAppBase(options) {
     registry: registries.task,
     rootDir,
     config,
+    resourcesDir,
     registries: createTaskRegistriesView(registries),
     driver: taskDriver,
     onFailed: config?.task?.onFailed
@@ -7628,6 +7664,7 @@ async function createAppBase(options) {
     config?.plugins,
     {
       rootDir,
+      resourcesDir,
       registries,
       routes: sorted,
       getRoutes: () => sorted,
@@ -7645,6 +7682,8 @@ async function createAppBase(options) {
     routes: sorted,
     wsRoutes,
     rootDir,
+    dist,
+    resourcesDir,
     tasks: taskQueue,
     async listen(listenPort) {
       const envPort = process.env.PORT ? Number(process.env.PORT) : void 0;
@@ -7656,7 +7695,8 @@ async function createAppBase(options) {
             routes: sorted,
             server,
             registries,
-            tasks: taskQueue
+            tasks: taskQueue,
+            resourcesDir
           });
           console.log("- onBoot hook executed");
         } catch (err) {
@@ -7691,7 +7731,8 @@ async function createAppBase(options) {
               routes: sorted,
               server,
               registries,
-              tasks: taskQueue
+              tasks: taskQueue,
+              resourcesDir
             });
             console.log("- onReady hook executed");
           }
@@ -7715,7 +7756,8 @@ async function createAppBase(options) {
           routes: sorted,
           server,
           registries,
-          tasks: taskQueue
+          tasks: taskQueue,
+          resourcesDir
         });
       }
       registries.tool.clear();
@@ -7781,7 +7823,7 @@ import path30 from "path";
 
 // src/router/scanRoutes.ts
 import fg3 from "fast-glob";
-import path27 from "path";
+import path28 from "path";
 import fs22 from "fs";
 
 // src/router/constants.ts
@@ -7852,26 +7894,26 @@ function extractExportsFromSource(source) {
   return names;
 }
 function collectMiddlewarePaths(routeFilePath, rootDir, dist) {
-  const routeDir = path27.dirname(routeFilePath);
-  const resolvedRoot = path27.resolve(rootDir);
+  const routeDir = path28.dirname(routeFilePath);
+  const resolvedRoot = path28.resolve(rootDir);
   const paths = [];
-  let currentDir = path27.resolve(rootDir, routeDir);
+  let currentDir = path28.resolve(rootDir, routeDir);
   while (true) {
     if (dist) {
-      const mwTsPath = path27.join(currentDir, "middlewares.ts");
-      const mwJsPath = path27.join(currentDir, "middlewares.js");
-      const absTsPath = path27.resolve(rootDir, mwTsPath);
-      const absJsPath = path27.resolve(rootDir, mwJsPath);
+      const mwTsPath = path28.join(currentDir, "middlewares.ts");
+      const mwJsPath = path28.join(currentDir, "middlewares.js");
+      const absTsPath = path28.resolve(rootDir, mwTsPath);
+      const absJsPath = path28.resolve(rootDir, mwJsPath);
       const absMwPath = fs22.existsSync(absTsPath) ? absTsPath : fs22.existsSync(absJsPath) ? absJsPath : null;
       if (absMwPath) {
-        const relMwPath = path27.relative(rootDir, absMwPath);
-        const prodAbsPath = path27.resolve(rootDir, toProdFilePath(relMwPath, dist));
+        const relMwPath = path28.relative(rootDir, absMwPath);
+        const prodAbsPath = path28.resolve(rootDir, toProdFilePath(relMwPath, dist));
         paths.push(prodAbsPath);
       }
     } else {
       for (const ext of [".ts", ".js"]) {
-        const mwPath = path27.join(currentDir, `middlewares${ext}`);
-        const absMwPath = path27.resolve(rootDir, mwPath);
+        const mwPath = path28.join(currentDir, `middlewares${ext}`);
+        const absMwPath = path28.resolve(rootDir, mwPath);
         if (fs22.existsSync(absMwPath)) {
           paths.push(absMwPath);
           break;
@@ -7879,7 +7921,7 @@ function collectMiddlewarePaths(routeFilePath, rootDir, dist) {
       }
     }
     if (currentDir === resolvedRoot) break;
-    const parentDir = path27.dirname(currentDir);
+    const parentDir = path28.dirname(currentDir);
     if (parentDir === currentDir) break;
     currentDir = parentDir;
   }
@@ -7898,7 +7940,7 @@ async function scanRoutes(rootDir, patterns, dist) {
     const normalizedFile = file.replace(/\\/g, "/");
     const fileName = normalizedFile.split("/").pop();
     if (fileName === "handler.ts" || fileName === "handler.js") {
-      const absPath = path27.resolve(rootDir, normalizedFile);
+      const absPath = path28.resolve(rootDir, normalizedFile);
       const urlPath = filePathToUrlPath(normalizedFile);
       const paramNames = extractParamNames(urlPath);
       const isDynamic = paramNames.length > 0;
@@ -7947,7 +7989,7 @@ async function scanRoutes(rootDir, patterns, dist) {
 
 // src/tools/scanTools.ts
 import fg4 from "fast-glob";
-import path28 from "path";
+import path29 from "path";
 import fs23 from "fs";
 var TOOL_PATTERNS = ["src/tools/**/*.ts"];
 var TOOL_EXPORT_RE = new RegExp(
@@ -7998,7 +8040,7 @@ async function scanTools(rootDir, patterns) {
     if (fileName !== "handler.ts" && fileName !== "handler.js") {
       continue;
     }
-    const absPath = path28.resolve(rootDir, normalizedFile);
+    const absPath = path29.resolve(rootDir, normalizedFile);
     const source = await fs23.promises.readFile(absPath, "utf8").catch(() => "");
     const exportNames = extractToolExportsFromSource(source);
     const namespace = filePathToToolNamespace(normalizedFile);
@@ -8023,10 +8065,7 @@ async function scanTools(rootDir, patterns) {
 
 // src/agents/scanAgents.ts
 import fg5 from "fast-glob";
-import path29 from "path";
-import fs24 from "fs";
 var DEFAULT_AGENT_PATTERNS = ["src/agents/**/handler.ts"];
-var RUN_EXPORT_RE = /export\s+(?:async\s+)?(?:function\s+|const\s+)run\b/;
 function extractAgentNameFromPath(filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   const match = normalized.match(/(?:^|\/)agents\/(.+)\/handler\.ts$/);
@@ -8037,11 +8076,6 @@ function extractAgentNameFromPath(filePath) {
   }
   return match[1].replace(/\//g, ".");
 }
-function detectAgentExports(source) {
-  return {
-    hasRun: RUN_EXPORT_RE.test(source)
-  };
-}
 async function scanAgents(rootDir, patterns) {
   const files = await fg5(patterns, {
     cwd: rootDir,
@@ -8056,9 +8090,6 @@ async function scanAgents(rootDir, patterns) {
     if (fileName !== "handler.ts" && fileName !== "handler.js") {
       continue;
     }
-    const absPath = path29.resolve(rootDir, normalizedFile);
-    const source = await fs24.promises.readFile(absPath, "utf8").catch(() => "");
-    const { hasRun } = detectAgentExports(source);
     const name = extractAgentNameFromPath(normalizedFile);
     const prevFile = seen.get(name);
     if (prevFile) {
@@ -8069,8 +8100,7 @@ async function scanAgents(rootDir, patterns) {
     seen.set(name, normalizedFile);
     agents.push({
       name,
-      filePath: normalizedFile,
-      hasRun
+      filePath: normalizedFile
     });
   }
   return agents;
@@ -8194,7 +8224,6 @@ export {
   hydrateSkillRegistry,
   invalidateProgramCache,
   listSkills,
-  loadAgentModule,
   loadConfig,
   loadEnv,
   loadTaskDriver,