plugin-agent-orchestrator 1.0.20 → 1.0.22

package/src/server/tools/agent-loop.ts

@@ -1,6 +1,14 @@
 import { z } from 'zod';
 import { AgentLoopPlanStepInput, AgentLoopService } from '../services/AgentLoopService';
 import { getOrchestratorTraceContext, setOrchestratorTraceContext } from '../services/ExecutionSpanService';
+import {
+  currentUserId,
+  resolveSessionId,
+  resolveMessageId,
+  normalizeEmployeeUsername,
+  resolveLeaderUsername,
+  valuesFromCtx,
+} from '../utils/ctx-utils';
 
 const stepSchema = z.object({
   id: z.string().optional(),
@@ -34,52 +42,6 @@ function toolResult(status: 'success' | 'error', payload: any) {
   };
 }
 
-function valuesFromCtx(ctx: any) {
-  return ctx?.action?.params?.values || {};
-}
-
-function currentUserId(ctx: any) {
-  return ctx?.state?.currentUser?.id || ctx?.auth?.user?.id;
-}
-
-function resolveSessionId(ctx: any, args: any) {
-  const values = valuesFromCtx(ctx);
-  return args?.sessionId || values.sessionId || ctx?.action?.params?.sessionId || ctx?.state?.sessionId;
-}
-
-function resolveMessageId(ctx: any, args: any) {
-  const values = valuesFromCtx(ctx);
-  return args?.messageId || values.messageId || ctx?.action?.params?.messageId;
-}
-
-function normalizeEmployeeUsername(raw: any) {
-  if (!raw) return null;
-  if (typeof raw === 'string') return raw;
-  return raw.username || raw.aiEmployeeUsername || raw.name || null;
-}
-
-async function resolveLeaderUsername(ctx: any, plugin: any, args: any) {
-  const values = valuesFromCtx(ctx);
-  const direct = normalizeEmployeeUsername(
-    args?.leaderUsername ||
-      ctx?._currentAIEmployee ||
-      ctx?.state?.currentAIEmployee ||
-      ctx?.runtime?.context?.currentAIEmployee ||
-      values.aiEmployee,
-  );
-  if (direct) return direct;
-
-  const sessionId = resolveSessionId(ctx, args);
-  if (!sessionId) return undefined;
-  try {
-    const repo = ctx?.db?.getRepository?.('aiConversations') || plugin.db.getRepository('aiConversations');
-    const conversation = await repo.findOne({ filter: { sessionId } });
-    return normalizeEmployeeUsername(conversation?.aiEmployeeUsername || conversation?.get?.('aiEmployeeUsername'));
-  } catch {
-    return undefined;
-  }
-}
-
 function setLoopTraceContext(ctx: any, snapshot: any, step?: any) {
   if (!ctx || !snapshot?.run) return;
   const existing: any = getOrchestratorTraceContext(ctx) || {};
@@ -139,7 +101,7 @@ export function createAgentLoopTools(plugin: any, service: AgentLoopService) {
             metadata: args.metadata,
             plan: planFromArgs(args.plan),
           });
-          setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+          setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           return toolResult('success', snapshot);
         } catch (error: any) {
           return toolResult('error', error?.message || String(error));
@@ -152,12 +114,11 @@ export function createAgentLoopTools(plugin: any, service: AgentLoopService) {
       defaultPermission: 'ALLOW' as const,
       introduction: {
         title: 'Agent Loop - Status',
-        about: 'Read the current run, steps, and next executable step.',
+        about: 'Read the current run, steps, and next executable steps.',
       },
       definition: {
         name: 'agent_loop_status',
-        description:
-          'Fetch an agent loop run. Call this before executing the next step so subsequent skill/tool calls can be linked to the current loop step.',
+        description: 'Fetch an agent loop run. Call this to check which steps are ready for execution.',
         schema: z.object({
           runId: z.union([z.string(), z.number()]),
         }),
@@ -165,7 +126,7 @@ export function createAgentLoopTools(plugin: any, service: AgentLoopService) {
       invoke: async (ctx: any, args: any) => {
         try {
           const snapshot = await service.getRunSnapshot(args.runId);
-          setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+          setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           return toolResult('success', snapshot);
         } catch (error: any) {
           return toolResult('error', error?.message || String(error));
@@ -212,18 +173,18 @@ export function createAgentLoopTools(plugin: any, service: AgentLoopService) {
               agentExecutionSpanId: args.agentExecutionSpanId,
               metadata: args.metadata,
             });
-            setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+            setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           } else if (args.status === 'failed') {
             snapshot = await service.failStep(args.stepId, args.error || 'Step failed.', {
               userId: currentUserId(ctx),
               metadata: args.metadata,
             });
-            setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+            setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           } else {
             snapshot = await service.skipStep(args.stepId, args.reason || 'Skipped.', {
               userId: currentUserId(ctx),
             });
-            setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+            setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           }
           return toolResult('success', snapshot);
         } catch (error: any) {
@@ -258,7 +219,7 @@ export function createAgentLoopTools(plugin: any, service: AgentLoopService) {
             userId: currentUserId(ctx),
           });
           const snapshot = await service.getRunSnapshot(args.runId);
-          setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+          setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           return toolResult('success', snapshot);
         } catch (error: any) {
           return toolResult('error', error?.message || String(error));
@@ -289,7 +250,7 @@ export function createAgentLoopTools(plugin: any, service: AgentLoopService) {
             reason: args.reason,
             userId: currentUserId(ctx),
           });
-          setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+          setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           return toolResult('success', snapshot);
         } catch (error: any) {
           return toolResult('error', error?.message || String(error));
@@ -324,7 +285,7 @@ export function createAgentLoopTools(plugin: any, service: AgentLoopService) {
             userId: currentUserId(ctx),
             ctx,
           });
-          setLoopTraceContext(ctx, snapshot, snapshot.nextStep);
+          setLoopTraceContext(ctx, snapshot, snapshot.nextSteps?.[0]);
           return toolResult('success', snapshot);
         } catch (error: any) {
           return toolResult('error', error?.message || String(error));

package/src/server/tools/delegate-task.ts

@@ -12,6 +12,9 @@ import {
   getOrchestratorTraceContext,
   setOrchestratorTraceContext,
 } from '../services/ExecutionSpanService';
+import { captureCtxSnapshot, normalizeEmployeeUsername, trimText as truncateText, nowIso } from '../utils/ctx-utils';
+import { logDelegation as sharedLogDelegation } from '../utils/logging';
+import { CtxSnapshot, TraceEvent } from '../types';
 
 /**
  * Maximum delegation depth key stored in ctx metadata.
@@ -31,16 +34,6 @@ const MAX_DISPATCH_TASKS = 20;
 /** OpenAI/Anthropic tool-name limit. Names exceeding this are silently rejected by providers. */
 const MAX_TOOL_NAME_LENGTH = 64;
 
-type TraceEvent = {
-  type: string;
-  at: string;
-  title: string;
-  content?: string;
-  toolName?: string;
-  args?: any;
-  status?: string;
-};
-
 type AgentExecutionResult = {
   content: string;
   messages: any[];
@@ -437,31 +430,6 @@ function createDispatchToolOptions(
   };
 }
 
-type CtxSnapshot = {
-  userId?: number;
-};
-
-/**
- * Read the few ctx fields we depend on once, before kicking off the long-running
- * sub-agent. Avoids "ctx is destroyed" or stale-state issues when we later
- * write the orchestratorLogs row from inside the agent's execution promise.
- */
-function captureCtxSnapshot(ctx: Context): CtxSnapshot {
-  let userId: number | undefined;
-  try {
-    userId = (ctx as any).auth?.user?.id || (ctx as any).state?.currentUser?.id;
-  } catch {
-    // ctx already disposed — nothing to capture.
-  }
-  return { userId };
-}
-
-function normalizeEmployeeUsername(raw: any) {
-  if (!raw) return null;
-  if (typeof raw === 'string') return raw;
-  return raw.username || raw.aiEmployeeUsername || raw.name || null;
-}
-
 async function resolveCallingEmployee(ctx: Context, plugin: any) {
   const values = (ctx as any).action?.params?.values || {};
   const raw =
@@ -488,15 +456,6 @@ async function resolveCallingEmployee(ctx: Context, plugin: any) {
   }
 }
 
-function truncateText(value: any, maxLen: number) {
-  const text = typeof value === 'string' ? value : value == null ? '' : JSON.stringify(value);
-  return text.length > maxLen ? `${text.slice(0, maxLen)}\n...[truncated]` : text;
-}
-
-function nowIso() {
-  return new Date().toISOString();
-}
-
 function hasModelSettings(value: any): value is { llmService: string; model: string } {
   return Boolean(value?.llmService && value?.model);
 }
@@ -889,55 +848,14 @@ async function logDelegation(
     snapshot?: CtxSnapshot;
   },
 ) {
-  try {
-    const logsRepo = plugin.db.getRepository('orchestratorLogs');
-    if (!logsRepo) {
-      plugin.app.log.warn('[AgentOrchestrator] orchestratorLogs repository not found — skipping log');
-      return;
-    }
-
-    let userId: number | undefined = data.snapshot?.userId;
-    if (userId == null) {
-      try {
-        userId = ctx.auth?.user?.id || ctx.state?.currentUser?.id;
-      } catch {
-        // ctx lifecycle ended
-      }
-    }
-
-    const values = {
-      leaderUsername: data.leaderUsername,
-      subAgentUsername: data.subAgentUsername,
-      toolName: data.toolName,
-      task: truncateText(data.task, 10000),
-      context: truncateText(data.context || '', 10000),
-      result: truncateText(data.result || '', 50000),
-      status: data.status,
-      depth: data.depth,
-      durationMs: data.durationMs,
-      error: truncateText(data.error || '', 10000),
-      trace: data.trace || [],
-      messages: data.messages || [],
-      userId,
-      updatedAt: new Date(),
-    };
-
-    if (data.id) {
-      await logsRepo.update({
-        filterByTk: data.id,
-        values,
-      });
-      return { id: data.id };
+  // Capture userId from snapshot or ctx
+  let userId: number | string | undefined = data.snapshot?.userId;
+  if (userId == null) {
+    try {
+      userId = (ctx as any).auth?.user?.id || (ctx as any).state?.currentUser?.id;
+    } catch {
+      // ctx lifecycle ended
     }
-
-    const record = await logsRepo.create({
-      values: {
-        ...values,
-        createdAt: new Date(),
-      },
-    });
-    return record?.toJSON?.() || record;
-  } catch (e) {
-    plugin.app.log.warn('[AgentOrchestrator] Failed to log delegation event', e);
   }
+  return sharedLogDelegation(ctx, plugin, { ...data, userId });
 }

package/src/server/tools/orchestrator-plan.ts

@@ -1,5 +1,13 @@
 import { z } from 'zod';
 import { AgentLoopPlanStepInput, AgentLoopService } from '../services/AgentLoopService';
+import {
+  currentUserId,
+  resolveSessionId,
+  resolveMessageId,
+  normalizeEmployeeUsername,
+  resolveLeaderUsername,
+  valuesFromCtx,
+} from '../utils/ctx-utils';
 
 const stepSchema = z.object({
   id: z.string().optional(),
@@ -34,52 +42,6 @@ function toolResult(status: 'success' | 'error', payload: any) {
   };
 }
 
-function valuesFromCtx(ctx: any) {
-  return ctx?.action?.params?.values || ctx?.request?.body || {};
-}
-
-function currentUserId(ctx: any) {
-  return ctx?.state?.currentUser?.id || ctx?.auth?.user?.id;
-}
-
-function resolveSessionId(ctx: any, args: any) {
-  const values = valuesFromCtx(ctx);
-  return args?.sessionId || values.sessionId || ctx?.action?.params?.sessionId || ctx?.state?.sessionId;
-}
-
-function resolveMessageId(ctx: any, args: any) {
-  const values = valuesFromCtx(ctx);
-  return args?.messageId || values.messageId || ctx?.action?.params?.messageId;
-}
-
-function normalizeEmployeeUsername(raw: any) {
-  if (!raw) return null;
-  if (typeof raw === 'string') return raw;
-  return raw.username || raw.aiEmployeeUsername || raw.name || null;
-}
-
-async function resolveLeaderUsername(ctx: any, plugin: any, args: any) {
-  const values = valuesFromCtx(ctx);
-  const direct = normalizeEmployeeUsername(
-    args?.leaderUsername ||
-      ctx?._currentAIEmployee ||
-      ctx?.state?.currentAIEmployee ||
-      ctx?.runtime?.context?.currentAIEmployee ||
-      values.aiEmployee,
-  );
-  if (direct) return direct;
-
-  const sessionId = resolveSessionId(ctx, args);
-  if (!sessionId) return undefined;
-  try {
-    const repo = ctx?.db?.getRepository?.('aiConversations') || plugin.db.getRepository('aiConversations');
-    const conversation = await repo.findOne({ filter: { sessionId } });
-    return normalizeEmployeeUsername(conversation?.aiEmployeeUsername || conversation?.get?.('aiEmployeeUsername'));
-  } catch {
-    return undefined;
-  }
-}
-
 function summarizePlan(steps: any[]) {
   return (steps || []).map((step) => ({
     id: step.id,
@@ -100,7 +62,12 @@ function inferTargetAgent(args: any) {
   return subAgentStep?.target;
 }
 
-async function resolveHarnessTag(plugin: any, leaderUsername: string | undefined, targetAgent: string | undefined, args: any) {
+async function resolveHarnessTag(
+  plugin: any,
+  leaderUsername: string | undefined,
+  targetAgent: string | undefined,
+  args: any,
+) {
   const direct = String(args?.harnessTag || args?.metadata?.harnessTag || '').trim();
   if (direct) return direct;
   if (!leaderUsername || !targetAgent) return 'default';
@@ -139,10 +106,17 @@ export function createOrchestratorPlanTools(plugin: any, service: AgentLoopServi
             .union([z.string(), z.number()])
             .optional()
             .describe('Existing run id to revise after the user requested plan changes. Omit for a new run.'),
-          leaderUsername: z.string().optional().describe('Leader AI employee username. Usually omit; inferred from chat.'),
+          leaderUsername: z
+            .string()
+            .optional()
+            .describe('Leader AI employee username. Usually omit; inferred from chat.'),
           sessionId: z.string().optional(),
           messageId: z.string().optional(),
-          harnessTag: z.string().optional().default('default').describe('Harness profile tag, for example default, safe, or file-heavy.'),
+          harnessTag: z
+            .string()
+            .optional()
+            .default('default')
+            .describe('Harness profile tag, for example default, safe, or file-heavy.'),
           targetAgent: z.string().optional().describe('Optional sub-agent username for generated fallback plans.'),
           plannerModel: z.string().optional(),
           policy: policySchema,
@@ -150,7 +124,9 @@ export function createOrchestratorPlanTools(plugin: any, service: AgentLoopServi
           plan: z
             .array(stepSchema)
             .optional()
-            .describe('Draft plan steps. Tool/sub_agent steps should include target. Dependencies must reference planKey values.'),
+            .describe(
+              'Draft plan steps. Tool/sub_agent steps should include target. Dependencies must reference planKey values.',
+            ),
         }),
       },
       invoke: async (ctx: any, args: any) => {