plugin-agent-orchestrator 1.0.20 → 1.0.21

package/dist/server/services/AgentHarness.js

@@ -34,54 +34,30 @@ var import_prebuilt = require("@langchain/langgraph/prebuilt");
 var import_tools = require("@langchain/core/tools");
 var import_messages = require("@langchain/core/messages");
 var import_ExecutionSpanService = require("./ExecutionSpanService");
+var import_TokenTracker = require("./TokenTracker");
+var import_ContextAggregator = require("./ContextAggregator");
+var import_CircuitBreaker = require("./CircuitBreaker");
+var import_ctx_utils = require("../utils/ctx-utils");
+var import_logging = require("../utils/logging");
 const ORCHESTRATOR_DEPTH_KEY = "__orchestratorDepth";
 const ORCHESTRATOR_PATH_KEY = "__orchestratorPath";
-function toPlain(record) {
-  var _a;
-  return ((_a = record == null ? void 0 : record.toJSON) == null ? void 0 : _a.call(record)) || record;
-}
-function asObject(value) {
-  if (value && typeof value === "object" && !Array.isArray(value)) return value;
-  if (typeof value === "string" && value.trim()) {
-    try {
-      const parsed = JSON.parse(value);
-      return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
-    } catch {
-      return {};
-    }
-  }
-  return {};
-}
-function trimText(value, max = 5e4) {
-  let text = "";
-  if (typeof value === "string") {
-    text = value;
-  } else if (value != null) {
-    try {
-      text = JSON.stringify(value);
-    } catch {
-      text = String(value);
-    }
-  }
-  return text.length > max ? `${text.slice(0, max)}
-...[truncated]` : text;
-}
 function sanitizeToolPart(value) {
   return (value || "").replace(/[^a-zA-Z0-9_-]/g, "_");
 }
 function buildDelegateToolName(leaderUsername, subAgentUsername) {
   return `delegate_${sanitizeToolPart(leaderUsername)}_to_${sanitizeToolPart(subAgentUsername)}`;
 }
