@dudousxd/nestjs-agent 1.36.2 → 1.38.0

package/dist/index.d.cts

@@ -7,8 +7,8 @@ export * from '@dudousxd/nestjs-agent-core';
 export { FunctionalToolDefinition } from '@dudousxd/nestjs-agent-core';
 import { A2uiOptions } from '@dudousxd/nestjs-agent-core/a2ui';
 import { Request, Response } from 'express';
-import { A as AgentService, a as ActionProposalService } from './index-CJdTomOT.cjs';
-export { b as A2uiAdapterOptions, c as A2uiRunHandler, d as AttachmentLimits, C as ChatParams, e as ChatSendMode, f as ChatSendResult, D as DEFAULT_ALLOWED_ATTACHMENT_CONTENT_TYPES, g as DEFAULT_MAX_ATTACHMENT_BYTES, M as MAX_ATTACHMENTS_PER_MESSAGE, N as NO_USER_MESSAGE_CODE, Q as QueuedSend, T as ThreadDefaultAgentReader, h as ThreadModelReader, i as a2uiAdapter, j as attachmentLimits } from './index-CJdTomOT.cjs';
+import { A as AgentService, a as ActionProposalService } from './index-BJFM1tG8.cjs';
+export { b as A2uiAdapterOptions, c as A2uiRunHandler, d as AttachmentLimits, C as ChatParams, e as ChatSendMode, f as ChatSendResult, D as DEFAULT_ALLOWED_ATTACHMENT_CONTENT_TYPES, g as DEFAULT_MAX_ATTACHMENT_BYTES, F as ForkThreadParams, M as MAX_ATTACHMENTS_PER_MESSAGE, N as NO_USER_MESSAGE_CODE, Q as QueuedSend, T as ThreadDefaultAgentReader, h as ThreadModelReader, i as a2uiAdapter, j as attachmentLimits } from './index-BJFM1tG8.cjs';
 import { AgentGenui } from './genui/index.cjs';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { DiscoveryService, MetadataScanner } from '@nestjs/core';

package/dist/index.d.ts

@@ -7,8 +7,8 @@ export * from '@dudousxd/nestjs-agent-core';
 export { FunctionalToolDefinition } from '@dudousxd/nestjs-agent-core';
 import { A2uiOptions } from '@dudousxd/nestjs-agent-core/a2ui';
 import { Request, Response } from 'express';
-import { A as AgentService, a as ActionProposalService } from './index-D1xRrnCq.js';
-export { b as A2uiAdapterOptions, c as A2uiRunHandler, d as AttachmentLimits, C as ChatParams, e as ChatSendMode, f as ChatSendResult, D as DEFAULT_ALLOWED_ATTACHMENT_CONTENT_TYPES, g as DEFAULT_MAX_ATTACHMENT_BYTES, M as MAX_ATTACHMENTS_PER_MESSAGE, N as NO_USER_MESSAGE_CODE, Q as QueuedSend, T as ThreadDefaultAgentReader, h as ThreadModelReader, i as a2uiAdapter, j as attachmentLimits } from './index-D1xRrnCq.js';
+import { A as AgentService, a as ActionProposalService } from './index-De98CGXa.js';
+export { b as A2uiAdapterOptions, c as A2uiRunHandler, d as AttachmentLimits, C as ChatParams, e as ChatSendMode, f as ChatSendResult, D as DEFAULT_ALLOWED_ATTACHMENT_CONTENT_TYPES, g as DEFAULT_MAX_ATTACHMENT_BYTES, F as ForkThreadParams, M as MAX_ATTACHMENTS_PER_MESSAGE, N as NO_USER_MESSAGE_CODE, Q as QueuedSend, T as ThreadDefaultAgentReader, h as ThreadModelReader, i as a2uiAdapter, j as attachmentLimits } from './index-De98CGXa.js';
 import { AgentGenui } from './genui/index.js';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { DiscoveryService, MetadataScanner } from '@nestjs/core';

package/dist/index.js

