@dudousxd/nestjs-agent 2.0.2 → 2.1.0

package/dist/durable/index.d.cts

@@ -1,7 +1,7 @@
 import { AgentStore, AgentRunInput, AgentLoopResult, LlmStepEnvelope, ToolStepEnvelope, BufferedModelTurnResult, AgentRunner, TokenStreamSink, AgentRunStartOptions, HumanReply } from '@dudousxd/nestjs-agent-core';
 import { WorkflowService } from '@dudousxd/nestjs-durable';
 import { RunGateway, WorkflowCtx } from '@dudousxd/nestjs-durable-core';
-import { A as AgentDepsFactory, C as ChatQueueService, a as AgentSurface, b as AgentModuleOptions } from '../chat-queue.service-C49HIuEV.cjs';
+import { A as AgentDepsFactory, C as ChatQueueService, a as AgentSurface, b as AgentModuleOptions } from '../chat-queue.service-OY6mUgB9.cjs';
 import { DynamicModule } from '@nestjs/common';
 import '@dudousxd/nestjs-agent-core/genui';
 import '@standard-schema/spec';

package/dist/durable/index.d.ts

@@ -1,7 +1,7 @@
 import { AgentStore, AgentRunInput, AgentLoopResult, LlmStepEnvelope, ToolStepEnvelope, BufferedModelTurnResult, AgentRunner, TokenStreamSink, AgentRunStartOptions, HumanReply } from '@dudousxd/nestjs-agent-core';
 import { WorkflowService } from '@dudousxd/nestjs-durable';
 import { RunGateway, WorkflowCtx } from '@dudousxd/nestjs-durable-core';
-import { A as AgentDepsFactory, C as ChatQueueService, a as AgentSurface, b as AgentModuleOptions } from '../chat-queue.service-BjPCw4Pf.js';
+import { A as AgentDepsFactory, C as ChatQueueService, a as AgentSurface, b as AgentModuleOptions } from '../chat-queue.service-MYNBAY3P.js';
 import { DynamicModule } from '@nestjs/common';
 import '@dudousxd/nestjs-agent-core/genui';
 import '@standard-schema/spec';

package/dist/durable/index.js

@@ -12493,7 +12493,7 @@ AgentDurableModule = _ts_decorate4([
 ], AgentDurableModule);
 
 // src/agent.module.ts
-import { AGENT_ACTOR_RESOLVER as AGENT_ACTOR_RESOLVER14, AGENT_APPROVAL_PORT, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY9, AGENT_DURABLE_RUNNER as AGENT_DURABLE_RUNNER2, AGENT_MEMORY as AGENT_MEMORY3, AGENT_MODEL as AGENT_MODEL3, AGENT_MODEL_CATALOG as AGENT_MODEL_CATALOG3, AGENT_OPTIONS as AGENT_OPTIONS11, 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_SINK4, AGENT_SKILLS as AGENT_SKILLS3, AGENT_SKILL_SOURCES as AGENT_SKILL_SOURCES2, AGENT_STORE as AGENT_STORE9, AGENT_TOOL_REGISTRY as AGENT_TOOL_REGISTRY3, AGENT_WORKFLOWS_RUNNER, AgentRegistry as AgentRegistry6, ClosedRolesPolicy, DefaultRolesPolicy, InMemoryAgentStore, ToolRegistry as ToolRegistry3, personalAgentGate, personalAgentScopes, withControllerDecorators } from "@dudousxd/nestjs-agent-core";
+import { AGENT_ACTOR_RESOLVER as AGENT_ACTOR_RESOLVER14, AGENT_APPROVAL_PORT, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY9, AGENT_DURABLE_RUNNER as AGENT_DURABLE_RUNNER2, AGENT_MEMORY as AGENT_MEMORY3, AGENT_MODEL as AGENT_MODEL3, AGENT_MODEL_CATALOG as AGENT_MODEL_CATALOG3, AGENT_OPTIONS as AGENT_OPTIONS11, 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_SINK4, AGENT_SKILLS as AGENT_SKILLS3, AGENT_SKILL_SOURCES as AGENT_SKILL_SOURCES2, AGENT_STORE as AGENT_STORE9, AGENT_TOOL_REGISTRY as AGENT_TOOL_REGISTRY3, AGENT_WORKFLOWS_RUNNER, AgentRegistry as AgentRegistry6, CONTEXT_ACCESSOR as CONTEXT_ACCESSOR3, ClosedRolesPolicy, DefaultRolesPolicy, InMemoryAgentStore, ToolRegistry as ToolRegistry3, personalAgentGate, personalAgentScopes, withControllerDecorators } from "@dudousxd/nestjs-agent-core";
 import { Global as Global2, Logger as Logger13, Module as Module3 } from "@nestjs/common";
 import { DiscoveryModule, ModulesContainer, RouterModule } from "@nestjs/core";
 
