@desplega.ai/agent-swarm 1.131.0 → 1.133.1

package/dist/{cli-e7ckcg4v.js → cli-ftwpv451.js}

@@ -1,21 +1,21 @@
 import {
   renderSteeringDelivery
-} from "./cli-f1am9szv.js";
+} from "./cli-xxv5pn4f.js";
 import {
   checkCodexCredentials
-} from "./cli-5kx36evn.js";
+} from "./cli-ggmdxeqa.js";
 import {
   checkClaudeManagedCredentials
-} from "./cli-qmdnhpej.js";
+} from "./cli-zr9q011v.js";
 import {
   checkDevinCredentials
 } from "./cli-9b13ggd1.js";
 import {
   checkOpencodeCredentials
-} from "./cli-n6h8qt8n.js";
+} from "./cli-c897wyhw.js";
 import {
   checkClaudeCredentials
-} from "./cli-3kf51j15.js";
+} from "./cli-6zfq31nj.js";
 import {
   MAX_RATE_LIMIT_RESET_MS,
   isCodexCreditsExhaustedMessage,
@@ -35,7 +35,7 @@ import {
   withSpan,
   withSpanContext,
   writeSkillsToFilesystem
-} from "./cli-t76vw5db.js";
+} from "./cli-y08jvxzx.js";
 import {
   authJsonToCredentialSelection,
   credentialsToAuthJson,
@@ -44,10 +44,10 @@ import {
 import {
   ensure,
   initialize
-} from "./cli-5ze9rv97.js";
+} from "./cli-9ta3pwms.js";
 import {
   validateJsonSchema
-} from "./cli-yw8vghx2.js";
+} from "./cli-xv8t8p3c.js";
 import {
   getOpenRouterBaseUrl
 } from "./cli-3dpj7atn.js";
@@ -57,11 +57,12 @@ import {
 import {
   contentSha256,
   init_profile_sync,
+  prependProfileSyncRejectionBanner,
   resolveClaudeMdPath,
   syncProfileFilesToServer,
   writeIdentityBaselines,
   writeProfileFileFromDb
-} from "./cli-0258203w.js";
+} from "./cli-rpp0x4zy.js";
 import {
   taskAttachmentDisplayUrl
 } from "./cli-t930g0xh.js";