@@ -70,7 +70,7 @@ var init_kit = __esm({
 
 // src/agent.module.ts
 import { AGENT_ACTOR_RESOLVER as AGENT_ACTOR_RESOLVER14, AGENT_APPROVAL_PORT, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY7, AGENT_DURABLE_RUNNER, AGENT_MEMORY as AGENT_MEMORY3, AGENT_MODEL as AGENT_MODEL3, AGENT_MODEL_CATALOG as AGENT_MODEL_CATALOG3, AGENT_OPTIONS as AGENT_OPTIONS10, AGENT_PROMPT_CONTRIBUTORS as AGENT_PROMPT_CONTRIBUTORS3, AGENT_QUOTA_PROVIDER as AGENT_QUOTA_PROVIDER3, AGENT_REGISTRY as AGENT_REGISTRY6, AGENT_ROLES_POLICY as AGENT_ROLES_POLICY2, AGENT_RUNNER as AGENT_RUNNER2, AGENT_SINK as AGENT_SINK3, AGENT_SKILLS as AGENT_SKILLS3, AGENT_SKILL_SOURCES as AGENT_SKILL_SOURCES2, AGENT_STORE as AGENT_STORE7, AGENT_TOOL_REGISTRY as AGENT_TOOL_REGISTRY3, AgentRegistry as AgentRegistry6, ClosedRolesPolicy, DefaultRolesPolicy, InMemoryAgentStore, ToolRegistry as ToolRegistry3, personalAgentGate, personalAgentScopes } from "@dudousxd/nestjs-agent-core";
-import { Global, Logger as Logger8, Module as Module2 } from "@nestjs/common";
+import { Global, Logger as Logger9, Module as Module2 } from "@nestjs/common";
 import { DiscoveryModule, ModulesContainer, RouterModule } from "@nestjs/core";
 
 // src/agent-deps.factory.ts
@@ -807,8 +807,8 @@ AgentDepsFactory2 = _ts_decorate2([
 var AGENT_SERVICE = /* @__PURE__ */ Symbol.for("@dudousxd/nestjs-agent:agent-service");
 
 // src/agent.service.ts
-import { AGENT_ATTACHMENT_STAGING as AGENT_ATTACHMENT_STAGING2, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY2, AGENT_MODEL_CATALOG, AGENT_OPTIONS as AGENT_OPTIONS4, AGENT_QUOTA_PROVIDER as AGENT_QUOTA_PROVIDER2, AGENT_RUNNER, AGENT_STORE as AGENT_STORE4, DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY as DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY2, REQUESTER_APPROVER, findCatalogModel, mayDecideApproval as mayDecideApproval2, readElicitationQuestions, settleDeadRun, textActionProposalReply as textActionProposalReply2, validateElicitationAnswer } from "@dudousxd/nestjs-agent-core";
-import { BadRequestException as BadRequestException2, ConflictException as ConflictException2, ForbiddenException as ForbiddenException2, GoneException, HttpException, HttpStatus, Inject as Inject5, Injectable as Injectable4, NotFoundException as NotFoundException2, NotImplementedException as NotImplementedException3, Optional as Optional3, PayloadTooLargeException, UnsupportedMediaTypeException } from "@nestjs/common";
+import { AGENT_ATTACHMENT_STAGING as AGENT_ATTACHMENT_STAGING2, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY2, AGENT_MODEL_CATALOG, AGENT_OPTIONS as AGENT_OPTIONS4, AGENT_QUOTA_PROVIDER as AGENT_QUOTA_PROVIDER2, AGENT_RUNNER, AGENT_STORE as AGENT_STORE4, DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY as DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY2, REQUESTER_APPROVER, findCatalogModel, mayDecideApproval as mayDecideApproval2, readElicitationQuestions, recordAiUsage, settleDeadRun, textActionProposalReply as textActionProposalReply2, validateElicitationAnswer } from "@dudousxd/nestjs-agent-core";
+import { BadRequestException as BadRequestException2, ConflictException as ConflictException2, ForbiddenException as ForbiddenException2, GoneException, HttpException, HttpStatus, Inject as Inject5, Injectable as Injectable4, Logger as Logger2, NotFoundException as NotFoundException2, NotImplementedException as NotImplementedException3, Optional as Optional3, PayloadTooLargeException, UnsupportedMediaTypeException } from "@nestjs/common";
 
 // src/agent-deps.ts
 function utcDay(date = /* @__PURE__ */ new Date()) {
@@ -1631,6 +1631,7 @@ function _ts_param4(paramIndex, decorator) {
   };
 }
 __name(_ts_param4, "_ts_param");
+var usageLogger = new Logger2("AgentService");
 var NO_USER_MESSAGE_CODE = "no_user_message";
 function sendableParams(params) {
   const message = params.message;
@@ -2458,9 +2459,28 @@ var AgentService2 = class {
     await this.assertOwnsThread(actor, threadId);
     return this.store.softDeleteThread(threadId);
   }
-  async forkThread(actor, threadId, fromMessageId) {
-    await this.assertOwnsThread(actor, threadId);
-    return this.store.forkThread(threadId, fromMessageId);
+  /**
+  * Copy a thread up to `fromMessageId` (inclusive) into a new one. By default only the thread's
+  * owner may, and the copy is theirs. With `params.authorized`, the host has vouched for `actor`
+  * (a share link it checked) and the copy is `actor`'s — see {@link ForkThreadParams}.
+  */
+  async forkThread(actor, threadId, fromMessageId, params = {}) {
+    if (params.authorized === true) {
+      if (await this.store.ownerOfThread(threadId) === null) {
+        throw new NotFoundException2(`thread ${threadId} not found`);
+      }
+    } else {
+      await this.assertOwnsThread(actor, threadId);
+    }
+    const options = {
+      ...params.authorized === true ? {
+        actorRef: actor.id
+      } : {},
+      ...params.tenantRef !== void 0 ? {
+        tenantRef: params.tenantRef
+      } : {}
+    };
+    return this.store.forkThread(threadId, fromMessageId, options);
   }
   /** Kept for source compatibility — a thin wrapper over the more general `updateThread`. */
   async renameThread(actor, threadId, title) {
@@ -2855,6 +2875,31 @@ var AgentService2 = class {
       throw new ForbiddenException2("run belongs to another actor");
     }
   }
+  /**
+  * Record AI spend that did not come from an agent turn — a transcription, a TTS render, a batch of
+  * embeddings, a direct OpenAI/OpenRouter SDK call — on the same ledger the agent's turns write, so
+  * cost, quota and the dashboard see one figure.
+  *
+  * Never throws into the caller's flow by default: a failed write or an invalid input is logged and
+  * answered with `{ recorded: false, error }`. Pass `{ throwOnError: true }` where losing the row
+  * must fail the caller.
+  *
+  * Counted against `actorRef` like an agent turn: the ledger is the budget (`LedgerQuotaProvider`),
+  * so its tokens count in the token windows (a row with no tokens adds 0 there) and its `costUsd` in
+  * the USD windows. A `QuotaStore` counter is bumped only where loop deps carry one (`AgentModule`
+  * wires none). `actorRef: null` is platform cost, recorded under `PLATFORM_ACTOR_REF` and counted
+  * against nobody.
+  */
+  recordUsage(input, options = {}) {
+    return recordAiUsage({
+      store: this.store,
+      quota: this.deps.forAgent().quota,
+      day: utcDay(),
+      input,
+      options,
+      warn: /* @__PURE__ */ __name((message) => usageLogger.warn(message), "warn")
+    });
+  }
 };
 AgentService2 = _ts_decorate5([
   Injectable4(),
@@ -4761,7 +4806,7 @@ ToolsController = _ts_decorate19([
 
 // src/discovery/agent-discovery.service.ts
 import { AGENT_PROMPT_CONTRIBUTORS as AGENT_PROMPT_CONTRIBUTORS2, AGENT_REGISTRY as AGENT_REGISTRY4, AgentRegistry as AgentRegistry5 } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject19, Injectable as Injectable6, Logger as Logger2 } from "@nestjs/common";
+import { Inject as Inject19, Injectable as Injectable6, Logger as Logger3 } from "@nestjs/common";
 import { DiscoveryService, MetadataScanner } from "@nestjs/core";
 
 // src/decorator/agent.decorator.ts
@@ -4830,7 +4875,7 @@ var AgentDiscoveryService = class _AgentDiscoveryService {
   scanner;
   registry;
   contributors;
-  logger = new Logger2(_AgentDiscoveryService.name);
+  logger = new Logger3(_AgentDiscoveryService.name);
   constructor(discovery, scanner, registry, contributors) {
     this.discovery = discovery;
     this.scanner = scanner;
@@ -5012,7 +5057,7 @@ AgentDiscoveryService = _ts_decorate20([
 
 // src/discovery/ai-tool-discovery.service.ts
 import { AGENT_OPTIONS as AGENT_OPTIONS7, AGENT_REGISTRY as AGENT_REGISTRY5, AGENT_TOOL_REGISTRY as AGENT_TOOL_REGISTRY2, normalizeDelegation as normalizeDelegation2 } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject20, Injectable as Injectable7, Logger as Logger3 } from "@nestjs/common";
+import { Inject as Inject20, Injectable as Injectable7, Logger as Logger4 } from "@nestjs/common";
 import { DiscoveryService as DiscoveryService2 } from "@nestjs/core";
 import { z } from "zod";
 
@@ -5079,7 +5124,7 @@ var AiToolDiscoveryService = class _AiToolDiscoveryService {
   registry;
   agents;
   options;
-  logger = new Logger3(_AiToolDiscoveryService.name);
+  logger = new Logger4(_AiToolDiscoveryService.name);
   constructor(discovery, registry, agents, options) {
     this.discovery = discovery;
     this.registry = registry;
@@ -5245,7 +5290,7 @@ AiToolDiscoveryService = _ts_decorate21([
 
 // src/discovery/skill-discovery.service.ts
 import { AGENT_SKILL_SOURCES } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject21, Injectable as Injectable8, Logger as Logger4 } from "@nestjs/common";
+import { Inject as Inject21, Injectable as Injectable8, Logger as Logger5 } from "@nestjs/common";
 import { DiscoveryService as DiscoveryService3 } from "@nestjs/core";
 
 // src/decorator/skill.decorator.ts
@@ -5300,7 +5345,7 @@ var SkillDiscoveryService = class _SkillDiscoveryService {
   }
   discovery;
   declared;
-  logger = new Logger4(_SkillDiscoveryService.name);
+  logger = new Logger5(_SkillDiscoveryService.name);
   constructor(discovery, declared) {
     this.discovery = discovery;
     this.declared = declared;
@@ -5608,7 +5653,7 @@ var LedgerQuotaProvider = class {
 
 // src/pricing-boot.service.ts
 import { AGENT_MODEL as AGENT_MODEL2, AGENT_OPTIONS as AGENT_OPTIONS8, AGENT_PRICING_STORE as AGENT_PRICING_STORE2, ensureModelPricing } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject22, Injectable as Injectable9, Logger as Logger5, Optional as Optional9 } from "@nestjs/common";
+import { Inject as Inject22, Injectable as Injectable9, Logger as Logger6, Optional as Optional9 } from "@nestjs/common";
 function _ts_decorate23(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
@@ -5635,7 +5680,7 @@ function _ts_param22(paramIndex, decorator) {
   };
 }
 __name(_ts_param22, "_ts_param");
-var logger = new Logger5("AgentPricing");
+var logger = new Logger6("AgentPricing");
 var PricingBootService = class {
   static {
     __name(this, "PricingBootService");
@@ -5698,7 +5743,7 @@ PricingBootService = _ts_decorate23([
 // src/proposals/action-proposal-worker.service.ts
 import { randomUUID } from "crypto";
 import { AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY5, AGENT_OPTIONS as AGENT_OPTIONS9, AGENT_STORE as AGENT_STORE5, ActionProposalExecutor, ActionProposalWorker, assertIndependentActionCapabilities as assertIndependentActionCapabilities2 } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject23, Injectable as Injectable10, Logger as Logger6 } from "@nestjs/common";
+import { Inject as Inject23, Injectable as Injectable10, Logger as Logger7 } from "@nestjs/common";
 function _ts_decorate24(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
@@ -5733,7 +5778,7 @@ var ActionProposalWorkerService = class _ActionProposalWorkerService {
   options;
   deps;
   worker;
-  logger = new Logger6(_ActionProposalWorkerService.name);
+  logger = new Logger7(_ActionProposalWorkerService.name);
   settledListeners = /* @__PURE__ */ new Set();
   admittedListeners = /* @__PURE__ */ new Set();
   /**
@@ -5993,8 +6038,8 @@ ActionProposalController = _ts_decorate25([
 var AGENT_CHAT_QUEUE = /* @__PURE__ */ Symbol.for("@dudousxd/nestjs-agent:chat-queue");
 
 // src/runner/inline-agent-runner.ts
-import { AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY6, AGENT_STORE as AGENT_STORE6, RUN_ENDED_BEFORE_TOOL_CALL, RunCancelledError, agentFailureCode, agentRunContext, encodeStreamEvent as encodeStreamEvent2, publishAgentRunCancelled, publishAgentRunFailed, releaseThreadRun, runAgentLoop, runDurationMs, settleAll, settleUnsettledDelegation, streamFailure as streamFailure2 } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject25, Injectable as Injectable11, Logger as Logger7, Optional as Optional10 } from "@nestjs/common";
+import { AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY6, AGENT_STORE as AGENT_STORE6, RUN_ENDED_BEFORE_TOOL_CALL, RunCancelledError, agentFailureCode, agentRunContext, encodeStreamEvent as encodeStreamEvent2, publishAgentRunCancelled, publishAgentRunFailed, releaseThreadRun, runAgentLoop, runDurationMs, runEndTimings, settleAll, settleUnsettledDelegation, streamFailure as streamFailure2 } from "@dudousxd/nestjs-agent-core";
+import { Inject as Inject25, Injectable as Injectable11, Logger as Logger8, Optional as Optional10 } from "@nestjs/common";
 function _ts_decorate26(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
@@ -6028,7 +6073,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
   factory;
   store;
   queue;
-  logger = new Logger7(_InlineAgentRunner.name);
+  logger = new Logger8(_InlineAgentRunner.name);
   pending = /* @__PURE__ */ new Map();
   /**
   * Runs someone has asked to stop. In-process, like `pending`, and for the same reason: this runner
@@ -6065,10 +6110,12 @@ var InlineAgentRunner = class _InlineAgentRunner {
   }
   async start(input, options = {}) {
     const runId = options.runId ?? crypto.randomUUID();
+    const acceptedAt = Date.now();
     const day = input.day ?? utcDay();
     const deps = this.factory.forAgent(input.agentName);
     this.live.add(runId);
     const hooks = this.topLevelHooks({
+      acceptedAt,
       runId,
       deps,
       actor: input.actor,
@@ -6090,8 +6137,9 @@ var InlineAgentRunner = class _InlineAgentRunner {
       const timed = durationMs !== void 0 ? {
         durationMs
       } : {};
+      const measured = runEndTimings(error);
       if (error instanceof RunCancelledError) {
-        await this.settleCancelled(runId, input, deps, durationMs);
+        await this.settleCancelled(runId, input, deps, durationMs, measured);
         return;
       }
       const message = error instanceof Error ? error.message : String(error);
@@ -6103,6 +6151,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
         code,
         message,
         ...timed,
+        ...measured,
         context: agentRunContext(input)
       });
       await this.store.recordRunEnd?.({
@@ -6180,7 +6229,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
   * the stream ENDED after a `cancelled` frame rather than failed, so a client that retries failed
   * streams does not retry this one.
   */
-  async settleCancelled(runId, input, deps, durationMs) {
+  async settleCancelled(runId, input, deps, durationMs, measured = {}) {
     this.logger.log(`agent run ${runId} cancelled`);
     const timed = durationMs !== void 0 ? {
       durationMs
@@ -6189,6 +6238,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
       runId,
       threadId: input.threadId,
       ...timed,
+      ...measured,
       context: agentRunContext(input)
     });
     const writer = await deps.sink.open(runId);
@@ -6281,9 +6331,10 @@ var InlineAgentRunner = class _InlineAgentRunner {
     });
   }
   topLevelHooks(args) {
-    const { runId, deps, actor, day, threadId, chainBelow, input } = args;
+    const { runId, deps, actor, day, threadId, chainBelow, input, acceptedAt } = args;
     return {
       runId,
+      queueMs: /* @__PURE__ */ __name(() => Date.now() - acceptedAt, "queueMs"),
       // The loop ends the stream when the turn completes. Just before, the thread passes to the next
       // queued message (or is released), and the reader is told which — so by the time a client
       // sees the run end, the thread is already free or already running what it queued.
@@ -6408,10 +6459,12 @@ var InlineAgentRunner = class _InlineAgentRunner {
       const timed = durationMs !== void 0 ? {
         durationMs
       } : {};
+      const measured = runEndTimings(error);
       const settled = {
         runId,
         threadId: subThread.id,
         ...timed,
+        ...measured,
         context: agentRunContext(childInput)
       };
       if (cancelled) {
@@ -6600,7 +6653,7 @@ function _ts_decorate27(decorators, target, key, desc) {
 }
 __name(_ts_decorate27, "_ts_decorate");
 var DEFAULT_PATH = "agent";
-var logger2 = new Logger8("AgentModule");
+var logger2 = new Logger9("AgentModule");
 function externalWrapper(modules, token) {
   for (const module of modules.values()) {
     if (module.metatype === AgentModule) continue;