@dudousxd/nestjs-agent 1.21.0 → 1.22.0

package/dist/durable/index.d.cts

@@ -1,7 +1,7 @@
 import { AgentStore, AgentRunInput, AgentLoopResult, LlmStepEnvelope, BufferedModelTurnResult, ToolStepEnvelope, 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-CGsR40Ct.cjs';
+import { A as AgentDepsFactory, C as ChatQueueService, a as AgentSurface, b as AgentModuleOptions } from '../chat-queue.service-Dx9OsjcF.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, BufferedModelTurnResult, ToolStepEnvelope, 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-XG9RQCjU.js';
+import { A as AgentDepsFactory, C as ChatQueueService, a as AgentSurface, b as AgentModuleOptions } from '../chat-queue.service-CTyX_yNr.js';
 import { DynamicModule } from '@nestjs/common';
 import '@dudousxd/nestjs-agent-core/genui';
 import '@standard-schema/spec';

package/dist/durable/index.js

@@ -1186,6 +1186,7 @@ import { defineCatalog, genuiTools } from "@dudousxd/nestjs-agent-core/genui";
 import { Inject as Inject4, Module as Module2 } from "@nestjs/common";
 
 // src/functional-tool.ts
+import { createFunctionalTool } from "@dudousxd/nestjs-agent-core";
 var AGENT_TOOL_BRAND = /* @__PURE__ */ Symbol.for("@dudousxd/nestjs-agent:functional-tool");
 function brand(tool) {
   return {
@@ -1721,7 +1722,7 @@ import { AGENT_ATTACHMENT_STAGING as AGENT_ATTACHMENT_STAGING2, AGENT_DEPS_FACTO
 import { BadRequestException as BadRequestException2, ConflictException as ConflictException2, ForbiddenException as ForbiddenException2, GoneException, HttpException, HttpStatus, Inject as Inject8, Injectable as Injectable7, NotFoundException as NotFoundException2, NotImplementedException as NotImplementedException3, Optional as Optional5 } from "@nestjs/common";
 
 // src/proposals/action-proposal.service.ts
-import { AGENT_OPTIONS as AGENT_OPTIONS2, AGENT_STORE as AGENT_STORE4, mayDecideApproval, parseTextActionProposalCommand, resolveTextActionProposalDecision } from "@dudousxd/nestjs-agent-core";
+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";
 function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -1758,7 +1759,19 @@ var ActionProposalService = class {
   constructor(store, options) {
     this.store = store;
     this.options = options;
+    const text = options.actionProposalText;
+    this.vocabulary = {
+      ...DEFAULT_TEXT_ACTION_PROPOSAL_VOCABULARY,
+      ...text?.vocabulary
+    };
+    this.replies = {
+      ...DEFAULT_TEXT_ACTION_PROPOSAL_REPLIES,
+      ...text?.replies
+    };
   }
+  /** The words a text decision is made of, and what the agent answers — English unless configured. */
+  vocabulary;
+  replies;
   capability() {
     const store = this.store;
     if (typeof store.getThreadActionProposalScope !== "function" || typeof store.listActionProposals !== "function") throw new NotImplementedException("Action proposals are unavailable");
@@ -1787,7 +1800,8 @@ var ActionProposalService = class {
     for (const row of rows) if (scope.actorRef === actor.id || await this.mayDecide(actor, row)) visible.push(row);
     const last = rows.at(-1);
     return {
-      items: visible,
+      // The public view: a row carries the worker's lease token and the tool's idempotency key.
+      items: visible.map(toActionProposalView),
       ...rows.length === 1e3 && last ? {
         next: {
           createdAt: last.createdAt,
@@ -1804,7 +1818,7 @@ var ActionProposalService = class {
     const proposal = await this.capability().getActionProposal(scope, proposalId);
     if (!proposal) throw new NotFoundException("Proposal not found");
     if (!await this.mayDecide(actor, proposal)) throw new ForbiddenException("May not decide this proposal");
-    return this.capability().decideActionProposal(scope, proposalId, {
+    const result = await this.capability().decideActionProposal(scope, proposalId, {
       decision: command.decision,
       actorRef: actor.id,
       via: command.via ?? "web",
@@ -1815,9 +1829,10 @@ var ActionProposalService = class {
         reason: command.reason
       } : {}
     });
+    return toActionProposalMutationView(result);
   }
   async handleTextDecision(threadId, actor, text) {
-    const command = parseTextActionProposalCommand(text);
+    const command = parseTextActionProposalCommand(text, this.vocabulary);
     if (command.status === "unmatched") return command;
     if (command.proposalId !== void 0) {
       const result2 = await this.decide(threadId, command.proposalId, actor, {
@@ -1825,7 +1840,7 @@ var ActionProposalService = class {
         remember: command.remember,
         via: "text"
       });
-      return this.textReceipt(threadId, result2);
+      return this.textReceipt(threadId, result2, command.decision);
     }
     const candidates = [];
     const scope = await this.scope(threadId, actor);
@@ -1834,30 +1849,38 @@ var ActionProposalService = class {
       limit: 1e3
     });
     for (const proposal of pending) if (await this.mayDecide(actor, proposal)) candidates.push(proposal);
-    const resolution = resolveTextActionProposalDecision(text, candidates);
+    const resolution = resolveTextActionProposalDecision(text, candidates, this.vocabulary);
     if (resolution.status === "unmatched") return resolution;
-    if (resolution.status === "ambiguous" || resolution.status === "decision" && pending.length === 1e3 && !text.includes("#")) return {
-      threadId,
-      proposalDecision: {
-        status: "ambiguous",
-        proposalIds: candidates.map(({ id }) => id)
-      },
-      text: `Choose the action to decide: ${candidates.map(({ id }) => id).map((id) => `#${id}`).join(", ")}`
-    };
+    const saturated = pending.length === 1e3 && !text.includes("#");
+    if (resolution.status === "ambiguous" || saturated) {
+      const proposalIds = candidates.map(({ id }) => id);
+      return {
+        threadId,
+        proposalDecision: {
+          status: "ambiguous",
+          proposalIds
+        },
+        text: saturated ? this.replies.tooMany : this.replies.ambiguous(proposalIds)
+      };
+    }
     const result = await this.decide(threadId, resolution.proposalId, actor, {
       decision: resolution.decision,
       remember: resolution.remember,
       via: "text"
     });
-    return this.textReceipt(threadId, result);
+    return this.textReceipt(threadId, result, resolution.decision);
   }
-  textReceipt(threadId, result) {
+  textReceipt(threadId, result, decision) {
     return {
       threadId,
       proposalDecision: result,
-      text: result.proposal?.decision === "approved" ? "Action approved and queued for execution." : `Action ${result.proposal?.decision ?? result.status}; no execution was performed by this decision.`
+      text: this.reply(result, decision)
     };
   }
+  /** The configured reply to a decision the store answered with `result`. */
+  reply(result, decision) {
+    return textActionProposalReply(result, decision, this.replies);
+  }
 };
 ActionProposalService = _ts_decorate7([
   Injectable5(),
@@ -1874,6 +1897,33 @@ ActionProposalService = _ts_decorate7([
 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";
 
+// src/quota-exceeded.ts
+import { publishAgentQuotaExceeded } from "@dudousxd/nestjs-agent-core";
+function publishQuotaBlocked(actor, report, blocked) {
+  const window = report.windows.find((candidate) => candidate.period === blocked.period);
+  const payload = {
+    actorId: actor.id,
+    period: blocked.period,
+    ...blocked.reason !== void 0 ? {
+      reason: blocked.reason
+    } : {},
+    ...window?.usedTokens !== void 0 ? {
+      usedTokens: window.usedTokens
+    } : {},
+    ...window?.limitTokens !== void 0 ? {
+      limitTokens: window.limitTokens
+    } : {},
+    ...window !== void 0 ? {
+      usedUsd: window.usedUsd
+    } : {},
+    ...window?.limitUsd !== void 0 ? {
+      limitUsd: window.limitUsd
+    } : {}
+  };
+  publishAgentQuotaExceeded(payload);
+}
+__name(publishQuotaBlocked, "publishQuotaBlocked");
+
 // src/thread-persona.ts
 async function threadPersona(store, threadId) {
   const projecting = store;
@@ -2217,12 +2267,14 @@ var ChatQueueService2 = class _ChatQueueService {
       return null;
     }
     try {
-      const { blocked } = await this.quotaProvider.report({
+      const report = await this.quotaProvider.report({
         actor
       });
+      const { blocked } = report;
       if (blocked === void 0) {
         return null;
       }
+      publishQuotaBlocked(actor, report, blocked);
       return blocked.reason ?? `The ${blocked.period === "day" ? "daily" : "monthly"} quota is used up`;
     } catch {
       return null;
@@ -2424,6 +2476,21 @@ var AgentService = class {
     this.queue = queue;
     this.proposals = proposals;
   }
+  /**
+  * Decide one independent proposal through the scoped proposal service — what the native
+  * `action-proposals/:id/approve|reject` routes call — and the reply to show for it. `404` when
+  * proposals are not on, `403`/`404` when this actor may not decide it.
+  */
+  async decideActionProposal(actor, threadId, proposalId, command) {
+    if (this.options?.actionApprovalMode !== "independent" || !this.proposals) {
+      throw new NotFoundException2("Proposal not found");
+    }
+    const result = await this.proposals.decide(threadId, proposalId, actor, command);
+    return {
+      proposalDecision: result,
+      text: this.proposals.reply(result, command.decision)
+    };
+  }
   async handleTextDecision(threadId, actor, text) {
     if (this.options?.actionApprovalMode !== "independent" || !this.proposals) return {
       status: "unmatched"
@@ -2471,10 +2538,12 @@ var AgentService = class {
     if (this.options?.quota === void 0 || this.quotaProvider === void 0) {
       return;
     }
-    const { blocked } = await this.quotaProvider.report({
+    const report = await this.quotaProvider.report({
       actor
     });
+    const { blocked } = report;
     if (blocked !== void 0) {
+      publishQuotaBlocked(actor, report, blocked);
       throw new HttpException({
         statusCode: HttpStatus.TOO_MANY_REQUESTS,
         code: "quota_exceeded",
@@ -5727,6 +5796,9 @@ var AiToolDiscoveryService = class _AiToolDiscoveryService {
         } : {}
       }, {
         execute: /* @__PURE__ */ __name((input, ctx) => instance.execute(input, ctx), "execute"),
+        ...typeof handler.present === "function" ? {
+          present: /* @__PURE__ */ __name((output, ctx) => instance.present(output, ctx), "present")
+        } : {},
         ...typeof handler.preflight === "function" ? {
           preflight: /* @__PURE__ */ __name((input, ctx, options) => instance.preflight(input, ctx, options), "preflight")
         } : {},
@@ -6763,15 +6835,15 @@ function _ts_decorate30(decorators, target, key, desc) {
 __name(_ts_decorate30, "_ts_decorate");
 var DEFAULT_PATH = "agent";
 var logger = new Logger9("AgentModule");
-function externalStoreWrapper(modules) {
+function externalWrapper(modules, token) {
   for (const module of modules.values()) {
     if (module.metatype === AgentModule) continue;
-    const wrapper = module.providers.get(AGENT_STORE9);
+    const wrapper = module.providers.get(token);
     if (wrapper !== void 0) return wrapper;
   }
   return void 0;
 }
-__name(externalStoreWrapper, "externalStoreWrapper");
+__name(externalWrapper, "externalWrapper");
 function forwardingStore(wrapper) {
   const target = /* @__PURE__ */ __name(() => {
     const instance = wrapper.instance;
@@ -6794,12 +6866,36 @@ function forwardingStore(wrapper) {
 __name(forwardingStore, "forwardingStore");
 function resolveStore(options, modules) {
   if (options.store !== void 0) return options.store;
-  const external = externalStoreWrapper(modules);
+  const external = externalWrapper(modules, AGENT_STORE9);
   if (external !== void 0) return forwardingStore(external);
   logger.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 InMemoryAgentStore();
 }
 __name(resolveStore, "resolveStore");
+function resolveRolesPolicy(options, modules) {
+  const external = externalWrapper(modules, AGENT_ROLES_POLICY2);
+  if (options.rolesPolicy !== void 0) {
+    if (external !== void 0) {
+      logger.warn("Both a `rolesPolicy` option and a module binding AGENT_ROLES_POLICY (e.g. AgentAuthzModule) are configured \u2014 the `rolesPolicy` option wins.");
+    }
+    return options.rolesPolicy;
+  }
+  if (external !== void 0) return forwardingPolicy(external);
+  return options.emptyRoles === "deny" ? new ClosedRolesPolicy(options.defaultRoles) : new DefaultRolesPolicy(options.defaultRoles);
+}
+__name(resolveRolesPolicy, "resolveRolesPolicy");
+function forwardingPolicy(wrapper) {
+  return {
+    can(actor, tool) {
+      const policy = wrapper.instance;
+      if (policy === void 0 || policy === null) {
+        throw new Error("AgentModule: the AGENT_ROLES_POLICY bound by another module is not ready yet");
+      }
+      return policy.can(actor, tool);
+    }
+  };
+}
+__name(forwardingPolicy, "forwardingPolicy");
 function isQuotaProvider(quota) {
   return quota !== void 0 && typeof quota.report === "function";
 }
@@ -6861,9 +6957,10 @@ function sharedProviders(durable) {
     },
     {
       provide: AGENT_ROLES_POLICY2,
-      useFactory: /* @__PURE__ */ __name((options) => options.rolesPolicy ?? (options.emptyRoles === "deny" ? new ClosedRolesPolicy(options.defaultRoles) : new DefaultRolesPolicy(options.defaultRoles)), "useFactory"),
+      useFactory: /* @__PURE__ */ __name((options, modules) => resolveRolesPolicy(options, modules), "useFactory"),
       inject: [
-        AGENT_OPTIONS9
+        AGENT_OPTIONS9,
+        ModulesContainer
       ]
     },
     {