@dudousxd/nestjs-agent-core 0.4.0 → 0.6.0

package/dist/index.cjs

@@ -23,8 +23,10 @@ var index_exports = {};
 __export(index_exports, {
   AGENT_ACTOR_DIRECTORY: () => AGENT_ACTOR_DIRECTORY,
   AGENT_ACTOR_RESOLVER: () => AGENT_ACTOR_RESOLVER,
+  AGENT_APPROVAL_PORT: () => AGENT_APPROVAL_PORT,
   AGENT_ATTACHMENT_STAGING: () => AGENT_ATTACHMENT_STAGING,
   AGENT_DEPS_FACTORY: () => AGENT_DEPS_FACTORY,
+  AGENT_DIAGNOSTIC_EVENTS: () => AGENT_DIAGNOSTIC_EVENTS,
   AGENT_DURABLE_RUNNER: () => AGENT_DURABLE_RUNNER,
   AGENT_EMBEDDING_PROVIDER: () => AGENT_EMBEDDING_PROVIDER,
   AGENT_GOVERNANCE_QUERIES: () => AGENT_GOVERNANCE_QUERIES,
@@ -48,6 +50,7 @@ __export(index_exports, {
   ToolInputInvalidError: () => ToolInputInvalidError,
   ToolNotFoundError: () => ToolNotFoundError,
   ToolRegistry: () => ToolRegistry,
+  agentDiagnosticKey: () => agentDiagnosticKey,
   bucketByActor: () => bucketByActor,
   bucketByModel: () => bucketByModel,
   bucketByThread: () => bucketByThread,
@@ -66,7 +69,8 @@ __export(index_exports, {
   publishAgentRunStarted: () => publishAgentRunStarted,
   publishAgentToolCall: () => publishAgentToolCall,
   runAgentLoop: () => runAgentLoop,
-  seedModelPrices: () => seedModelPrices
+  seedModelPrices: () => seedModelPrices,
+  withToolTimeout: () => withToolTimeout
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -90,6 +94,7 @@ 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");
+var AGENT_APPROVAL_PORT = Symbol.for("@dudousxd/nestjs-agent:approval-port");
 
 // src/spi/token-stream-sink.ts
 var AgentStreamError = class extends Error {
@@ -393,6 +398,9 @@ var DefaultRolesPolicy = class {
   }
 };
 
+// src/agent-loop.ts
+var import_node_crypto = require("crypto");
+
 // src/diagnostics.ts
 var import_nestjs_diagnostics = require("@dudousxd/nestjs-diagnostics");
 function publishAgentRunStarted(payload) {
@@ -427,6 +435,20 @@ function publishAgentRetrieved(payload) {
   (0, import_nestjs_diagnostics.emit)("agent", "retrieved", payload);
 }
 __name(publishAgentRetrieved, "publishAgentRetrieved");
+var AGENT_DIAGNOSTIC_EVENTS = [
+  "run.started",
+  "message",
+  "tool-call",
+  "quota.exceeded",
+  "run.finished",
+  "run.failed",
+  "delegated",
+  "retrieved"
+];
+function agentDiagnosticKey(event) {
+  return `agent:${event}`;
+}
+__name(agentDiagnosticKey, "agentDiagnosticKey");
 
 // src/agent-loop.ts
 function resolveCostUsd(usage, reportedCostUsd, price) {
@@ -505,7 +527,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) => {
@@ -517,7 +539,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 {
@@ -622,6 +644,19 @@ 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 () => {
+    const promptHash = (0, import_node_crypto.createHash)("sha256").update(system).digest("hex");
+    await deps.store.recordRunStart?.({
+      runId: hooks.runId,
+      threadId: input.threadId,
+      actorRef: input.actor.id,
+      ...input.agentName !== void 0 ? {
+        agentName: input.agentName
+      } : {},
+      promptHash
+    });
+  });
   let injectedPassages;
   if (deps.retriever !== void 0) {
     const retriever = deps.retriever;
@@ -655,13 +690,25 @@ ${buildContextBlock(passages)}`;
         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) => ({
@@ -836,6 +883,7 @@ ${buildContextBlock(passages)}`;
         });
         continue;
       }
+      let deciderRef = input.actor.id;
       if (toolType === "action") {
         await hooks.step(`persist:toolcall:${call.id}`, () => deps.store.recordToolCall({
           toolCallId: call.id,
@@ -846,10 +894,12 @@ ${buildContextBlock(passages)}`;
           status: "pending_approval"
         }));
         const decision = await hooks.awaitApproval(call, ctx);
+        deciderRef = decision.executedByRef ?? input.actor.id;
         if (!decision.approved) {
           await hooks.step(`persist:toolreject:${call.id}`, () => deps.store.updateToolCall({
             toolCallId: call.id,
             status: "rejected",
+            executedByRef: deciderRef,
             ...decision.reason !== void 0 ? {
               error: decision.reason
             } : {}
@@ -881,18 +931,43 @@ ${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",
           output,
           executionMs,
           ...toolType === "action" ? {
-            executedByRef: input.actor.id
+            executedByRef: deciderRef
           } : {}
         }));
         results.push({
@@ -908,7 +983,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,
@@ -956,6 +1034,13 @@ ${buildContextBlock(passages)}`;
   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,
@@ -973,8 +1058,10 @@ __name(runAgentLoop, "runAgentLoop");
 0 && (module.exports = {
   AGENT_ACTOR_DIRECTORY,
   AGENT_ACTOR_RESOLVER,
+  AGENT_APPROVAL_PORT,
   AGENT_ATTACHMENT_STAGING,
   AGENT_DEPS_FACTORY,
+  AGENT_DIAGNOSTIC_EVENTS,
   AGENT_DURABLE_RUNNER,
   AGENT_EMBEDDING_PROVIDER,
   AGENT_GOVERNANCE_QUERIES,
@@ -998,6 +1085,7 @@ __name(runAgentLoop, "runAgentLoop");
   ToolInputInvalidError,
   ToolNotFoundError,
   ToolRegistry,
+  agentDiagnosticKey,
   bucketByActor,
   bucketByModel,
   bucketByThread,
@@ -1016,6 +1104,7 @@ __name(runAgentLoop, "runAgentLoop");
   publishAgentRunStarted,
   publishAgentToolCall,
   runAgentLoop,
-  seedModelPrices
+  seedModelPrices,
+  withToolTimeout
 });
 //# sourceMappingURL=index.cjs.map