-function nowIso() {
-  return (/* @__PURE__ */ new Date()).toISOString();
-}
 class AgentHarness {
   constructor(plugin, registryService) {
     this.plugin = plugin;
     this.registryService = registryService;
     this.spanService = new import_ExecutionSpanService.ExecutionSpanService(plugin);
+    this.tokenTracker = new import_TokenTracker.TokenTracker(plugin);
+    this.contextAggregator = new import_ContextAggregator.ContextAggregator(plugin);
   }
   spanService;
+  tokenTracker;
+  contextAggregator;
   get db() {
     return this.plugin.db;
   }
@@ -89,9 +65,9 @@ class AgentHarness {
     return this.plugin.app;
   }
   async executeStep(run, step, options = {}) {
-    const harnessTag = asObject(run.metadata).harnessTag || asObject(step.metadata).harnessTag || "default";
+    const harnessTag = (0, import_ctx_utils.asObject)(run.metadata).harnessTag || (0, import_ctx_utils.asObject)(step.metadata).harnessTag || "default";
     const profile = await this.registryService.getHarnessProfile(harnessTag);
-    const settings = asObject(profile == null ? void 0 : profile.settings);
+    const settings = (0, import_ctx_utils.asObject)(profile == null ? void 0 : profile.settings);
     if (step.type === "sub_agent") {
       if (settings.allowSubAgents === false) {
         throw new Error(`Harness profile "${harnessTag}" does not allow sub-agent execution.`);
@@ -121,7 +97,7 @@ class AgentHarness {
   }
   async invokeSubAgentStep(run, step, settings, options) {
     var _a;
-    const target = step.target || asObject(step.metadata).subAgentUsername || ((_a = step.input) == null ? void 0 : _a.subAgentUsername);
+    const target = step.target || (0, import_ctx_utils.asObject)(step.metadata).subAgentUsername || ((_a = step.input) == null ? void 0 : _a.subAgentUsername);
     if (!target) {
       throw new Error(`Sub-agent step "${step.planKey}" is missing target sub-agent username.`);
     }
@@ -130,17 +106,33 @@ class AgentHarness {
     }
     const toolName = String(target).startsWith("delegate_") ? String(target) : buildDelegateToolName(run.leaderUsername, target);
     const task = step.description || step.title || run.goal;
-    const context = trimText(
+    const context = (0, import_ctx_utils.trimText)(
       {
         goal: run.goal,
         input: step.input || {},
-        harnessTag: asObject(run.metadata).harnessTag || asObject(step.metadata).harnessTag || "default",
+        harnessTag: (0, import_ctx_utils.asObject)(run.metadata).harnessTag || (0, import_ctx_utils.asObject)(step.metadata).harnessTag || "default",
         agentLoopRunId: String(run.id),
         agentLoopStepId: String(step.id)
       },
       2e4
     );
-    return this.invokeNamedTool(run, step, toolName, { task, context }, settings, options);
+    const circuitBreaker = (0, import_CircuitBreaker.getCircuitBreaker)({ appLog: this.app });
+    if (!circuitBreaker.isAllowed(target)) {
+      const state = circuitBreaker.getState(target);
+      throw new Error(
+        `Sub-agent "${target}" circuit is open (${(state == null ? void 0 : state.failures) || 0} failures). Retry after the recovery timeout.`
+      );
+    }
+    try {
+      const result = await this.invokeNamedTool(run, step, toolName, { task, context }, settings, options);
+      circuitBreaker.recordSuccess(target);
+      return result;
+    } catch (e) {
+      if ((e == null ? void 0 : e.message) !== "requires_approval") {
+        circuitBreaker.recordFailure(target);
+      }
+      throw e;
+    }
   }
   async invokeNamedTool(run, step, toolName, args, settings, options) {
     var _a, _b, _c, _d, _e;
@@ -225,7 +217,7 @@ class AgentHarness {
     const trace = [
       {
         type: "start",
-        at: nowIso(),
+        at: (0, import_ctx_utils.nowIso)(),
         title: `Delegation started: ${leaderUsername} -> ${subAgentUsername}`,
         content: task
       }
@@ -345,26 +337,26 @@ class AgentHarness {
               });
               trace.push({
                 type: "tool_call",
-                at: nowIso(),
+                at: (0, import_ctx_utils.nowIso)(),
                 title: `Calling tool: ${toolEntry.definition.name}`,
                 toolName: toolEntry.definition.name,
                 args: toolArgs
               });
               try {
                 const res = await toolEntry.invoke(invokeCtx, toolArgs, `orch-${toolCallId}`);
-                const output = trimText((res == null ? void 0 : res.content) ?? (res == null ? void 0 : res.result) ?? res, 5e4);
+                const output = (0, import_ctx_utils.trimText)((res == null ? void 0 : res.content) ?? (res == null ? void 0 : res.result) ?? res, 5e4);
                 trace.push({
                   type: "tool_result",
-                  at: nowIso(),
+                  at: (0, import_ctx_utils.nowIso)(),
                   title: `Tool finished: ${toolEntry.definition.name}`,
                   toolName: toolEntry.definition.name,
                   status: (res == null ? void 0 : res.status) || "success",
-                  content: trimText(output, 2e3)
+                  content: (0, import_ctx_utils.trimText)(output, 2e3)
                 });
                 if ((res == null ? void 0 : res.status) === "error") {
                   await this.spanService.finish(toolSpanId, "error", toolStartedAt, {
                     output,
-                    error: trimText(res.content || output, 1e4)
+                    error: (0, import_ctx_utils.trimText)(res.content || output, 1e4)
                   });
                   throw new Error(`Tool <${toolEntry.definition.name}> failed: ${res.content}`);
                 }
@@ -376,14 +368,14 @@ class AgentHarness {
               } catch (e) {
                 trace.push({
                   type: "tool_error",
-                  at: nowIso(),
+                  at: (0, import_ctx_utils.nowIso)(),
                   title: `Tool failed: ${toolEntry.definition.name}`,
                   toolName: toolEntry.definition.name,
                   status: "error",
                   content: e.message
                 });
                 await this.spanService.finish(toolSpanId, "error", toolStartedAt, {
-                  error: trimText(e.message, 1e4)
+                  error: (0, import_ctx_utils.trimText)(e.message, 1e4)
                 });
                 throw e;
               }
@@ -414,7 +406,13 @@ ${contextSummary}
 </shared_context>`;
           }
         }
-      } catch {
+      } catch (e) {
+      }
+      if (agentLoopRunId) {
+        try {
+          systemPrompt = await this.contextAggregator.enrichSystemPrompt(systemPrompt, agentLoopRunId, agentLoopStepId);
+        } catch {
+        }
       }
       const combinedTask = context ? `Task: ${task}
 
@@ -423,7 +421,7 @@ ${context}` : `Task: ${task}`;
       const effectiveLimit = recursionLimit && recursionLimit > 0 ? recursionLimit : 50;
       let timeoutId;
       const timeoutMs = Number(timeout) > 0 ? Number(timeout) : 12e4;
-      const timeoutPromise = new Promise((_, reject) => {
+      const timeoutPromise = new Promise((_resolve, reject) => {
         timeoutId = setTimeout(() => {
           abortController.abort();
           reject(new Error(`Sub-agent execution timed out after ${timeoutMs}ms.`));
@@ -441,6 +439,10 @@ ${context}` : `Task: ${task}`;
       } finally {
         if (timeoutId) clearTimeout(timeoutId);
       }
+      const tokenUsage = (0, import_TokenTracker.extractTokenUsage)(finalState);
+      if (tokenUsage) {
+        await this.tokenTracker.trackSpan(executionSpanId, tokenUsage, agentLoopRunId);
+      }
       const messages = (finalState == null ? void 0 : finalState.messages) || [];
       const lastAIMessage = [...messages].reverse().find((m) => m.getType() === "ai");
       let content = "";
@@ -449,10 +451,10 @@ ${context}` : `Task: ${task}`;
       }
       trace.push({
         type: "finish",
-        at: nowIso(),
+        at: (0, import_ctx_utils.nowIso)(),
         title: `Delegation finished: ${subAgentUsername}`,
         status: "success",
-        content: trimText(content, 2e3)
+        content: (0, import_ctx_utils.trimText)(content, 2e3)
       });
       await this.logDelegation(ctx, {
         id: logRecord == null ? void 0 : logRecord.id,
@@ -484,7 +486,7 @@ ${context}` : `Task: ${task}`;
     } catch (e) {
       trace.push({
         type: "error",
-        at: nowIso(),
+        at: (0, import_ctx_utils.nowIso)(),
         title: `Delegation failed: ${subAgentUsername}`,
         status: "error",
         content: e.message
@@ -504,7 +506,7 @@ ${context}` : `Task: ${task}`;
         trace
       });
       await this.spanService.finish(executionSpanId, "error", startTime, {
-        error: trimText(e.message, 1e4),
+        error: (0, import_ctx_utils.trimText)(e.message, 1e4),
         metadata: {
           depth: currentDepth,
           toolName,
@@ -520,43 +522,7 @@ ${context}` : `Task: ${task}`;
     }
   }
   async logDelegation(ctx, data) {
-    var _a, _b, _c, _d;
-    try {
-      const logsRepo = this.db.getRepository("orchestratorLogs");
-      if (!logsRepo) return null;
-      const userId = ((_b = (_a = ctx == null ? void 0 : ctx.auth) == null ? void 0 : _a.user) == null ? void 0 : _b.id) || ((_d = (_c = ctx == null ? void 0 : ctx.state) == null ? void 0 : _c.currentUser) == null ? void 0 : _d.id);
-      const values = {
-        leaderUsername: data.leaderUsername,
-        subAgentUsername: data.subAgentUsername,
-        toolName: data.toolName,
-        task: trimText(data.task, 1e4),
-        context: trimText(data.context || "", 1e4),
-        result: trimText(data.result || "", 5e4),
-        status: data.status,
-        depth: data.depth,
-        durationMs: data.durationMs,
-        error: trimText(data.error || "", 1e4),
-        trace: data.trace || [],
-        userId,
-        updatedAt: /* @__PURE__ */ new Date()
-      };
-      if (data.id) {
-        await logsRepo.update({
-          filterByTk: data.id,
-          values
-        });
-        return { id: data.id };
-      }
-      const record = await logsRepo.create({
-        values: {
-          ...values,
-          createdAt: /* @__PURE__ */ new Date()
-        }
-      });
-      return toPlain(record);
-    } catch {
-      return null;
-    }
+    return (0, import_logging.logDelegation)(ctx, this.plugin, data);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -4,13 +4,15 @@ import { AgentPlanValidator } from './AgentPlanValidator';
 import { AgentLoopRepository } from './AgentLoopRepository';
 import { AgentHarness } from './AgentHarness';
 import { AgentLoopPolicy, AgentLoopPlanStepInput, AgentLoopRunStatus } from './AgentLoopService';
+import { TokenTracker } from './TokenTracker';
 export declare class AgentLoopController {
     private readonly registryService;
     private readonly plannerService;
     private readonly validator;
     private readonly repository;
     private readonly harness;
-    constructor(registryService: AgentRegistryService, plannerService: AgentPlannerService, validator: AgentPlanValidator, repository: AgentLoopRepository, harness: AgentHarness);
+    private readonly tokenTracker;
+    constructor(registryService: AgentRegistryService, plannerService: AgentPlannerService, validator: AgentPlanValidator, repository: AgentLoopRepository, harness: AgentHarness, tokenTracker?: TokenTracker | null);
     createRun(options: {
         goal: string;
         leaderUsername?: string;
@@ -23,7 +25,7 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     planGoal(options: {
         goal: string;
@@ -45,7 +47,7 @@ export declare class AgentLoopController {
         skillExecutions: any;
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     revisePlanGoal(runId: string | number, plan: AgentLoopPlanStepInput[], options?: {
         goal?: string;
@@ -62,7 +64,7 @@ export declare class AgentLoopController {
         skillExecutions: any;
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     approvePlanAndExecute(runId: string | number, options?: {
         userId?: string | number;
@@ -71,7 +73,7 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     rejectPlan(runId: string | number, options?: {
         userId?: string | number;
@@ -79,7 +81,7 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     requestPlanChanges(runId: string | number, options?: {
         userId?: string | number;
@@ -90,7 +92,7 @@ export declare class AgentLoopController {
         skillExecutions: any;
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     replacePlan(runId: string | number, plan: AgentLoopPlanStepInput[], options?: {
         userId?: string | number;
@@ -109,7 +111,7 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     completeStep(stepId: string | number, output: any, options?: {
         userId?: string | number;
@@ -119,7 +121,7 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     failStep(stepId: string | number, error: string, options?: {
         userId?: string | number;
@@ -127,14 +129,14 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     skipStep(stepId: string | number, reason?: string, options?: {
         userId?: string | number;
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     requestApproval(stepId: string | number, approval: any, options?: {
         userId?: string | number;
@@ -142,7 +144,7 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     resumeRun(runId: string | number, options: {
         stepId?: string | number;
@@ -153,14 +155,14 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     retryStep(stepId: string | number, options?: {
         userId?: string | number;
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     finishRun(runId: string | number, finalAnswer: string, options?: {
         status?: Extract<AgentLoopRunStatus, 'succeeded' | 'failed'>;
@@ -170,7 +172,18 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
+    }>;
+    stepFeedback(stepId: string | number, feedback: {
+        rating: 'positive' | 'negative';
+        comment?: string;
+        category?: string;
+    }, options?: {
+        userId?: string | number;
+    }): Promise<{
+        run: any;
+        steps: any;
+        nextSteps: any[];
     }>;
     cancelRun(runId: string | number, options?: {
         userId?: string | number;
@@ -178,7 +191,7 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     executeApprovedPlan(runId: string | number, options?: {
         userId?: string | number;
@@ -186,12 +199,12 @@ export declare class AgentLoopController {
     }): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     getRunSnapshot(runId: string | number): Promise<{
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
     getRunDetail(runId: string | number): Promise<{
         events: any;
@@ -199,7 +212,7 @@ export declare class AgentLoopController {
         skillExecutions: any;
         run: any;
         steps: any;
-        nextStep: any;
+        nextSteps: any[];
     }>;
-    pickNextStep(steps: any[], runPolicy?: any): any;
+    pickNextSteps(steps: any[], runPolicy?: any): any[];
 }