@desplega.ai/agent-swarm 1.85.0 → 1.87.0

package/src/providers/claude-adapter.ts

@@ -318,6 +318,30 @@ export function buildClaudeCodeOtelEnv(
   return otelEnv;
 }
 
+/**
+ * Resolve the path at which the per-task system prompt is staged on disk.
+ *
+ * Pushing the prompt as `--append-system-prompt <value>` makes the entire
+ * prompt one argv element. Linux's per-arg limit is `MAX_ARG_STRLEN = 131072`
+ * bytes — and the system prompt (CLAUDE.md + TOOLS.md + identity files +
+ * repo CLAUDE.md) routinely runs 50–80 KB. A few growth nudges push us
+ * across the cliff and `posix_spawn` returns E2BIG, killing the worker
+ * (Picateclas attempts 4-6, 2026-05-28).
+ *
+ * `claude --append-system-prompt-file <path>` reads the prompt from disk,
+ * so the argv stays bounded by the filename length and the system prompt
+ * size is decoupled from the kernel's argv ceiling.
+ *
+ * Exported for unit testing.
+ */
+export function getSystemPromptFilePath(taskId: string): string {
+  // The taskId is a UUID; safe to embed in a /tmp filename. Mirrors the
+  // existing /tmp/agent-swarm-task-${pid}.json + /tmp/mcp-${taskId}.json
+  // convention so a janitor sweeping /tmp can find all session-scoped state
+  // under the same prefix.
+  return `/tmp/agent-swarm-system-prompt-${taskId}.txt`;
+}
+
 class ClaudeSession implements ProviderSession {
   private proc: ReturnType<typeof Bun.spawn>;
   private listeners: Array<(event: ProviderEvent) => void> = [];
@@ -327,6 +351,8 @@ class ClaudeSession implements ProviderSession {
   private errorTracker = new SessionErrorTracker();
   private taskFilePid: number;
   private contextWindowSize: number;
+  /** Path to the system-prompt temp file when one was staged for this session. */
+  private systemPromptFile: string | null;
 
   constructor(
     private config: ProviderSessionConfig,
@@ -335,9 +361,11 @@ class ClaudeSession implements ProviderSession {
     taskFilePid: number,
     private sessionMcpConfig: string | null = null,
     private claudeBinaryArgv: readonly string[] = ["claude"],
+    systemPromptFile: string | null = null,
   ) {
     this.taskFilePid = taskFilePid;
     this.contextWindowSize = getContextWindowSize(model);
+    this.systemPromptFile = systemPromptFile;
     const cmd = this.buildCommand();
 
     console.log(
@@ -395,15 +423,17 @@ class ClaudeSession implements ProviderSession {
       this.config.prompt,
     ];
 
-    if (this.config.resumeSessionId) {
-      cmd.push("--resume", this.config.resumeSessionId);
-    }
-
     if (this.config.additionalArgs?.length) {
       cmd.push(...this.config.additionalArgs);
     }
 
-    if (this.config.systemPrompt) {
+    // System prompt is staged on disk and read via the file-flag — see
+    // `getSystemPromptFilePath` for the rationale (argv E2BIG hardening,
+    // Picateclas spawn-OOM, 2026-05-28). The legacy inline form is kept as
+    // a fallback for the (unlikely) case where the file couldn't be staged.
+    if (this.systemPromptFile) {
+      cmd.push("--append-system-prompt-file", this.systemPromptFile);
+    } else if (this.config.systemPrompt) {
       cmd.push("--append-system-prompt", this.config.systemPrompt);
     }
 
@@ -490,7 +520,7 @@ class ClaudeSession implements ProviderSession {
     await logFileHandle.end();
     const exitCode = await this.proc.exited;
 
-    // Cleanup task file and per-session MCP config
+    // Cleanup task file, per-session MCP config, and per-task system prompt
     await cleanupTaskFile(this.taskFilePid);
     if (this.sessionMcpConfig) {
       try {
@@ -499,6 +529,13 @@ class ClaudeSession implements ProviderSession {
         // ignore — temp file may already be gone
       }
     }
+    if (this.systemPromptFile) {
+      try {
+        await unlink(this.systemPromptFile);
+      } catch {
+        // ignore — temp file may already be gone
+      }
+    }
 
     if (exitCode !== 0 && stderrOutput) {
       console.error(
@@ -687,61 +724,7 @@ class ClaudeSession implements ProviderSession {
   }
 
   async waitForCompletion(): Promise<ProviderResult> {
-    const result = await this.completionPromise;
-
-    // Stale session retry: if process failed because session not found and we used --resume,
-    // strip --resume and retry with a fresh session
-    if (result.exitCode !== 0 && this.errorTracker.isSessionNotFound()) {
-      const hasResume =
-        !!this.config.resumeSessionId || (this.config.additionalArgs || []).includes("--resume");
-      if (hasResume) {
-        console.log(
-          `\x1b[33m[${this.config.role}] Session resume failed for task ${this.config.taskId.slice(0, 8)} — retrying without --resume\x1b[0m`,
-        );
-
-        const freshArgs = (this.config.additionalArgs || []).filter((arg, idx, arr) => {
-          if (arg === "--resume") return false;
-          if (idx > 0 && arr[idx - 1] === "--resume") return false;
-          return true;
-        });
-
-        const logDir = this.config.logFile.substring(0, this.config.logFile.lastIndexOf("/"));
-        const retryTimestamp = new Date().toISOString().replace(/[:.]/g, "-");
-        const retryLogFile = `${logDir}/${retryTimestamp}-retry-${this.config.taskId.slice(0, 8)}.jsonl`;
-
-        const retryConfig: ProviderSessionConfig = {
-          ...this.config,
-          additionalArgs: freshArgs,
-          logFile: retryLogFile,
-          resumeSessionId: undefined,
-        };
-
-        // Write new task file for retry
-        const taskFilePath = await writeTaskFile(this.taskFilePid, {
-          taskId: this.config.taskId,
-          agentId: this.config.agentId,
-          startedAt: new Date().toISOString(),
-        });
-
-        const retrySession = new ClaudeSession(
-          retryConfig,
-          this.model,
-          taskFilePath,
-          this.taskFilePid,
-          null,
-          this.claudeBinaryArgv,
-        );
-
-        // Forward events from retry to our listeners
-        for (const listener of this.listeners) {
-          retrySession.onEvent(listener);
-        }
-
-        return retrySession.waitForCompletion();
-      }
-    }
-
-    return result;
+    return this.completionPromise;
   }
 
   async abort(): Promise<void> {
@@ -754,6 +737,15 @@ export class ClaudeAdapter implements ProviderAdapter {
   readonly traits = { hasMcp: true, hasLocalEnvironment: true };
 
   async createSession(config: ProviderSessionConfig): Promise<ProviderSession> {
+    // Native resume is deprecated. Follow-up continuity is delivered via the
+    // context preamble (see src/commands/context-preamble.ts). Any stray
+    // resumeSessionId is logged and ignored — we always spawn a fresh session.
+    if (config.resumeSessionId) {
+      console.warn(
+        "[claude-adapter] resumeSessionId ignored — native resume is disabled by deprecation plan",
+      );
+    }
+
     const model = config.model || "opus";
 
     const credType = validateClaudeCredentials(config.env || process.env);
@@ -832,6 +824,28 @@ export class ClaudeAdapter implements ProviderAdapter {
       installedServers,
     );
 
+    // Stage the system prompt on disk so it can be passed as a file path
+    // instead of one giant argv element. This is the structural fix for
+    // posix_spawn E2BIG once the prompt grows past MAX_ARG_STRLEN (131,072
+    // bytes) — see `getSystemPromptFilePath` and PR description for the
+    // Picateclas spawn-OOM saga. Soft-fail (`systemPromptFile = null`) makes
+    // the session fall back to the inline `--append-system-prompt` argv;
+    // good enough since `BOOTSTRAP_TOTAL_MAX_CHARS` (now 120,000) already
+    // caps the worst-case argv element below the kernel limit even without
+    // the file path.
+    let systemPromptFile: string | null = null;
+    if (config.systemPrompt) {
+      const candidate = getSystemPromptFilePath(config.taskId);
+      try {
+        await writeFile(candidate, config.systemPrompt);
+        systemPromptFile = candidate;
+      } catch (err) {
+        console.warn(
+          `\x1b[33m[claude]\x1b[0m Failed to stage system prompt to ${candidate} (${err}); falling back to --append-system-prompt argv. Argv may approach MAX_ARG_STRLEN if the prompt is large.`,
+        );
+      }
+    }
+
     return new ClaudeSession(
       config,
       model,
@@ -839,6 +853,7 @@ export class ClaudeAdapter implements ProviderAdapter {
       taskFilePid,
       sessionMcpConfig,
       claudeBinaryArgv,
+      systemPromptFile,
     );
   }
 

package/src/providers/claude-managed-adapter.ts

@@ -808,85 +808,71 @@ export class ClaudeManagedAdapter implements ProviderAdapter {
   }
 
   async createSession(config: ProviderSessionConfig): Promise<ProviderSession> {
-    let sessionId: string;
-    let userMessageContent: BetaManagedAgentsTextBlock[] | null;
+    // Native resume is deprecated. Follow-up continuity is delivered via the
+    // context preamble (see src/commands/context-preamble.ts). Any stray
+    // resumeSessionId is logged and ignored — we always create a fresh session.
+    if (config.resumeSessionId) {
+      console.warn(
+        "[claude-managed-adapter] resumeSessionId ignored — native resume is disabled by deprecation plan",
+      );
+    }
+
     const seenEventIds = new Set<string>();
 
-    if (config.resumeSessionId) {
-      // Resume path: skip `sessions.create`. Pre-fetch event history via
-      // `events.list` so the SSE loop can skip duplicates that the live
-      // stream replays. NO new `user.message` is sent (the agent already
-      // has one in flight).
-      sessionId = config.resumeSessionId;
-      userMessageContent = null;
-      try {
-        const list = await Promise.resolve(this.client.beta.sessions.events.list(sessionId));
-        for await (const evt of list) {
-          if ("id" in evt && evt.id) {
-            seenEventIds.add(evt.id);
-          }
-        }
-      } catch {
-        // If history fetch fails, fall through with an empty `seenEventIds`
-        // — the worst case is that the listener sees a few duplicate events
-        // (which the runner-side dedup handles).
-      }
-    } else {
-      // Fresh session. Compose the cache-control-annotated user message and
-      // open the managed session against the pre-existing agent + env.
-      userMessageContent = composeManagedUserMessage(config);
-      // Phase 4: derive `resources` from `config.vcsRepo` (which the runner
-      // copies from `task.vcsRepo` at the spawn site, see
-      // src/commands/runner.ts:3296). The SDK contract is
-      // `BetaManagedAgentsGitHubRepositoryResourceParams`:
-      //   { type: 'github_repository', url, authorization_token, checkout?: { type: 'branch', name } }
-      // We default `branch` to "main" since `ProviderSessionConfig` only
-      // carries the repo identifier as a string.
-      //
-      // GitHub auth: prefer the operator-side `MANAGED_GITHUB_VAULT_ID`
-      // (passed via `vault_ids` on the session — see runbook §"Claude Managed
-      // Agents — GitHub access"). If a literal PAT is supplied via
-      // `MANAGED_GITHUB_TOKEN`, use that instead. Without either, the SDK's
-      // required `authorization_token` field gets an empty string and the
-      // operator sees an authentication error from Anthropic — which is
-      // strictly better than silently dropping `resources`.
-      const createParams: Record<string, unknown> = {
-        agent: this.agentId,
-        environment_id: this.environmentId,
-        title: `Task ${config.taskId}`,
-        metadata: {
-          swarmAgentId: config.agentId,
-          swarmTaskId: config.taskId,
+    // Fresh session. Compose the cache-control-annotated user message and
+    // open the managed session against the pre-existing agent + env.
+    const userMessageContent: BetaManagedAgentsTextBlock[] | null =
+      composeManagedUserMessage(config);
+    // Phase 4: derive `resources` from `config.vcsRepo` (which the runner
+    // copies from `task.vcsRepo` at the spawn site, see
+    // src/commands/runner.ts:3296). The SDK contract is
+    // `BetaManagedAgentsGitHubRepositoryResourceParams`:
+    //   { type: 'github_repository', url, authorization_token, checkout?: { type: 'branch', name } }
+    // We default `branch` to "main" since `ProviderSessionConfig` only
+    // carries the repo identifier as a string.
+    //
+    // GitHub auth: prefer the operator-side `MANAGED_GITHUB_VAULT_ID`
+    // (passed via `vault_ids` on the session — see runbook §"Claude Managed
+    // Agents — GitHub access"). If a literal PAT is supplied via
+    // `MANAGED_GITHUB_TOKEN`, use that instead. Without either, the SDK's
+    // required `authorization_token` field gets an empty string and the
+    // operator sees an authentication error from Anthropic — which is
+    // strictly better than silently dropping `resources`.
+    const createParams: Record<string, unknown> = {
+      agent: this.agentId,
+      environment_id: this.environmentId,
+      title: `Task ${config.taskId}`,
+      metadata: {
+        swarmAgentId: config.agentId,
+        swarmTaskId: config.taskId,
+      },
+    };
+    if (config.vcsRepo) {
+      const repoUrl = normalizeRepoUrl(config.vcsRepo);
+      const branch = "main"; // ProviderSessionConfig doesn't carry per-task branch info today.
+      const githubToken = process.env.MANAGED_GITHUB_TOKEN ?? "";
+      createParams.resources = [
+        {
+          type: "github_repository",
+          url: repoUrl,
+          authorization_token: githubToken,
+          checkout: { type: "branch", name: branch },
         },
-      };
-      if (config.vcsRepo) {
-        const repoUrl = normalizeRepoUrl(config.vcsRepo);
-        const branch = "main"; // ProviderSessionConfig doesn't carry per-task branch info today.
-        const githubToken = process.env.MANAGED_GITHUB_TOKEN ?? "";
-        createParams.resources = [
-          {
-            type: "github_repository",
-            url: repoUrl,
-            authorization_token: githubToken,
-            checkout: { type: "branch", name: branch },
-          },
-        ];
-      }
-      // Multiple vaults can be linked to a single session — `vault_ids` is an
-      // array. The MCP vault holds the static-bearer credential for our
-      // `/mcp` endpoint (provisioned by `claude-managed-setup`); the GitHub
-      // vault holds the credential used by the `github_repository` resource.
-      // Either or both may be unset.
-      const vaultIds = [
-        process.env.MANAGED_MCP_VAULT_ID,
-        process.env.MANAGED_GITHUB_VAULT_ID,
-      ].filter((v): v is string => !!v && v.length > 0);
-      if (vaultIds.length > 0) {
-        createParams.vault_ids = Array.from(new Set(vaultIds));
-      }
-      const created = await Promise.resolve(this.client.beta.sessions.create(createParams));
-      sessionId = created.id;
+      ];
+    }
+    // Multiple vaults can be linked to a single session — `vault_ids` is an
+    // array. The MCP vault holds the static-bearer credential for our
+    // `/mcp` endpoint (provisioned by `claude-managed-setup`); the GitHub
+    // vault holds the credential used by the `github_repository` resource.
+    // Either or both may be unset.
+    const vaultIds = [process.env.MANAGED_MCP_VAULT_ID, process.env.MANAGED_GITHUB_VAULT_ID].filter(
+      (v): v is string => !!v && v.length > 0,
+    );
+    if (vaultIds.length > 0) {
+      createParams.vault_ids = Array.from(new Set(vaultIds));
     }
+    const created = await Promise.resolve(this.client.beta.sessions.create(createParams));
+    const sessionId = created.id;
 
     return new ClaudeManagedSession(
       this.client,

package/src/providers/claude-managed-models.ts

@@ -26,7 +26,9 @@
 /** Models supported by the managed-agents surface for the swarm worker. */
 export const CLAUDE_MANAGED_MODELS = [
   "claude-sonnet-4-6",
+  "claude-opus-4-8",
   "claude-opus-4-7",
+  "claude-opus-4-6",
   "claude-haiku-4-5",
 ] as const;
 
@@ -45,11 +47,13 @@ export interface ClaudeManagedModelPricing {
 }
 
 /**
- * Anthropic public list pricing as of 2026-04-28. Source:
+ * Anthropic public list pricing. Source:
  * https://platform.claude.com/docs/en/about-claude/pricing
  *
  * - claude-sonnet-4-6: $3 / $15 / $0.30 / $3.75    (in / out / cache-read / cache-write)
- * - claude-opus-4-7:   $15 / $75 / $1.50 / $18.75
+ * - claude-opus-4-8:   $5 / $25 / $0.50 / $6.25    (verified 2026-05-28)
+ * - claude-opus-4-7:   $15 / $75 / $1.50 / $18.75  (STALE — was correct at launch, Anthropic has since dropped Opus to $5/$25)
+ * - claude-opus-4-6:   $5 / $25 / $0.50 / $6.25    (verified 2026-05-28)
  * - claude-haiku-4-5:  $1 / $5 / $0.10 / $1.25
  */
 export const CLAUDE_MANAGED_MODEL_PRICING: Record<ClaudeManagedModel, ClaudeManagedModelPricing> = {
@@ -59,12 +63,24 @@ export const CLAUDE_MANAGED_MODEL_PRICING: Record<ClaudeManagedModel, ClaudeMana
     cacheReadPerMillion: 0.3,
     cacheWritePerMillion: 3.75,
   },
+  "claude-opus-4-8": {
+    inputPerMillion: 5.0,
+    outputPerMillion: 25.0,
+    cacheReadPerMillion: 0.5,
+    cacheWritePerMillion: 6.25,
+  },
   "claude-opus-4-7": {
     inputPerMillion: 15.0,
     outputPerMillion: 75.0,
     cacheReadPerMillion: 1.5,
     cacheWritePerMillion: 18.75,
   },
+  "claude-opus-4-6": {
+    inputPerMillion: 5.0,
+    outputPerMillion: 25.0,
+    cacheReadPerMillion: 0.5,
+    cacheWritePerMillion: 6.25,
+  },
   "claude-haiku-4-5": {
     inputPerMillion: 1.0,
     outputPerMillion: 5.0,