@@ -13223,8 +13223,8 @@ function durableEngineOf(durable) {
 __name(durableEngineOf, "durableEngineOf");
 
 // src/agent.service.ts
-import { AGENT_ATTACHMENT_STAGING as AGENT_ATTACHMENT_STAGING2, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY4, AGENT_MODEL_CATALOG, AGENT_OPTIONS as AGENT_OPTIONS4, AGENT_QUOTA_PROVIDER as AGENT_QUOTA_PROVIDER2, AGENT_RUNNER, AGENT_STORE as AGENT_STORE6, DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY as DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY2, REQUESTER_APPROVER, findCatalogModel, mayDecideApproval as mayDecideApproval2, readElicitationQuestions, recordAiUsage, settleDeadRun as settleDeadRun2, textActionProposalReply as textActionProposalReply2, validateElicitationAnswer } from "@dudousxd/nestjs-agent-core";
-import { BadRequestException as BadRequestException2, ConflictException as ConflictException2, ForbiddenException as ForbiddenException2, GoneException, HttpException, HttpStatus, Inject as Inject8, Injectable as Injectable7, Logger as Logger4, NotFoundException as NotFoundException2, NotImplementedException as NotImplementedException3, Optional as Optional5, PayloadTooLargeException, UnsupportedMediaTypeException } from "@nestjs/common";
+import { AGENT_ATTACHMENT_STAGING as AGENT_ATTACHMENT_STAGING2, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY4, AGENT_MODEL_CATALOG, AGENT_OPTIONS as AGENT_OPTIONS4, AGENT_QUOTA_PROVIDER as AGENT_QUOTA_PROVIDER2, AGENT_RUNNER, AGENT_STORE as AGENT_STORE6, CONTEXT_ACCESSOR as CONTEXT_ACCESSOR2, DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY as DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY2, REQUESTER_APPROVER, contextTenantRef, findCatalogModel, mayDecideApproval as mayDecideApproval2, readElicitationQuestions, readTenancy as readTenancy2, recordAiUsage, settleDeadRun as settleDeadRun2, tenantRowFilter as tenantRowFilter2, tenantRowVisible as tenantRowVisible2, textActionProposalReply as textActionProposalReply2, validateElicitationAnswer } from "@dudousxd/nestjs-agent-core";
+import { BadRequestException as BadRequestException2, ConflictException as ConflictException2, ForbiddenException as ForbiddenException2, GoneException, HttpException, HttpStatus, Inject as Inject8, Injectable as Injectable7, Logger as Logger4, NotFoundException as NotFoundException2, NotImplementedException as NotImplementedException3, Optional as Optional6, PayloadTooLargeException, UnsupportedMediaTypeException } from "@nestjs/common";
 
 // src/attachment-limits.ts
 var DEFAULT_MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024;
@@ -13252,8 +13252,8 @@ function attachmentLimits(options, staging) {
 __name(attachmentLimits, "attachmentLimits");
 
 // src/proposals/action-proposal.service.ts
-import { AGENT_OPTIONS as AGENT_OPTIONS2, AGENT_STORE as AGENT_STORE4, DEFAULT_TEXT_ACTION_PROPOSAL_REPLIES, DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY, mayDecideApproval, parseTextActionProposalCommand, resolveTextActionProposalDecision, textActionProposalReply, toActionProposalMutationView, toActionProposalView } from "@dudousxd/nestjs-agent-core";
-import { ForbiddenException, Inject as Inject6, Injectable as Injectable5, NotFoundException, NotImplementedException } from "@nestjs/common";
+import { AGENT_OPTIONS as AGENT_OPTIONS2, AGENT_STORE as AGENT_STORE4, CONTEXT_ACCESSOR, DEFAULT_TEXT_ACTION_PROPOSAL_REPLIES, DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY, mayDecideApproval, parseTextActionProposalCommand, readTenancy, resolveTextActionProposalDecision, tenantRowFilter, tenantRowVisible, textActionProposalReply, toActionProposalMutationView, toActionProposalView } from "@dudousxd/nestjs-agent-core";
+import { ForbiddenException, Inject as Inject6, Injectable as Injectable5, NotFoundException, NotImplementedException, Optional as Optional4 } from "@nestjs/common";
 function _ts_decorate7(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") {
@@ -13286,9 +13286,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 = {
       ...DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY,
@@ -13314,6 +13316,8 @@ var ActionProposalService = class {
   async scope(threadId, actor) {
     const scope = await this.capability().getThreadActionProposalScope(threadId);
     if (!scope) throw new NotFoundException("Thread not found");
+    const filter = tenantRowFilter(readTenancy(this.options.tenancy ?? "inherit", this.contextAccessor), actor.tenantRef);
+    if (filter !== void 0 && !tenantRowVisible(filter, scope.tenantRef)) throw new NotFoundException("Thread not found");
     if (scope.tenantRef !== (actor.tenantRef ?? null)) throw new ForbiddenException("Wrong proposal tenant");
     return scope;
   }
@@ -13433,16 +13437,19 @@ ActionProposalService = _ts_decorate7([
   Injectable5(),
   _ts_param5(0, Inject6(AGENT_STORE4)),
   _ts_param5(1, Inject6(AGENT_OPTIONS2)),
+  _ts_param5(2, Optional4()),
+  _ts_param5(2, Inject6(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);
 
 // src/queue/chat-queue.service.ts
 import { AGENT_ATTACHMENT_STAGING, AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY3, AGENT_OPTIONS as AGENT_OPTIONS3, AGENT_QUOTA_PROVIDER, AGENT_SINK as AGENT_SINK3, AGENT_STORE as AGENT_STORE5, encodeStreamEvent as encodeStreamEvent4, isChatQueueStore, queuedMessageView } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject7, Injectable as Injectable6, Logger as Logger3, NotImplementedException as NotImplementedException2, Optional as Optional4 } from "@nestjs/common";
+import { Inject as Inject7, Injectable as Injectable6, Logger as Logger3, NotImplementedException as NotImplementedException2, Optional as Optional5 } from "@nestjs/common";
 
 // src/quota-exceeded.ts
 import { publishAgentQuotaExceeded } from "@dudousxd/nestjs-agent-core";
@@ -13918,13 +13925,13 @@ ChatQueueService2 = _ts_decorate8([
   Injectable6(),
   _ts_param6(0, Inject7(AGENT_STORE5)),
   _ts_param6(1, Inject7(AGENT_SINK3)),
-  _ts_param6(2, Optional4()),
+  _ts_param6(2, Optional5()),
   _ts_param6(2, Inject7(AGENT_QUOTA_PROVIDER)),
-  _ts_param6(3, Optional4()),
+  _ts_param6(3, Optional5()),
   _ts_param6(3, Inject7(AGENT_OPTIONS3)),
-  _ts_param6(4, Optional4()),
+  _ts_param6(4, Optional5()),
   _ts_param6(4, Inject7(AGENT_ATTACHMENT_STAGING)),
-  _ts_param6(5, Optional4()),
+  _ts_param6(5, Optional5()),
   _ts_param6(5, Inject7(AGENT_DEPS_FACTORY3)),
   _ts_metadata6("design:type", Function),
   _ts_metadata6("design:paramtypes", [
@@ -14071,7 +14078,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;
@@ -14081,6 +14089,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 = tenantRowFilter2(this.tenancy());
+    if (filter === void 0) return;
+    const row = typeof this.store.tenantOf === "function" ? await this.store.tenantOf({
+      toolCallId: toolCallId2
+    }) : null;
+    if (row === null || !tenantRowVisible2(filter, row.tenantRef)) {
+      throw new NotFoundException2(`tool call ${toolCallId2} not found`);
+    }
+  }
+  /** The agent's tenancy, read per call: the context's switch can be flipped at any time. */
+  tenancy() {
+    return readTenancy2(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 = tenantRowFilter2(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 || !tenantRowVisible2(filter, row.tenantRef)) throw notFound();
   }
   /**
   * Decide one independent proposal through the scoped proposal service — what the native
@@ -14818,6 +14878,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 ForbiddenException2("run belongs to another actor");
     }
@@ -14840,8 +14903,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 = tenantRowFilter2(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) {
@@ -14863,6 +14933,9 @@ var AgentService = class {
       if (await this.store.ownerOfThread(threadId) === null) {
         throw new NotFoundException2(`thread ${threadId} not found`);
       }
+      await this.assertTenantVisible(actor, {
+        threadId
+      }, () => new NotFoundException2(`thread ${threadId} not found`));
     } else {
       await this.assertOwnsThread(actor, threadId);
     }
@@ -15165,6 +15238,9 @@ var AgentService = class {
     if (owner === null) {
       throw new NotFoundException2(`thread ${threadId} not found`);
     }
+    await this.assertTenantVisible(actor, {
+      threadId
+    }, () => new NotFoundException2(`thread ${threadId} not found`));
     if (owner !== actor.id) {
       throw new ForbiddenException2("thread belongs to another actor");
     }
@@ -15179,6 +15255,9 @@ var AgentService = class {
     if (owner === null) {
       throw new NotFoundException2(`tool call ${toolCallId2} not found`);
     }
+    await this.assertTenantVisible(actor, {
+      toolCallId: toolCallId2
+    }, () => new NotFoundException2(`tool call ${toolCallId2} not found`));
     if (owner !== actor.id) {
       throw new ForbiddenException2("tool call belongs to another actor");
     }
@@ -15220,6 +15299,9 @@ var AgentService = class {
     if (requesterRef === null) {
       throw new NotFoundException2(`tool call ${toolCallId2} not found`);
     }
+    await this.assertTenantVisible(actor, {
+      toolCallId: toolCallId2
+    }, () => new NotFoundException2(`tool call ${toolCallId2} not found`));
     const allowed = await mayDecideApproval2(this.deps.forAgent().approvalPolicy, actor, {
       toolCallId: toolCallId2,
       approver,
@@ -15265,6 +15347,9 @@ var AgentService = class {
     if (owner === null) {
       throw new NotFoundException2(`no active run ${runId}`);
     }
+    await this.assertTenantVisible(actor, {
+      runId
+    }, () => new NotFoundException2(`no active run ${runId}`));
     if (owner !== actor.id) {
       throw new ForbiddenException2("run belongs to another actor");
     }
@@ -15285,11 +15370,15 @@ var AgentService = class {
   * against nobody.
   */
   recordUsage(input, options = {}) {
+    const tenantRef = input.tenantRef ?? contextTenantRef(this.tenancy());
     return 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")
     });
@@ -15300,16 +15389,18 @@ AgentService = _ts_decorate9([
   _ts_param7(0, Inject8(AGENT_RUNNER)),
   _ts_param7(1, Inject8(AGENT_STORE6)),
   _ts_param7(2, Inject8(AGENT_DEPS_FACTORY4)),
-  _ts_param7(3, Optional5()),
+  _ts_param7(3, Optional6()),
   _ts_param7(3, Inject8(AGENT_ATTACHMENT_STAGING2)),
-  _ts_param7(4, Optional5()),
+  _ts_param7(4, Optional6()),
   _ts_param7(4, Inject8(AGENT_MODEL_CATALOG)),
-  _ts_param7(5, Optional5()),
+  _ts_param7(5, Optional6()),
   _ts_param7(5, Inject8(AGENT_QUOTA_PROVIDER2)),
-  _ts_param7(6, Optional5()),
+  _ts_param7(6, Optional6()),
   _ts_param7(6, Inject8(AGENT_OPTIONS4)),
-  _ts_param7(7, Optional5()),
-  _ts_param7(8, Optional5()),
+  _ts_param7(7, Optional6()),
+  _ts_param7(8, Optional6()),
+  _ts_param7(9, Optional6()),
+  _ts_param7(9, Inject8(CONTEXT_ACCESSOR2)),
   _ts_metadata7("design:type", Function),
   _ts_metadata7("design:paramtypes", [
     typeof AgentRunner === "undefined" ? Object : AgentRunner,
@@ -15320,12 +15411,13 @@ 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);
 
 // src/approval-port.adapter.ts
-import { Injectable as Injectable8, NotImplementedException as NotImplementedException4, Optional as Optional6 } from "@nestjs/common";
+import { Injectable as Injectable8, NotImplementedException as NotImplementedException4, Optional as Optional7 } from "@nestjs/common";
 function _ts_decorate10(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") {
@@ -15383,6 +15475,7 @@ var AgentApprovalPortAdapter = class {
     });
   }
   async approve(toolCallId2, opts) {
+    await this.agent.assertToolCallInRequestTenant(toolCallId2);
     await this.agent.signalToolCall(toolCallId2, {
       approved: true,
       ...opts?.executedByRef !== void 0 ? {
@@ -15397,6 +15490,7 @@ var AgentApprovalPortAdapter = class {
     });
   }
   async reject(toolCallId2, opts) {
+    await this.agent.assertToolCallInRequestTenant(toolCallId2);
     await this.agent.signalToolCall(toolCallId2, {
       approved: false,
       ...opts?.executedByRef !== void 0 ? {
@@ -15413,7 +15507,7 @@ var AgentApprovalPortAdapter = class {
 };
 AgentApprovalPortAdapter = _ts_decorate10([
   Injectable8(),
-  _ts_param8(1, Optional6()),
+  _ts_param8(1, Optional7()),
   _ts_metadata8("design:type", Function),
   _ts_metadata8("design:paramtypes", [
     typeof AgentService === "undefined" ? Object : AgentService,
@@ -15500,7 +15594,7 @@ AgentsController = _ts_decorate11([
 
 // src/controller/attachments.controller.ts
 import { AGENT_ACTOR_RESOLVER, AGENT_ATTACHMENT_STAGING as AGENT_ATTACHMENT_STAGING3, AGENT_OPTIONS as AGENT_OPTIONS5, CanAnyone as CanAnyone2 } from "@dudousxd/nestjs-agent-core";
-import { BadRequestException as BadRequestException3, Controller as Controller2, Get as Get2, Inject as Inject10, NotImplementedException as NotImplementedException5, Optional as Optional7, PayloadTooLargeException as PayloadTooLargeException2, Post, Req, UnsupportedMediaTypeException as UnsupportedMediaTypeException2, UploadedFile, UseInterceptors } from "@nestjs/common";
+import { BadRequestException as BadRequestException3, Controller as Controller2, Get as Get2, Inject as Inject10, NotImplementedException as NotImplementedException5, Optional as Optional8, PayloadTooLargeException as PayloadTooLargeException2, Post, Req, UnsupportedMediaTypeException as UnsupportedMediaTypeException2, UploadedFile, UseInterceptors } from "@nestjs/common";
 import { FileInterceptor } from "@nestjs/platform-express";
 function _ts_decorate12(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -15613,7 +15707,7 @@ AttachmentsController = _ts_decorate12([
   Controller2("attachments"),
   _ts_param10(0, Inject10(AGENT_OPTIONS5)),
   _ts_param10(1, Inject10(AGENT_ACTOR_RESOLVER)),
-  _ts_param10(3, Optional7()),
+  _ts_param10(3, Optional8()),
   _ts_param10(3, Inject10(AGENT_ATTACHMENT_STAGING3)),
   _ts_metadata10("design:type", Function),
   _ts_metadata10("design:paramtypes", [
@@ -15934,7 +16028,7 @@ __name(parseCursor, "parseCursor");
 
 // src/controller/config.controller.ts
 import { AGENT_ACTOR_RESOLVER as AGENT_ACTOR_RESOLVER3, AGENT_ATTACHMENT_STAGING as AGENT_ATTACHMENT_STAGING4, AGENT_MODEL_CATALOG as AGENT_MODEL_CATALOG2, AGENT_OPTIONS as AGENT_OPTIONS6, CanAnyone as CanAnyone4 } from "@dudousxd/nestjs-agent-core";
-import { Controller as Controller4, Get as Get4, Inject as Inject12, Optional as Optional8, Req as Req3 } from "@nestjs/common";
+import { Controller as Controller4, Get as Get4, Inject as Inject12, Optional as Optional9, Req as Req3 } from "@nestjs/common";
 
 // src/resolver/anonymous-actor-resolver.ts
 import { createHash, randomBytes } from "crypto";
@@ -16101,11 +16195,11 @@ ConfigController = _ts_decorate14([
   Controller4("config"),
   _ts_param12(0, Inject12(AGENT_OPTIONS6)),
   _ts_param12(1, Inject12(AGENT_ACTOR_RESOLVER3)),
-  _ts_param12(2, Optional8()),
+  _ts_param12(2, Optional9()),
   _ts_param12(2, Inject12(AGENT_ATTACHMENT_STAGING4)),
-  _ts_param12(3, Optional8()),
+  _ts_param12(3, Optional9()),
   _ts_param12(3, Inject12(AGENT_MODEL_CATALOG2)),
-  _ts_param12(4, Optional8()),
+  _ts_param12(4, Optional9()),
   _ts_param12(4, Inject12(AGENT_GENUI)),
   _ts_metadata12("design:type", Function),
   _ts_metadata12("design:paramtypes", [
@@ -16119,7 +16213,7 @@ ConfigController = _ts_decorate14([
 
 // src/controller/memories.controller.ts
 import { AGENT_ACTOR_RESOLVER as AGENT_ACTOR_RESOLVER4, AGENT_MEMORY as AGENT_MEMORY2, CanAnyone as CanAnyone5, memoryForgetVerdict, offerMemories } from "@dudousxd/nestjs-agent-core";
-import { Controller as Controller5, Delete, ForbiddenException as ForbiddenException3, Get as Get5, Inject as Inject13, NotFoundException as NotFoundException3, Optional as Optional9, Param as Param2, Query as Query2, Req as Req4 } from "@nestjs/common";
+import { Controller as Controller5, Delete, ForbiddenException as ForbiddenException3, Get as Get5, Inject as Inject13, NotFoundException as NotFoundException3, Optional as Optional10, Param as Param2, Query as Query2, Req as Req4 } from "@nestjs/common";
 function _ts_decorate15(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") {
@@ -16244,7 +16338,7 @@ MemoriesController = _ts_decorate15([
   CanAnyone5(),
   Controller5("memories"),
   _ts_param13(0, Inject13(AGENT_ACTOR_RESOLVER4)),
-  _ts_param13(1, Optional9()),
+  _ts_param13(1, Optional10()),
   _ts_param13(1, Inject13(AGENT_MEMORY2)),
   _ts_metadata13("design:type", Function),
   _ts_metadata13("design:paramtypes", [
@@ -16635,7 +16729,7 @@ QuotaController = _ts_decorate19([
 
 // src/controller/skills.controller.ts
 import { AGENT_ACTOR_RESOLVER as AGENT_ACTOR_RESOLVER9, AGENT_SKILLS as AGENT_SKILLS2, CanAnyone as CanAnyone10, offerSkills } from "@dudousxd/nestjs-agent-core";
-import { Controller as Controller10, Get as Get9, Inject as Inject18, Optional as Optional10, Query as Query4, Req as Req9 } from "@nestjs/common";
+import { Controller as Controller10, Get as Get9, Inject as Inject18, Optional as Optional11, Query as Query4, Req as Req9 } from "@nestjs/common";
 function _ts_decorate20(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") {
@@ -16699,7 +16793,7 @@ SkillsController = _ts_decorate20([
   CanAnyone10(),
   Controller10("skills"),
   _ts_param18(0, Inject18(AGENT_ACTOR_RESOLVER9)),
-  _ts_param18(1, Optional10()),
+  _ts_param18(1, Optional11()),
   _ts_param18(1, Inject18(AGENT_SKILLS2)),
   _ts_metadata18("design:type", Function),
   _ts_metadata18("design:paramtypes", [
@@ -16749,7 +16843,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);
@@ -17960,6 +18054,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();
@@ -17967,7 +18065,16 @@ var LedgerQuotaProvider = class {
     const day = quotaPeriodRange("day", now);
     const month = 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
@@ -18612,7 +18719,7 @@ NestAiModelsBinding = _ts_decorate28([
 
 // src/pricing-boot.service.ts
 import { AGENT_MODEL as AGENT_MODEL2, AGENT_OPTIONS as AGENT_OPTIONS9, AGENT_PRICING_STORE as AGENT_PRICING_STORE2, ensureModelPricing } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject26, Injectable as Injectable14, Logger as Logger10, Optional as Optional11 } from "@nestjs/common";
+import { Inject as Inject26, Injectable as Injectable14, Logger as Logger10, Optional as Optional12 } from "@nestjs/common";
 function _ts_decorate29(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") {
@@ -18697,9 +18804,9 @@ var PricingBootService = class {
 PricingBootService = _ts_decorate29([
   Injectable14(),
   _ts_param26(0, Inject26(AGENT_OPTIONS9)),
-  _ts_param26(1, Optional11()),
+  _ts_param26(1, Optional12()),
   _ts_param26(1, Inject26(AGENT_MODEL2)),
-  _ts_param26(2, Optional11()),
+  _ts_param26(2, Optional12()),
   _ts_param26(2, Inject26(AGENT_PRICING_STORE2)),
   _ts_metadata27("design:type", Function),
   _ts_metadata27("design:paramtypes", [
@@ -19004,9 +19111,22 @@ ActionProposalController = _ts_decorate31([
   ])
 ], ActionProposalController);
 
+// src/resolver/tenant-filling-resolver.ts
+import { readTenancy as readTenancy3, withContextTenant } from "@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) => withContextTenant(await resolver.resolve(req), readTenancy3(tenancy ?? "inherit", contextAccessor ?? void 0)), "value"),
+    enumerable: false
+  });
+  return wrapper;
+}
+__name(tenantFillingResolver, "tenantFillingResolver");
+
 // src/runner/inline-agent-runner.ts
 import { AGENT_DEPS_FACTORY as AGENT_DEPS_FACTORY8, AGENT_STORE as AGENT_STORE8, RUN_ENDED_BEFORE_TOOL_CALL as RUN_ENDED_BEFORE_TOOL_CALL2, RunCancelledError as RunCancelledError2, agentFailureCode as agentFailureCode2, agentRunContext as agentRunContext2, encodeStreamEvent as encodeStreamEvent5, publishAgentRunCancelled as publishAgentRunCancelled2, publishAgentRunFailed as publishAgentRunFailed2, releaseThreadRun as releaseThreadRun3, runAgentLoop as runAgentLoop2, runDurationMs as runDurationMs2, runEndTimings as runEndTimings2, settleAll as settleAll2, settleUnsettledDelegation as settleUnsettledDelegation3, streamFailure as streamFailure3 } from "@dudousxd/nestjs-agent-core";
-import { Inject as Inject29, Injectable as Injectable16, Logger as Logger12, Optional as Optional12 } from "@nestjs/common";
+import { Inject as Inject29, Injectable as Injectable16, Logger as Logger12, Optional as Optional13 } from "@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;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
@@ -19553,7 +19673,7 @@ InlineAgentRunner = _ts_decorate32([
   Injectable16(),
   _ts_param29(0, Inject29(AGENT_DEPS_FACTORY8)),
   _ts_param29(1, Inject29(AGENT_STORE8)),
-  _ts_param29(2, Optional12()),
+  _ts_param29(2, Optional13()),
   _ts_metadata30("design:type", Function),
   _ts_metadata30("design:paramtypes", [
     typeof AgentDepsFactory === "undefined" ? Object : AgentDepsFactory,
@@ -19778,13 +19898,20 @@ function sharedProviders(durable, engine) {
     },
     {
       provide: AGENT_ACTOR_RESOLVER14,
-      useFactory: /* @__PURE__ */ __name((options) => {
-        if (options.actorResolver !== void 0) return options.actorResolver;
+      // 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: [
-        AGENT_OPTIONS11
+        AGENT_OPTIONS11,
+        {
+          token: CONTEXT_ACCESSOR3,
+          optional: true
+        }
       ]
     },
     // No `model` (and no `engine`): the turns run on `@nestjs/ai`'s `AiModule` models.
@@ -19807,6 +19934,9 @@ function sharedProviders(durable, engine) {
         } : {},
         ...o.quota?.countEstimatedCost !== void 0 ? {
           countEstimatedCost: o.quota.countEstimatedCost
+        } : {},
+        ...o.quota?.per !== void 0 ? {
+          per: o.quota.per
         } : {}
       }), "useFactory"),
       inject: [