@faapi/faapi 6.30.0 → 6.32.0

package/dist/index.js

@@ -1126,6 +1126,8 @@ var init_resolveInjection = __esm({
       // 任务子系统：TaskClient（入队/查询）
       log: "log",
       // 请求级日志器（ctx.log 同一实例：scope http，自动带 requestId 等字段）
+      llm: "llm",
+      // 轻量 LLM 补全通道（@faapi/agent 插件注册到 registries.llm；未加载时 undefined）
       // raw 系：恒原始输入（无 schema、无校验、管线永不转换），与 query/params/body
       // 的「校验转换后」口径二分互补
       rawQuery: "rawQuery",
@@ -1970,6 +1972,20 @@ function createAgentHandleStore() {
     }
   };
 }
+function createLlmChannelStore() {
+  let current = null;
+  return {
+    register(channel) {
+      current = channel;
+    },
+    get() {
+      return current ?? void 0;
+    },
+    clear() {
+      current = null;
+    }
+  };
+}
 function createTaskHandleStore() {
   let currentFactory = null;
   return {
@@ -2026,7 +2042,8 @@ function createAppRegistries() {
   const task = createTaskRegistry();
   const agentHandle = createAgentHandleStore();
   const taskHandle = createTaskHandleStore();
-  return { tool, agent, skill, task, agentHandle, taskHandle };
+  const llm = createLlmChannelStore();
+  return { tool, agent, skill, task, agentHandle, taskHandle, llm };
 }
 var defaultRegistries = createAppRegistries();
 
@@ -2240,6 +2257,7 @@ async function runTaskInWorker(options) {
           job: taskCtx.job
         },
         registries: options.registries,
+        llms: options.llms,
         log: options.log
       });
     } catch (err) {
@@ -2592,6 +2610,9 @@ function createTaskQueue(deps) {
             job: { id: job.id, name: job.name, attempt: job.attempt }
           },
           registries: snapshotRegistries(),
+          // agent.llms 纯数据快照随 workerData 下发，worker 内动态加载 @faapi/agent
+          // 重建轻量补全通道（taskCtx.llm）——llms 未配置时不传
+          llms: deps.llms,
           // 日志配置随 workerData 下发（纯数据），worker 内联重建 taskCtx.log，
           // 条目回传宿主走统一管道（scope/fields 与进程内路径一致）
           log: {
@@ -2621,6 +2642,8 @@ function createTaskQueue(deps) {
           config: deps.config,
           job: { id: job.id, name: job.name, attempt: job.attempt },
           registries: registriesView,
+          // 轻量补全通道惰性读取（插件晚于队列构造注册，执行时刻取值才可见）
+          llm: deps.llm?.get(),
           log: createLogger(`task:${job.name}`, {
             fields: { jobId: job.id, task: job.name, attempt: job.attempt }
           }),
@@ -3926,18 +3949,18 @@ function getDist() {
   }
   return process.env.FAAPI_DIST ?? "dist";
 }
-function getToolSchemaPath(tool, rootDir) {
+function getToolSchemaPath(ref, rootDir) {
   const dist = getDist();
-  return getRuntimeSchemaPath(tool.filePath, dist, rootDir ?? process.cwd());
+  return getRuntimeSchemaPath(ref.filePath, dist, rootDir ?? process.cwd());
 }
-async function loadToolSchema(tool, rootDir) {
-  if (!tool.inputTypeName) return void 0;
-  const schemaName = `${tool.inputTypeName}Schema`;
-  const zodPath = getToolSchemaPath(tool, rootDir);
+async function loadToolSchema(ref, rootDir) {
+  if (!ref.inputTypeName) return void 0;
+  const schemaName = `${ref.inputTypeName}Schema`;
+  const zodPath = getToolSchemaPath(ref, rootDir);
   if (!existsSync3(zodPath)) return void 0;
   try {
     const mod = await importWithCacheBust(zodPath, isDevOnDemandEnabled());
-    const schema = mod[`${tool.inputTypeName}Schema`];
+    const schema = mod[`${ref.inputTypeName}Schema`];
     if (!schema) return void 0;
     return { schema, schemaName };
   } catch {
@@ -5375,6 +5398,10 @@ function getBuiltinInjectionValue(type, ctx, body) {
     // 任务子系统：注入 TaskClient（入队/查询）；未注册工厂（无 app 编排）时 undefined
     case "tasks":
       return ctx.registries ? ctx.registries.taskHandle.get(ctx) : void 0;
+    // 轻量 LLM 补全通道：@faapi/agent 插件注册到 registries.llm；与请求上下文无关，
+    // get 无参。插件未加载（或编程式直调 ctx 无 registries）时 undefined
+    case "llm":
+      return ctx.registries ? ctx.registries.llm.get() : void 0;
     // 请求级日志器：与 ctx.log 同一实例（scope http，自动带 requestId/method/path 字段）
     case "log":
       return ctx.log;
@@ -6902,9 +6929,20 @@ function extractAgentMetadata(program, filePath, pathMeta) {
     agents,
     model,
     maxTurns,
-    inputDescription
+    inputDescription,
+    inputTypeName: findInputDeclaration(sourceFile) ? "Input" : void 0
   };
 }
+function findInputDeclaration(sourceFile) {
+  let found = false;
+  ts11.forEachChild(sourceFile, (node) => {
+    if (found) return;
+    if ((ts11.isInterfaceDeclaration(node) || ts11.isTypeAliasDeclaration(node)) && node.name.text === "Input") {
+      found = true;
+    }
+  });
+  return found;
+}
 function findRunExportOwner(sourceFile) {
   let result = null;
   ts11.forEachChild(sourceFile, (node) => {
@@ -7111,6 +7149,9 @@ function extractStringArrayValue(expr) {
 // src/cli/generateAgentArtifacts.ts
 init_createProgram();
 init_atomicWrite();
+init_extractHandlerTypes();
+init_generateZodSchema();
+init_generateZodArtifacts();
 var AGENTS_FILE = "faapi-agents.js";
 function serializeAgents(agents, dist = "dist") {
   return agents.map((a) => ({
@@ -7123,6 +7164,7 @@ function serializeAgents(agents, dist = "dist") {
     model: a.model,
     maxTurns: a.maxTurns,
     inputDescription: a.inputDescription,
+    inputTypeName: a.inputTypeName,
     filePath: toProdFilePath(a.filePath, dist)
   }));
 }
@@ -7143,7 +7185,8 @@ function hydrateAgents(manifest) {
     agents: a.agents ?? void 0,
     model: a.model ?? void 0,
     maxTurns: a.maxTurns ?? void 0,
-    inputDescription: a.inputDescription ?? void 0
+    inputDescription: a.inputDescription ?? void 0,
+    inputTypeName: a.inputTypeName ?? void 0
   }));
 }
 function validateAgentList(metadata) {
@@ -7189,8 +7232,66 @@ async function generateAgentArtifacts(agents, rootDir, dist) {
   const serialized = serializeAgents(metadata, dist);
   const agentsPath = path24.resolve(rootDir, dist, AGENTS_FILE);
   await writeAgentsModule(serialized, agentsPath);
+  await generateAgentZodArtifacts(metadata, programByFile, rootDir, dist);
   return metadata;
 }
+async function generateAgentZodArtifacts(metadata, programByFile, rootDir, dist) {
+  const declared = metadata.filter((a) => a.inputTypeName);
+  if (declared.length === 0) return;
+  const resolversByFile = /* @__PURE__ */ new Map();
+  const sources = [];
+  for (const agent of declared) {
+    const absPath = path24.resolve(rootDir, agent.filePath);
+    const program = programByFile.get(absPath);
+    if (!program) {
+      throw new Error(
+        `agent "${agent.name}" \u6E90\u6587\u4EF6\u4E0D\u5728 Program \u4E2D: ${agent.filePath}\u2014\u2014\u65E0\u6CD5\u751F\u6210\u5165\u53C2 schema`
+      );
+    }
+    if (!resolversByFile.has(absPath)) {
+      resolversByFile.set(absPath, createLazyTypeResolver(program, absPath));
+    }
+    const typeInfo = extractTypeInfo(program, absPath, agent.inputTypeName);
+    sources.push({
+      name: agent.name,
+      filePath: absPath,
+      schemaName: agent.inputTypeName,
+      typeInfo
+    });
+  }
+  await generateZodArtifacts(sources, {
+    generateFileSource: generateAgentSchemaFileSource,
+    resolversByFile,
+    rootDir,
+    dist
+  });
+}
+function generateAgentSchemaFileSource(sources, resolveType, helpersImportPath) {
+  const lines = ["import { z } from 'zod';"];
+  const schemaBlocks = [];
+  for (const source of sources) {
+    if (!source.typeInfo) continue;
+    const block = [`// agent ${source.name} \u2192 ${source.schemaName}`];
+    const schemaCode = generateZodSchemaSource(
+      source.typeInfo,
+      resolveType,
+      source.schemaName,
+      false
+    ).replace(/^import \{ z \} from 'zod';\s*\n\s*\n/, "");
+    block.push(schemaCode);
+    block.push("");
+    schemaBlocks.push(block.join("\n"));
+  }
+  const allSchemaCode = schemaBlocks.join("\n");
+  if (helpersImportPath && usesCoerceHelpers(allSchemaCode)) {
+    lines.push(
+      `import { coerceNumber, coerceBoolean, coerceMap, coerceSet } from '${helpersImportPath}';`
+    );
+  }
+  lines.push("");
+  lines.push(...schemaBlocks);
+  return lines.join("\n").replace(/\n+$/, "\n");
+}
 
 // src/cli/generateTaskArtifacts.ts
 init_generateZodArtifacts();
@@ -7581,6 +7682,10 @@ async function createAppBase(options) {
     config,
     resourcesDir,
     registries: createTaskRegistriesView(registries),
+    // 轻量补全通道：进程内路径经 store 惰性读取（插件注册后的活引用）；
+    // 隔离路径传 agent.llms 纯数据快照（worker 内重建）
+    llm: registries.llm,
+    llms: config?.agent?.llms,
     driver: taskDriver,
     onFailed: config?.task?.onFailed
   });
@@ -7718,6 +7823,7 @@ async function createAppBase(options) {
       registries.task.clear();
       registries.agentHandle.clear();
       registries.taskHandle.clear();
+      registries.llm.clear();
       setActiveResourcesDir(null);
       if (!server.listening) {
         app.server = null;