@desplega.ai/agent-swarm 1.172.0 → 2.0.0

package/dist/{cli-pstq9888.js → cli-j0pfptdp.js}

@@ -1,12 +1,28 @@
+import {
+  checkGrokCredentials
+} from "./cli-kt6zqg0e.js";
 import {
   renderSteeringDelivery
 } from "./cli-19njxg5g.js";
 import {
-  checkCursorCredentials
-} from "./cli-1x7da0de.js";
+  checkClaudeManagedCredentials
+} from "./cli-29jc5q7w.js";
 import {
-  checkGrokCredentials
-} from "./cli-nv4zd0b9.js";
+  checkDevinCredentials
+} from "./cli-q50942rs.js";
+import {
+  checkOpencodeCredentials
+} from "./cli-vatyhshy.js";
+import {
+  checkDshCredentials
+} from "./cli-3fbmmawm.js";
+import {
+  checkAmpCredentials,
+  liveTestAmpCredentials
+} from "./cli-vdach5a9.js";
+import {
+  checkCursorCredentials
+} from "./cli-s4setq91.js";
 import {
   createSkillInvokeTracker,
   isSkillLoaderCall,
@@ -15,23 +31,13 @@ import {
 import {
   checkCodexCredentials,
   codexUserHome
-} from "./cli-k46r9hmk.js";
+} from "./cli-03gedhng.js";
 import {
-  checkClaudeManagedCredentials
-} from "./cli-d603qf86.js";
-import {
-  checkDevinCredentials
-} from "./cli-e3pmyt39.js";
-import {
-  checkOpencodeCredentials
-} from "./cli-j1pmc07z.js";
-import {
-  checkDshCredentials
-} from "./cli-zxm9p3x4.js";
+  checkClaudeCredentials
+} from "./cli-q0ke1yww.js";
 import {
-  checkAmpCredentials,
-  liveTestAmpCredentials
-} from "./cli-04emfe2q.js";
+  getContextWindowSize
+} from "./cli-w1q7h2r2.js";
 import {
   isLeadChannelMonitoringEnabled,
   isUnknownModelError,
@@ -41,19 +47,13 @@ import {
 import {
   ACP_TARGET_IDS,
   isAcpTarget
-} from "./cli-7a0sde2x.js";
+} from "./cli-6cagzc96.js";
 import {
   CODEX_OAUTH_POOL_SLOTS_ENV,
   countCodexOAuthPoolSlots,
   hasCodexOAuthPoolSlots,
   isCodexOAuthConfigKey
 } from "./cli-bqjfjex4.js";
-import {
-  checkClaudeCredentials
-} from "./cli-g4f5pj26.js";
-import {
-  getContextWindowSize
-} from "./cli-7avy4v8w.js";
 import {
   CODEX_CREDITS_EXHAUSTED_COOLDOWN_MS,
   MAX_RATE_LIMIT_RESET_MS,
@@ -62,23 +62,27 @@ import {
   parseRateLimitResetTime,
   resolveCodexCreditsExhaustedCooldownMs
 } from "./cli-2pdaysab.js";
+import {
+  effectiveReasoningEffort
+} from "./cli-n5vwg842.js";
 import {
   canonicalAzureDevOpsRepoUrl,
   isAzureDevOpsUrl,
   parseAzureDevOpsRepoUrl,
-  resolveScriptsOnlyMode
-} from "./cli-ztrv9y21.js";
+  resolveScriptsOnlyMode,
+  resumedTaskModelSelection
+} from "./cli-bzszjf2p.js";
 import {
   terminateRegisteredProcessGroups
 } from "./cli-zt3w1cn1.js";
 import {
   validateJsonSchema
-} from "./cli-kb4ehzx5.js";
+} from "./cli-1e4b6bzh.js";
 import {
   authJsonToCredentialSelection,
   credentialsToAuthJson,
   loadAllCodexOAuthSlots
-} from "./cli-7jykv7ef.js";
+} from "./cli-e6mpjhed.js";
 import {
   ensure,
   initOtel,
@@ -88,20 +92,22 @@ import {
   startSpan,
   withSpan,
   withSpanContext
-} from "./cli-9xsmdpdt.js";
+} from "./cli-skxvvpap.js";
 import {
   MASKED_SECRET_VALUE,
   initTelemetry,
   init_api_drain,
   init_codex_auth_failure,
+  init_config_env_export,
   init_config_secrets,
   init_telemetry,
   init_telemetry_context,
   isApiDrainingResponse,
   isCodexAuthFailureReason,
+  isEnvExportRestrictedKey,
   mapTriggerSurface,
   telemetry
-} from "./cli-tgpfnm6r.js";
+} from "./cli-ef1hg1wv.js";
 import {
   ProviderNameSchema,
   WorkerNudgeSchema,
@@ -109,8 +115,9 @@ import {
   isTerminalTaskStatus,
   parseWorkerModelTierOverrides,
   resolveTaskModelSelection
-} from "./cli-hsem16hb.js";
+} from "./cli-cgtksawx.js";
 import {
+  WORKSPACE_CLAUDE_MD_PATH,
   buildContextPreamble,
   buildResumeContextPreamble,
   contentSha256,
@@ -119,6 +126,7 @@ import {
   generateDefaultSoulMd,
   generateDefaultToolsMd,
   getBasePrompt,
+  getTaskContextPrompt,
   init_base_prompt,
   init_context_preamble,
   init_defaults,
@@ -131,20 +139,21 @@ import {
   taskAttachmentFetchCommand,
   writeIdentityBaselines,
   writeProfileFileFromDb
-} from "./cli-nyhb1r6x.js";
+} from "./cli-s2sp957d.js";
 import {
   init_steering_enabled,
   isSteeringEnabled
 } from "./cli-7mm2r1kp.js";
-import {
-  init_templates
-} from "./cli-mvzyxwg3.js";
 import {
   CLAUDE_CREDENTIALS_HINT,
   ModelWindowExhaustedError,
   init_credentials,
+  normalizeProviderKeyAliases,
   resolveCredentialPools
-} from "./cli-tadfgd0t.js";
+} from "./cli-5hkm7whv.js";
+import {
+  init_templates
+} from "./cli-mvzyxwg3.js";
 import {
   configureHttpResolver,
   init_resolver,
@@ -161,7 +170,7 @@ import {
 } from "./cli-ywybs5as.js";
 import {
   deriveDefaultRoute,
-  init_src,
+  init_src as init_src2,
   validateRoute
 } from "./cli-f9w1semm.js";
 import {
@@ -170,12 +179,10 @@ import {
   init_openrouter_base_url
 } from "./cli-a35hzdve.js";
 import {
-  harnessModelMismatch,
   init_runtime_model_catalog,
-  init_src as init_src2,
   refreshRuntimeModelCatalog,
   runtimeHarnessSections
-} from "./cli-014vns2y.js";
+} from "./cli-stfs0k5s.js";
 import {
   getMcpBaseUrl,
   init_constants
@@ -186,9 +193,18 @@ import {
 } from "./cli-a1b9b32n.js";
 import {
   init_secret_scrubber,
+  registerEnvSecrets,
   registerSensitiveKeyName,
   scrubSecrets
-} from "./cli-d161g69q.js";
+} from "./cli-p1x85d2t.js";
+import {
+  harnessModelMismatch,
+  init_src,
+  openAICompatibleKeyVars,
+  openAICompatibleProviders,
+  providerBaseUrl,
+  providerKeyFromEnv
+} from "./cli-e3g5mbkz.js";
 import {
   __require
 } from "./cli-bc05qbss.js";
@@ -225,47 +241,47 @@ async function materializeCodexAuthJson(_slot, creds, deps = {}) {
 async function createProviderAdapter(provider) {
   switch (provider) {
     case "claude": {
-      const { ClaudeAdapter } = await import("./claude-adapter-t26cv8a4.js");
+      const { ClaudeAdapter } = await import("./claude-adapter-9vmvpvgd.js");
       return new ClaudeAdapter;
     }
     case "pi": {
-      const { PiMonoAdapter } = await import("./pi-mono-adapter-ef9wwx9m.js");
+      const { PiMonoAdapter } = await import("./pi-mono-adapter-9n2ya240.js");
       return new PiMonoAdapter;
     }
     case "codex": {
-      const { CodexAdapter } = await import("./codex-adapter-m4tgdysy.js");
+      const { CodexAdapter } = await import("./codex-adapter-y81sssk0.js");
       return new CodexAdapter;
     }
     case "claude-managed": {
-      const { ClaudeManagedAdapter } = await import("./claude-managed-adapter-xgxhqrt2.js");
+      const { ClaudeManagedAdapter } = await import("./claude-managed-adapter-k9qae05j.js");
       return new ClaudeManagedAdapter;
     }
     case "devin": {
-      const { DevinAdapter } = await import("./devin-adapter-xgtj680j.js");
+      const { DevinAdapter } = await import("./devin-adapter-x1022qb1.js");
       return new DevinAdapter;
     }
     case "opencode": {
-      const { OpencodeAdapter } = await import("./opencode-adapter-5zh0he20.js");
+      const { OpencodeAdapter } = await import("./opencode-adapter-nm42wwj8.js");
       return new OpencodeAdapter;
     }
     case "dsh": {
-      const { DshAdapter } = await import("./dsh-adapter-2h8m4cab.js");
+      const { DshAdapter } = await import("./dsh-adapter-3epjm3af.js");
       return new DshAdapter;
     }
     case "amp": {
-      const { AmpAdapter } = await import("./amp-adapter-8jem2bc0.js");
+      const { AmpAdapter } = await import("./amp-adapter-ad8ft89x.js");
       return new AmpAdapter;
     }
     case "cursor": {
-      const { CursorAdapter } = await import("./cursor-adapter-q8pgv5qa.js");
+      const { CursorAdapter } = await import("./cursor-adapter-cehv1qns.js");
       return new CursorAdapter;
     }
     case "grok": {
-      const { GrokAdapter } = await import("./grok-adapter-8m9yqzbq.js");
+      const { GrokAdapter } = await import("./grok-adapter-0d4x7gkx.js");
       return new GrokAdapter;
     }
     case "acp": {
-      const { ACPAdapter } = await import("./acp-adapter-fpecx1g1.js");
+      const { ACPAdapter } = await import("./acp-adapter-sj2g0m84.js");
       return new ACPAdapter;
     }
     default:
@@ -453,6 +469,7 @@ function computeBudgetBackoffMs(consecutiveRefusals, basePollMs) {
 
 // src/commands/runner.ts
 init_codex_auth_failure();
+init_config_env_export();
 init_config_secrets();
 init_constants();
 init_credentials();
@@ -534,15 +551,17 @@ async function reportHarnessModelOutcome(opts) {
 }
 
 // src/utils/harness-provider.ts
+init_src();
 init_types();
 var SUPPORTED_PROVIDERS = ProviderNameSchema.options;
 function hasEnvValue(key, resolvedEnv, fallbackEnv) {
   return !!(resolvedEnv[key]?.trim() || fallbackEnv[key]?.trim());
 }
+var PI_DEFAULT_KEY_VARS = ["OPENROUTER_API_KEY", ...openAICompatibleKeyVars()];
 function credentialAwareDefault(resolvedEnv, fallbackEnv) {
-  const hasOpenRouterKey = hasEnvValue("OPENROUTER_API_KEY", resolvedEnv, fallbackEnv);
+  const hasPiKey = PI_DEFAULT_KEY_VARS.some((key) => hasEnvValue(key, resolvedEnv, fallbackEnv));
   const hasClaudeCredential = hasEnvValue("ANTHROPIC_API_KEY", resolvedEnv, fallbackEnv) || hasEnvValue("CLAUDE_CODE_OAUTH_TOKEN", resolvedEnv, fallbackEnv);
-  return hasOpenRouterKey && !hasClaudeCredential ? "pi" : "claude";
+  return hasPiKey && !hasClaudeCredential ? "pi" : "claude";
 }
 function resolveHarnessProvider(resolvedEnv, fallbackEnv = process.env) {
   const candidate = resolvedEnv.HARNESS_PROVIDER?.trim() || fallbackEnv.HARNESS_PROVIDER?.trim();
@@ -865,7 +884,7 @@ async function refreshSkillsIfChanged(ctx, lastHashRef, homeOverride) {
 }
 
 // src/utils/spawn-model-guard.ts
-init_src2();
+init_src();
 init_runtime_model_catalog();
 function spawnHarnessMismatchReason(model, harness) {
   return `[model-harness-mismatch] Model "${model}" does not run on the ${harness} harness of this worker. The task pinned a model from another harness family. Re-create the task with modelTier or with a ${harness} model.`;
@@ -1109,6 +1128,7 @@ async function reportCredentialOutcomeThenFinish(input, finish) {
 
 // src/commands/provider-credentials.ts
 init_src();
+init_src2();
 init_credentials();
 init_openrouter_base_url();
 init_secret_scrubber();
@@ -1119,6 +1139,29 @@ function isBedrockMode(env) {
 function shouldRefreshBedrockStatus(opts) {
   return opts.harnessProvider === "pi" && isBedrockMode(opts.env) && opts.now - opts.lastRefreshAt > opts.intervalMs;
 }
+var REQUIRED_CRED_VARS_BY_PROVIDER = {
+  claude: ["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_API_KEY"],
+  "claude-managed": [
+    "ANTHROPIC_API_KEY",
+    "MANAGED_AGENT_ID",
+    "MANAGED_ENVIRONMENT_ID",
+    "MCP_BASE_URL"
+  ],
+  codex: ["OPENAI_API_KEY", "CODEX_OAUTH"],
+  devin: ["DEVIN_API_KEY", "DEVIN_ORG_ID"],
+  opencode: [
+    "OPENROUTER_API_KEY",
+    "ANTHROPIC_API_KEY",
+    "OPENAI_API_KEY",
+    ...openAICompatibleKeyVars()
+  ],
+  pi: ["ANTHROPIC_API_KEY", "OPENROUTER_API_KEY", "OPENAI_API_KEY", ...openAICompatibleKeyVars()],
+  acp: [],
+  dsh: ["DEEPSEEK_API_KEY", "OPENROUTER_API_KEY"],
+  amp: ["AMP_API_KEY"],
+  cursor: ["CURSOR_API_KEY"],
+  grok: ["XAI_API_KEY", "OPENROUTER_API_KEY"]
+};
 var CREDENTIAL_PROVIDER_CHECKERS = {
   dsh: (env) => checkDshCredentials(env),
   amp: (env) => checkAmpCredentials(env),
@@ -1130,7 +1173,7 @@ var CREDENTIAL_PROVIDER_CHECKERS = {
   devin: (env) => checkDevinCredentials(env),
   opencode: (env, opts) => checkOpencodeCredentials(env, opts),
   pi: async (env, opts) => {
-    const { checkPiMonoCredentials } = await import("./pi-mono-adapter-ef9wwx9m.js");
+    const { checkPiMonoCredentials } = await import("./pi-mono-adapter-9n2ya240.js");
     return checkPiMonoCredentials(env, opts);
   },
   acp: (env) => {
@@ -1245,6 +1288,19 @@ async function checkOpenRouter(apiKey) {
     latency_ms: r.latency_ms
   };
 }
+async function checkOpenAICompatibleProvider(provider, apiKey, baseUrl = provider.baseUrl) {
+  const r = await timedFetch(`${baseUrl.replace(/\/+$/, "")}/models`, {
+    method: "GET",
+    headers: { Authorization: `Bearer ${apiKey}` }
+  });
+  if (r.ok)
+    return { ok: true, latency_ms: r.latency_ms };
+  return {
+    ok: false,
+    error: scrubSecrets(`HTTP ${r.status}: ${r.bodyText.slice(0, 200)}`),
+    latency_ms: r.latency_ms
+  };
+}
 function codexAuthFileExists(env) {
   return checkCodexCredentials(env).satisfiedBy === "file";
 }
@@ -1317,11 +1373,17 @@ async function validateProviderCredentials(provider, env = process.env, presence
           return checkAnthropicApiKey(env.ANTHROPIC_API_KEY);
         if (env.OPENAI_API_KEY)
           return checkOpenAiApiKey(env.OPENAI_API_KEY);
+        for (const direct of openAICompatibleProviders()) {
+          const key = providerKeyFromEnv(direct, env);
+          if (key) {
+            return checkOpenAICompatibleProvider(direct, key, providerBaseUrl(direct, env));
+          }
+        }
         if (status.ready)
           return presenceCheckOk();
         return {
           ok: false,
-          error: "No usable credential found (OPENROUTER_API_KEY, ANTHROPIC_API_KEY, or OPENAI_API_KEY).",
+          error: `No usable credential found (OPENROUTER_API_KEY, ANTHROPIC_API_KEY, OPENAI_API_KEY, ${openAICompatibleProviders().map((p) => p.envVar).join(", ").replace(/, (?=[^,]*$)/, ", or ")}).`,
           latency_ms: Date.now() - startedAt
         };
       }
@@ -1380,7 +1442,7 @@ async function validateProviderCredentials(provider, env = process.env, presence
             latency_ms: Date.now() - startedAt
           };
         }
-        const { liveTestCursorKey } = await import("./cursor-adapter-q8pgv5qa.js");
+        const { liveTestCursorKey } = await import("./cursor-adapter-cehv1qns.js");
         const result = await liveTestCursorKey(apiKey);
         return result.ok ? { ok: true, latency_ms: Date.now() - startedAt } : { ok: false, error: result.error, latency_ms: Date.now() - startedAt };
       }
@@ -1913,13 +1975,6 @@ function scheduleRunnerGc(reason) {
   timer.unref?.();
   return true;
 }
-async function savePm2State(role) {
-  try {
-    console.log(`[${role}] Saving PM2 process list...`);
-    await Bun.$`pm2 save`.quiet();
-    console.log(`[${role}] PM2 state saved`);
-  } catch {}
-}
 async function fetchRepoConfig(apiUrl, apiKey, vcsRepo, requireExactMatch = false) {
   try {
     const requested = vcsRepo.trim().replace(/\/+$/, "").replace(/\.git$/, "");
@@ -2254,6 +2309,16 @@ async function exitAfterTasksIfFinished(state, limit, shutdown) {
 }
 var deploymentMemoryRaters = process.env.MEMORY_RATERS;
 var rowOverriddenBootEnv = new Map;
+var lastWithheldEnvKeys = "";
+function logWithheldEnvKeys(keys) {
+  const summary = [...keys].sort().join(", ");
+  if (summary === lastWithheldEnvKeys)
+    return;
+  lastWithheldEnvKeys = summary;
+  if (!summary)
+    return;
+  console.log(`[env-reload] Kept ${keys.length} config entries with exportToEnv=false out of the harness env: ${summary}`);
+}
 async function fetchResolvedEnv(apiUrl, apiKey, agentId, baseEnv = process.env, taskModel, sessionContext) {
   const env = { ...baseEnv };
   for (const key of Object.keys(env)) {
@@ -2283,7 +2348,17 @@ async function fetchResolvedEnv(apiUrl, apiKey, agentId, baseEnv = process.env,
         if (data.configs?.length) {
           const skippedSecretKeys = [];
           scriptsOnlyConfigValue = data.configs.find((config) => config.key === "SCRIPTS_ONLY_MCP")?.value;
+          const withheldEnvKeys = [];
           for (const config of data.configs) {
+            if (config.exportToEnv === false || isEnvExportRestrictedKey(config.key)) {
+              if (config.isSecret)
+                registerSensitiveKeyName(config.key);
+              delete env[config.key];
+              if (baseEnv === process.env)
+                delete process.env[config.key];
+              withheldEnvKeys.push(config.key);
+              continue;
+            }
             if (config.isSecret && config.value === MASKED_SECRET_VALUE) {
               skippedSecretKeys.push(config.key);
               continue;
@@ -2301,6 +2376,7 @@ async function fetchResolvedEnv(apiUrl, apiKey, agentId, baseEnv = process.env,
           if (skippedSecretKeys.length) {
             console.warn(scrubSecrets(`[env-reload] Skipped masked secrets: ${skippedSecretKeys.join(", ")}`));
           }
+          logWithheldEnvKeys(withheldEnvKeys);
           console.log(`[env-reload] Loaded ${data.configs.length} config entries from API`);
         }
         const codexPoolSlots = countCodexOAuthPoolSlots(data.configs ?? []);
@@ -2310,6 +2386,8 @@ async function fetchResolvedEnv(apiUrl, apiKey, agentId, baseEnv = process.env,
       console.warn(`[env-reload] Could not fetch config, using current env: ${error}`);
     }
   }
+  normalizeProviderKeyAliases(env);
+  registerEnvSecrets(env);
   const resolvedProvider = sessionContext?.provider ?? resolveHarnessProvider(env, baseEnv);
   if (sessionContext?.provider)
     env.HARNESS_PROVIDER = sessionContext.provider;
@@ -2510,10 +2588,6 @@ var SWARM_TOOL_LABELS = {
   "create-channel": "\uD83D\uDCE2 Creating channel",
   "list-channels": "\uD83D\uDCE2 Listing channels",
   "delete-channel": "\uD83D\uDCE2 Deleting channel",
-  "register-service": "\uD83D\uDD0C Registering service",
-  "list-services": "\uD83D\uDD0C Listing services",
-  "unregister-service": "\uD83D\uDD0C Unregistering service",
-  "update-service-status": "\uD83D\uDD0C Updating service status",
   "script-search": "\uD83D\uDCDC Searching scripts",
   "script-run": "\uD83D\uDCDC Running script",
   "script-upsert": "\uD83D\uDCDC Saving script",
@@ -3173,7 +3247,6 @@ function setupShutdownHandlers(role, apiConfig, getRunnerState, onShutdown) {
       });
       await closeAgent(apiConfig, role);
     }
-    await savePm2State(role);
     process.exit(exitCode);
   };
   const beginShutdown = (signal, exitCode = 0) => shutdown(signal, exitCode).catch(async (error) => {
@@ -3253,11 +3326,13 @@ async function saveCostData(cost, apiUrl, apiKey, deadline) {
     console.warn(scrubSecrets(`[runner] Error saving cost data: ${error}`));
   }
 }
-async function saveProviderSessionId(apiUrl, apiKey, taskId, claudeSessionId, provider, providerMeta, model, harnessVariant, harnessVariantMeta) {
+async function saveProviderSessionId(apiUrl, apiKey, taskId, claudeSessionId, provider, providerMeta, model, harnessVariant, harnessVariantMeta, effort) {
   const headers = { "Content-Type": "application/json" };
   if (apiKey)
     headers.Authorization = `Bearer ${apiKey}`;
   const body = { claudeSessionId };
+  if (effort !== undefined && provider !== "devin")
+    body.effort = effort;
   if (provider !== undefined)
     body.provider = provider;
   if (providerMeta !== undefined)
@@ -3544,6 +3619,33 @@ ${notes}` : "";
   });
   return result.skipped ? "" : result.text.trim();
 }
+function missingTaskDirWarning(taskDir, effectiveCwd) {
+  return taskDir && !effectiveCwd ? `Note: The task requested working directory "${taskDir}" but it does not exist. Falling back to default directory.` : undefined;
+}
+async function buildTaskSessionPrompts(input) {
+  const { basePromptArgs, additionalSystemPrompt, context } = input;
+  const basePrompt = await getBasePrompt(basePromptArgs);
+  const systemPrompt = additionalSystemPrompt ? `${basePrompt}
+
+${additionalSystemPrompt}` : basePrompt;
+  const taskContext = [
+    await getTaskContextPrompt({
+      ...basePromptArgs,
+      repoContext: context.repoContext,
+      slackContext: context.slackContext
+    }),
+    await buildRequesterProfilePrompt(context.requestedBy),
+    context.cwdWarning?.trim()
+  ].filter((part) => Boolean(part)).join(`
+
+`);
+  return {
+    systemPrompt,
+    prompt: taskContext ? `${input.taskPrompt}
+
+${taskContext}` : input.taskPrompt
+  };
+}
 
 class AgentRegistrationHttpError extends Error {
   status;
@@ -4076,6 +4178,7 @@ async function spawnProviderProcess(adapter, opts, logDir, isYolo) {
   if (spawnModel.warning)
     console.warn(spawnModel.warning);
   const model = spawnModel.model;
+  const sessionEffort = effectiveReasoningEffort(adapter.name, model, reasoningEffortOverride);
   let oauthSelection;
   let oauthIsPoolBacked = false;
   if (adapter.name === "codex") {
@@ -4248,7 +4351,7 @@ async function spawnProviderProcess(adapter, opts, logDir, isYolo) {
           }).catch((err) => console.warn(`[runner] Failed to report ACP options: ${err}`));
         }
         if (realTaskId) {
-          saveProviderSessionId(opts.apiUrl, opts.apiKey, realTaskId, event.sessionId, event.provider, event.providerMeta, model, event.harnessVariant, event.harnessVariantMeta).catch((err) => console.warn(`[runner] Failed to save session ID: ${err}`));
+          saveProviderSessionId(opts.apiUrl, opts.apiKey, realTaskId, event.sessionId, event.provider, event.providerMeta, model, event.harnessVariant, event.harnessVariantMeta, sessionEffort).catch((err) => console.warn(`[runner] Failed to save session ID: ${err}`));
         } else {
           saveProviderSessionIdOnActiveSession(opts.apiUrl, opts.apiKey, effectiveTaskId, event.sessionId).catch((err) => console.warn(`[runner] Failed to save provider session on active session: ${err}`));
         }
@@ -5076,11 +5179,9 @@ async function runAgent(config, opts) {
   let agentDescription;
   let agentSkillsSummary;
   let agentMcpServers;
-  let currentRepoContext;
-  let currentTaskSlackContext;
-  const buildSystemPrompt = async () => {
+  const basePromptArgs = () => {
     const { traits } = adapter;
-    return getBasePrompt({
+    return {
       role,
       agentId,
       capabilities,
@@ -5093,14 +5194,13 @@ async function runAgent(config, opts) {
       soulMd: agentSoulMd,
       identityMd: agentIdentityMd,
       claudeMd: agentClaudeMd,
-      repoContext: currentRepoContext,
-      slackContext: currentTaskSlackContext,
       ...traits.hasMcp && {
         skillsSummary: agentSkillsSummary,
         mcpServers: agentMcpServers
       }
-    });
+    };
   };
+  const buildSystemPrompt = async () => getBasePrompt(basePromptArgs());
   let basePrompt = await buildSystemPrompt();
   let additionalSystemPrompt;
   const systemPromptText = opts.systemPrompt || process.env.SYSTEM_PROMPT;
@@ -5577,7 +5677,7 @@ ${agentSetupScript}
   }
   if (agentClaudeMd) {
     try {
-      const backupPath = await writeProfileFileFromDb("/workspace/CLAUDE.md", agentClaudeMd);
+      const backupPath = await writeProfileFileFromDb(WORKSPACE_CLAUDE_MD_PATH, agentClaudeMd);
       if (backupPath)
         console.warn(`[${role}] Archived differing CLAUDE.md at ${backupPath}`);
       console.log(`[${role}] Wrote CLAUDE.md to workspace`);
@@ -5714,7 +5814,8 @@ ${additionalSystemPrompt}` : basePrompt;
             console.warn(`[${role}] Failed to check resume task dir "${task.dir}", falling back to default cwd`);
           }
         }
-        if (!resumeCwd && task.vcsRepo && apiUrl) {
+        let resumeRepoContext;
+        if (task.vcsRepo && apiUrl) {
           const repoConfig = await fetchRepoConfig(apiUrl, apiKey, task.vcsRepo);
           const effectiveConfig = repoConfig ?? {
             url: task.vcsRepo,
@@ -5723,10 +5824,27 @@ ${additionalSystemPrompt}` : basePrompt;
             defaultBranch: "main"
           };
           const repoContext = await ensureRepoForTask(effectiveConfig, role, false);
-          if (repoContext?.clonePath) {
+          resumeRepoContext = { ...repoContext, guidelines: repoConfig?.guidelines ?? null };
+          if (!resumeCwd && repoContext?.clonePath) {
             resumeCwd = repoContext.clonePath;
           }
         }
+        const resumeSlackChannelId = task.slackChannelId;
+        const resumeSession = await buildTaskSessionPrompts({
+          basePromptArgs: basePromptArgs(),
+          additionalSystemPrompt,
+          taskPrompt: resumePrompt,
+          context: {
+            repoContext: resumeRepoContext,
+            slackContext: resumeSlackChannelId ? {
+              channelId: resumeSlackChannelId,
+              threadTs: task.slackThreadTs
+            } : undefined,
+            requestedBy: task.requestedBy,
+            cwdWarning: missingTaskDirWarning(task.dir, resumeCwd)
+          }
+        });
+        resumePrompt = resumeSession.prompt;
         const resumeRunnerSessionId = crypto.randomUUID();
         await registerActiveSession(apiConfig, {
           taskId: task.id,
@@ -5739,7 +5857,7 @@ ${additionalSystemPrompt}` : basePrompt;
           runningTask = await spawnProviderProcess(adapter, {
             prompt: resumePrompt,
             logFile,
-            systemPrompt: resolvedSystemPrompt,
+            systemPrompt: resumeSession.systemPrompt,
             additionalArgs: opts.additionalArgs,
             resumeSessionId: undefined,
             role,
@@ -5749,10 +5867,8 @@ ${additionalSystemPrompt}` : basePrompt;
             runnerSessionId: resumeRunnerSessionId,
             iteration,
             taskId: task.id,
-            model: task.model,
+            ...resumedTaskModelSelection(task),
             modelTier: task.modelTier,
-            resolvedModel: task.resolvedModel,
-            modelSource: task.modelSource,
             effort: task.effort,
             harnessProvider: state.harnessProvider,
             cwd: resumeCwd,
@@ -5979,7 +6095,8 @@ ${additionalSystemPrompt}` : basePrompt;
         const taskContextKey = trigger.task?.contextKey;
         const taskSlackChannelId = trigger.task?.slackChannelId;
         const taskSlackThreadTs = trigger.task?.slackThreadTs;
-        currentTaskSlackContext = taskSlackChannelId ? { channelId: taskSlackChannelId, threadTs: taskSlackThreadTs } : undefined;
+        const taskSlackContext = taskSlackChannelId ? { channelId: taskSlackChannelId, threadTs: taskSlackThreadTs } : undefined;
+        let currentRepoContext;
         const taskVcsRepo = trigger.task?.vcsRepo;
         if (taskVcsRepo && apiUrl) {
           const repoConfig = await fetchRepoConfig(apiUrl, apiKey, taskVcsRepo);
@@ -5995,8 +6112,6 @@ ${additionalSystemPrompt}` : basePrompt;
             ...repoResult,
             guidelines: repoConfig?.guidelines ?? null
           };
-        } else {
-          currentRepoContext = undefined;
         }
         const taskDir = trigger.task?.dir;
         let effectiveCwd;
@@ -6026,12 +6141,7 @@ ${additionalSystemPrompt}` : basePrompt;
           }
           triggerPrompt += " You can still access any path on the filesystem — this is just your starting directory.";
         }
-        let cwdWarning = "";
-        if (taskDir && !effectiveCwd) {
-          cwdWarning = `
-
-Note: The task requested working directory "${taskDir}" but it does not exist. Falling back to default directory.`;
-        }
+        const cwdWarning = missingTaskDirWarning(taskDir, effectiveCwd);
         if (state.harnessProvider !== "claude-managed") {
           const skillResult = await refreshSkillsIfChanged({ apiUrl, swarmUrl, apiKey, agentId, role }, lastSkillHash);
           if (skillResult.changed && skillResult.summary) {
@@ -6058,12 +6168,19 @@ Note: The task requested working directory "${taskDir}" but it does not exist. F
           agentDescription = identityResult.fields.description;
           console.log(`[${role}] Identity changed — refreshing system prompt (${identityResult.changedFields.join(", ")})`);
         }
-        const taskBasePrompt = await buildSystemPrompt();
-        const requesterProfilePrompt = await buildRequesterProfilePrompt(trigger.requestedBy);
-        const taskPromptParts = [taskBasePrompt, requesterProfilePrompt, additionalSystemPrompt].filter((part) => Boolean(part)).join(`
-
-`);
-        const taskSystemPrompt = taskPromptParts + cwdWarning;
+        const taskSession = await buildTaskSessionPrompts({
+          basePromptArgs: basePromptArgs(),
+          additionalSystemPrompt,
+          taskPrompt: triggerPrompt,
+          context: {
+            repoContext: currentRepoContext,
+            slackContext: taskSlackContext,
+            requestedBy: trigger.requestedBy,
+            cwdWarning
+          }
+        });
+        const taskSystemPrompt = taskSession.systemPrompt;
+        triggerPrompt = taskSession.prompt;
         const modelUnsupported = trigger.task?.modelUnsupported;
         if (trigger.taskId && modelUnsupported) {
           console.log(`[${role}] ${modelUnsupported}`);