opencode-swarm 5.0.3 → 5.0.5

package/dist/config/schema.d.ts

@@ -45,7 +45,15 @@ export declare const GuardrailsProfileSchema: z.ZodObject<{
     warning_threshold: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
 export type GuardrailsProfile = z.infer<typeof GuardrailsProfileSchema>;
-export declare const DEFAULT_ARCHITECT_PROFILE: GuardrailsProfile;
+export declare const DEFAULT_AGENT_PROFILES: Record<string, GuardrailsProfile>;
+/** @deprecated Use DEFAULT_AGENT_PROFILES.architect instead */
+export declare const DEFAULT_ARCHITECT_PROFILE: {
+    max_tool_calls?: number | undefined;
+    max_duration_minutes?: number | undefined;
+    max_repetitions?: number | undefined;
+    max_consecutive_errors?: number | undefined;
+    warning_threshold?: number | undefined;
+};
 export declare const GuardrailsConfigSchema: z.ZodObject<{
     enabled: z.ZodDefault<z.ZodBoolean>;
     max_tool_calls: z.ZodDefault<z.ZodNumber>;
@@ -76,7 +84,7 @@ export type GuardrailsConfig = z.infer<typeof GuardrailsConfigSchema>;
 export declare function stripKnownSwarmPrefix(name: string): string;
 /**
  * Resolve guardrails configuration for a specific agent.
- * Merges the base config with built-in defaults (for the architect) and
+ * Merges the base config with built-in agent-type defaults and
  * any per-agent profile overrides. Merge order: base < built-in < user profile.
  *
  * @param base - The base guardrails configuration

package/dist/index.js

@@ -13623,19 +13623,52 @@ var GuardrailsProfileSchema = exports_external.object({
   max_consecutive_errors: exports_external.number().min(2).max(20).optional(),
   warning_threshold: exports_external.number().min(0.1).max(0.9).optional()
 });
-var DEFAULT_ARCHITECT_PROFILE = {
-  max_tool_calls: 600,
-  max_duration_minutes: 90,
-  max_consecutive_errors: 8,
-  warning_threshold: 0.7
+var DEFAULT_AGENT_PROFILES = {
+  architect: {
+    max_tool_calls: 800,
+    max_duration_minutes: 90,
+    max_consecutive_errors: 8,
+    warning_threshold: 0.75
+  },
+  coder: {
+    max_tool_calls: 400,
+    max_duration_minutes: 45,
+    warning_threshold: 0.85
+  },
+  test_engineer: {
+    max_tool_calls: 400,
+    max_duration_minutes: 45,
+    warning_threshold: 0.85
+  },
+  explorer: {
+    max_tool_calls: 150,
+    max_duration_minutes: 20,
+    warning_threshold: 0.75
+  },
+  reviewer: {
+    max_tool_calls: 200,
+    max_duration_minutes: 30,
+    warning_threshold: 0.65
+  },
+  critic: {
+    max_tool_calls: 200,
+    max_duration_minutes: 30,
+    warning_threshold: 0.65
+  },
+  sme: {
+    max_tool_calls: 200,
+    max_duration_minutes: 30,
+    warning_threshold: 0.65
+  }
 };
+var DEFAULT_ARCHITECT_PROFILE = DEFAULT_AGENT_PROFILES.architect;
 var GuardrailsConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(true),
   max_tool_calls: exports_external.number().min(10).max(1000).default(200),
   max_duration_minutes: exports_external.number().min(1).max(120).default(30),
   max_repetitions: exports_external.number().min(3).max(50).default(10),
   max_consecutive_errors: exports_external.number().min(2).max(20).default(5),
-  warning_threshold: exports_external.number().min(0.1).max(0.9).default(0.5),
+  warning_threshold: exports_external.number().min(0.1).max(0.9).default(0.75),
   profiles: exports_external.record(exports_external.string(), GuardrailsProfileSchema).optional()
 });
 function stripKnownSwarmPrefix(name) {
@@ -13656,7 +13689,7 @@ function resolveGuardrailsConfig(base, agentName) {
     return base;
   }
   const baseName = stripKnownSwarmPrefix(agentName);
-  const builtIn = baseName === ORCHESTRATOR_NAME ? DEFAULT_ARCHITECT_PROFILE : undefined;
+  const builtIn = DEFAULT_AGENT_PROFILES[baseName];
   const userProfile = base.profiles?.[baseName] ?? base.profiles?.[agentName];
   if (!builtIn && !userProfile) {
     return base;
@@ -15955,11 +15988,11 @@ var swarmState = {
   pendingEvents: 0,
   agentSessions: new Map
 };
-function startAgentSession(sessionId, agentName, staleDurationMs = 3600000) {
+function startAgentSession(sessionId, agentName, staleDurationMs = 7200000) {
   const now = Date.now();
   const staleIds = [];
   for (const [id, session] of swarmState.agentSessions) {
-    if (now - session.startTime > staleDurationMs) {
+    if (now - session.lastToolCallTime > staleDurationMs) {
       staleIds.push(id);
     }
   }
@@ -15969,10 +16002,12 @@ function startAgentSession(sessionId, agentName, staleDurationMs = 3600000) {
   const sessionState = {
     agentName,
     startTime: now,
+    lastToolCallTime: now,
     toolCallCount: 0,
     consecutiveErrors: 0,
     recentToolCalls: [],
     warningIssued: false,
+    warningReason: "",
     hardLimitHit: false
   };
   swarmState.agentSessions.set(sessionId, sessionState);
@@ -15980,6 +16015,24 @@ function startAgentSession(sessionId, agentName, staleDurationMs = 3600000) {
 function getAgentSession(sessionId) {
   return swarmState.agentSessions.get(sessionId);
 }
+function ensureAgentSession(sessionId, agentName) {
+  const now = Date.now();
+  let session = swarmState.agentSessions.get(sessionId);
+  if (session) {
+    if (agentName && session.agentName === "unknown") {
+      session.agentName = agentName;
+      session.startTime = now;
+    }
+    session.lastToolCallTime = now;
+    return session;
+  }
+  startAgentSession(sessionId, agentName ?? "unknown");
+  session = swarmState.agentSessions.get(sessionId);
+  if (!session) {
+    throw new Error(`Failed to create guardrail session for ${sessionId}`);
+  }
+  return session;
+}
 
 // src/hooks/agent-activity.ts
 function createAgentActivityHooks(config2, directory) {
@@ -16208,6 +16261,7 @@ function createDelegationTrackerHook(config2) {
     }
     const previousAgent = swarmState.activeAgent.get(input.sessionID);
     swarmState.activeAgent.set(input.sessionID, input.agent);
+    ensureAgentSession(input.sessionID, input.agent);
     if (config2.hooks?.delegation_tracker === true && previousAgent && previousAgent !== input.agent) {
       const entry = {
         from: previousAgent,
@@ -16234,22 +16288,8 @@ function createGuardrailsHooks(config2) {
   }
   return {
     toolBefore: async (input, output) => {
-      let session = getAgentSession(input.sessionID);
-      if (!session) {
-        const agentName = swarmState.activeAgent.get(input.sessionID) ?? "unknown";
-        startAgentSession(input.sessionID, agentName);
-        session = getAgentSession(input.sessionID);
-        if (!session) {
-          warn(`Failed to create session for ${input.sessionID}`);
-          return;
-        }
-      } else if (session.agentName === "unknown") {
-        const activeAgentName = swarmState.activeAgent.get(input.sessionID);
-        if (activeAgentName) {
-          session.agentName = activeAgentName;
-          session.startTime = Date.now();
-        }
-      }
+      const agentName = swarmState.activeAgent.get(input.sessionID);
+      const session = ensureAgentSession(input.sessionID, agentName);
       const agentConfig = resolveGuardrailsConfig(config2, session.agentName);
       if (session.hardLimitHit) {
         throw new Error("\uD83D\uDED1 CIRCUIT BREAKER: Agent blocked. Hard limit was previously triggered. Stop making tool calls and return your progress summary.");
@@ -16279,27 +16319,53 @@ function createGuardrailsHooks(config2) {
       const elapsedMinutes = (Date.now() - session.startTime) / 60000;
       if (session.toolCallCount >= agentConfig.max_tool_calls) {
         session.hardLimitHit = true;
-        throw new Error(`\uD83D\uDED1 CIRCUIT BREAKER: Tool call limit reached (${session.toolCallCount}/${agentConfig.max_tool_calls}). Stop making tool calls and return your progress summary.`);
+        warn("Circuit breaker: tool call limit hit", {
+          sessionID: input.sessionID,
+          agentName: session.agentName,
+          resolvedMaxCalls: agentConfig.max_tool_calls,
+          currentCalls: session.toolCallCount
+        });
+        throw new Error(`\uD83D\uDED1 LIMIT REACHED: Tool calls exhausted (${session.toolCallCount}/${agentConfig.max_tool_calls}). Finish the current operation and return your progress summary.`);
       }
       if (elapsedMinutes >= agentConfig.max_duration_minutes) {
         session.hardLimitHit = true;
-        throw new Error(`\uD83D\uDED1 CIRCUIT BREAKER: Duration limit reached (${Math.floor(elapsedMinutes)} min). Stop making tool calls and return your progress summary.`);
+        warn("Circuit breaker: duration limit hit", {
+          sessionID: input.sessionID,
+          agentName: session.agentName,
+          resolvedMaxMinutes: agentConfig.max_duration_minutes,
+          elapsedMinutes: Math.floor(elapsedMinutes)
+        });
+        throw new Error(`\uD83D\uDED1 LIMIT REACHED: Duration exhausted (${Math.floor(elapsedMinutes)}/${agentConfig.max_duration_minutes} min). Finish the current operation and return your progress summary.`);
       }
       if (repetitionCount >= agentConfig.max_repetitions) {
         session.hardLimitHit = true;
-        throw new Error(`\uD83D\uDED1 CIRCUIT BREAKER: Repetition detected (same call ${repetitionCount} times). Stop making tool calls and return your progress summary.`);
+        throw new Error(`\uD83D\uDED1 LIMIT REACHED: Repeated the same tool call ${repetitionCount} times. This suggests a loop. Return your progress summary.`);
       }
       if (session.consecutiveErrors >= agentConfig.max_consecutive_errors) {
         session.hardLimitHit = true;
-        throw new Error(`\uD83D\uDED1 CIRCUIT BREAKER: Too many consecutive errors (${session.consecutiveErrors}). Stop making tool calls and return your progress summary.`);
+        throw new Error(`\uD83D\uDED1 LIMIT REACHED: ${session.consecutiveErrors} consecutive tool errors detected. Return your progress summary with details of what went wrong.`);
       }
       if (!session.warningIssued) {
-        const toolWarning = session.toolCallCount >= agentConfig.max_tool_calls * agentConfig.warning_threshold;
-        const durationWarning = elapsedMinutes >= agentConfig.max_duration_minutes * agentConfig.warning_threshold;
-        const repetitionWarning = repetitionCount >= agentConfig.max_repetitions * agentConfig.warning_threshold;
-        const errorWarning = session.consecutiveErrors >= agentConfig.max_consecutive_errors * agentConfig.warning_threshold;
-        if (toolWarning || durationWarning || repetitionWarning || errorWarning) {
+        const toolPct = session.toolCallCount / agentConfig.max_tool_calls;
+        const durationPct = elapsedMinutes / agentConfig.max_duration_minutes;
+        const repPct = repetitionCount / agentConfig.max_repetitions;
+        const errorPct = session.consecutiveErrors / agentConfig.max_consecutive_errors;
+        const reasons = [];
+        if (toolPct >= agentConfig.warning_threshold) {
+          reasons.push(`tool calls ${session.toolCallCount}/${agentConfig.max_tool_calls}`);
+        }
+        if (durationPct >= agentConfig.warning_threshold) {
+          reasons.push(`duration ${Math.floor(elapsedMinutes)}/${agentConfig.max_duration_minutes} min`);
+        }
+        if (repPct >= agentConfig.warning_threshold) {
+          reasons.push(`repetitions ${repetitionCount}/${agentConfig.max_repetitions}`);
+        }
+        if (errorPct >= agentConfig.warning_threshold) {
+          reasons.push(`errors ${session.consecutiveErrors}/${agentConfig.max_consecutive_errors}`);
+        }
+        if (reasons.length > 0) {
           session.warningIssued = true;
+          session.warningReason = reasons.join(", ");
         }
       }
     },
@@ -16342,11 +16408,12 @@ function createGuardrailsHooks(config2) {
         return;
       }
       if (session.hardLimitHit) {
-        textPart.text = `[\uD83D\uDED1 CIRCUIT BREAKER ACTIVE: You have exceeded your resource limits. Do NOT make any more tool calls. Immediately return a summary of your progress so far. Any further tool calls will be blocked.]
+        textPart.text = `[\uD83D\uDED1 LIMIT REACHED: Your resource budget is exhausted. Do not make additional tool calls. Return a summary of your progress and any remaining work.]
 
 ` + textPart.text;
       } else if (session.warningIssued) {
-        textPart.text = `[\u26A0\uFE0F GUARDRAIL WARNING: You are approaching resource limits. Please wrap up your current task efficiently. Avoid unnecessary tool calls and prepare to return your results soon.]
+        const reasonSuffix = session.warningReason ? ` (${session.warningReason})` : "";
+        textPart.text = `[\u26A0\uFE0F APPROACHING LIMITS${reasonSuffix}: You still have capacity to finish your current step. Complete what you're working on, then return your results.]
 
 ` + textPart.text;
       }

package/dist/state.d.ts

@@ -41,6 +41,8 @@ export interface AgentSessionState {
     agentName: string;
     /** Date.now() when session started */
     startTime: number;
+    /** Timestamp of most recent tool call (for stale session eviction) */
+    lastToolCallTime: number;
     /** Total tool calls in this session */
     toolCallCount: number;
     /** Consecutive errors (reset on success) */
@@ -53,6 +55,8 @@ export interface AgentSessionState {
     }>;
     /** Whether a soft warning has been issued */
     warningIssued: boolean;
+    /** Human-readable warning reason (set when warningIssued = true) */
+    warningReason: string;
     /** Whether a hard limit has been triggered */
     hardLimitHit: boolean;
 }
@@ -82,7 +86,7 @@ export declare function resetSwarmState(): void;
  * Also removes any stale sessions older than staleDurationMs.
  * @param sessionId - The session identifier
  * @param agentName - The agent associated with this session
- * @param staleDurationMs - Age threshold for stale session eviction (default: 60 min)
+ * @param staleDurationMs - Age threshold for stale session eviction (default: 120 min)
  */
 export declare function startAgentSession(sessionId: string, agentName: string, staleDurationMs?: number): void;
 /**
@@ -96,3 +100,13 @@ export declare function endAgentSession(sessionId: string): void;
  * @returns The AgentSessionState or undefined if not found
  */
 export declare function getAgentSession(sessionId: string): AgentSessionState | undefined;
+/**
+ * Ensure a guardrail session exists for the given sessionID.
+ * If one exists and agentName is provided and different, update it.
+ * If none exists, create one.
+ * Always updates lastToolCallTime.
+ * @param sessionId - The session identifier
+ * @param agentName - Optional agent name (if known)
+ * @returns The AgentSessionState
+ */
+export declare function ensureAgentSession(sessionId: string, agentName?: string): AgentSessionState;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencode-swarm",
-	"version": "5.0.3",
+	"version": "5.0.5",
 	"description": "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",