opencode-swarm 5.0.2 → 5.0.4

package/dist/config/schema.d.ts

@@ -62,6 +62,18 @@ export declare const GuardrailsConfigSchema: z.ZodObject<{
     }, z.core.$strip>>>;
 }, z.core.$strip>;
 export type GuardrailsConfig = z.infer<typeof GuardrailsConfigSchema>;
+/**
+ * Strip any swarm prefix from an agent name to get the base agent name.
+ * Works with any swarm name by checking if the name (or suffix after removing
+ * a prefix) matches a known agent name from ALL_AGENT_NAMES.
+ *
+ * Examples: 'local_architect' → 'architect', 'enterprise_coder' → 'coder',
+ *           'architect' → 'architect', 'unknown_thing' → 'unknown_thing'
+ *
+ * @param name - The agent name (possibly prefixed)
+ * @returns The base agent name if recognized, or the original name
+ */
+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

package/dist/index.js

@@ -13638,12 +13638,26 @@ var GuardrailsConfigSchema = exports_external.object({
   warning_threshold: exports_external.number().min(0.1).max(0.9).default(0.5),
   profiles: exports_external.record(exports_external.string(), GuardrailsProfileSchema).optional()
 });
+function stripKnownSwarmPrefix(name) {
+  if (!name)
+    return name;
+  if (ALL_AGENT_NAMES.includes(name))
+    return name;
+  for (const agentName of ALL_AGENT_NAMES) {
+    const suffix = `_${agentName}`;
+    if (name.endsWith(suffix)) {
+      return agentName;
+    }
+  }
+  return name;
+}
 function resolveGuardrailsConfig(base, agentName) {
   if (!agentName) {
     return base;
   }
-  const builtIn = agentName === ORCHESTRATOR_NAME ? DEFAULT_ARCHITECT_PROFILE : undefined;
-  const userProfile = base.profiles?.[agentName];
+  const baseName = stripKnownSwarmPrefix(agentName);
+  const builtIn = baseName === ORCHESTRATOR_NAME ? DEFAULT_ARCHITECT_PROFILE : undefined;
+  const userProfile = base.profiles?.[baseName] ?? base.profiles?.[agentName];
   if (!builtIn && !userProfile) {
     return base;
   }
@@ -15941,11 +15955,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);
     }
   }
@@ -15955,6 +15969,7 @@ function startAgentSession(sessionId, agentName, staleDurationMs = 3600000) {
   const sessionState = {
     agentName,
     startTime: now,
+    lastToolCallTime: now,
     toolCallCount: 0,
     consecutiveErrors: 0,
     recentToolCalls: [],
@@ -15966,6 +15981,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) {
@@ -16194,6 +16227,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,
@@ -16220,15 +16254,8 @@ function createGuardrailsHooks(config2) {
   }
   return {
     toolBefore: async (input, output) => {
-      let session = getAgentSession(input.sessionID);
-      if (!session) {
-        startAgentSession(input.sessionID, "unknown");
-        session = getAgentSession(input.sessionID);
-        if (!session) {
-          warn(`Failed to create session for ${input.sessionID}`);
-          return;
-        }
-      }
+      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.");
@@ -16258,10 +16285,22 @@ function createGuardrailsHooks(config2) {
       const elapsedMinutes = (Date.now() - session.startTime) / 60000;
       if (session.toolCallCount >= agentConfig.max_tool_calls) {
         session.hardLimitHit = true;
+        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 CIRCUIT BREAKER: Tool call limit reached (${session.toolCallCount}/${agentConfig.max_tool_calls}). Stop making tool calls and return your progress summary.`);
       }
       if (elapsedMinutes >= agentConfig.max_duration_minutes) {
         session.hardLimitHit = true;
+        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 CIRCUIT BREAKER: Duration limit reached (${Math.floor(elapsedMinutes)} min). Stop making tool calls and return your progress summary.`);
       }
       if (repetitionCount >= agentConfig.max_repetitions) {
@@ -16467,7 +16506,7 @@ function extractAgentContext(contextContent, activeAgent, maxChars) {
   const activitySection = activityMatch[1].trim();
   if (!activitySection || activitySection === "No tool activity recorded yet.")
     return null;
-  const agentName = activeAgent.replace(/^(?:paid|local|mega|default)_/, "");
+  const agentName = stripKnownSwarmPrefix(activeAgent);
   let contextSummary;
   switch (agentName) {
     case "coder":

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) */
@@ -82,7 +84,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 +98,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.2",
+	"version": "5.0.4",
 	"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",