@dudousxd/nestjs-agent 2.0.2 → 2.1.0

package/dist/durable/index.cjs

@@ -12506,7 +12506,7 @@ AgentDurableModule = _ts_decorate4([
 ], AgentDurableModule);
 
 // src/agent.module.ts
-var import_nestjs_agent_core47 = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core48 = require("@dudousxd/nestjs-agent-core");
 var import_common36 = require("@nestjs/common");
 var import_core6 = require("@nestjs/core");
 
@@ -13299,9 +13299,11 @@ var ActionProposalService = class {
   }
   store;
   options;
-  constructor(store, options) {
+  contextAccessor;
+  constructor(store, options, contextAccessor) {
     this.store = store;
     this.options = options;
+    this.contextAccessor = contextAccessor;
     const text = options.actionProposalText;
     this.vocabulary = {
       ...import_nestjs_agent_core13.DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY,
@@ -13327,6 +13329,8 @@ var ActionProposalService = class {
   async scope(threadId, actor) {
     const scope = await this.capability().getThreadActionProposalScope(threadId);
     if (!scope) throw new import_common7.NotFoundException("Thread not found");
+    const filter = (0, import_nestjs_agent_core13.tenantRowFilter)((0, import_nestjs_agent_core13.readTenancy)(this.options.tenancy ?? "inherit", this.contextAccessor), actor.tenantRef);
+    if (filter !== void 0 && !(0, import_nestjs_agent_core13.tenantRowVisible)(filter, scope.tenantRef)) throw new import_common7.NotFoundException("Thread not found");
     if (scope.tenantRef !== (actor.tenantRef ?? null)) throw new import_common7.ForbiddenException("Wrong proposal tenant");
     return scope;
   }
@@ -13446,10 +13450,13 @@ ActionProposalService = _ts_decorate7([
   (0, import_common7.Injectable)(),
   _ts_param5(0, (0, import_common7.Inject)(import_nestjs_agent_core13.AGENT_STORE)),
   _ts_param5(1, (0, import_common7.Inject)(import_nestjs_agent_core13.AGENT_OPTIONS)),
+  _ts_param5(2, (0, import_common7.Optional)()),
+  _ts_param5(2, (0, import_common7.Inject)(import_nestjs_agent_core13.CONTEXT_ACCESSOR)),
   _ts_metadata5("design:type", Function),
   _ts_metadata5("design:paramtypes", [
     typeof AgentStore === "undefined" ? Object : AgentStore,
-    typeof Pick === "undefined" ? Object : Pick
+    typeof Pick === "undefined" ? Object : Pick,
+    Object
   ])
 ], ActionProposalService);
 
@@ -14084,7 +14091,8 @@ var AgentService = class {
   options;
   queue;
   proposals;
-  constructor(runner, store, deps, staging, models, quotaProvider, options, queue, proposals) {
+  contextAccessor;
+  constructor(runner, store, deps, staging, models, quotaProvider, options, queue, proposals, contextAccessor) {
     this.runner = runner;
     this.store = store;
     this.deps = deps;
@@ -14094,6 +14102,58 @@ var AgentService = class {
     this.options = options;
     this.queue = queue;
     this.proposals = proposals;
+    this.contextAccessor = contextAccessor;
+  }
+  /**
+  * With tenancy on, the store must be able to tell a thread's tenant: fail the boot with the fix
+  * rather than answer every thread read `404` at runtime. Tenancy enabled explicitly with no
+  * context accessor to read the tenant from fails the boot too.
+  */
+  onApplicationBootstrap() {
+    if (!this.tenancy().enabled) {
+      const option = this.options?.tenancy;
+      if (typeof option === "object" && option.enabled === true) {
+        throw new Error("AgentModule tenancy is enabled explicitly, but no `@dudousxd/nestjs-context` accessor (1.2.0 or later) is available to read the tenant from, so every read would be unscoped. Import `ContextModule`, or remove `tenancy.enabled: true`.");
+      }
+      return;
+    }
+    const missing = [
+      "tenantOf",
+      "listThreadsForTenant"
+    ].filter((method) => typeof this.store[method] !== "function");
+    if (missing.length > 0) {
+      throw new Error(`AgentModule tenancy is on, and ${this.store.constructor.name} does not implement ${missing.join(" / ")}, so thread reads cannot be scoped by tenant. Use a store that does (in-memory, Drizzle, MikroORM), implement them, or set AgentModule's \`tenancy: false\`.`);
+    }
+  }
+  /**
+  * The matching rule for a decision that comes from outside the thread's own actor (the console's
+  * approvals inbox): with tenancy on, a tool call on a thread the request's context tenant may not
+  * see is not found. A no-op with tenancy off.
+  */
+  async assertToolCallInRequestTenant(toolCallId2) {
+    const filter = (0, import_nestjs_agent_core17.tenantRowFilter)(this.tenancy());
+    if (filter === void 0) return;
+    const row = typeof this.store.tenantOf === "function" ? await this.store.tenantOf({
+      toolCallId: toolCallId2
+    }) : null;
+    if (row === null || !(0, import_nestjs_agent_core17.tenantRowVisible)(filter, row.tenantRef)) {
+      throw new import_common10.NotFoundException(`tool call ${toolCallId2} not found`);
+    }
+  }
+  /** The agent's tenancy, read per call: the context's switch can be flipped at any time. */
+  tenancy() {
+    return (0, import_nestjs_agent_core17.readTenancy)(this.options?.tenancy ?? "inherit", this.contextAccessor);
+  }
+  /**
+  * The matching rule for one thread, run or tool call: with tenancy on, a row of another tenant
+  * (or, for a request with a tenant, one with no tenant unless `nullRows: 'shared'`) is not found.
+  * The request's tenant is `actor.tenantRef` (the resolver's, else the context's), else none.
+  */
+  async assertTenantVisible(actor, target, notFound) {
+    const filter = (0, import_nestjs_agent_core17.tenantRowFilter)(this.tenancy(), actor.tenantRef);
+    if (filter === void 0) return;
+    const row = typeof this.store.tenantOf === "function" ? await this.store.tenantOf(target) : null;
+    if (row === null || !(0, import_nestjs_agent_core17.tenantRowVisible)(filter, row.tenantRef)) throw notFound();
   }
   /**
   * Decide one independent proposal through the scoped proposal service — what the native
@@ -14831,6 +14891,9 @@ var AgentService = class {
     if (owner === null) {
       throw new RunNotActiveException(runId);
     }
+    await this.assertTenantVisible(actor, {
+      runId
+    }, () => new RunNotActiveException(runId));
     if (owner !== actor.id) {
       throw new import_common10.ForbiddenException("run belongs to another actor");
     }
@@ -14853,8 +14916,15 @@ var AgentService = class {
     await this.assertOwnsActiveStream(actor, runId);
     return this.runner.cancel(runId);
   }
-  async listThreads(actorRef) {
-    const threads = await this.store.listThreads(actorRef);
+  /**
+  * The actor's threads. With tenancy on, only those the request's tenant may see: pass the
+  * {@link Actor} so a `tenantRef` its resolver set is the tenant; a bare `actorRef` uses the
+  * context's.
+  */
+  async listThreads(actor) {
+    const actorRef = typeof actor === "string" ? actor : actor.id;
+    const filter = (0, import_nestjs_agent_core17.tenantRowFilter)(this.tenancy(), typeof actor === "string" ? void 0 : actor.tenantRef);
+    const threads = filter === void 0 ? await this.store.listThreads(actorRef) : typeof this.store.listThreadsForTenant === "function" ? await this.store.listThreadsForTenant(actorRef, filter) : [];
     return Promise.all(threads.map((thread) => this.toSummaryView(thread)));
   }
   async getThread(actor, threadId) {
@@ -14876,6 +14946,9 @@ var AgentService = class {
       if (await this.store.ownerOfThread(threadId) === null) {
         throw new import_common10.NotFoundException(`thread ${threadId} not found`);
       }
+      await this.assertTenantVisible(actor, {
+        threadId
+      }, () => new import_common10.NotFoundException(`thread ${threadId} not found`));
     } else {
       await this.assertOwnsThread(actor, threadId);
     }
@@ -15178,6 +15251,9 @@ var AgentService = class {
     if (owner === null) {
       throw new import_common10.NotFoundException(`thread ${threadId} not found`);
     }
+    await this.assertTenantVisible(actor, {
+      threadId
+    }, () => new import_common10.NotFoundException(`thread ${threadId} not found`));
     if (owner !== actor.id) {
       throw new import_common10.ForbiddenException("thread belongs to another actor");
     }
@@ -15192,6 +15268,9 @@ var AgentService = class {
     if (owner === null) {
       throw new import_common10.NotFoundException(`tool call ${toolCallId2} not found`);
     }
+    await this.assertTenantVisible(actor, {
+      toolCallId: toolCallId2
+    }, () => new import_common10.NotFoundException(`tool call ${toolCallId2} not found`));
     if (owner !== actor.id) {
       throw new import_common10.ForbiddenException("tool call belongs to another actor");
     }
@@ -15233,6 +15312,9 @@ var AgentService = class {
     if (requesterRef === null) {
       throw new import_common10.NotFoundException(`tool call ${toolCallId2} not found`);
     }
+    await this.assertTenantVisible(actor, {
+      toolCallId: toolCallId2
+    }, () => new import_common10.NotFoundException(`tool call ${toolCallId2} not found`));
     const allowed = await (0, import_nestjs_agent_core17.mayDecideApproval)(this.deps.forAgent().approvalPolicy, actor, {
       toolCallId: toolCallId2,
       approver,
@@ -15278,6 +15360,9 @@ var AgentService = class {
     if (owner === null) {
       throw new import_common10.NotFoundException(`no active run ${runId}`);
     }
+    await this.assertTenantVisible(actor, {
+      runId
+    }, () => new import_common10.NotFoundException(`no active run ${runId}`));
     if (owner !== actor.id) {
       throw new import_common10.ForbiddenException("run belongs to another actor");
     }
@@ -15298,11 +15383,15 @@ var AgentService = class {
   * against nobody.
   */
   recordUsage(input, options = {}) {
+    const tenantRef = input.tenantRef ?? (0, import_nestjs_agent_core17.contextTenantRef)(this.tenancy());
     return (0, import_nestjs_agent_core17.recordAiUsage)({
       store: this.store,
       quota: this.deps.forAgent().quota,
       day: utcDay(),
-      input,
+      input: tenantRef !== void 0 && input.tenantRef === void 0 ? {
+        ...input,
+        tenantRef
+      } : input,
       options,
       warn: /* @__PURE__ */ __name((message) => usageLogger.warn(message), "warn")
     });
@@ -15323,6 +15412,8 @@ AgentService = _ts_decorate9([
   _ts_param7(6, (0, import_common10.Inject)(import_nestjs_agent_core17.AGENT_OPTIONS)),
   _ts_param7(7, (0, import_common10.Optional)()),
   _ts_param7(8, (0, import_common10.Optional)()),
+  _ts_param7(9, (0, import_common10.Optional)()),
+  _ts_param7(9, (0, import_common10.Inject)(import_nestjs_agent_core17.CONTEXT_ACCESSOR)),
   _ts_metadata7("design:type", Function),
   _ts_metadata7("design:paramtypes", [
     typeof AgentRunner === "undefined" ? Object : AgentRunner,
@@ -15333,7 +15424,8 @@ AgentService = _ts_decorate9([
     typeof QuotaProvider === "undefined" ? Object : QuotaProvider,
     typeof Pick === "undefined" ? Object : Pick,
     typeof ChatQueueService2 === "undefined" ? Object : ChatQueueService2,
-    typeof ActionProposalService === "undefined" ? Object : ActionProposalService
+    typeof ActionProposalService === "undefined" ? Object : ActionProposalService,
+    Object
   ])
 ], AgentService);
 
@@ -15396,6 +15488,7 @@ var AgentApprovalPortAdapter = class {
     });
   }
   async approve(toolCallId2, opts) {
+    await this.agent.assertToolCallInRequestTenant(toolCallId2);
     await this.agent.signalToolCall(toolCallId2, {
       approved: true,
       ...opts?.executedByRef !== void 0 ? {
@@ -15410,6 +15503,7 @@ var AgentApprovalPortAdapter = class {
     });
   }
   async reject(toolCallId2, opts) {
+    await this.agent.assertToolCallInRequestTenant(toolCallId2);
     await this.agent.signalToolCall(toolCallId2, {
       approved: false,
       ...opts?.executedByRef !== void 0 ? {
@@ -16762,7 +16856,7 @@ var ThreadsController = class {
   }
   async list(req) {
     const actor = await this.actorResolver.resolve(req);
-    return this.agent.listThreads(actor.id);
+    return this.agent.listThreads(actor);
   }
   async detail(req, id) {
     const actor = await this.actorResolver.resolve(req);
@@ -17973,6 +18067,10 @@ var LedgerQuotaProvider = class {
     this.store = store;
     this.limits = limits;
     this.options = options;
+    const per = options.per ?? "actor";
+    if (per !== "actor" && typeof store.usageWindowsForTenant !== "function") {
+      throw new Error(`quota.per: '${per}' sums the usage ledger by tenant, and ${store.constructor.name} does not implement usageWindowsForTenant. Use a store that does (in-memory, Drizzle, MikroORM) or a QuotaProvider of your own.`);
+    }
   }
   async report(query) {
     const now = query.now ?? /* @__PURE__ */ new Date();
@@ -17980,7 +18078,16 @@ var LedgerQuotaProvider = class {
     const day = (0, import_nestjs_agent_core38.quotaPeriodRange)("day", now);
     const month = (0, import_nestjs_agent_core38.quotaPeriodRange)("month", now);
     const windows = [];
-    if (this.store.usageWindows !== void 0) {
+    const per = this.options.per ?? "actor";
+    const tenantRef = query.actor.tenantRef;
+    if (per !== "actor" && typeof tenantRef === "string" && tenantRef !== "" && this.store.usageWindowsForTenant !== void 0) {
+      const [dayUsed, monthUsed] = await this.store.usageWindowsForTenant(tenantRef, [
+        day,
+        month
+      ], per === "actor-in-tenant" ? actorRef : void 0);
+      windows.push(this.usedWindow("day", dayUsed, day.resetsAt));
+      windows.push(this.usedWindow("month", monthUsed, month.resetsAt));
+    } else if (this.store.usageWindows !== void 0) {
       const [dayUsed, monthUsed] = await this.store.usageWindows(actorRef, [
         day,
         month
@@ -19017,8 +19124,21 @@ ActionProposalController = _ts_decorate31([
   ])
 ], ActionProposalController);
 
-// src/runner/inline-agent-runner.ts
+// src/resolver/tenant-filling-resolver.ts
 var import_nestjs_agent_core45 = require("@dudousxd/nestjs-agent-core");
+function tenantFillingResolver(resolver, tenancy, contextAccessor) {
+  if (tenancy === false) return resolver;
+  const wrapper = Object.create(resolver);
+  Object.defineProperty(wrapper, "resolve", {
+    value: /* @__PURE__ */ __name(async (req) => (0, import_nestjs_agent_core45.withContextTenant)(await resolver.resolve(req), (0, import_nestjs_agent_core45.readTenancy)(tenancy ?? "inherit", contextAccessor ?? void 0)), "value"),
+    enumerable: false
+  });
+  return wrapper;
+}
+__name(tenantFillingResolver, "tenantFillingResolver");
+
+// src/runner/inline-agent-runner.ts
+var import_nestjs_agent_core46 = require("@dudousxd/nestjs-agent-core");
 var import_common35 = require("@nestjs/common");
 function _ts_decorate32(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -19109,30 +19229,30 @@ var InlineAgentRunner = class _InlineAgentRunner {
       ],
       input
     });
-    void (0, import_nestjs_agent_core45.runAgentLoop)({
+    void (0, import_nestjs_agent_core46.runAgentLoop)({
       ...deps,
       day
-    }, input, hooks).then(() => (0, import_nestjs_agent_core45.releaseThreadRun)(this.store, input.threadId, runId)).catch(async (error) => {
-      const durationMs = (0, import_nestjs_agent_core45.runDurationMs)(error);
+    }, input, hooks).then(() => (0, import_nestjs_agent_core46.releaseThreadRun)(this.store, input.threadId, runId)).catch(async (error) => {
+      const durationMs = (0, import_nestjs_agent_core46.runDurationMs)(error);
       const timed = durationMs !== void 0 ? {
         durationMs
       } : {};
-      const measured = (0, import_nestjs_agent_core45.runEndTimings)(error);
-      if (error instanceof import_nestjs_agent_core45.RunCancelledError) {
+      const measured = (0, import_nestjs_agent_core46.runEndTimings)(error);
+      if (error instanceof import_nestjs_agent_core46.RunCancelledError) {
         await this.settleCancelled(runId, input, deps, durationMs, measured);
         return;
       }
       const message = error instanceof Error ? error.message : String(error);
-      const code = (0, import_nestjs_agent_core45.agentFailureCode)(error);
+      const code = (0, import_nestjs_agent_core46.agentFailureCode)(error);
       this.logger.error(`agent run ${runId} failed (${code}): ${message}`);
-      (0, import_nestjs_agent_core45.publishAgentRunFailed)({
+      (0, import_nestjs_agent_core46.publishAgentRunFailed)({
         runId,
         threadId: input.threadId,
         code,
         message,
         ...timed,
         ...measured,
-        context: (0, import_nestjs_agent_core45.agentRunContext)(input)
+        context: (0, import_nestjs_agent_core46.agentRunContext)(input)
       });
       await this.store.recordRunEnd?.({
         runId,
@@ -19141,11 +19261,11 @@ var InlineAgentRunner = class _InlineAgentRunner {
         errorCode: code,
         errorMessage: message
       });
-      await Promise.resolve(this.store.failUnsettledToolCalls?.(runId, import_nestjs_agent_core45.RUN_ENDED_BEFORE_TOOL_CALL)).catch(() => 0);
+      await Promise.resolve(this.store.failUnsettledToolCalls?.(runId, import_nestjs_agent_core46.RUN_ENDED_BEFORE_TOOL_CALL)).catch(() => 0);
       const writer = await deps.sink.open(runId);
       await this.settleQueue(writer, input, runId, "failed", message);
-      await (0, import_nestjs_agent_core45.releaseThreadRun)(this.store, input.threadId, runId);
-      await writer.fail((0, import_nestjs_agent_core45.streamFailure)(error));
+      await (0, import_nestjs_agent_core46.releaseThreadRun)(this.store, input.threadId, runId);
+      await writer.fail((0, import_nestjs_agent_core46.streamFailure)(error));
     }).finally(() => {
       this.forgetCancel(runId);
       this.live.delete(runId);
@@ -19180,11 +19300,11 @@ var InlineAgentRunner = class _InlineAgentRunner {
   */
   async cancel(runId) {
     this.cancelled.add(runId);
-    this.aborts.get(runId)?.abort(new import_nestjs_agent_core45.RunCancelledError());
+    this.aborts.get(runId)?.abort(new import_nestjs_agent_core46.RunCancelledError());
     for (const [key, waiter] of this.pending) {
       if (key.startsWith(`${runId}:`)) {
         this.pending.delete(key);
-        waiter.reject(new import_nestjs_agent_core45.RunCancelledError());
+        waiter.reject(new import_nestjs_agent_core46.RunCancelledError());
       }
     }
     await Promise.resolve();
@@ -19214,17 +19334,17 @@ var InlineAgentRunner = class _InlineAgentRunner {
     const timed = durationMs !== void 0 ? {
       durationMs
     } : {};
-    (0, import_nestjs_agent_core45.publishAgentRunCancelled)({
+    (0, import_nestjs_agent_core46.publishAgentRunCancelled)({
       runId,
       threadId: input.threadId,
       ...timed,
       ...measured,
-      context: (0, import_nestjs_agent_core45.agentRunContext)(input)
+      context: (0, import_nestjs_agent_core46.agentRunContext)(input)
     });
     const writer = await deps.sink.open(runId);
     await this.settleQueue(writer, input, runId, "cancelled");
-    await (0, import_nestjs_agent_core45.releaseThreadRun)(this.store, input.threadId, runId);
-    await writer.write((0, import_nestjs_agent_core45.encodeStreamEvent)({
+    await (0, import_nestjs_agent_core46.releaseThreadRun)(this.store, input.threadId, runId);
+    await writer.write((0, import_nestjs_agent_core46.encodeStreamEvent)({
       kind: "cancelled"
     }));
     await writer.end();
@@ -19260,7 +19380,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
         runId: nextRunId
       }));
       if (frame !== void 0) {
-        await writer.write((0, import_nestjs_agent_core45.encodeStreamEvent)(frame));
+        await writer.write((0, import_nestjs_agent_core46.encodeStreamEvent)(frame));
       }
     } catch (failure) {
       this.logger.error(`could not advance the queue of thread ${input.threadId} after run ${runId}: ${failure instanceof Error ? failure.message : String(failure)}`);
@@ -19332,7 +19452,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
       awaitApproval: /* @__PURE__ */ __name((call, _ctx, opts) => this.parkApproval(runId, call.id, opts?.timeoutMs), "awaitApproval"),
       awaitAnswers: /* @__PURE__ */ __name((request) => this.park(runId, request.id), "awaitAnswers"),
       step: /* @__PURE__ */ __name((_name, fn) => fn(), "step"),
-      parallel: import_nestjs_agent_core45.settleAll,
+      parallel: import_nestjs_agent_core46.settleAll,
       cancelled: /* @__PURE__ */ __name(async () => this.cancelled.has(runId), "cancelled"),
       abortSignal: this.abortSignalFor(runId),
       runAgent: /* @__PURE__ */ __name((agentName, task) => this.runNested({
@@ -19384,7 +19504,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
       awaitApproval: /* @__PURE__ */ __name((call, _ctx, opts) => this.parkApproval(runId, call.id, opts?.timeoutMs), "awaitApproval"),
       awaitAnswers: /* @__PURE__ */ __name((request) => this.park(runId, request.id), "awaitAnswers"),
       step: /* @__PURE__ */ __name((_name, fn) => fn(), "step"),
-      parallel: import_nestjs_agent_core45.settleAll,
+      parallel: import_nestjs_agent_core46.settleAll,
       cancelled: /* @__PURE__ */ __name(async () => this.cancelled.has(runId), "cancelled"),
       abortSignal: this.abortSignalFor(runId),
       runAgent: /* @__PURE__ */ __name((childName, childTask) => this.runNested({
@@ -19429,31 +19549,31 @@ var InlineAgentRunner = class _InlineAgentRunner {
       parentRunId,
       deliverTo
     };
-    void (0, import_nestjs_agent_core45.runAgentLoop)({
+    void (0, import_nestjs_agent_core46.runAgentLoop)({
       ...deps,
       day
     }, childInput, hooks).catch(async (error) => {
-      const cancelled = error instanceof import_nestjs_agent_core45.RunCancelledError;
+      const cancelled = error instanceof import_nestjs_agent_core46.RunCancelledError;
       const message = error instanceof Error ? error.message : String(error);
-      const durationMs = (0, import_nestjs_agent_core45.runDurationMs)(error);
+      const durationMs = (0, import_nestjs_agent_core46.runDurationMs)(error);
       const timed = durationMs !== void 0 ? {
         durationMs
       } : {};
-      const measured = (0, import_nestjs_agent_core45.runEndTimings)(error);
+      const measured = (0, import_nestjs_agent_core46.runEndTimings)(error);
       const settled = {
         runId,
         threadId: subThread.id,
         ...timed,
         ...measured,
-        context: (0, import_nestjs_agent_core45.agentRunContext)(childInput)
+        context: (0, import_nestjs_agent_core46.agentRunContext)(childInput)
       };
       if (cancelled) {
-        (0, import_nestjs_agent_core45.publishAgentRunCancelled)(settled);
+        (0, import_nestjs_agent_core46.publishAgentRunCancelled)(settled);
       } else {
         this.logger.error(`detached agent run ${runId} failed: ${message}`);
-        (0, import_nestjs_agent_core45.publishAgentRunFailed)({
+        (0, import_nestjs_agent_core46.publishAgentRunFailed)({
           ...settled,
-          code: (0, import_nestjs_agent_core45.agentFailureCode)(error),
+          code: (0, import_nestjs_agent_core46.agentFailureCode)(error),
           message
         });
       }
@@ -19462,12 +19582,12 @@ var InlineAgentRunner = class _InlineAgentRunner {
         status: cancelled ? "cancelled" : "failed",
         ...timed,
         ...cancelled ? {} : {
-          errorCode: (0, import_nestjs_agent_core45.agentFailureCode)(error),
+          errorCode: (0, import_nestjs_agent_core46.agentFailureCode)(error),
           errorMessage: message
         }
       });
-      await Promise.resolve(this.store.failUnsettledToolCalls?.(runId, import_nestjs_agent_core45.RUN_ENDED_BEFORE_TOOL_CALL)).catch(() => 0);
-      await (0, import_nestjs_agent_core45.settleUnsettledDelegation)({
+      await Promise.resolve(this.store.failUnsettledToolCalls?.(runId, import_nestjs_agent_core46.RUN_ENDED_BEFORE_TOOL_CALL)).catch(() => 0);
+      await (0, import_nestjs_agent_core46.settleUnsettledDelegation)({
         store: this.store,
         delivery: deliverTo,
         agent: agentName,
@@ -19506,7 +19626,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
       awaitApproval: /* @__PURE__ */ __name((call, _ctx, opts) => this.parkApproval(runId, call.id, opts?.timeoutMs), "awaitApproval"),
       awaitAnswers: /* @__PURE__ */ __name((request) => this.park(runId, request.id), "awaitAnswers"),
       step: /* @__PURE__ */ __name((_name, fn) => fn(), "step"),
-      parallel: import_nestjs_agent_core45.settleAll,
+      parallel: import_nestjs_agent_core46.settleAll,
       // A child stops when it is cancelled OR when the run a human is actually watching is: the
       // canceller names the top-level run, which is the only id that ever left the server.
       cancelled: /* @__PURE__ */ __name(async () => this.cancelled.has(runId) || this.cancelled.has(sinkRunId), "cancelled"),
@@ -19543,7 +19663,7 @@ var InlineAgentRunner = class _InlineAgentRunner {
       }), "startAgent")
     };
     try {
-      return await (0, import_nestjs_agent_core45.runAgentLoop)({
+      return await (0, import_nestjs_agent_core46.runAgentLoop)({
         ...deps,
         day
       }, {
@@ -19564,8 +19684,8 @@ var InlineAgentRunner = class _InlineAgentRunner {
 };
 InlineAgentRunner = _ts_decorate32([
   (0, import_common35.Injectable)(),
-  _ts_param29(0, (0, import_common35.Inject)(import_nestjs_agent_core45.AGENT_DEPS_FACTORY)),
-  _ts_param29(1, (0, import_common35.Inject)(import_nestjs_agent_core45.AGENT_STORE)),
+  _ts_param29(0, (0, import_common35.Inject)(import_nestjs_agent_core46.AGENT_DEPS_FACTORY)),
+  _ts_param29(1, (0, import_common35.Inject)(import_nestjs_agent_core46.AGENT_STORE)),
   _ts_param29(2, (0, import_common35.Optional)()),
   _ts_metadata30("design:type", Function),
   _ts_metadata30("design:paramtypes", [
@@ -19580,7 +19700,7 @@ function isThreadTurn2(input) {
 __name(isThreadTurn2, "isThreadTurn");
 
 // src/skills-config.ts
-var import_nestjs_agent_core46 = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core47 = require("@dudousxd/nestjs-agent-core");
 function declaredSkillProvider(declared) {
   return {
     list: /* @__PURE__ */ __name(({ scopes }) => declared.filter((skill) => scopes.includes(skill.scope)).map(({ name, description, scope }) => ({
@@ -19606,7 +19726,7 @@ function resolveSkillsConfig(options, declared) {
     declaredSkillProvider(declared)
   ];
   return {
-    provider: providers.length === 1 ? providers[0] : (0, import_nestjs_agent_core46.compositeSkillProvider)(providers),
+    provider: providers.length === 1 ? providers[0] : (0, import_nestjs_agent_core47.compositeSkillProvider)(providers),
     ...options.scopes !== void 0 ? {
       scopes: options.scopes
     } : {},
@@ -19665,14 +19785,14 @@ function forwardingStore(wrapper) {
 __name(forwardingStore, "forwardingStore");
 function resolveStore(options, modules) {
   if (options.store !== void 0) return options.store;
-  const external = externalWrapper(modules, import_nestjs_agent_core47.AGENT_STORE);
+  const external = externalWrapper(modules, import_nestjs_agent_core48.AGENT_STORE);
   if (external !== void 0) return forwardingStore(external);
   logger4.warn("No `store` configured and no store module imported \u2014 using the in-memory store. Threads are lost on restart and not shared between processes: not for production. Pass `store`, or import a store module (e.g. MikroOrmAgentStoreModule.forFeature()).");
-  return new import_nestjs_agent_core47.InMemoryAgentStore();
+  return new import_nestjs_agent_core48.InMemoryAgentStore();
 }
 __name(resolveStore, "resolveStore");
 function resolveRolesPolicy(options, modules) {
-  const external = externalWrapper(modules, import_nestjs_agent_core47.AGENT_ROLES_POLICY);
+  const external = externalWrapper(modules, import_nestjs_agent_core48.AGENT_ROLES_POLICY);
   if (options.rolesPolicy !== void 0) {
     if (external !== void 0) {
       logger4.warn("Both a `rolesPolicy` option and a module binding AGENT_ROLES_POLICY are configured \u2014 the `rolesPolicy` option wins. (For ability checks, use `@Can()` from @nestjs/authorization on the tool instead of a roles policy.)");
@@ -19680,7 +19800,7 @@ function resolveRolesPolicy(options, modules) {
     return options.rolesPolicy;
   }
   if (external !== void 0) return forwardingPolicy(external);
-  return options.emptyRoles === "deny" ? new import_nestjs_agent_core47.ClosedRolesPolicy(options.defaultRoles) : new import_nestjs_agent_core47.DefaultRolesPolicy(options.defaultRoles);
+  return options.emptyRoles === "deny" ? new import_nestjs_agent_core48.ClosedRolesPolicy(options.defaultRoles) : new import_nestjs_agent_core48.DefaultRolesPolicy(options.defaultRoles);
 }
 __name(resolveRolesPolicy, "resolveRolesPolicy");
 function forwardingPolicy(wrapper) {
@@ -19716,128 +19836,138 @@ function sharedProviders(durable, engine) {
   const durableEngine = durableEngineOf(durable);
   const providers = [
     {
-      provide: import_nestjs_agent_core47.AGENT_TOOL_REGISTRY,
-      useFactory: /* @__PURE__ */ __name(() => new import_nestjs_agent_core47.ToolRegistry(), "useFactory")
+      provide: import_nestjs_agent_core48.AGENT_TOOL_REGISTRY,
+      useFactory: /* @__PURE__ */ __name(() => new import_nestjs_agent_core48.ToolRegistry(), "useFactory")
     },
     // Starts empty; AgentDiscoveryService populates it from `@Agent`-decorated providers at boot.
     {
-      provide: import_nestjs_agent_core47.AGENT_REGISTRY,
-      useFactory: /* @__PURE__ */ __name(() => new import_nestjs_agent_core47.AgentRegistry(), "useFactory")
+      provide: import_nestjs_agent_core48.AGENT_REGISTRY,
+      useFactory: /* @__PURE__ */ __name(() => new import_nestjs_agent_core48.AgentRegistry(), "useFactory")
     },
     // A shared, mutable list AgentDiscoveryService fills with `@SystemPromptContributor()` methods.
     {
-      provide: import_nestjs_agent_core47.AGENT_PROMPT_CONTRIBUTORS,
+      provide: import_nestjs_agent_core48.AGENT_PROMPT_CONTRIBUTORS,
       useFactory: /* @__PURE__ */ __name(() => [], "useFactory")
     },
     // Likewise for `@Skill`-decorated providers — filled by SkillDiscoveryService at onModuleInit,
     // read lazily by the AGENT_SKILLS provider below (which DI builds before discovery has run).
     {
-      provide: import_nestjs_agent_core47.AGENT_SKILL_SOURCES,
+      provide: import_nestjs_agent_core48.AGENT_SKILL_SOURCES,
       useFactory: /* @__PURE__ */ __name(() => [], "useFactory")
     },
     {
       // One resolution, shared by the loop's deps and the listing endpoint: a second one would
       // drift, and a user would be offered a skill the agent cannot reach. `undefined` when the
       // host configured none — which is what keeps the turn's checkpoint sequence unchanged.
-      provide: import_nestjs_agent_core47.AGENT_SKILLS,
+      provide: import_nestjs_agent_core48.AGENT_SKILLS,
       // Personal agents resolve no skill scope (`personalAgentScopes`): nothing of the app's to load.
       useFactory: /* @__PURE__ */ __name((options, declared) => {
         const skills = resolveSkillsConfig(options.skills, declared);
         return skills === void 0 ? void 0 : {
           ...skills,
-          scopes: (0, import_nestjs_agent_core47.personalAgentScopes)(skills.scopes)
+          scopes: (0, import_nestjs_agent_core48.personalAgentScopes)(skills.scopes)
         };
       }, "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS,
-        import_nestjs_agent_core47.AGENT_SKILL_SOURCES
+        import_nestjs_agent_core48.AGENT_OPTIONS,
+        import_nestjs_agent_core48.AGENT_SKILL_SOURCES
       ]
     },
     {
       // One resolution, shared by the loop's deps and the read-back endpoint: a person has to be
       // shown what the model was shown, and two resolutions would eventually disagree about that.
-      provide: import_nestjs_agent_core47.AGENT_MEMORY,
+      provide: import_nestjs_agent_core48.AGENT_MEMORY,
       // Personal agents resolve no memory scope (`personalAgentScopes`): under a signed-in Poppy
       // conversation the actor is the account, and it must neither read nor write its memories.
       useFactory: /* @__PURE__ */ __name((options) => options.memory === void 0 ? void 0 : {
         ...options.memory,
-        scopes: (0, import_nestjs_agent_core47.personalAgentScopes)(options.memory.scopes)
+        scopes: (0, import_nestjs_agent_core48.personalAgentScopes)(options.memory.scopes)
       }, "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS
+        import_nestjs_agent_core48.AGENT_OPTIONS
       ]
     },
     {
-      provide: import_nestjs_agent_core47.AGENT_SINK,
+      provide: import_nestjs_agent_core48.AGENT_SINK,
       useFactory: /* @__PURE__ */ __name((options) => options.sink ?? new InProcessTokenStreamSink(), "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS
+        import_nestjs_agent_core48.AGENT_OPTIONS
       ]
     },
     // `@nestjs/authorization`'s AuthorizationService, when the app imports AuthorizationModule.
     NestAuthorizationBinding,
     {
-      provide: import_nestjs_agent_core47.AGENT_ROLES_POLICY,
+      provide: import_nestjs_agent_core48.AGENT_ROLES_POLICY,
       // Personal agents (a Poppy conversation, a Poppy session's MCP token) reach only the tools
       // written for them, and run only those of the scopes their user granted. A no-op for every
       // other actor. Around the roles policy, a tool's `@Can()` abilities are asked of
       // `@nestjs/authorization`, for the user its agent function calls run as.
-      useFactory: /* @__PURE__ */ __name((options, modules, authorization) => (0, import_nestjs_agent_core47.personalAgentGate)(authorizationGate(resolveRolesPolicy(options, modules), () => authorization.service, (actor) => (options.agentFunctionCaller ?? defaultAgentFunctionCaller)(actor).user)), "useFactory"),
+      useFactory: /* @__PURE__ */ __name((options, modules, authorization) => (0, import_nestjs_agent_core48.personalAgentGate)(authorizationGate(resolveRolesPolicy(options, modules), () => authorization.service, (actor) => (options.agentFunctionCaller ?? defaultAgentFunctionCaller)(actor).user)), "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS,
+        import_nestjs_agent_core48.AGENT_OPTIONS,
         import_core6.ModulesContainer,
         NestAuthorizationBinding
       ]
     },
     {
-      provide: import_nestjs_agent_core47.AGENT_ACTOR_RESOLVER,
-      useFactory: /* @__PURE__ */ __name((options) => {
-        if (options.actorResolver !== void 0) return options.actorResolver;
+      provide: import_nestjs_agent_core48.AGENT_ACTOR_RESOLVER,
+      // With tenancy on, an actor the resolver left without a `tenantRef` gets the context tenant's.
+      useFactory: /* @__PURE__ */ __name((options, contextAccessor) => {
+        if (options.actorResolver !== void 0) {
+          return tenantFillingResolver(options.actorResolver, options.tenancy, contextAccessor);
+        }
         logger4.warn("No `actorResolver` configured \u2014 the agent endpoints are PUBLIC: every browser gets its own anonymous identity (an HttpOnly cookie). Set `actorResolver: requestUserActorResolver()` (or your own) to require login.");
-        return new AnonymousActorResolver();
+        return tenantFillingResolver(new AnonymousActorResolver(), options.tenancy, contextAccessor);
       }, "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS
+        import_nestjs_agent_core48.AGENT_OPTIONS,
+        {
+          token: import_nestjs_agent_core48.CONTEXT_ACCESSOR,
+          optional: true
+        }
       ]
     },
     // No `model` (and no `engine`): the turns run on `@nestjs/ai`'s `AiModule` models.
     NestAiModelsBinding,
     {
-      provide: import_nestjs_agent_core47.AGENT_MODEL,
+      provide: import_nestjs_agent_core48.AGENT_MODEL,
       useFactory: /* @__PURE__ */ __name((o, nestAi) => o.model ?? (nestAi.active ? nestAi : void 0), "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS,
+        import_nestjs_agent_core48.AGENT_OPTIONS,
         NestAiModelsBinding
       ]
     },
     {
       // `quota` is either a provider of the host's own or ceilings for the built-in ledger one;
       // omitted, the ledger provider still reports usage, with no ceiling to block on.
-      provide: import_nestjs_agent_core47.AGENT_QUOTA_PROVIDER,
+      provide: import_nestjs_agent_core48.AGENT_QUOTA_PROVIDER,
       useFactory: /* @__PURE__ */ __name((o, store) => isQuotaProvider(o.quota) ? o.quota : new LedgerQuotaProvider(store, o.quota?.limits, {
         ...o.quota?.warnAt !== void 0 ? {
           warnAt: o.quota.warnAt
         } : {},
         ...o.quota?.countEstimatedCost !== void 0 ? {
           countEstimatedCost: o.quota.countEstimatedCost
+        } : {},
+        ...o.quota?.per !== void 0 ? {
+          per: o.quota.per
         } : {}
       }), "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS,
-        import_nestjs_agent_core47.AGENT_STORE
+        import_nestjs_agent_core48.AGENT_OPTIONS,
+        import_nestjs_agent_core48.AGENT_STORE
       ]
     },
     {
-      provide: import_nestjs_agent_core47.AGENT_MODEL_CATALOG,
+      provide: import_nestjs_agent_core48.AGENT_MODEL_CATALOG,
       useFactory: /* @__PURE__ */ __name((o, model) => resolveCatalog(o, model), "useFactory"),
       inject: [
-        import_nestjs_agent_core47.AGENT_OPTIONS,
-        import_nestjs_agent_core47.AGENT_MODEL
+        import_nestjs_agent_core48.AGENT_OPTIONS,
+        import_nestjs_agent_core48.AGENT_MODEL
       ]
     },
     AgentDepsFactory2,
     {
-      provide: import_nestjs_agent_core47.AGENT_DEPS_FACTORY,
+      provide: import_nestjs_agent_core48.AGENT_DEPS_FACTORY,
       useExisting: AgentDepsFactory2
     },
     // Seeds a configured model's missing price row from models.dev and warns about one that would
@@ -19867,26 +19997,26 @@ function sharedProviders(durable, engine) {
     // through AgentService.signalToolCall, which reaches whichever AGENT_RUNNER is bound above.
     AgentApprovalPortAdapter,
     {
-      provide: import_nestjs_agent_core47.AGENT_APPROVAL_PORT,
+      provide: import_nestjs_agent_core48.AGENT_APPROVAL_PORT,
       useExisting: AgentApprovalPortAdapter
     }
   ];
   providers.push({
-    provide: import_nestjs_agent_core47.AGENT_STORE,
+    provide: import_nestjs_agent_core48.AGENT_STORE,
     useFactory: /* @__PURE__ */ __name((o, modules) => resolveStore(o, modules), "useFactory"),
     inject: [
-      import_nestjs_agent_core47.AGENT_OPTIONS,
+      import_nestjs_agent_core48.AGENT_OPTIONS,
       import_core6.ModulesContainer
     ]
   });
   if (engine !== void 0) {
     providers.push(...engine.providers, {
-      provide: import_nestjs_agent_core47.AGENT_RUNNER,
+      provide: import_nestjs_agent_core48.AGENT_RUNNER,
       useExisting: engine.runner
     });
   } else if (durableEngine === "aviary") {
     providers.push({
-      provide: import_nestjs_agent_core47.AGENT_RUNNER,
+      provide: import_nestjs_agent_core48.AGENT_RUNNER,
       useFactory: /* @__PURE__ */ __name((durableRunner) => {
         if (durableRunner === void 0) {
           throw new Error("AgentModule.forRoot({ durable: { engine: 'aviary' } }) requires importing AgentDurableModule from '@dudousxd/nestjs-agent/durable' (alongside a configured DurableModule). It was not found.");
@@ -19895,14 +20025,14 @@ function sharedProviders(durable, engine) {
       }, "useFactory"),
       inject: [
         {
-          token: import_nestjs_agent_core47.AGENT_DURABLE_RUNNER,
+          token: import_nestjs_agent_core48.AGENT_DURABLE_RUNNER,
           optional: true
         }
       ]
     });
   } else if (durableEngine === "workflows") {
     providers.push({
-      provide: import_nestjs_agent_core47.AGENT_RUNNER,
+      provide: import_nestjs_agent_core48.AGENT_RUNNER,
       useFactory: /* @__PURE__ */ __name((workflowsRunner) => {
         if (workflowsRunner === void 0) {
           throw new Error("AgentModule.forRoot({ durable: true }) runs turns on @nestjs/workflows: import WorkflowsModule.forRoot() from '@nestjs/workflows' and AgentWorkflowsModule from '@dudousxd/nestjs-agent/workflows'. AgentWorkflowsModule was not found. (For the @dudousxd/nestjs-durable engine, set durable: { engine: 'aviary' }.)");
@@ -19911,14 +20041,14 @@ function sharedProviders(durable, engine) {
       }, "useFactory"),
       inject: [
         {
-          token: import_nestjs_agent_core47.AGENT_WORKFLOWS_RUNNER,
+          token: import_nestjs_agent_core48.AGENT_WORKFLOWS_RUNNER,
           optional: true
         }
       ]
     });
   } else {
     providers.push({
-      provide: import_nestjs_agent_core47.AGENT_RUNNER,
+      provide: import_nestjs_agent_core48.AGENT_RUNNER,
       useExisting: InlineAgentRunner
     });
   }
@@ -19928,20 +20058,20 @@ __name(sharedProviders, "sharedProviders");
 function exportsFor(engine) {
   return [
     ...engine?.exports ?? [],
-    import_nestjs_agent_core47.AGENT_OPTIONS,
-    import_nestjs_agent_core47.AGENT_TOOL_REGISTRY,
-    import_nestjs_agent_core47.AGENT_REGISTRY,
-    import_nestjs_agent_core47.AGENT_SINK,
-    import_nestjs_agent_core47.AGENT_ROLES_POLICY,
-    import_nestjs_agent_core47.AGENT_ACTOR_RESOLVER,
-    import_nestjs_agent_core47.AGENT_MODEL,
-    import_nestjs_agent_core47.AGENT_STORE,
-    import_nestjs_agent_core47.AGENT_MODEL_CATALOG,
-    import_nestjs_agent_core47.AGENT_QUOTA_PROVIDER,
-    import_nestjs_agent_core47.AGENT_PROMPT_CONTRIBUTORS,
-    import_nestjs_agent_core47.AGENT_SKILLS,
-    import_nestjs_agent_core47.AGENT_MEMORY,
-    import_nestjs_agent_core47.AGENT_DEPS_FACTORY,
+    import_nestjs_agent_core48.AGENT_OPTIONS,
+    import_nestjs_agent_core48.AGENT_TOOL_REGISTRY,
+    import_nestjs_agent_core48.AGENT_REGISTRY,
+    import_nestjs_agent_core48.AGENT_SINK,
+    import_nestjs_agent_core48.AGENT_ROLES_POLICY,
+    import_nestjs_agent_core48.AGENT_ACTOR_RESOLVER,
+    import_nestjs_agent_core48.AGENT_MODEL,
+    import_nestjs_agent_core48.AGENT_STORE,
+    import_nestjs_agent_core48.AGENT_MODEL_CATALOG,
+    import_nestjs_agent_core48.AGENT_QUOTA_PROVIDER,
+    import_nestjs_agent_core48.AGENT_PROMPT_CONTRIBUTORS,
+    import_nestjs_agent_core48.AGENT_SKILLS,
+    import_nestjs_agent_core48.AGENT_MEMORY,
+    import_nestjs_agent_core48.AGENT_DEPS_FACTORY,
     AgentDepsFactory2,
     AgentService,
     AGENT_SERVICE,
@@ -19950,7 +20080,7 @@ function exportsFor(engine) {
     ChatQueueService2,
     AGENT_CHAT_QUEUE,
     InlineAgentRunner,
-    import_nestjs_agent_core47.AGENT_APPROVAL_PORT
+    import_nestjs_agent_core48.AGENT_APPROVAL_PORT
   ];
 }
 __name(exportsFor, "exportsFor");
@@ -19981,7 +20111,7 @@ __name(adapterProviders, "adapterProviders");
 function controllersForSurface(surface, adapters, engine, decorators, routes) {
   if (surface === "engine" || routes === false) return [];
   return [
-    ...(0, import_nestjs_agent_core47.withControllerDecorators)([
+    ...(0, import_nestjs_agent_core48.withControllerDecorators)([
       ...BASE_CONTROLLERS,
       ...adapterControllers(adapters)
     ], decorators),
@@ -20021,7 +20151,7 @@ var AgentModule = class _AgentModule {
       controllers: controllersForSurface(options.surface, options.adapters, options.engine, options.decorators, options.routes),
       providers: [
         {
-          provide: import_nestjs_agent_core47.AGENT_OPTIONS,
+          provide: import_nestjs_agent_core48.AGENT_OPTIONS,
           useValue: options
         },
         ...sharedProviders(options.durable, options.engine),
@@ -20049,7 +20179,7 @@ var AgentModule = class _AgentModule {
       controllers: controllersForSurface(options.surface, options.adapters, options.engine, options.decorators, options.routes),
       providers: [
         {
-          provide: import_nestjs_agent_core47.AGENT_OPTIONS,
+          provide: import_nestjs_agent_core48.AGENT_OPTIONS,
           // Stamp the STATIC wiring flags onto the factory result: `durable`/`surface` are
           // authoritative on the async config object (they decided the actual wiring above), and
           // the durable module reads `durable` back off AGENT_OPTIONS. `surface` isn't read back by