plugin-agent-orchestrator 1.0.20 → 1.0.21

package/dist/externalVersion.js

@@ -11,12 +11,12 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "2.0.56",
-  "@nocobase/server": "2.0.56",
-  "@nocobase/database": "2.0.56",
+  "@nocobase/client": "2.0.60",
+  "@nocobase/server": "2.0.60",
+  "@nocobase/database": "2.0.60",
   "@langchain/langgraph": "0.2.74",
   "@langchain/core": "0.3.80",
-  "@nocobase/actions": "2.0.56",
-  "@nocobase/plugin-ai": "2.0.56",
-  "@nocobase/ai": "2.0.56"
+  "@nocobase/actions": "2.0.60",
+  "@nocobase/plugin-ai": "2.0.60",
+  "@nocobase/ai": "2.0.60"
 };

package/dist/server/collections/agent-execution-spans.js

@@ -101,6 +101,30 @@ var agent_execution_spans_default = (0, import_database.defineCollection)({
       name: "durationMs",
       type: "integer"
     },
+    {
+      name: "inputTokens",
+      type: "integer",
+      defaultValue: 0,
+      comment: "Number of input/prompt tokens consumed by this span"
+    },
+    {
+      name: "outputTokens",
+      type: "integer",
+      defaultValue: 0,
+      comment: "Number of output/completion tokens generated by this span"
+    },
+    {
+      name: "totalTokens",
+      type: "integer",
+      defaultValue: 0,
+      comment: "Total tokens consumed by this span (input + output)"
+    },
+    {
+      name: "cost",
+      type: "float",
+      defaultValue: 0,
+      comment: "Estimated cost in USD for this span"
+    },
     {
       name: "startedAt",
       type: "date"

package/dist/server/collections/agent-loop-runs.js

@@ -143,6 +143,42 @@ var agent_loop_runs_default = (0, import_database.defineCollection)({
       name: "summary",
       type: "text"
     },
+    {
+      name: "totalInputTokens",
+      type: "integer",
+      defaultValue: 0,
+      comment: "Accumulated input/prompt tokens across all spans in this run"
+    },
+    {
+      name: "totalOutputTokens",
+      type: "integer",
+      defaultValue: 0,
+      comment: "Accumulated output/completion tokens across all spans in this run"
+    },
+    {
+      name: "totalTokens",
+      type: "integer",
+      defaultValue: 0,
+      comment: "Total accumulated tokens (input + output) across all spans in this run"
+    },
+    {
+      name: "totalCost",
+      type: "float",
+      defaultValue: 0,
+      comment: "Estimated total cost in USD across all spans in this run"
+    },
+    {
+      name: "budgetMaxTokens",
+      type: "integer",
+      allowNull: true,
+      comment: "Maximum allowed tokens for this run (null = unlimited)"
+    },
+    {
+      name: "budgetMaxCost",
+      type: "float",
+      allowNull: true,
+      comment: "Maximum allowed cost in USD for this run (null = unlimited)"
+    },
     {
       name: "metadata",
       type: "json",

package/dist/server/collections/orchestrator-config.js

@@ -75,6 +75,20 @@ var orchestrator_config_default = (0, import_database.defineCollection)({
       defaultValue: 50,
       comment: "Max LangGraph reasoning steps (tool-call + LLM-step iterations) per delegation. Lower = safer; higher = more complex multi-step tasks. Default 50."
     },
+    {
+      name: "budgetMaxTokens",
+      type: "integer",
+      defaultValue: 0,
+      allowNull: true,
+      comment: "Maximum tokens allowed per sub-agent invocation (0 = unlimited)"
+    },
+    {
+      name: "budgetMaxCost",
+      type: "float",
+      defaultValue: 0,
+      allowNull: true,
+      comment: "Maximum cost in USD allowed per sub-agent invocation (0 = unlimited)"
+    },
     {
       name: "harnessTag",
       type: "string",

package/dist/server/migrations/20260601000000-add-token-fields.d.ts

@@ -0,0 +1,7 @@
+import { Migration } from '@nocobase/server';
+export default class AddTokenFieldsMigration extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/dist/server/migrations/20260601000000-add-token-fields.js

@@ -0,0 +1,101 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var add_token_fields_exports = {};
+__export(add_token_fields_exports, {
+  default: () => AddTokenFieldsMigration
+});
+module.exports = __toCommonJS(add_token_fields_exports);
+var import_server = require("@nocobase/server");
+class AddTokenFieldsMigration extends import_server.Migration {
+  on = "afterLoad";
+  appVersion = "<=2.x";
+  async up() {
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    const DataTypes = this.db.sequelize.constructor["DataTypes"];
+    const prefix = this.db.options.tablePrefix || "";
+    const spansTable = `${prefix}agentExecutionSpans`;
+    const spansExists = await queryInterface.describeTable(spansTable).then(() => true).catch(() => false);
+    if (spansExists) {
+      const spansCols = await queryInterface.describeTable(spansTable);
+      const addSpanIfMissing = async (name, definition) => {
+        if (!spansCols[name]) {
+          await queryInterface.addColumn(spansTable, name, definition);
+        }
+      };
+      await addSpanIfMissing("inputTokens", { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 });
+      await addSpanIfMissing("outputTokens", { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 });
+      await addSpanIfMissing("totalTokens", { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 });
+      await addSpanIfMissing("cost", { type: DataTypes.FLOAT, allowNull: false, defaultValue: 0 });
+    }
+    const runsTable = `${prefix}agentLoopRuns`;
+    const runsExists = await queryInterface.describeTable(runsTable).then(() => true).catch(() => false);
+    if (runsExists) {
+      const runsCols = await queryInterface.describeTable(runsTable);
+      const addRunIfMissing = async (name, definition) => {
+        if (!runsCols[name]) {
+          await queryInterface.addColumn(runsTable, name, definition);
+        }
+      };
+      await addRunIfMissing("totalInputTokens", { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 });
+      await addRunIfMissing("totalOutputTokens", { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 });
+      await addRunIfMissing("totalTokens", { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 });
+      await addRunIfMissing("totalCost", { type: DataTypes.FLOAT, allowNull: false, defaultValue: 0 });
+      await addRunIfMissing("budgetMaxTokens", { type: DataTypes.INTEGER, allowNull: true });
+      await addRunIfMissing("budgetMaxCost", { type: DataTypes.FLOAT, allowNull: true });
+    }
+    const configTable = `${prefix}orchestratorConfig`;
+    const configExists = await queryInterface.describeTable(configTable).then(() => true).catch(() => false);
+    if (configExists) {
+      const configCols = await queryInterface.describeTable(configTable);
+      const addConfigIfMissing = async (name, definition) => {
+        if (!configCols[name]) {
+          await queryInterface.addColumn(configTable, name, definition);
+        }
+      };
+      await addConfigIfMissing("budgetMaxTokens", { type: DataTypes.INTEGER, allowNull: true, defaultValue: 0 });
+      await addConfigIfMissing("budgetMaxCost", { type: DataTypes.FLOAT, allowNull: true, defaultValue: 0 });
+    }
+  }
+  async down() {
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    const prefix = this.db.options.tablePrefix || "";
+    const tables = [
+      { name: `${prefix}agentExecutionSpans`, cols: ["inputTokens", "outputTokens", "totalTokens", "cost"] },
+      {
+        name: `${prefix}agentLoopRuns`,
+        cols: ["totalInputTokens", "totalOutputTokens", "totalTokens", "totalCost", "budgetMaxTokens", "budgetMaxCost"]
+      },
+      { name: `${prefix}orchestratorConfig`, cols: ["budgetMaxTokens", "budgetMaxCost"] }
+    ];
+    for (const { name, cols } of tables) {
+      for (const col of cols) {
+        await queryInterface.removeColumn(name, col).catch(() => {
+        });
+      }
+    }
+  }
+}

package/dist/server/plugin.js

@@ -47,6 +47,7 @@ var import_external_rag_search = require("./tools/external-rag-search");
 var import_orchestrator_plan = require("./tools/orchestrator-plan");
 var import_tracing = require("./resources/tracing");
 var import_agent_loop = require("./resources/agent-loop");
+var import_RunEventBus = require("./services/RunEventBus");
 var import_plugin = __toESM(require("./skill-hub/plugin"));
 var import_AgentLoopService = require("./services/AgentLoopService");
 class PluginAgentOrchestratorServer extends import_server.Plugin {
@@ -75,6 +76,7 @@ class PluginAgentOrchestratorServer extends import_server.Plugin {
         "agentLoopRuns:*",
         "agentLoopSteps:*",
         "agentLoopEvents:*",
+        "agentLoopEventsStream:*",
         "agentHarnessProfiles:*",
         "agentExecutionSpans:*",
         "skillDefinitions:*",
@@ -89,6 +91,51 @@ class PluginAgentOrchestratorServer extends import_server.Plugin {
     toolsManager.registerTools((0, import_external_rag_search.createExternalRagSearchTool)(this));
     toolsManager.registerDynamicTools((0, import_delegate_task.createDelegateToolsProvider)(this));
     (0, import_agent_loop.registerAgentLoopResource)(this, this.agentLoopService);
+    this.app.resource({
+      name: "agentLoopEventsStream",
+      actions: {
+        async stream(ctx, next) {
+          var _a, _b, _c;
+          const runId = ((_a = ctx.action.params) == null ? void 0 : _a.runId) || ((_b = ctx.query) == null ? void 0 : _b.runId) || ((_c = ctx.request.query) == null ? void 0 : _c.runId);
+          if (!runId) {
+            ctx.throw(400, "runId query parameter is required.");
+            return;
+          }
+          ctx.type = "text/event-stream";
+          ctx.set("Cache-Control", "no-cache");
+          ctx.set("Connection", "keep-alive");
+          ctx.set("X-Accel-Buffering", "no");
+          const unsubscribe = (0, import_RunEventBus.getRunEventBus)().subscribe(runId, (event) => {
+            try {
+              ctx.res.write(`data: ${JSON.stringify(event)}
+
+`);
+            } catch {
+              unsubscribe();
+            }
+          });
+          const keepalive = setInterval(() => {
+            try {
+              ctx.res.write(": keepalive\n\n");
+            } catch {
+              clearInterval(keepalive);
+              unsubscribe();
+            }
+          }, 15e3);
+          ctx.req.on("close", () => {
+            clearInterval(keepalive);
+            unsubscribe();
+          });
+          ctx.req.on("error", () => {
+            clearInterval(keepalive);
+            unsubscribe();
+          });
+          ctx.res.writeHead(200);
+          ctx.res.write(": connected\n\n");
+          await next();
+        }
+      }
+    });
     (0, import_tracing.registerTracingResource)(this);
     this.app.cronJobManager.addJob({
       cronTime: "0 30 2 * * *",

package/dist/server/resources/agent-loop.js

@@ -29,20 +29,9 @@ __export(agent_loop_exports, {
   registerAgentLoopResource: () => registerAgentLoopResource
 });
 module.exports = __toCommonJS(agent_loop_exports);
-function toPlain(record) {
-  var _a;
-  return ((_a = record == null ? void 0 : record.toJSON) == null ? void 0 : _a.call(record)) || record;
-}
-function currentUserId(ctx) {
-  var _a, _b, _c, _d;
-  return ((_b = (_a = ctx == null ? void 0 : ctx.state) == null ? void 0 : _a.currentUser) == null ? void 0 : _b.id) || ((_d = (_c = ctx == null ? void 0 : ctx.auth) == null ? void 0 : _c.user) == null ? void 0 : _d.id);
-}
-function values(ctx) {
-  var _a, _b, _c;
-  return ((_a = ctx.request) == null ? void 0 : _a.body) || ((_c = (_b = ctx.action) == null ? void 0 : _b.params) == null ? void 0 : _c.values) || {};
-}
+var import_ctx_utils = require("../utils/ctx-utils");
 function formatRunRow(raw) {
-  const row = toPlain(raw);
+  const row = (0, import_ctx_utils.toPlain)(raw);
   return {
     id: row.id,
     rootRunId: row.rootRunId,
@@ -105,7 +94,7 @@ function registerAgentLoopResource(plugin, service) {
         await next();
       },
       async resume(ctx, next) {
-        const body = values(ctx);
+        const body = (0, import_ctx_utils.valuesFromCtx)(ctx);
         const runId = body.runId || ctx.action.params.filterByTk;
         if (!runId) {
           ctx.throw(400, "runId is required");
@@ -116,14 +105,14 @@ function registerAgentLoopResource(plugin, service) {
             stepId: body.stepId,
             approved: body.approved !== false,
             editedInput: body.editedInput,
-            userId: currentUserId(ctx),
+            userId: (0, import_ctx_utils.currentUserId)(ctx),
             ctx
           })
         };
         await next();
       },
       async approvePlan(ctx, next) {
-        const body = values(ctx);
+        const body = (0, import_ctx_utils.valuesFromCtx)(ctx);
         const runId = body.runId || ctx.action.params.filterByTk;
         if (!runId) {
           ctx.throw(400, "runId is required");
@@ -131,7 +120,7 @@ function registerAgentLoopResource(plugin, service) {
         }
         ctx.body = {
           data: await service.approvePlanAndExecute(runId, {
-            userId: currentUserId(ctx),
+            userId: (0, import_ctx_utils.currentUserId)(ctx),
             ctx,
             reason: body.reason
           })
@@ -139,7 +128,7 @@ function registerAgentLoopResource(plugin, service) {
         await next();
       },
       async rejectPlan(ctx, next) {
-        const body = values(ctx);
+        const body = (0, import_ctx_utils.valuesFromCtx)(ctx);
         const runId = body.runId || ctx.action.params.filterByTk;
         if (!runId) {
           ctx.throw(400, "runId is required");
@@ -148,13 +137,13 @@ function registerAgentLoopResource(plugin, service) {
         ctx.body = {
           data: await service.rejectPlan(runId, {
             reason: body.reason,
-            userId: currentUserId(ctx)
+            userId: (0, import_ctx_utils.currentUserId)(ctx)
           })
         };
         await next();
       },
       async requestPlanChanges(ctx, next) {
-        const body = values(ctx);
+        const body = (0, import_ctx_utils.valuesFromCtx)(ctx);
         const runId = body.runId || ctx.action.params.filterByTk;
         if (!runId) {
           ctx.throw(400, "runId is required");
@@ -163,13 +152,13 @@ function registerAgentLoopResource(plugin, service) {
         ctx.body = {
           data: await service.requestPlanChanges(runId, {
             feedback: body.feedback,
-            userId: currentUserId(ctx)
+            userId: (0, import_ctx_utils.currentUserId)(ctx)
           })
         };
         await next();
       },
       async cancel(ctx, next) {
-        const body = values(ctx);
+        const body = (0, import_ctx_utils.valuesFromCtx)(ctx);
         const runId = body.runId || ctx.action.params.filterByTk;
         if (!runId) {
           ctx.throw(400, "runId is required");
@@ -178,23 +167,42 @@ function registerAgentLoopResource(plugin, service) {
         ctx.body = {
           data: await service.cancelRun(runId, {
             reason: body.reason,
-            userId: currentUserId(ctx)
+            userId: (0, import_ctx_utils.currentUserId)(ctx)
           })
         };
         await next();
       },
       async retryStep(ctx, next) {
-        const body = values(ctx);
+        const body = (0, import_ctx_utils.valuesFromCtx)(ctx);
         if (!body.stepId) {
           ctx.throw(400, "stepId is required");
           return;
         }
         ctx.body = {
           data: await service.retryStep(body.stepId, {
-            userId: currentUserId(ctx)
+            userId: (0, import_ctx_utils.currentUserId)(ctx)
           })
         };
         await next();
+      },
+      async stepFeedback(ctx, next) {
+        const body = (0, import_ctx_utils.valuesFromCtx)(ctx);
+        if (!body.stepId || !body.rating) {
+          ctx.throw(400, "stepId and rating are required");
+          return;
+        }
+        if (!["positive", "negative"].includes(body.rating)) {
+          ctx.throw(400, 'rating must be "positive" or "negative"');
+          return;
+        }
+        ctx.body = {
+          data: await service.stepFeedback(
+            body.stepId,
+            { rating: body.rating, comment: body.comment, category: body.category },
+            { userId: (0, import_ctx_utils.currentUserId)(ctx) }
+          )
+        };
+        await next();
       }
     }
   });

package/dist/server/resources/tracing.js

@@ -29,10 +29,7 @@ __export(tracing_exports, {
   registerTracingResource: () => registerTracingResource
 });
 module.exports = __toCommonJS(tracing_exports);
-function toPlain(row) {
-  var _a;
-  return ((_a = row == null ? void 0 : row.toJSON) == null ? void 0 : _a.call(row)) || row;
-}
+var import_ctx_utils = require("../utils/ctx-utils");
 function normalizeSpanFilter(filter = {}) {
   const next = { ...filter };
   if (next.subAgentUsername) {
@@ -47,7 +44,7 @@ function spanTitle(row) {
   return row.toolName || row.type || "span";
 }
 function formatSpanListRow(raw) {
-  const row = toPlain(raw);
+  const row = (0, import_ctx_utils.toPlain)(raw);
   const metadata = row.metadata || {};
   const input = row.input || {};
   return {
@@ -74,7 +71,7 @@ function formatSpanListRow(raw) {
   };
 }
 function buildSpanTree(rows) {
-  const plainRows = rows.map(toPlain);
+  const plainRows = rows.map(import_ctx_utils.toPlain);
   const byId = /* @__PURE__ */ new Map();
   const roots = [];
   for (const row of plainRows) {
@@ -98,7 +95,7 @@ function buildSpanTree(rows) {
   return roots;
 }
 function flattenSpanTimeline(rows) {
-  return rows.map(toPlain).sort(
+  return rows.map(import_ctx_utils.toPlain).sort(
     (a, b) => new Date(a.startedAt || a.createdAt || 0).getTime() - new Date(b.startedAt || b.createdAt || 0).getTime()
   ).map((row) => {
     const input = row.input || {};
@@ -211,7 +208,7 @@ function registerTracingResource(plugin) {
               filter: { id: filterByTk }
             });
             if (span) {
-              const plainSpan = toPlain(span);
+              const plainSpan = (0, import_ctx_utils.toPlain)(span);
               const rows = await spanRepo.find({
                 filter: { rootRunId: plainSpan.rootRunId },
                 sort: ["createdAt"]

package/dist/server/services/AgentHarness.d.ts

@@ -3,6 +3,8 @@ export declare class AgentHarness {
     private readonly plugin;
     private readonly registryService;
     private readonly spanService;
+    private readonly tokenTracker;
+    private readonly contextAggregator;
     constructor(plugin: any, registryService: AgentRegistryService);
     get db(): any;
     get app(): any;