@dudousxd/nestjs-agent-core 0.3.3 → 0.5.0

package/dist/index.cjs

@@ -21,7 +21,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AGENT_ACTOR_DIRECTORY: () => AGENT_ACTOR_DIRECTORY,
   AGENT_ACTOR_RESOLVER: () => AGENT_ACTOR_RESOLVER,
+  AGENT_ATTACHMENT_STAGING: () => AGENT_ATTACHMENT_STAGING,
   AGENT_DEPS_FACTORY: () => AGENT_DEPS_FACTORY,
   AGENT_DURABLE_RUNNER: () => AGENT_DURABLE_RUNNER,
   AGENT_EMBEDDING_PROVIDER: () => AGENT_EMBEDDING_PROVIDER,
@@ -64,7 +66,8 @@ __export(index_exports, {
   publishAgentRunStarted: () => publishAgentRunStarted,
   publishAgentToolCall: () => publishAgentToolCall,
   runAgentLoop: () => runAgentLoop,
-  seedModelPrices: () => seedModelPrices
+  seedModelPrices: () => seedModelPrices,
+  withToolTimeout: () => withToolTimeout
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -86,6 +89,8 @@ var AGENT_RETRIEVER = Symbol.for("@dudousxd/nestjs-agent:retriever");
 var AGENT_EMBEDDING_PROVIDER = Symbol.for("@dudousxd/nestjs-agent:embedding-provider");
 var AGENT_DEPS_FACTORY = Symbol.for("@dudousxd/nestjs-agent:deps-factory");
 var AGENT_PROMPT_CONTRIBUTORS = Symbol.for("@dudousxd/nestjs-agent:prompt-contributors");
+var AGENT_ACTOR_DIRECTORY = Symbol.for("@dudousxd/nestjs-agent:actor-directory");
+var AGENT_ATTACHMENT_STAGING = Symbol.for("@dudousxd/nestjs-agent:attachment-staging");
 
 // src/spi/token-stream-sink.ts
 var AgentStreamError = class extends Error {
@@ -425,6 +430,13 @@ function publishAgentRetrieved(payload) {
 __name(publishAgentRetrieved, "publishAgentRetrieved");
 
 // src/agent-loop.ts
+function resolveCostUsd(usage, reportedCostUsd, price) {
+  if (reportedCostUsd !== void 0) {
+    return reportedCostUsd;
+  }
+  return price === void 0 ? null : estimateCost(usage, price);
+}
+__name(resolveCostUsd, "resolveCostUsd");
 function buildContextBlock(passages) {
   const items = passages.map((passage, index) => {
     const label = passage.source !== void 0 ? ` (${passage.source})` : "";
@@ -494,7 +506,7 @@ var ToolTimeoutError = class ToolTimeoutError2 extends Error {
     this.name = "ToolTimeoutError";
   }
 };
-function withTimeout(work, ms, toolName) {
+function withToolTimeout(work, ms, toolName) {
   return new Promise((resolve, reject) => {
     const timer = setTimeout(() => reject(new ToolTimeoutError(toolName, ms)), ms);
     work.then((value) => {
@@ -506,7 +518,7 @@ function withTimeout(work, ms, toolName) {
     });
   });
 }
-__name(withTimeout, "withTimeout");
+__name(withToolTimeout, "withToolTimeout");
 function parseFollowUps(text, count) {
   const source = text.match(/\[[\s\S]*\]/)?.[0] ?? text;
   try {
@@ -611,6 +623,17 @@ async function runAgentLoop(deps, input, hooks) {
       agentName: input.agentName
     } : {}
   });
+  const startedAt = await hooks.step("run:started-at", () => Promise.resolve(Date.now()));
+  await hooks.step("persist:run:start", async () => {
+    await deps.store.recordRunStart?.({
+      runId: hooks.runId,
+      threadId: input.threadId,
+      actorRef: input.actor.id,
+      ...input.agentName !== void 0 ? {
+        agentName: input.agentName
+      } : {}
+    });
+  });
   let injectedPassages;
   if (deps.retriever !== void 0) {
     const retriever = deps.retriever;
@@ -629,24 +652,50 @@ ${buildContextBlock(passages)}`;
       count: passages.length
     });
   }
+  let prices = [];
+  if (deps.pricingStore !== void 0) {
+    const pricingStore = deps.pricingStore;
+    prices = await hooks.step("pricing:list", () => pricingStore.listCurrentPrices());
+  }
+  const priceByModel = new Map(prices.map((price) => [
+    price.modelId,
+    price
+  ]));
   for (let i = 0; i < maxSteps; i += 1) {
     await hooks.step(`stream:step-start:${i}`, async () => {
       await writer.write(encodeStreamEvent({
         kind: "step-start"
       }));
     });
-    const tools = await deps.registry.definitionsFor(input.actor, deps.rolesPolicy, deps.toolAllowList);
-    const turn = await hooks.step(`llm:${i}`, () => deps.model.runTurn({
-      system,
-      messages: modelMessages,
-      tools,
-      sink: writer
+    let turn;
+    if (hooks.dispatchLlm) {
+      turn = await hooks.dispatchLlm(i, {
+        ...input.agentName !== void 0 ? {
+          agentName: input.agentName
+        } : {},
+        system,
+        messages: modelMessages,
+        actor: input.actor
+      });
+    } else {
+      const tools = await deps.registry.definitionsFor(input.actor, deps.rolesPolicy, deps.toolAllowList);
+      turn = await hooks.step(`llm:${i}`, () => deps.model.runTurn({
+        system,
+        messages: modelMessages,
+        tools,
+        sink: writer
+      }));
+    }
+    const resolvedModelId = turn.modelId ?? deps.modelId ?? "unknown";
+    const costUsd = resolveCostUsd(turn.usage, turn.costUsd, priceByModel.get(resolvedModelId));
+    const toolCallsWithKind = turn.toolCalls.map((call) => ({
+      ...call,
+      kind: deps.registry.spec(call.name)?.kind ?? "read"
     }));
     await hooks.step(`persist:usage:${i}`, () => deps.store.recordUsage({
       threadId: input.threadId,
       actorRef: input.actor.id,
-      // provider-reported model wins over the configured fallback, so cost can't misattribute
-      modelId: turn.modelId ?? deps.modelId ?? "unknown",
+      modelId: resolvedModelId,
       purpose: "chat",
       usage: turn.usage,
       // persist the provider's actual cost when reported; the read-model prefers it over pricing
@@ -694,12 +743,15 @@ ${buildContextBlock(passages)}`;
       threadId: input.threadId,
       role: "assistant",
       content: turn.text,
-      usage: turn.usage,
+      usage: {
+        ...turn.usage,
+        costUsd
+      },
       ...input.agentName !== void 0 ? {
         agentName: input.agentName
       } : {},
-      ...turn.toolCalls.length > 0 ? {
-        toolCalls: turn.toolCalls
+      ...toolCallsWithKind.length > 0 ? {
+        toolCalls: toolCallsWithKind
       } : {},
       ...followUps !== void 0 ? {
         followUps
@@ -708,8 +760,8 @@ ${buildContextBlock(passages)}`;
     const assistantMessage = {
       role: "assistant",
       content: turn.text,
-      ...turn.toolCalls.length > 0 ? {
-        toolCalls: turn.toolCalls
+      ...toolCallsWithKind.length > 0 ? {
+        toolCalls: toolCallsWithKind
       } : {}
     };
     modelMessages.push(assistantMessage);
@@ -739,15 +791,17 @@ ${buildContextBlock(passages)}`;
     if (isFinalTurn) {
       await hooks.step(`stream:step-finish:${i}`, async () => {
         await writer.write(encodeStreamEvent({
-          kind: "step-finish"
+          kind: "step-finish",
+          usage: turn.usage,
+          costUsd
         }));
       });
       break;
     }
     const results = [];
-    for (const call of turn.toolCalls) {
+    for (const call of toolCallsWithKind) {
       const spec = deps.registry.spec(call.name);
-      const toolType = spec?.kind ?? "read";
+      const toolType = call.kind ?? "read";
       const ctx = {
         actor: input.actor,
         threadId: input.threadId,
@@ -851,11 +905,36 @@ ${buildContextBlock(passages)}`;
           status: "auto_executed"
         }));
       }
-      const startedAt = Date.now();
+      const startedAt2 = Date.now();
       try {
-        const invocation = hooks.step(`tool:${call.id}`, () => deps.registry.invoke(call.name, call.input, ctx, deps.rolesPolicy));
-        const output = deps.toolTimeoutMs !== void 0 ? await withTimeout(invocation, deps.toolTimeoutMs, call.name) : await invocation;
-        const executionMs = Date.now() - startedAt;
+        let output;
+        if (hooks.dispatchTool) {
+          const stepCtx = {
+            actor: input.actor,
+            threadId: input.threadId,
+            runId: hooks.runId,
+            requestId: hooks.runId,
+            ...input.agentName !== void 0 ? {
+              agentName: input.agentName
+            } : {},
+            ...input.pageContext !== void 0 ? {
+              pageContext: input.pageContext
+            } : {}
+          };
+          const envelope = {
+            toolName: call.name,
+            input: call.input,
+            ctx: stepCtx,
+            ...deps.toolTimeoutMs !== void 0 ? {
+              timeoutMs: deps.toolTimeoutMs
+            } : {}
+          };
+          output = await hooks.dispatchTool(call, envelope);
+        } else {
+          const invocation = hooks.step(`tool:${call.id}`, () => deps.registry.invoke(call.name, call.input, ctx, deps.rolesPolicy));
+          output = deps.toolTimeoutMs !== void 0 ? await withToolTimeout(invocation, deps.toolTimeoutMs, call.name) : await invocation;
+        }
+        const executionMs = Date.now() - startedAt2;
         await hooks.step(`persist:toolexec:${call.id}`, () => deps.store.updateToolCall({
           toolCallId: call.id,
           status: "executed",
@@ -878,7 +957,10 @@ ${buildContextBlock(passages)}`;
           durationMs: executionMs
         });
       } catch (error) {
-        const executionMs = Date.now() - startedAt;
+        if (hooks.isControlFlowError?.(error) === true) {
+          throw error;
+        }
+        const executionMs = Date.now() - startedAt2;
         const message = error instanceof Error ? error.message : String(error);
         await hooks.step(`persist:toolfail:${call.id}`, () => deps.store.updateToolCall({
           toolCallId: call.id,
@@ -917,13 +999,22 @@ ${buildContextBlock(passages)}`;
     });
     await hooks.step(`stream:step-finish:${i}`, async () => {
       await writer.write(encodeStreamEvent({
-        kind: "step-finish"
+        kind: "step-finish",
+        usage: turn.usage,
+        costUsd
       }));
     });
   }
   if (thread !== null && (thread.title === "" || thread.title === "New chat")) {
     await hooks.step("persist:title", () => deps.store.setTitle(input.threadId, deriveTitle(input.userText)));
   }
+  await hooks.step("persist:run:end", async () => {
+    await deps.store.recordRunEnd?.({
+      runId: hooks.runId,
+      status: "completed",
+      durationMs: Date.now() - startedAt
+    });
+  });
   await writer.end();
   publishAgentRunFinished({
     runId: hooks.runId,
@@ -939,7 +1030,9 @@ ${buildContextBlock(passages)}`;
 __name(runAgentLoop, "runAgentLoop");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AGENT_ACTOR_DIRECTORY,
   AGENT_ACTOR_RESOLVER,
+  AGENT_ATTACHMENT_STAGING,
   AGENT_DEPS_FACTORY,
   AGENT_DURABLE_RUNNER,
   AGENT_EMBEDDING_PROVIDER,
@@ -982,6 +1075,7 @@ __name(runAgentLoop, "runAgentLoop");
   publishAgentRunStarted,
   publishAgentToolCall,
   runAgentLoop,
-  seedModelPrices
+  seedModelPrices,
+  withToolTimeout
 });
 //# sourceMappingURL=index.cjs.map