create-walle 0.10.2 → 0.10.3

package/template/coding-task-manager/lib/session-create/provider-process.js

@@ -21,9 +21,14 @@ const { validateDeferredRestoreAttempt } = require('../deferred-restore-attempt'
 const { getPrivateSourceRecoveryEnvironment, capturePrivateSourceEnvironment,
   hasCapturedEmptySourceEnvironmentRestore } = require('../lead-model-restore-reconciliation');
 const { modelStorageRootsFromEnv, privateOverridesFromEnv } = require('../host-handoff');
+// WP-1 (D-2): the host-carried launch-environment record is built by the ONE capture function (§5 D-1).
+const { captureLaunchEnvironment } = require('../launch-environment');
 // WP-0b: the rollback launch capture (moved out of this file, same spawn point) -- see
 // lib/session-create/provider-launch-context.js for the field-by-field contract.
 const { buildModelTransitionLaunchContext } = require('./provider-launch-context');
+// WP-4 (D-7/D-8, §6.4): the hub's agent-skill bundle, applied to the SPAWN argv/env only.
+const { applyAgentBundleToSpawn, resolveSpawnBundleForSession } = require('../agent-bundle/spawn');
+const { treeHex } = require('../agent-bundle/drift'); // WP-3 D-11/S-5: the spawn result names the tree it applied
 const codexNativeProviderGate = require('./codex-native-provider-gate');
 const MAX_CODEX_CONFIG_BYTES = 1024 * 1024;
 
@@ -117,12 +122,19 @@ function explicitClaudeSessionId(args) {
   return unique.length === 1 ? unique[0] : unique.length === 0 ? null : '';
 }
 
-function launchProviderThreadId({ agent, launchPlan, claudeResumeId, injectedSessionId, args }) {
+// R-2 (docs/opencode-v2-model-switch-standalone-plugin-2026-10-30.html §5.1): the OpenCode v2 session id
+// resolve-launch-params minted, carried in the `_launchParams` bag server.js forwards.
+function injectedOpencodeSessionId(state) {
+  const value = state?._injectedOpencodeSessionId || state?._launchParams?._injectedOpencodeSessionId;
+  return typeof value === 'string' && value.length > 0 ? value : null;
+}
+
+function launchProviderThreadId({ agent, launchPlan, claudeResumeId, injectedSessionId, injectedOpencodeId, args }) {
   const resume = launchPlan?.resume || {};
   const explicit = agent === 'claude' ? explicitClaudeSessionId(args) : null;
   if (explicit === '') return null;
   const candidates = [resume.providerResumeId, resume.providerResumeID, resume.sessionId, resume.agentSessionId,
-    claudeResumeId, injectedSessionId, explicit,
+    claudeResumeId, injectedSessionId, injectedOpencodeId, explicit,
     extractResumeTarget(agent, args)?.sessionId].filter((value) => typeof value === 'string' && value.length > 0);
   const unique = [...new Set(candidates)];
   return unique.length === 1 ? unique[0] : null;
@@ -202,6 +214,7 @@ async function prepareProviderSession(state) {
   } = _getDeps();
   const { args, cmd, createAgentType, cwd, env, id, msg, preparedLaunchPlan, restoreSeedSnapshot, ws, signal,
     claudeResumeId, _injectedSessionId } = state;
+  const _injectedOpencodeSessionId = injectedOpencodeSessionId(state);
   const transitionSignal = Object.hasOwn(state, 'transitionSignal')
     ? (state.transitionSignal || null) : (msg?._transitionSignal || null);
   // WP-0b (docs/session-model-authority-and-display-2026-10-15.html §9 S3, AC-0d): a provider
@@ -225,7 +238,7 @@ async function prepareProviderSession(state) {
     return { handled: true, result: null };
   }
   const resolvedProviderThreadId = launchProviderThreadId({ agent: createAgentType, launchPlan: preparedLaunchPlan,
-    claudeResumeId, injectedSessionId: _injectedSessionId, args });
+    claudeResumeId, injectedSessionId: _injectedSessionId, injectedOpencodeId: _injectedOpencodeSessionId, args });
   const subagentOwnerContext = {
     processGeneration: modelProcessGeneration,
     harness: createAgentType === 'codex' ? 'codex-cli' : 'claude-code',
@@ -238,8 +251,8 @@ async function prepareProviderSession(state) {
     if (!msg._isRestore || msg._leadModelTransition
         || sourceRecoveryEnvironment.ctmSessionId !== id
         || sourceRecoveryEnvironment.agent !== createAgentType
-        || sourceRecoveryEnvironment.providerThreadId !== providerThreadId
-        || sourceRecoveryEnvironment.modelId !== msg._launchModelOverride
+        || (sourceRecoveryEnvironment.providerThreadId !== providerThreadId && !(sourceRecoveryEnvironment.freshRelaunch === true && providerThreadId === ''))
+        || sourceRecoveryEnvironment.modelId !== String(msg._launchModelOverride || '')
         || sourceRecoveryEnvironment.routeId !== routeId) {
       recordSessionDiagnostic?.(id, 'source-recovery-environment-rejected', { reason: 'source_owner_mismatch' });
       return { handled: false, providerState: null };
@@ -293,6 +306,7 @@ async function prepareProviderSession(state) {
       ? await _prepareRestoredScrollbackSeed(id, restoreSeedData, {
         recordedSeamRow: Number.isFinite(restoreSeedSnapshot?.archiveSeamRow)
           ? restoreSeedSnapshot.archiveSeamRow : null,
+        seedRows: restoreSeedSnapshot?.rows, // the snapshot's rows, not the new session's
       })
       : null;
   } catch (error) {
@@ -313,8 +327,11 @@ async function prepareProviderSession(state) {
   // session has a persisted lead route runs its CLI against CTM's model proxy. Never for a worker
   // (own route path) and never for a non claude/codex agent. The target comes from the switch's own
   // msg._launchLeadRoute when present (object, or null = explicitly native), else the DB row.
+  // WP-2 (opencode-model-selection round 2 §5 R-3): an OpenCode LEAD rides the SAME preparation --
+  // same token, ownership, persistence, revocation -- only its last step (the OPENCODE_CONFIG_CONTENT
+  // provider patch merged below) differs, exactly as Codex's `-c` block already does.
   let leadRoute = null;
-  if (msg.agentRole !== 'worker' && (createAgentType === 'claude' || createAgentType === 'codex')) {
+  if (msg.agentRole !== 'worker' && (createAgentType === 'claude' || createAgentType === 'codex' || createAgentType === 'opencode')) {
     let target = null;
     let readFailed = false;
     if (Object.hasOwn(msg, '_launchLeadRoute')) {
@@ -512,9 +529,12 @@ async function prepareProviderSession(state) {
   }
   // default-subagent-model-delegate-pick-2026-10-13.html §5 D-1..D-3/D-9/D-12: a Claude/Codex LEAD
   // launch reads the Wall-E delegate pick and applies a native/inherit pick to THIS spawn's env/argv
-  // only. The RESOLVER comes through the deps getter (never a require fallback): when it is absent
-  // (every existing test harness) nothing happens -- no Wall-E read, zero change (D-1), and unit
-  // tests stay off the live Wall-E. The PURE planner is required lazily inside that guard.
+  // only. S-19 (opencode-lead-and-delegate-model-selection-2026-10-28.html §8 WP-4) adds the OpenCode
+  // lead to that same gate: its pick is projected into OPENCODE_CONFIG_CONTENT instead of subagent env
+  // vars (see subagent-pick.opencodeLaunchProjection). The RESOLVER comes through the deps getter
+  // (never a require fallback): when it is absent (every existing test harness) nothing happens -- no
+  // Wall-E read, zero change (D-1), and unit tests stay off the live Wall-E. The PURE planner is
+  // required lazily inside that guard.
   let subagentPick = null;
   let subagentPlan = null;
   let appliedSubagentPick = null;
@@ -532,7 +552,8 @@ async function prepareProviderSession(state) {
   // through the private runtime state so the PRE-SPAWN rechecks (after every late transform) can still
   // refuse an attempt that went stale while the launch plan ran.
   let nativeLaunchGenerationFence = null;
-  if (msg.agentRole !== 'worker' && (createAgentType === 'claude' || createAgentType === 'codex')) {
+  if (msg.agentRole !== 'worker'
+      && (createAgentType === 'claude' || createAgentType === 'codex' || createAgentType === 'opencode')) {
     const resolvePick = _getDeps().resolveSubagentPick;
     if (typeof resolvePick === 'function') {
       try {
@@ -608,15 +629,42 @@ async function prepareProviderSession(state) {
           }
         }
       }
-      if (subagentPick && (subagentPick.kind === 'native' || subagentPick.kind === 'inherit')) {
-        const { planSubagentLaunch } = require('./subagent-pick');
-        subagentPlan = planSubagentLaunch(subagentPick, { agent: createAgentType, leadRoute, dataDir: getDataDir() });
+      // WP-1 (codex-native-subagent-pick-enforcement-2026-10-28.html D-2/D-3/D-4): an unservable Codex pick is
+      // planned too -- the plan carries the deny prefix (roleFile null) and the fact is recorded on the pick.
+      let codexVersion = '';
+      if (subagentPick && (subagentPick.kind === 'native' || subagentPick.kind === 'inherit'
+          || subagentPick.kind === 'unservable')) {
+        const { planSubagentLaunch, nativeSubagentsDenied } = require('./subagent-pick');
+        // WP-1b: the deny prefix needs a config key only Codex >= 0.163.0 knows, so probe the binary
+        // this launch spawns -- and ONLY for a denied pick (no extra spawn everywhere else). A
+        // throwing or empty probe reads as unknown: no deny, never a blocked launch.
+        if (nativeSubagentsDenied(subagentPick)) {
+          try {
+            const probeVersion = _getDeps().probeCodexVersion || require('../harness-model-profile')._probeVersion;
+            codexVersion = String(await probeVersion(cmd, signal) || '');
+          } catch (error) {
+            /* HANDLE: a failed probe is unknown -> baseline launch (D-1), never a refusal. */
+            recordSessionDiagnostic?.(id, 'subagent-pick-version-probe-failed', { detail: String((error && error.message) || error).slice(0, 200) });
+          }
+        }
+        // §5 R-10: an OpenCode pick is projected into inline runtime config, so the planner needs the
+        // launch env's CURRENT OPENCODE_CONFIG_CONTENT to merge over rather than replace. Nothing else
+        // reads it -- a claude/codex plan ignores the option entirely.
+        subagentPlan = planSubagentLaunch(subagentPick, { agent: createAgentType, leadRoute, dataDir: getDataDir(), codexVersion,
+          existingConfigContent: env && env.OPENCODE_CONFIG_CONTENT });
+        if (subagentPlan && subagentPlan.nativeSubagents) {
+          subagentPick = { ...subagentPick, nativeSubagents: subagentPlan.nativeSubagents };
+        }
       }
       if (typeof recordSessionDiagnostic === 'function') {
         if (subagentPick && subagentPick.kind === 'none' && subagentPick.reason === 'read_failed') {
           recordSessionDiagnostic(id, 'subagent-pick-read-failed', { detail: subagentPick.detail });
         } else if (subagentPick && subagentPick.kind === 'unservable') {
-          recordSessionDiagnostic(id, 'subagent-pick-unservable', { reason: subagentPick.reason });
+          recordSessionDiagnostic(id, 'subagent-pick-unservable', {
+            reason: subagentPick.reason,
+            nativeSubagents: subagentPlan ? subagentPlan.nativeSubagents : '',
+            codexVersion,
+          });
         }
       }
       if (subagentPlan && subagentPlan.roleFile) {
@@ -675,6 +723,12 @@ async function prepareProviderSession(state) {
     }
   }
 
+  // WP-4 (§5 D-6/D-7/D-8, §6.4): the hub's bundle, read while we are still async (the spawn tail is
+  // synchronous). Resolved per spawn, so a restore picks up the CURRENT tree (AC-4d); never persisted.
+  const spawnBundle = createAgentType === 'claude'
+    ? await resolveSpawnBundleForSession(id, { report: (event, details) => recordSessionDiagnostic?.(id, event, details) })
+    : null;
+
   const providerStateInput = {
     ...state,
     // Carry only the already-validated private capability across the async preparation boundary.
@@ -693,7 +747,7 @@ async function prepareProviderSession(state) {
     restoreSeedPrepared,
     args: runtime?.ready ? runtime.args : args,
     codexApprovalProxyOwnsApprovals: runtime?.ready === true && runtime.mode === 'canary',
-    appliedSubagentPick,
+    appliedSubagentPick, spawnBundle,
   };
   let providerState;
   try {
@@ -727,8 +781,10 @@ function isLiveForCwdConflict(s) {
 function createProviderSession(state) {
   const { sessionInputAuthority } = _getDeps();
   const { CODEX_RESUME_CWD_GUARD_ENABLED, RESUME_FIRSTBYTE_MS, RESUME_LIFECYCLE_V2_ENABLED, _armResumeHardCeiling, _attentionMarkerMs, _detachOwnerMutation, _enforceLifecycleCap, _fireResumeFirstByteWatchdog, _fireResumeLoadingSafetyTimeout, _isAgentWorktreePath, _markRestoreInterruptionWaiting, _markRestoredHeadlessSeedApplied, _perfTracker, _prepareScrollbackForSession, _providerIdFromCmd, _reportWorkerIpc, _resumeAttemptTracker, _resumeLifecycleCoordinator, _resumeLoadingAgentEnabled, _resumeLoadingMaxMs, _resumeLoadingServerCore, _retireResumeGenerationLocalState, _sessionMcpProfileSetting, _sessionStream, _setSessionAttentionFields, _spawnSessionPty, _providerRunningHoldMsForSession, _stateSyncCreateSubscriptionOptions, _resyncViewingForSession, _stripAgentWorktreePath, _subscribeStateSyncClient, _useSessionHostProcessForPty, _viewerArbitration, _wsSend, broadcastSessionList, claudeProjectDirForCwd, codexConfigGuard, codexPaths, createPtyStartupReservation, createSessionWithStartupTaskWithRetry, crypto, dbModule, detectAgentType, encodeClaudeProjectEntry, encodeProjectEntry, execFileCb, headlessWorker, normalizeAgentType, parseSessionStartMs, path, recordSessionDiagnostic, resolveResumeGeneration, restoreRuntime, seedClaudeModel, serverConfig, sessionEvents, sessionHostManager, sessionRegistry, statusHooks, telemetry } = _getDeps();
-  const { _approvalHookEnabled, _approvalHookToken, _codexResumeCwdToHeal, _handleCreateStartedAt, _injectedSessionId, claudeResumeId, cmd, codexApprovalProxyOwnsApprovals, cols, createAgentType, cwd, env, existingTitle, hasExplicitClientTitle, id, isResumeLaunch, label, leadRoute, modelProcessGeneration: capturedModelProcessGeneration, nativeLeadTokenOwnership, nativeLeadLifetimeCapture: capturedNativeLifetime, nativeLeadOwnerRow: capturedNativeOwnerRow, nativeLaunchGenerationFence: capturedNativeGenerationFence, model_id, model_provider, msg, nativeConfigReceipt, preparedLaunchPlan, ptyStartupAttempt, restoreLaunchFence, restoreSeedPrepared, restoreSeedSnapshot, rows, sourceRecoveryEnvironment, subagentPick, appliedSubagentPick, subagentPlan, title, ws } = state;
+  const { _approvalHookEnabled, _approvalHookToken, _codexResumeCwdToHeal, _handleCreateStartedAt, _injectedSessionId, claudeResumeId, cmd, codexApprovalProxyOwnsApprovals, cols, createAgentType, cwd, env, existingTitle, hasExplicitClientTitle, id, isResumeLaunch, label, leadRoute, modelProcessGeneration: capturedModelProcessGeneration, nativeLeadTokenOwnership, nativeLeadLifetimeCapture: capturedNativeLifetime, nativeLeadOwnerRow: capturedNativeOwnerRow, nativeLaunchGenerationFence: capturedNativeGenerationFence, model_id, model_provider, msg, nativeConfigReceipt, preparedLaunchPlan, ptyStartupAttempt, restoreLaunchFence, restoreSeedPrepared, restoreSeedSnapshot, rows, sourceRecoveryEnvironment, subagentPick, appliedSubagentPick, subagentPlan, spawnBundle, title, ws } = state;
   const preparedLeadTokenOwner = leadRoute?.ownership || leadRoute?.preparedPlan?.ownership || nativeLeadTokenOwnership || null;
+  // R-2: never `_injectedSessionId` — the Claude-only JSONL/project-dir side effects below key on it.
+  const _injectedOpencodeSessionId = injectedOpencodeSessionId(state);
   // §6.6 item 11 / §6.12: an EXACT captured native owner has exactly ONE cleanup obligation — the
   // private lifetime record owns both phases of it (the exact token/row revoke AND the files), and the
   // module decides whether the files may go (an UNCONSUMED attempt) or must be retained until a real
@@ -822,11 +878,11 @@ function createProviderSession(state) {
       }
     }
 
-    // Lead-model switch (picker design D-7): the one-shot model override reaches THIS spawn's argv
-    // only. `args` (what session.args and startup_tasks get below) never carries it; a later
-    // restore replays the session's stored pin (the WP-3 block below), not the one-shot override.
+    // Lead-model switch (picker design D-7): the one-shot model override reaches THIS spawn's argv only
+    // (`args`/startup_tasks never carry it; a later restore replays the stored pin, WP-3). The OpenCode
+    // line rides along so a 2.x relaunch drops `--model` (its target is the inline config + plugin, R-4).
     const launchOverride = msg._isRestore === true
-      ? applyLaunchModelOverride({ agentType: normalizeAgentType(createAgentType), args, model: msg._launchModelOverride })
+      ? applyLaunchModelOverride({ agentType: normalizeAgentType(createAgentType), args, model: msg._launchModelOverride, ...(normalizeAgentType(createAgentType) === 'opencode' ? { line: require('../opencode-cli').peekOpencodeLine() } : {}) })
       : { args, applied: false, reason: 'none' };
     if (msg._launchModelOverride) recordSessionDiagnostic(id, 'lead-model-launch-override', { applied: launchOverride.applied, reason: launchOverride.reason, agent: createAgentType });
 
@@ -882,10 +938,15 @@ function createProviderSession(state) {
     // receives them (`launchEnvOverrides` below).
     const trustedCapturedEmptySourceEnvironment = msg._isRestore === true
       && hasCapturedEmptySourceEnvironmentRestore(msg);
-    const sourceOverrideCapture = capturePrivateSourceEnvironment(sourceRecoveryEnvironment
+    // The ONE input both the spawn receipt and the host-carried record are built from (WP-1 §6 S-3).
+    const privateSourceEnv = sourceRecoveryEnvironment
       ? privateOverridesFromEnv(sourceRecoveryEnvironment.environment)
       : trustedCapturedEmptySourceEnvironment ? {}
-        : privateOverridesFromEnv(msg.env && typeof msg.env === 'object' ? msg.env : {}));
+        : privateOverridesFromEnv(msg.env && typeof msg.env === 'object' ? msg.env : {});
+    const sourceOverrideCapture = capturePrivateSourceEnvironment(privateSourceEnv);
+    // WP-1 (S-3, §6): the SAME input drives the host-carried record, so the record's state/reason can never
+    // drift from the spawn receipt's `sourceEnvironmentReference` below.
+    const launchEnvironmentRecord = captureLaunchEnvironment(privateSourceEnv);
     const sourceEnvironmentReference = trustedCapturedEmptySourceEnvironment ? 'captured-empty'
       : sourceOverrideCapture.state === 'captured'
         ? (Object.keys(sourceOverrideCapture.values || {}).length === 0 ? 'captured-empty' : 'private-owner-required')
@@ -909,7 +970,8 @@ function createProviderSession(state) {
     const executionRecipe = modelExecutionRecipeForSpawn({ sessionId: id, processGeneration: modelProcessGeneration,
       agent: createAgentType, launchPlan: preparedLaunchPlan, leadRoute, transition: msg._leadModelTransition || null,
       sourceEnvironmentReference, nativeConfigReceipt, providerThreadId: launchProviderThreadId({ agent: createAgentType,
-        launchPlan: preparedLaunchPlan, claudeResumeId, injectedSessionId: _injectedSessionId, args: launchArgs }) });
+        launchPlan: preparedLaunchPlan, claudeResumeId, injectedSessionId: _injectedSessionId,
+        injectedOpencodeId: _injectedOpencodeSessionId, args: launchArgs }) });
     let spawnEnv = { ...applyModelExecutionRecipeToSpawnEnv(leadApplied.spawnEnv, executionRecipe,
       { sessionId: id, processGeneration: modelProcessGeneration }), CTM_MODEL_PROCESS_GENERATION: String(modelProcessGeneration) };
     // default-subagent-model-delegate-pick-2026-10-13.html §5 D-2/D-3/D-9: apply this session's
@@ -918,6 +980,73 @@ function createProviderSession(state) {
     const pickApplied = _applySubagentPickToSpawn({ launchArgs, spawnEnv, plan: subagentPlan });
     launchArgs = pickApplied.launchArgs;
     spawnEnv = pickApplied.spawnEnv;
+    // WP-5 (§5 R-6/§9 S-21, opencode-lead-and-delegate-model-selection-2026-10-28.html §8): an
+    // OpenCode LEAD gets the Wall-E MCP server INLINE, for THIS spawn only -- CTM never writes
+    // OpenCode's own config (~/.config/opencode/*). The entry comes through the deps getter
+    // (opencodeWalleMcp); absent (every existing test harness) means byte-identical behaviour. It is
+    // merged AFTER the subagent pick so it never replaces the pick's `agent.*.model` config -- both
+    // ride the same OPENCODE_CONFIG_CONTENT document (subagent-pick.opencodeWalleMcpProjection).
+    // A throw from the dep is REPORTED and the launch proceeds without it.
+    if (msg.agentRole !== 'worker' && createAgentType === 'opencode') {
+      const opencodeWalleMcp = _getDeps().opencodeWalleMcp;
+      if (typeof opencodeWalleMcp === 'function') {
+        let walleMcpEntry = null;
+        try {
+          walleMcpEntry = opencodeWalleMcp();
+        } catch (error) {
+          recordSessionDiagnostic?.(id, 'opencode-walle-mcp-failed', { message: String((error && error.message) || error).slice(0, 200) });
+        }
+        if (walleMcpEntry) {
+          const { opencodeWalleMcpProjection } = require('./subagent-pick');
+          const content = opencodeWalleMcpProjection({
+            existingConfigContent: spawnEnv.OPENCODE_CONFIG_CONTENT,
+            walleMcp: walleMcpEntry,
+          });
+          if (content !== null) spawnEnv = { ...spawnEnv, OPENCODE_CONFIG_CONTENT: content };
+        }
+      }
+    }
+    // WP-2 (opencode-model-selection round 2 §5 R-3/R-6, §6.2): an OpenCode ROUTED lead's `ctm-lead`
+    // provider entry is merged into the SAME OPENCODE_CONFIG_CONTENT blob its subagent pick (:942) and
+    // Wall-E MCP server (:951-973) ride. It is merged LAST -- after BOTH -- because the pick's
+    // projection REPLACES the value (`{...spawnEnv, OPENCODE_CONFIG_CONTENT: <its own>}`), so only here
+    // is the document final. One writer, one blob: provider['ctm-lead'] + agent.general/explore +
+    // mcp['wall-e'] together (AC-2b), with the token appearing only as {env:CTM_LEAD_TOKEN} (AC-2c).
+    // The `delete spawnEnv.ANTHROPIC_API_KEY` behaviour stays in _applyLeadRouteToSpawn, unchanged.
+    if (createAgentType === 'opencode' && leadRoute && leadRoute.configPatch) {
+      const { opencodeLeadRouteProjection } = require('./subagent-pick');
+      const content = opencodeLeadRouteProjection({
+        existingConfigContent: spawnEnv.OPENCODE_CONFIG_CONTENT,
+        configPatch: leadRoute.configPatch,
+      });
+      if (content !== null) spawnEnv = { ...spawnEnv, OPENCODE_CONFIG_CONTENT: content };
+    }
+    // WP-5 (R-9, §6.7): a prompted OpenCode 1.x tab's switch relaunch carries the model carrier; a no-op otherwise.
+    const v1CarrierEnv = require('./subagent-pick').opencodeV1CarrierEnv({
+      agentType: createAgentType, isRestore: msg._isRestore === true, agentRole: msg.agentRole,
+      line: require('../opencode-cli').peekOpencodeLine(), nativeModel: msg._launchModelOverride,
+      launchLeadRoute: msg._launchLeadRoute, launchArgs, spawnEnv,
+    });
+    if (v1CarrierEnv !== spawnEnv) {
+      spawnEnv = v1CarrierEnv;
+      recordSessionDiagnostic?.(id, 'opencode-v1-model-carrier', { target: spawnEnv.CTM_OPENCODE_SWITCH_MODEL, session_id: spawnEnv.CTM_OPENCODE_SWITCH_SESSION });
+    }
+    // WP-2 (R-3, §6.2) + WP-4 (R-4): every OpenCode 2.x LEAD launch carries the CTM status plugin inline; on a restore that same entry also carries `switch_model` (the switch). No-op otherwise.
+    const v2PluginEnv = require('./subagent-pick').opencodeV2PluginEnv({
+      agentType: createAgentType, isRestore: msg._isRestore === true, agentRole: msg.agentRole,
+      line: require('../opencode-cli').peekOpencodeLine(), nativeModel: msg._launchModelOverride,
+      launchLeadRoute: msg._launchLeadRoute, launchArgs, spawnEnv,
+    });
+    if (v2PluginEnv !== spawnEnv) {
+      spawnEnv = v2PluginEnv;
+      recordSessionDiagnostic?.(id, 'opencode-v2-plugin', { session_id: require('./subagent-pick').opencodeResumeSessionId(launchArgs), switch_model: require('./subagent-pick').opencodeV2SwitchModelOf(v2PluginEnv) });
+    }
+    // WP-4 (D-7/D-8, §6.4): applied to THIS spawn's argv/env only — `args`/state env keep their
+    // originals (AC-4c), and the pre-spawn fence below still runs after it.
+    const bundleApplied = applyAgentBundleToSpawn({ launchArgs, spawnEnv, agentType: createAgentType, bundle: spawnBundle });
+    launchArgs = bundleApplied.launchArgs;
+    spawnEnv = bundleApplied.spawnEnv;
+    if (bundleApplied.applied) recordSessionDiagnostic?.(id, 'agent-bundle-applied', { treeHash: spawnBundle.treeHash, hubPeerId: spawnBundle.hubPeerId });
     if (leadRoute && typeof recordSessionDiagnostic === 'function') {
       const token = String(leadRoute.token || '');
       recordSessionDiagnostic(id, 'lead-route-launch', { agent: createAgentType, route_id: leadRoute.alias, model: leadRoute.model, token_suffix: token.slice(-4) });
@@ -978,7 +1107,7 @@ function createProviderSession(state) {
           cols,
           rows,
           cwd,
-          env: spawnEnv,
+          env: spawnEnv, launchEnvironment: launchEnvironmentRecord,
           initialHeadlessData: restoreSeedForHeadless || undefined,
           initialHeadlessSeedAligned: restoreSeedPrepared?.seedAligned === true,
           initialHeadlessForwardDriftSeamRow: restoreSeedPrepared?.forwardDriftSeamRow,
@@ -1198,6 +1327,8 @@ function createProviderSession(state) {
             // -- native, inherit or routed -- is env-only and none/unservable applies nothing, so
             // those persist null rather than claiming a native-role effort.
             effort: appliedNativeEffort(appliedSubagentPick),
+            // WP-1 (D-4, v58): what THIS spawn did about native sub-agents; the plan is the authority ('' = known not denied).
+            nativeSubagents: subagentPlan ? subagentPlan.nativeSubagents : '',
             routeId: appliedSubagentPick.routeId || '', processGeneration: modelProcessGeneration,
             harness: executionRecipe?.harness || (createAgentType === 'codex' ? 'codex-cli' : 'claude-code'),
             providerThreadId: executionRecipe?.providerThreadId ?? null,
@@ -1340,7 +1471,7 @@ function createProviderSession(state) {
         if (session._wakeStartedAt) {
           session._wakePhases = { ...(session._wakePhases || {}), ptyStartedAt: Date.now() };
         }
-        broadcastSessionList(true);
+        broadcastSessionList(true, { reason: 'pty-started' });
       });
     }
     // The creator was already subscribed atomically by subscribeOnCreate() at function entry
@@ -1360,7 +1491,7 @@ function createProviderSession(state) {
     setImmediate(() => { _enforceLifecycleCap().catch(error => {
       console.warn(`[lifecycle] create-cap-enforcement failed id=${String(id).slice(0, 8)} error=${error.message}`);
     }); });
-    telemetry.track('ctm_session', { type: cmd.includes('claude') ? 'claude' : cmd.includes('codex') ? 'codex' : 'shell' });
+    telemetry.track('ctm_session', { type: ({ claude: 'claude', codex: 'codex' })[detectAgentType(cmd)] || 'shell' });
 
     // With --session-id injected, the JSONL path is known before Claude even starts
     // writing. Link the session stream eagerly so the ring buffer / conversation
@@ -1392,9 +1523,10 @@ function createProviderSession(state) {
     let startupPersistence = Promise.resolve(true);
     if (!msg._isRestore) {
       const sessionAgentType = detectAgentType(cmd) || 'unknown';
+      // R-2: an OpenCode 2.x create persists its minted id (at most one of the three is set).
       const initialAgentSessionId = sessionAgentType === 'codex'
         ? ''
-        : (claudeResumeId || _injectedSessionId || '');
+        : (claudeResumeId || _injectedSessionId || _injectedOpencodeSessionId || '');
       // WP-R7: msg here is preparedMsg (handleCreatePrepared spreads it verbatim into
       // handleCreate), so a client-supplied `mcp_profile` on the WS create message survives
       // to this point unmodified. Normalizes through the same function the launch-plan
@@ -1478,7 +1610,7 @@ function createProviderSession(state) {
       // db-owner preparation owns cleanup for both new and restored sessionRegistry.
       deferInspect: true,
     });
-  return { ...state, branch, ptyProcess, session, startupPersistence, args };
+  return { ...state, branch, ptyProcess, session, startupPersistence, args, agentBundleTreeHash: treeHex(spawnBundle?.treeHash) }; // WP-3/D-11: the tree THIS spawn applied (hex; null = no tree)
 }
 
 module.exports = { configure, createProviderSession, prepareProviderSession, isLiveForCwdConflict,

package/template/coding-task-manager/lib/session-create/response.js

@@ -1219,7 +1219,7 @@ function installResponseRuntime(runtime) {
               console.log(`    ✗ Restart failed: ${e.message}`);
               // Startup task was already in DB from original create — leave it for
               // manual restart or next CTM boot
-              runtime.broadcastSessionList(true);
+              runtime.broadcastSessionList(true, { reason: 'resume-restart-failed' });
             }
         }, delay);
         return;
@@ -1245,9 +1245,8 @@ function installResponseRuntime(runtime) {
             agentType,
           }, 'response-defer');
         }
-        // Keep the CTM identity and startup recipe as a deferred placeholder. Retiring the startup
-        // task here would make retry impossible. Failed resume mirrors also stay provisional so they
-        // cannot replace the known-good seed with startup noise.
+        // Keep the CTM identity and startup recipe as a deferred placeholder. Retiring the startup task here would make
+        // retry impossible. Failed resume mirrors also stay provisional so they cannot replace the known-good seed with startup noise.
         runAfterExitDrain(() => {
           runtime.session._ptyExitLifecycle.stage = 'defer-finalizing';
           flushExitTailBuffers();
@@ -1281,7 +1280,8 @@ function installResponseRuntime(runtime) {
           cleanAutoApprovalBuffer(runtime.id);
           cleanIdleNotify(runtime.id);
           try { statusHooks.unregisterSession(runtime.id); } catch (error) { void error; }
-          runtime.broadcastSessionList(true);
+          runtime._announceLiveDefer(runtime.session, runtime.id, 'crash-defer'); // WP-2 (R-3): the open tab learns of the live defer
+          runtime.broadcastSessionList(true, { reason: 'session-crash-defer' });
         });
         return;
       }
@@ -1310,7 +1310,7 @@ function installResponseRuntime(runtime) {
           cleanIdleNotify(runtime.id);
           try { statusHooks.unregisterSession(runtime.id); } catch (e) { void e; /* non-fatal */ }
           if (_sessionStream && runtime.session._claudeSessionId) _sessionStream.removeSession(runtime.session._claudeSessionId);
-          runtime.broadcastSessionList(true);
+          runtime.broadcastSessionList(true, { reason: 'session-exit' });
 
           // Fresh-cache the conversation rows immediately on exit,
           // so the review page serves from DB without waiting for the background scan.
@@ -1494,7 +1494,7 @@ function finalizeProviderSession(runtime, state) {
         Promise.resolve(startupPersistence).then(sendCreated, sendCreated);
       }
     }
-    broadcastSessionList(true);
+    broadcastSessionList(true, { reason: 'session-create' });
 }
 
 module.exports = { installResponseRuntime, finalizeProviderSession, _revokeWorkerTokenOnCreatePathExit, scheduleExitedSessionRetire, RETIRE_EXITED_SESSION_DELAY_MS };

package/template/coding-task-manager/lib/session-create/structured-session.js

@@ -0,0 +1,27 @@
+'use strict';
+
+// WP-2 (docs/deepseek-harness-acp-agent-2026-10-28.html §5 D-17, §9 S-11; §8 WP-2 row).
+//
+// The ONE pre-PTY create dispatcher: a create request that is not backed by a terminal goes to the
+// strategy that owns it. Today those are the Wall-E transcript session and the DeepSeek Harness ACP
+// session (lib/session-create/dsh-session.js); a strategy returns `false` to decline, and a `true`
+// means "handled" (a session row was created, or the failure frame was already sent).
+//
+// server.js's `handleCreate` calls this at the exact line it used to call the Wall-E strategy, so the
+// dispatcher costs no line budget (D-17). The Wall-E strategy keeps its own `configure` call in
+// server.js and is reached here through the shared module instance, so this file only has to wire the
+// strategy that has no other owner.
+
+const transcript = require('./transcript');
+const dshSession = require('./dsh-session');
+
+function configure(getDeps) {
+  if (typeof getDeps !== 'function') throw new TypeError('session-create structured requires a dependency getter');
+  dshSession.configure(getDeps);
+}
+
+async function createStructuredSession(state) {
+  return (await transcript.createWalleSession(state)) || (await dshSession.createDshSession(state));
+}
+
+module.exports = { configure, createStructuredSession };

package/template/coding-task-manager/lib/session-create/subagent-pick-table.js

@@ -350,7 +350,9 @@ async function _runPass() {
     return;
   }
   const leads = live.map((s) => {
-    if (!s || (s.agent !== 'claude' && s.agent !== 'codex')) return null;
+    // WP-14 (§9b W-4): 'dsh' joins the lead agents the delegate-pick table serves. A dsh lead's pick
+    // is routed-only (D-24), so its row is read and reported exactly like a claude/codex lead's.
+    if (!s || (s.agent !== 'claude' && s.agent !== 'codex' && s.agent !== 'dsh')) return null;
     const owner = _ownerContext(s);
     return owner ? { ...s, owner, mutationEpoch: _mutationEpochs.get(s.id) || 0 } : null;
   }).filter(Boolean);