@@ -74,21 +75,24 @@ import {
   initTelemetry,
   init_defaults,
   init_telemetry,
-  init_templates,
   init_types,
   resolveTaskModelSelection,
   telemetry
-} from "./cli-a4jzdpa3.js";
+} from "./cli-zfbf3srj.js";
+import {
+  getBasePrompt,
+  init_base_prompt,
+  init_templates
+} from "./cli-hkwfe3qj.js";
 import {
   configureHttpResolver,
   init_resolver,
-  init_session_templates,
   init_steering_enabled,
   init_template,
   interpolate,
   isSteeringEnabled,
   resolveTemplateAsync
-} from "./cli-xpxde7rm.js";
+} from "./cli-qes8ef67.js";
 import {
   getMcpBaseUrl,
   init_constants
@@ -108,330 +112,7 @@ import {
 // src/commands/runner.ts
 import { existsSync, statSync } from "node:fs";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
-
-// src/prompts/base-prompt.ts
-init_steering_enabled();
-init_resolver();
-init_session_templates();
-var BOOTSTRAP_MAX_CHARS = 20000;
-var BOOTSTRAP_TOTAL_MAX_CHARS = 120000;
-var REPO_CLAUDE_MD_MAX_CHARS = 12000;
-var truncationNotice = (file) => `
-
-[...truncated, see /workspace/${file} for full content]
-`;
-function areSlackPromptToolsEnabled(env = process.env) {
-  const slackDisable = env.SLACK_DISABLE;
-  if (slackDisable === "true" || slackDisable === "1")
-    return false;
-  return Boolean(env.SLACK_BOT_TOKEN && env.SLACK_APP_TOKEN);
-}
-var getBasePrompt = async (args) => {
-  const { role, agentId, swarmUrl, traits } = args;
-  const {
-    hasMcp = true,
-    hasLocalEnvironment: hasLocalEnv = true,
-    nativeSkillDiscovery = true
-  } = traits ?? {};
-  const steerModes = traits?.steerModes ?? [];
-  const vars = { role, agentId, swarmUrl };
-  let compositeEventType;
-  if (!hasMcp) {
-    compositeEventType = "system.session.worker.remote";
-  } else if (args.provider === "pi") {
-    compositeEventType = role === "lead" ? "system.session.lead.pi" : "system.session.worker.pi";
-  } else if (role === "lead") {
-    compositeEventType = "system.session.lead";
-  } else {
-    compositeEventType = "system.session.worker";
-  }
-  const compositeResult = await resolveTemplateAsync(compositeEventType, vars);
-  let prompt = compositeResult.text;
-  const scriptsOnly = args.scriptsOnly ?? process.env.SCRIPTS_ONLY_MCP === "true";
-  const scriptsOnlyMode = hasMcp && scriptsOnly;
-  if (scriptsOnlyMode) {
-    const scriptsOnlyResult = await resolveTemplateAsync("system.agent.scripts_only_mode", {});
-    prompt += `
-${scriptsOnlyResult.text}`;
-  }
-  const slackPromptToolsEnabled = areSlackPromptToolsEnabled();
-  const serverHasCapability = (cap, whenUnknown) => args.serverCapabilities ? args.serverCapabilities.includes(cap) : whenUnknown;
-  if (hasMcp && slackPromptToolsEnabled && !scriptsOnlyMode && serverHasCapability("slack", true)) {
-    const slackResult = await resolveTemplateAsync("system.agent.slack", {});
-    prompt += slackResult.text;
-  }
-  if (role !== "lead" && args.slackContext && hasMcp && slackPromptToolsEnabled && (scriptsOnlyMode || serverHasCapability("slack", true))) {
-    const slackResult = await resolveTemplateAsync(scriptsOnlyMode ? "system.agent.scripts_only_mode.slack" : "system.agent.worker.slack", {
-      slackChannelId: args.slackContext.channelId,
-      slackThreadTs: args.slackContext.threadTs ?? ""
-    });
-    prompt += slackResult.text;
-  }
-  if (hasMcp && !scriptsOnlyMode && serverHasCapability("messaging", true)) {
-    const messagingResult = await resolveTemplateAsync("system.agent.messaging", {});
-    prompt += messagingResult.text;
-  }
-  if (hasMcp && isSteeringEnabled() && steerModes.length > 0 && !scriptsOnlyMode && serverHasCapability("core", true)) {
-    const steeringResult = await resolveTemplateAsync("system.agent.steering", {});
-    prompt += steeringResult.text;
-  }
-  if (!hasLocalEnv) {
-    prompt += `
-
-## Your Identity
-
-`;
-    if (args.name) {
-      prompt += `**Name:** ${args.name}
-`;
-      if (args.description) {
-        prompt += `**Description:** ${args.description}
-`;
-      }
-      prompt += `
-`;
-    }
-    prompt += `You are part of an agent swarm managed by the Desplega platform. `;
-    prompt += `You receive tasks from the swarm's lead agent and execute them independently. `;
-    prompt += `Focus on quality work and clear communication of results.
-`;
-  } else if (args.soulMd || args.identityMd || args.name) {
-    prompt += `
-
-## Your Identity
-
-`;
-    if (args.name) {
-      prompt += `**Name:** ${args.name}
-`;
-      if (args.description) {
-        prompt += `**Description:** ${args.description}
-`;
-      }
-      prompt += `
-`;
-    }
-    if (args.soulMd) {
-      prompt += `${args.soulMd}
-`;
-    }
-    if (args.identityMd) {
-      prompt += `${args.identityMd}
-`;
-    }
-  }
-  if (hasMcp && args.skillsSummary && args.skillsSummary.length > 0) {
-    const discovery = "To browse the full catalog use the `skill-list` MCP tool, find one by intent with `skill-search`, and read a skill's content with `skill-get`.";
-    if (nativeSkillDiscovery) {
-      const count = args.skillsSummary.length;
-      const where = hasLocalEnv ? "Your harness loads them from its skills directory (each skill is a folder with a SKILL.md — e.g. ~/.claude/skills/, ~/.codex/skills/, ~/.pi/agent/skills/, ~/.opencode/skills/) and most harnesses surface them natively." : "This session has no local skills directory, so reach them through the MCP tools.";
-      prompt += `
-
-## Installed Skills
-
-You have ${count} skill${count === 1 ? "" : "s"} installed. ${where} ${discovery}
-`;
-    } else {
-      const summaries = args.skillsSummary.map((s) => `- ${hasLocalEnv ? "/" : ""}${s.name}: ${s.description}`).join(`
-`);
-      const howTo = hasLocalEnv ? "To use one, read its SKILL.md from your skills directory and follow its instructions." : "To use one, read its content with the `skill-get` MCP tool and follow its instructions.";
-      prompt += `
-
-## Installed Skills
-
-The following skills are available. ${howTo}
-
-${summaries}
-
-${discovery}
-`;
-    }
-  }
-  if (hasMcp && args.mcpServersSummary) {
-    prompt += `
-
-## Installed MCP Servers
-
-The following MCP servers are configured for your use:
-${args.mcpServersSummary}
-`;
-  }
-  if (args.repoContext) {
-    prompt += `
-
-## Repository Context
-
-`;
-    if (args.repoContext.warning) {
-      prompt += `WARNING: ${args.repoContext.warning}
-
-`;
-    }
-    if (hasLocalEnv) {
-      if (args.repoContext.claudeMd) {
-        prompt += `The following CLAUDE.md is from the repository cloned at \`${args.repoContext.clonePath}\`. `;
-        prompt += `**IMPORTANT: These instructions apply ONLY when working within the \`${args.repoContext.clonePath}\` directory.** `;
-        prompt += `Do NOT apply these rules to files outside that directory.
-
-`;
-        prompt += `${truncateRepoClaudeMd(args.repoContext.claudeMd, args.repoContext.clonePath, REPO_CLAUDE_MD_MAX_CHARS)}
-`;
-      } else if (!args.repoContext.warning) {
-        prompt += `Repository is cloned at \`${args.repoContext.clonePath}\` but has no CLAUDE.md file.
-`;
-      }
-      if (args.repoContext.autoStashes && args.repoContext.autoStashes.length > 0) {
-        const stashes = args.repoContext.autoStashes.map((stash) => `- ${stash.ref}: ${stash.message}`).join(`
-`);
-        prompt += `
-Pending auto-stashed work exists in this repo:
-${stashes}
-Restore if relevant with \`git stash apply <ref>\` or \`git stash pop <ref>\`.
-`;
-      }
-    }
-    const g = args.repoContext.guidelines;
-    if (g === null || g === undefined) {
-      prompt += `
-### Repository Guidelines
-
-No repository guidelines defined. If you need to push code, ask the lead or user to define guidelines first.
-`;
-    } else {
-      const hasAnyContent = g.prChecks.length > 0 || g.mergeChecks.length > 0 || g.review.length > 0 || g.allowMerge;
-      if (hasAnyContent) {
-        prompt += `
-### Repository Guidelines (MANDATORY)
-
-`;
-        if (g.prChecks.length > 0) {
-          prompt += `**PR Checks — Run ALL before pushing code or creating a PR:**
-`;
-          g.prChecks.forEach((check, i) => {
-            prompt += `${i + 1}. \`${check}\`
-`;
-          });
-          prompt += `If ANY check fails, fix the issue before pushing. Do NOT push code with failing checks.
-Do NOT use \`--no-verify\` or any flag that bypasses git hooks.
-
-`;
-        }
-        prompt += `**Merge Policy:**
-`;
-        prompt += `- Auto-merge: ${g.allowMerge ? "Allowed" : "Not allowed (default)"}
-`;
-        if (g.mergeChecks.length > 0) {
-          prompt += `- Before merging, verify:
-`;
-          g.mergeChecks.forEach((check) => {
-            prompt += `  - ${check}
-`;
-          });
-        }
-        prompt += `
-`;
-        if (g.review.length > 0) {
-          prompt += `**Review Guidance:**
-`;
-          g.review.forEach((item) => {
-            prompt += `- ${item}
-`;
-          });
-          prompt += `
-`;
-        }
-      }
-    }
-  }
-  if (hasLocalEnv) {
-    let conditionalSuffix = "";
-    if (process.env.AGENT_FS_API_URL) {
-      const sharedOrgId = process.env.AGENT_FS_SHARED_ORG_ID || "YOUR_SHARED_ORG_ID";
-      const agentFsResult = await resolveTemplateAsync("system.agent.agent_fs", {
-        agentId,
-        sharedOrgId
-      });
-      conditionalSuffix += agentFsResult.text;
-    }
-    if (args.serverCapabilities ? args.serverCapabilities.includes("services") : !args.capabilities || args.capabilities.includes("services")) {
-      const servicesResult = await resolveTemplateAsync("system.agent.services", {
-        agentId,
-        swarmUrl
-      });
-      conditionalSuffix += servicesResult.text;
-    }
-    if (!args.capabilities || args.capabilities.includes("artifacts")) {
-      const artifactsResult = await resolveTemplateAsync("system.agent.artifacts", {});
-      conditionalSuffix += artifactsResult.text;
-    }
-    if (serverHasCapability("pages", !args.capabilities || args.capabilities.includes("pages"))) {
-      const appsResult = await resolveTemplateAsync("system.agent.apps", {});
-      conditionalSuffix += appsResult.text;
-    }
-    if (args.capabilities) {
-      conditionalSuffix += `
-### Capabilities enabled for this agent:
-
-- ${args.capabilities.join(`
-- `)}
-`;
-    }
-    const protectedLength = prompt.length + conditionalSuffix.length;
-    const totalBudget = Math.max(0, BOOTSTRAP_TOTAL_MAX_CHARS - protectedLength);
-    let totalUsed = 0;
-    if (args.claudeMd) {
-      const perSectionBudget = Math.min(BOOTSTRAP_MAX_CHARS, totalBudget - totalUsed);
-      const section = truncateSection(args.claudeMd, "## Agent Instructions", "CLAUDE.md", perSectionBudget);
-      prompt += section;
-      totalUsed += section.length;
-    }
-    if (args.toolsMd) {
-      const perSectionBudget = Math.min(BOOTSTRAP_MAX_CHARS, totalBudget - totalUsed);
-      const section = truncateSection(args.toolsMd, "## Your Tools & Capabilities", "TOOLS.md", perSectionBudget);
-      prompt += section;
-      totalUsed += section.length;
-    }
-    prompt += conditionalSuffix;
-  }
-  return prompt;
-};
-function truncateRepoClaudeMd(content, clonePath, budget) {
-  if (content.length <= budget)
-    return content;
-  const notice = `
-
-[...truncated — see ${clonePath}/CLAUDE.md for full content]
-`;
-  const contentBudget = budget - notice.length;
-  if (contentBudget <= 0)
-    return notice.trimStart();
-  return content.slice(0, contentBudget) + notice;
-}
-function truncateSection(content, header, fileName, budget) {
-  if (!content || budget <= 0)
-    return "";
-  const fullSection = `
-
-${header}
-
-${content}
-`;
-  if (fullSection.length <= budget)
-    return fullSection;
-  const headerStr = `
-
-${header}
-
-`;
-  const notice = truncationNotice(fileName);
-  const contentBudget = budget - headerStr.length - notice.length;
-  if (contentBudget > 0) {
-    return headerStr + content.slice(0, contentBudget) + notice;
-  }
-  return "";
-}
-
-// src/commands/runner.ts
+init_base_prompt();
 init_defaults();
 
 // src/prompts/memories.ts
@@ -495,19 +176,19 @@ async function materializeCodexAuthJson(_slot, creds, deps = {}) {
 async function createProviderAdapter(provider) {
   switch (provider) {
     case "claude": {
-      const { ClaudeAdapter } = await import("./claude-adapter-2y47mrkd.js");
+      const { ClaudeAdapter } = await import("./claude-adapter-3ct8kgxw.js");
       return new ClaudeAdapter;
     }
     case "pi": {
-      const { PiMonoAdapter } = await import("./pi-mono-adapter-t091s27g.js");
+      const { PiMonoAdapter } = await import("./pi-mono-adapter-btvqmj58.js");
       return new PiMonoAdapter;
     }
     case "codex": {
-      const { CodexAdapter } = await import("./codex-adapter-d24q75wk.js");
+      const { CodexAdapter } = await import("./codex-adapter-bef93pq4.js");
       return new CodexAdapter;
     }
     case "claude-managed": {
-      const { ClaudeManagedAdapter } = await import("./claude-managed-adapter-gv19tdew.js");
+      const { ClaudeManagedAdapter } = await import("./claude-managed-adapter-akx4ntf2.js");
       return new ClaudeManagedAdapter;
     }
     case "devin": {
@@ -515,7 +196,7 @@ async function createProviderAdapter(provider) {
       return new DevinAdapter;
     }
     case "opencode": {
-      const { OpencodeAdapter } = await import("./opencode-adapter-1gm38aba.js");
+      const { OpencodeAdapter } = await import("./opencode-adapter-b39jefcj.js");
       return new OpencodeAdapter;
     }
     default:
@@ -1201,7 +882,7 @@ async function checkProviderCredentials(provider, env, opts) {
     case "opencode":
       return checkOpencodeCredentials(env, opts);
     case "pi": {
-      const { checkPiMonoCredentials } = await import("./pi-mono-adapter-t091s27g.js");
+      const { checkPiMonoCredentials } = await import("./pi-mono-adapter-btvqmj58.js");
       return checkPiMonoCredentials(env, opts);
     }
     default:
@@ -1417,20 +1098,32 @@ async function buildCredStatusReport(provider, env, opts = {}, kind) {
     bedrock
   };
 }
-async function reportCredStatus(apiUrl, apiKey, agentId, credStatus) {
+async function sendCredStatusReport(apiUrl, apiKey, agentId, runtimeInstanceId, report) {
+  const res = await fetch(`${apiUrl}/api/agents/${encodeURIComponent(agentId)}/credential-status`, {
+    method: "PUT",
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+      "X-Agent-ID": agentId,
+      ...runtimeInstanceId ? { "X-Runtime-Instance-ID": runtimeInstanceId } : {},
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      ready: report.ready,
+      missing: report.missing,
+      ...report.credStatus ? { cred_status: report.credStatus } : {}
+    })
+  });
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new Error(`credential-status report failed: ${res.status} ${body}`.trim());
+  }
+}
+async function reportCredStatus(apiUrl, apiKey, agentId, runtimeInstanceId, credStatus) {
   try {
-    await fetch(`${apiUrl}/api/agents/${encodeURIComponent(agentId)}/credential-status`, {
-      method: "PUT",
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        "X-Agent-ID": agentId,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        ready: credStatus.ready,
-        missing: credStatus.missing,
-        cred_status: credStatus
-      })
+    await sendCredStatusReport(apiUrl, apiKey, agentId, runtimeInstanceId, {
+      ready: credStatus.ready,
+      missing: credStatus.missing,
+      credStatus
     });
   } catch (err) {
     console.warn(`[cred-status] POST failed (non-fatal): ${err}`);
@@ -1557,6 +1250,29 @@ async function awaitCredentials(opts) {
   } catch {}
   return status;
 }
+async function retryBootStep(step, opts = {}) {
+  const label = opts.label ?? "boot step";
+  const attempts = opts.attempts ?? 5;
+  const sleep = opts.sleep ?? ((ms) => Bun.sleep(ms));
+  const log = opts.log ?? ((line) => console.warn(line));
+  const maxDelayMs = opts.maxDelayMs ?? 1e4;
+  let delayMs = opts.initialDelayMs ?? 1000;
+  let lastError;
+  for (let attempt = 1;attempt <= attempts; attempt++) {
+    try {
+      await step();
+      return;
+    } catch (err) {
+      lastError = err;
+      if (attempt < attempts) {
+        log(`[boot] ${label} failed (attempt ${attempt}/${attempts}, retry in ${delayMs}ms): ${err}`);
+        await sleep(delayMs);
+        delayMs = Math.min(delayMs * 2, maxDelayMs);
+      }
+    }
+  }
+  throw lastError instanceof Error ? lastError : new Error(`${label} failed after ${attempts} attempt(s): ${lastError}`);
+}
 
 // src/commands/runner.ts
 init_profile_sync();
@@ -1856,6 +1572,9 @@ async function pingServer(config, _role) {
   if (config.apiKey) {
     headers.Authorization = `Bearer ${config.apiKey}`;
   }
+  if (config.runtimeInstanceId) {
+    headers["X-Runtime-Instance-ID"] = config.runtimeInstanceId;
+  }
   try {
     await fetch(`${config.apiUrl}/ping`, {
       method: "POST",
@@ -1870,6 +1589,9 @@ async function closeAgent(config, role) {
   if (config.apiKey) {
     headers.Authorization = `Bearer ${config.apiKey}`;
   }
+  if (config.runtimeInstanceId) {
+    headers["X-Runtime-Instance-ID"] = config.runtimeInstanceId;
+  }
   try {
     console.log(`[${role}] Marking agent as offline...`);
     await fetch(`${config.apiUrl}/close`, {
@@ -2883,7 +2605,8 @@ async function registerActiveSession(config, session) {
         taskId: session.taskId,
         triggerType: session.triggerType,
         taskDescription: session.taskDescription,
-        runnerSessionId: session.runnerSessionId
+        runnerSessionId: session.runnerSessionId,
+        runtimeInstanceId: config.runtimeInstanceId
       })
     });
   } catch {}
@@ -2957,15 +2680,24 @@ async function triggerHeartbeatSweep(config) {
   }
 }
 async function buildRequesterProfilePrompt(requestedBy) {
-  if (!requestedBy?.role && !requestedBy?.notes)
+  const comms = requestedBy?.comms;
+  const commsParts = [
+    comms?.tone ? `tone: ${comms.tone}` : undefined,
+    comms?.language ? `language: ${comms.language}` : undefined,
+    comms?.verbosity ? `verbosity: ${comms.verbosity}` : undefined
+  ].filter((part) => Boolean(part));
+  if (!requestedBy?.role && !requestedBy?.notes && commsParts.length === 0)
     return "";
-  const notes = requestedBy.notes?.trim();
+  const commsSection = commsParts.length > 0 ? `
+Their communication preferences: ${commsParts.join(", ")}.` : "";
+  const notes = requestedBy?.notes?.trim();
   const notesSection = notes ? `
 Their stated notes for how you should respond and act:
 ${notes}` : "";
   const result = await resolveTemplateAsync("task.requester.profile", {
-    requester_name: requestedBy.name,
-    requester_role_suffix: requestedBy.role ? ` (${requestedBy.role})` : "",
+    requester_name: requestedBy?.name ?? "",
+    requester_role_suffix: requestedBy?.role ? ` (${requestedBy.role})` : "",
+    requester_comms_section: commsSection,
     requester_notes_section: notesSection
   });
   return result.skipped ? "" : result.text.trim();
@@ -2990,7 +2722,8 @@ async function registerAgent(opts) {
       capabilities: opts.capabilities,
       maxTasks: opts.maxTasks,
       provider,
-      harness_provider: harnessProvider
+      harness_provider: harnessProvider,
+      runtimeInstanceId: opts.runtimeInstanceId
     })
   });
   if (!response.ok) {
@@ -3025,6 +2758,9 @@ async function pollForTriggerOnce(opts) {
   const headers = {
     "X-Agent-ID": opts.agentId
   };
+  if (opts.runtimeInstanceId) {
+    headers["X-Runtime-Instance-ID"] = opts.runtimeInstanceId;
+  }
   if (opts.apiKey) {
     headers.Authorization = `Bearer ${opts.apiKey}`;
   }
@@ -3477,7 +3213,7 @@ async function spawnProviderProcess(adapter, opts, logDir, isYolo) {
   function bufferEvent(evt) {
     eventBuffer.push(evt);
     if (eventBuffer.length >= EVENT_BUFFER_MAX) {
-      flushEvents();
+      flushEvents().catch((err) => console.error("[runner] event flush failed:", scrubSecrets(err instanceof Error ? err.message : String(err))));
     }
   }
   async function flushEvents() {
@@ -3989,7 +3725,7 @@ async function checkCompletedProcesses(state, role, apiConfig, cancelledSignaled
     vcsCheckTimestamps.delete(taskId);
     cancelledSignaled?.delete(taskId);
     if (apiConfig) {
-      removeActiveSession(apiConfig, taskId);
+      removeActiveSession(apiConfig, taskId).catch((err) => console.error("[runner] active-session removal failed:", scrubSecrets(err instanceof Error ? err.message : String(err))));
     }
     if (apiConfig && workingDir && !vcsDetectedTasks.has(taskId)) {
       await detectVcsForTask(apiConfig.apiUrl, apiConfig.apiKey, taskId, workingDir);
@@ -4365,7 +4101,9 @@ ${additionalSystemPrompt}` : basePrompt;
   const SERVER_CAPS_REFRESH_INTERVAL_MS = 300000;
   let lastBedrockRefreshAt = 0;
   const BEDROCK_REFRESH_INTERVAL_MS = 5 * 60 * 1000;
-  const apiConfig = { apiUrl, apiKey, agentId };
+  const runtimeInstanceId = crypto.randomUUID();
+  process.env.SWARM_RUNTIME_INSTANCE_ID = runtimeInstanceId;
+  const apiConfig = { apiUrl, apiKey, agentId, runtimeInstanceId };
   setupShutdownHandlers(role, apiConfig, () => state);
   const agentName = process.env.AGENT_NAME || cachedTemplate?.config.displayName || `${role}-${agentId.slice(0, 8)}`;
   const applySwarmConfigDrift = async (freshEnv, resolvedProvider, nextScriptsOnly) => {
@@ -4428,21 +4166,25 @@ ${additionalSystemPrompt}` : basePrompt;
       console.log(`[${role}] [config] Server capabilities updated (${next.length} flags) — system prompt rebuilt`);
     }
   };
+  const registerCurrentRuntime = async () => {
+    const reg = await registerAgent({
+      apiUrl,
+      apiKey,
+      agentId,
+      name: agentName,
+      role,
+      isLead,
+      capabilities,
+      maxTasks: state.maxConcurrent,
+      harnessProvider: state.harnessProvider,
+      runtimeInstanceId
+    });
+    lastServerCapsRefreshAt = Date.now();
+    await applyServerCapabilities(reg.serverCapabilities);
+  };
   const reregisterAgent = async () => {
     try {
-      const reg = await registerAgent({
-        apiUrl,
-        apiKey,
-        agentId,
-        name: agentName,
-        role,
-        isLead,
-        capabilities,
-        maxTasks: state.maxConcurrent,
-        harnessProvider: state.harnessProvider
-      });
-      lastServerCapsRefreshAt = Date.now();
-      await applyServerCapabilities(reg.serverCapabilities);
+      await registerCurrentRuntime();
     } catch (err) {
       console.warn(`[${role}] [config] Re-register failed (non-fatal): ${err}`);
     }
@@ -4457,7 +4199,8 @@ ${additionalSystemPrompt}` : basePrompt;
       isLead,
       capabilities,
       maxTasks: maxConcurrent,
-      harnessProvider: bootProvider
+      harnessProvider: bootProvider,
+      runtimeInstanceId
     });
     lastServerCapsRefreshAt = Date.now();
     await applyServerCapabilities(reg.serverCapabilities);
@@ -4492,6 +4235,7 @@ ${additionalSystemPrompt}` : basePrompt;
             headers: {
               Authorization: `Bearer ${apiKey}`,
               "X-Agent-ID": agentId,
+              "X-Runtime-Instance-ID": runtimeInstanceId,
               "Content-Type": "application/json"
             },
             body: JSON.stringify({ ready: status.ready, missing: status.missing })
@@ -4506,10 +4250,32 @@ ${additionalSystemPrompt}` : basePrompt;
       throw err;
     }
     try {
-      const snapshot = await buildCredStatusReport(state.harnessProvider, process.env, {}, "boot");
-      await reportCredStatus(apiUrl, apiKey, agentId, snapshot);
+      await retryBootStep(registerCurrentRuntime, {
+        label: "runtime re-registration",
+        log: (line) => console.warn(`[${role}] ${line}`)
+      });
+    } catch (error) {
+      console.error(`[${role}] Failed to re-register after credential wait: ${error}`);
+      process.exit(1);
+    }
+    let bootCredSnapshot;
+    try {
+      bootCredSnapshot = await buildCredStatusReport(state.harnessProvider, process.env, {}, "boot");
     } catch (err) {
-      console.warn(`[${role}] cred_status boot report failed (non-fatal): ${err}`);
+      console.warn(`[${role}] cred_status boot snapshot failed (non-fatal): ${err}`);
+    }
+    try {
+      await retryBootStep(() => sendCredStatusReport(apiUrl, apiKey, agentId, runtimeInstanceId, {
+        ready: bootCredSnapshot?.ready ?? true,
+        missing: bootCredSnapshot?.missing ?? [],
+        credStatus: bootCredSnapshot
+      }), {
+        label: "credential readiness report",
+        log: (line) => console.warn(`[${role}] ${line}`)
+      });
+    } catch (error) {
+      console.error(`[${role}] Failed to report credential readiness after recovery: ${error}`);
+      process.exit(1);
     }
   }
   await cleanupActiveSessions(apiConfig);
@@ -4759,6 +4525,14 @@ ${additionalSystemPrompt}` : basePrompt;
             console.log(`[${role}] Injected context preamble into resumed follow-up task prompt (parent: ${task.parentTaskId.slice(0, 8)})`);
           }
         }
+        const resumeWithSyncWarning = await prependProfileSyncRejectionBanner(resumePrompt, {
+          ...apiConfig,
+          claudeMdPath: resolveClaudeMdPath([state.harnessProvider])
+        });
+        resumePrompt = resumeWithSyncWarning.prompt;
+        if (resumeWithSyncWarning.injected) {
+          console.warn(`[${role}] Injected persisted profile sync rejection warning`);
+        }
         const resumeCandidates = [
           {
             source: "task",
@@ -4862,7 +4636,7 @@ ${additionalSystemPrompt}` : basePrompt;
           triggerType: "task_resumed",
           taskDescription: task.task?.slice(0, 200),
           runnerSessionId: resumeRunnerSessionId
-        });
+        }).catch((err) => console.error("[runner] active-session registration failed:", scrubSecrets(err instanceof Error ? err.message : String(err))));
         console.log(`[${role}] Resumed task ${task.id.slice(0, 8)} (${state.activeTasks.size}/${state.maxConcurrent} active)`);
       }
       console.log(`[${role}] All paused tasks resumed. Entering normal polling...`);
@@ -4911,10 +4685,10 @@ ${additionalSystemPrompt}` : basePrompt;
       const currentHarness = state.harnessProvider;
       if (currentHarness !== cachedCredHarnessProvider) {
         cachedCredHarnessProvider = currentHarness;
-        buildCredStatusReport(currentHarness, process.env, {}, "post_task").then((snap) => reportCredStatus(apiUrl, apiKey, agentId, snap)).catch((err) => console.warn(`[${role}] cred_status post_task report failed (non-fatal): ${err}`));
+        buildCredStatusReport(currentHarness, process.env, {}, "post_task").then((snap) => reportCredStatus(apiUrl, apiKey, agentId, runtimeInstanceId, snap)).catch((err) => console.warn(`[${role}] cred_status post_task report failed (non-fatal): ${err}`));
       } else if (currentHarness === "pi" && isBedrockSdkMode(process.env) && Date.now() - lastBedrockRefreshAt > BEDROCK_REFRESH_INTERVAL_MS) {
         lastBedrockRefreshAt = Date.now();
-        buildCredStatusReport(currentHarness, process.env, {}, "post_task").then((snap) => reportCredStatus(apiUrl, apiKey, agentId, snap)).catch((err) => console.warn(`[${role}] bedrock enumeration refresh failed (non-fatal): ${err}`));
+        buildCredStatusReport(currentHarness, process.env, {}, "post_task").then((snap) => reportCredStatus(apiUrl, apiKey, agentId, runtimeInstanceId, snap)).catch((err) => console.warn(`[${role}] bedrock enumeration refresh failed (non-fatal): ${err}`));
       }
     }
     const now = Date.now();
@@ -4927,7 +4701,7 @@ ${additionalSystemPrompt}` : basePrompt;
       if (!task.workingDir)
         continue;
       vcsCheckTimestamps.set(taskId, now);
-      detectVcsForTask(apiUrl, apiKey, taskId, task.workingDir);
+      detectVcsForTask(apiUrl, apiKey, taskId, task.workingDir).catch((err) => console.error("[runner] VCS detection failed:", scrubSecrets(err instanceof Error ? err.message : String(err))));
     }
     if (state.activeTasks.size > 0) {
       for (const [taskId, task] of state.activeTasks) {
@@ -4976,6 +4750,7 @@ ${additionalSystemPrompt}` : basePrompt;
         apiKey,
         agentId,
         pollInterval: PollIntervalMs,
+        runtimeInstanceId,
         pollTimeout: effectiveTimeout
       });
       if (trigger) {
@@ -5035,6 +4810,14 @@ ${additionalSystemPrompt}` : basePrompt;
             console.log(`[${role}] Injected ${isResumeTask ? "resume" : "context"} preamble for ${isResumeTask ? "resume" : "follow-up"} task (parent: ${taskObj.parentTaskId.slice(0, 8)})`);
           }
         }
+        const triggerWithSyncWarning = await prependProfileSyncRejectionBanner(triggerPrompt, {
+          ...apiConfig,
+          claudeMdPath: resolveClaudeMdPath([state.harnessProvider])
+        });
+        triggerPrompt = triggerWithSyncWarning.prompt;
+        if (triggerWithSyncWarning.injected) {
+          console.warn(`[${role}] Injected persisted profile sync rejection warning`);
+        }
         let resumeSessionId;
         if (taskObj?.parentTaskId) {
           const parentSession = await fetchProviderSessionInfo(apiUrl, apiKey, taskObj.parentTaskId);
@@ -5205,7 +4988,7 @@ Note: The task requested working directory "${taskDir}" but it does not exist. F
           triggerType: trigger.type,
           taskDescription: taskDesc,
           runnerSessionId: taskRunnerSessionId
-        });
+        }).catch((err) => console.error("[runner] active-session registration failed:", scrubSecrets(err instanceof Error ? err.message : String(err))));
         console.log(`[${role}] Started task ${runningTask.taskId.slice(0, 8)} (${state.activeTasks.size}/${state.maxConcurrent} active, trigger: ${trigger.type})`);
       }
     } else {