@sideboard-ai/core 0.1.205 → 0.1.206

package/dist/{chunk-ULZLWQBS.js → chunk-SCIMSW7C.js}

@@ -37,13 +37,14 @@ import {
   pushTurnStderr,
   resolveQuotaFallbackAgent,
   shouldFeedErrorBackToAgent,
+  shouldRetryCodexPluginIsolate,
   shouldRetryFailedAgentTurn,
   stripBrightsyNdjsonNoise,
   sumUsageList,
   summarizeTurnStderr,
   toolDescription,
   turnFailChatText
-} from "./chunk-WF33LOP4.js";
+} from "./chunk-64L62EZY.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -66,7 +67,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-5SMS6QTO.js";
+} from "./chunk-R7QI3O74.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -116,7 +117,7 @@ import {
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-QUW5D62C.js";
+} from "./chunk-6F2L3NTL.js";
 import {
   ATTACHMENTS_DIR,
   DETACHED_JOBS_DIR,
@@ -134,7 +135,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-INNLWYXW.js";
+} from "./chunk-DWGEBZ3C.js";
 import {
   ensureWorktreeSideboardIgnored
 } from "./chunk-SYFVUF2C.js";
@@ -408,7 +409,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-I7GFXLHF.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-WIL5WFBL.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -801,9 +802,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-2I2T7FL5.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-KHSZZKIH.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-NPT555BO.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-EWHEK24X.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -4223,7 +4224,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-RFGZBUAR.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-6RGWGUFK.js");
   await ensureWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored: ensureWorktreeSideboardIgnored2 } = await import("./worktree-exclude-N5X5I422.js");
   await ensureWorktreeSideboardIgnored2(input.worktreePath);
@@ -6601,7 +6602,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-I7GFXLHF.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-WIL5WFBL.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7571,7 +7572,12 @@ var Orchestrator = class {
       const stderrTail = [];
       const handle = await spawnAgentTurn(
         fresh,
-        { cachedPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
+        {
+          cachedPrefix,
+          prompt: agentPrompt,
+          systemPrompt: turnReminders,
+          isolateCodexPlugins: fresh.isolateCodexPlugins === true
+        },
         (event) => {
           this.emit({ type: "turn_output", threadId, event });
           noteTurnLiveEvent(threadId, event);
@@ -7645,10 +7651,19 @@ var Orchestrator = class {
       }
       let lastStderr = summarizeTurnStderr(stderrTail);
       let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && shouldRetryFailedAgentTurn(detail, {
+      const liveThread = this.requireThread(threadId);
+      const isolateCodexPluginRetry = liveThread.agent === "codex" && shouldRetryCodexPluginIsolate(detail, {
+        alreadyIsolated: liveThread.isolateCodexPlugins === true
+      });
+      if (isolateCodexPluginRetry) {
+        updateThread(threadId, { isolateCodexPlugins: true });
+      }
+      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && (isolateCodexPluginRetry || shouldRetryFailedAgentTurn(detail, {
         hasSession: Boolean(this.requireThread(threadId).sessionId)
-      })) {
-        updateThread(threadId, { sessionId: null });
+      }))) {
+        if (!isolateCodexPluginRetry) {
+          updateThread(threadId, { sessionId: null });
+        }
         try {
           const gitDirs = await resolveGitDirsForLockRecovery(thread.worktreePath);
           const clearedLocks = clearStaleIndexLocks(gitDirs, 2e3);
@@ -7657,7 +7672,7 @@ var Orchestrator = class {
           }
         } catch {
         }
-        const retryNote = looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : looksLikeV8Oom(detail) ? "Agent ran out of memory \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
+        const retryNote = isolateCodexPluginRetry ? "Codex plugin/MCP failed \u2014 continuing without that vendor plugin (Settings \u2192 Connectors + HTTP API)" : looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : looksLikeV8Oom(detail) ? "Agent ran out of memory \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
         pushTurnStderr(stderrTail, retryNote);
         this.emit({
           type: "turn_output",
@@ -7681,7 +7696,12 @@ var Orchestrator = class {
         ].filter(Boolean).join("\n\n---\n\n");
         const retryHandle = await spawnAgentTurn(
           retryThread,
-          { cachedPrefix: retryPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
+          {
+            cachedPrefix: retryPrefix,
+            prompt: agentPrompt,
+            systemPrompt: turnReminders,
+            isolateCodexPlugins: isolateCodexPluginRetry || retryThread.isolateCodexPlugins === true
+          },
           (event) => {
             this.emit({ type: "turn_output", threadId, event });
             if (event.type === "session_id") {
@@ -8752,7 +8772,7 @@ var Orchestrator = class {
     this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-RFGZBUAR.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-6RGWGUFK.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -8806,7 +8826,7 @@ var Orchestrator = class {
           `Cowboy checkout missing: ${thread.worktreePath}. Re-add the project folder, then restore.`
         );
       }
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-WSUQMMK4.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-SPH7Q2S6.js");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
       await withRepoGitLock(thread.repoPath, async () => {
@@ -8916,7 +8936,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-WSUQMMK4.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-SPH7Q2S6.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -8926,7 +8946,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-ZGVWPVHP.js");
+  const { updateThread: upd } = await import("./thread-store-LS2T6RVH.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal

package/dist/{coordinator-prompt-WEPXXLLX.js → coordinator-prompt-6Q5NDWOC.js}

@@ -7,15 +7,15 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-VIPA75ZA.js";
-import "./chunk-WVATAIF4.js";
+} from "./chunk-GD2WKFFA.js";
+import "./chunk-EJX62RSX.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-QQKDGPUI.js";
 import "./chunk-QFBBUFD4.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";
 import "./chunk-JT7R45JB.js";
-import "./chunk-DFUES6QU.js";
+import "./chunk-ARR4OGLY.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-WFUDY6PC.js";
 import "./chunk-UFHNSFAS.js";

package/dist/{coordinator-prompt-NPT555BO.js → coordinator-prompt-EWHEK24X.js}

@@ -9,10 +9,10 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-5SMS6QTO.js";
-import "./chunk-QUW5D62C.js";
+} from "./chunk-R7QI3O74.js";
+import "./chunk-6F2L3NTL.js";
 import "./chunk-D6JWYJ4P.js";
-import "./chunk-INNLWYXW.js";
+import "./chunk-DWGEBZ3C.js";
 import "./chunk-SYFVUF2C.js";
 import "./chunk-FNQNJOHY.js";
 import "./chunk-X743YN5Y.js";

package/dist/{global-workspace-NSILADOM.js → global-workspace-2GMALKKE.js}

@@ -15,15 +15,15 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-VIPA75ZA.js";
-import "./chunk-WVATAIF4.js";
+} from "./chunk-GD2WKFFA.js";
+import "./chunk-EJX62RSX.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-QQKDGPUI.js";
 import "./chunk-QFBBUFD4.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";
 import "./chunk-JT7R45JB.js";
-import "./chunk-DFUES6QU.js";
+import "./chunk-ARR4OGLY.js";
 import "./chunk-77WWLBCI.js";
 import {
   globalAgentCwd

package/dist/{global-workspace-2I2T7FL5.js → global-workspace-KHSZZKIH.js}

@@ -17,10 +17,10 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-5SMS6QTO.js";
-import "./chunk-QUW5D62C.js";
+} from "./chunk-R7QI3O74.js";
+import "./chunk-6F2L3NTL.js";
 import "./chunk-D6JWYJ4P.js";
-import "./chunk-INNLWYXW.js";
+import "./chunk-DWGEBZ3C.js";
 import "./chunk-SYFVUF2C.js";
 import "./chunk-FNQNJOHY.js";
 import "./chunk-X743YN5Y.js";

package/dist/index.cjs

@@ -2848,6 +2848,7 @@ function normalizeThread(raw) {
     effort: resolveThreadEffort(raw),
     fast: Boolean(raw.fast),
     planMode: Boolean(raw.planMode),
+    isolateCodexPlugins: raw.isolateCodexPlugins === true ? true : void 0,
     autonomy: raw.autonomy ?? "default",
     lastError: raw.lastError ?? null,
     agentPid: raw.agentPid ?? null,
@@ -3358,6 +3359,10 @@ function turnFailChatText(opts) {
 
 ${fail6}`;
 }
+function shouldRetryCodexPluginIsolate(detail, opts) {
+  if (opts?.alreadyIsolated) return false;
+  return looksLikeCodexMcpError(detail);
+}
 function looksLikeCodexMcpError(text7) {
   const t = text7.trim().toLowerCase();
   if (!t) return false;
@@ -10877,13 +10882,18 @@ function normalizeTurnInput(input) {
   return {
     prompt: input.prompt,
     cachedPrefix: input.cachedPrefix?.trim() || void 0,
-    systemPrompt: input.systemPrompt?.trim() || void 0
+    systemPrompt: input.systemPrompt?.trim() || void 0,
+    ...input.isolateCodexPlugins ? { isolateCodexPlugins: true } : {}
   };
 }
 function dropCachedPrefixOnResume(input, sessionId) {
   const turn = normalizeTurnInput(input);
   if (sessionId) {
-    return turn.systemPrompt ? { prompt: turn.prompt, systemPrompt: turn.systemPrompt } : { prompt: turn.prompt };
+    return {
+      prompt: turn.prompt,
+      ...turn.systemPrompt ? { systemPrompt: turn.systemPrompt } : {},
+      ...turn.isolateCodexPlugins ? { isolateCodexPlugins: true } : {}
+    };
   }
   return turn;
 }
@@ -12909,9 +12919,7 @@ function toCodexUnattendedAppsArgs() {
     "-c",
     "apps.posthog.enabled=false",
     "-c",
-    "features.plugins=false",
-    "-c",
-    "mcp_servers.posthog.enabled=false"
+    "features.plugins=false"
   ];
 }
 var import_node_fs32, import_node_os11, import_node_path33, import_smol_toml2;
@@ -13108,8 +13116,12 @@ var init_codex = __esm({
           }),
           orchestratorThreadId: isOrchestrator ? thread.id : null
         });
+        const isolatePlugins = isOrchestrator || Boolean(thread.isolateCodexPlugins) || Boolean(normalizeTurnInput(input).isolateCodexPlugins);
         const mcpOverrides = [
-          ...toCodexUnattendedAppsArgs(),
+          // Worktree first try keeps plugins (Claude connectors). Coordinators
+          // isolate. After a fatal plugin MCP, the orchestrator retries with
+          // isolateCodexPlugins so the turn continues. Never invent mcp_servers.posthog.
+          ...isolatePlugins ? toCodexUnattendedAppsArgs() : [],
           ...toCodexMcpConfigArgs(injected2),
           ...isOrchestrator ? toCodexDisableUserMcpArgs(
             userMcpNamesToDisable({
@@ -23371,7 +23383,12 @@ var init_orchestrator = __esm({
           const stderrTail = [];
           const handle = await spawnAgentTurn(
             fresh,
-            { cachedPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
+            {
+              cachedPrefix,
+              prompt: agentPrompt,
+              systemPrompt: turnReminders,
+              isolateCodexPlugins: fresh.isolateCodexPlugins === true
+            },
             (event) => {
               this.emit({ type: "turn_output", threadId, event });
               noteTurnLiveEvent(threadId, event);
@@ -23445,10 +23462,19 @@ var init_orchestrator = __esm({
           }
           let lastStderr = summarizeTurnStderr(stderrTail);
           let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-          if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && shouldRetryFailedAgentTurn(detail, {
+          const liveThread = this.requireThread(threadId);
+          const isolateCodexPluginRetry = liveThread.agent === "codex" && shouldRetryCodexPluginIsolate(detail, {
+            alreadyIsolated: liveThread.isolateCodexPlugins === true
+          });
+          if (isolateCodexPluginRetry) {
+            updateThread(threadId, { isolateCodexPlugins: true });
+          }
+          if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && (isolateCodexPluginRetry || shouldRetryFailedAgentTurn(detail, {
             hasSession: Boolean(this.requireThread(threadId).sessionId)
-          })) {
-            updateThread(threadId, { sessionId: null });
+          }))) {
+            if (!isolateCodexPluginRetry) {
+              updateThread(threadId, { sessionId: null });
+            }
             try {
               const gitDirs = await resolveGitDirsForLockRecovery(thread.worktreePath);
               const clearedLocks = clearStaleIndexLocks(gitDirs, 2e3);
@@ -23457,7 +23483,7 @@ var init_orchestrator = __esm({
               }
             } catch {
             }
-            const retryNote = looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : looksLikeV8Oom(detail) ? "Agent ran out of memory \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
+            const retryNote = isolateCodexPluginRetry ? "Codex plugin/MCP failed \u2014 continuing without that vendor plugin (Settings \u2192 Connectors + HTTP API)" : looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : looksLikeV8Oom(detail) ? "Agent ran out of memory \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
             pushTurnStderr(stderrTail, retryNote);
             this.emit({
               type: "turn_output",
@@ -23481,7 +23507,12 @@ var init_orchestrator = __esm({
             ].filter(Boolean).join("\n\n---\n\n");
             const retryHandle = await spawnAgentTurn(
               retryThread,
-              { cachedPrefix: retryPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
+              {
+                cachedPrefix: retryPrefix,
+                prompt: agentPrompt,
+                systemPrompt: turnReminders,
+                isolateCodexPlugins: isolateCodexPluginRetry || retryThread.isolateCodexPlugins === true
+              },
               (event) => {
                 this.emit({ type: "turn_output", threadId, event });
                 if (event.type === "session_id") {

package/dist/index.d.cts

@@ -128,6 +128,12 @@ interface Thread {
     fast: boolean;
     /** Plan-only turns — analyze and plan without editing files (Conductor-style). */
     planMode: boolean;
+    /**
+     * After a Codex plugin/App MCP kills `codex exec` (AuthRequired / invalid
+     * transport), later turns isolate Apps/plugins so the same fatal error
+     * cannot loop. Worktree first tries with plugins on.
+     */
+    isolateCodexPlugins?: boolean;
     sessionId: string | null;
     autonomy: Autonomy;
     sourceIsFork: boolean;
@@ -3034,6 +3040,11 @@ interface AgentTurnInput {
      * already carries the full playbook in `cachedPrefix`.
      */
     systemPrompt?: string;
+    /**
+     * Codex: disable ChatGPT Apps / plugins for this exec (after a fatal
+     * plugin MCP). Coordinators also isolate via `isOrchestratorThread`.
+     */
+    isolateCodexPlugins?: boolean;
 }
 declare function normalizeTurnInput(input: string | AgentTurnInput): Required<Pick<AgentTurnInput, 'prompt'>> & AgentTurnInput;
 /**

package/dist/index.d.ts

@@ -128,6 +128,12 @@ interface Thread {
     fast: boolean;
     /** Plan-only turns — analyze and plan without editing files (Conductor-style). */
     planMode: boolean;
+    /**
+     * After a Codex plugin/App MCP kills `codex exec` (AuthRequired / invalid
+     * transport), later turns isolate Apps/plugins so the same fatal error
+     * cannot loop. Worktree first tries with plugins on.
+     */
+    isolateCodexPlugins?: boolean;
     sessionId: string | null;
     autonomy: Autonomy;
     sourceIsFork: boolean;
@@ -3034,6 +3040,11 @@ interface AgentTurnInput {
      * already carries the full playbook in `cachedPrefix`.
      */
     systemPrompt?: string;
+    /**
+     * Codex: disable ChatGPT Apps / plugins for this exec (after a fatal
+     * plugin MCP). Coordinators also isolate via `isOrchestratorThread`.
+     */
+    isolateCodexPlugins?: boolean;
 }
 declare function normalizeTurnInput(input: string | AgentTurnInput): Required<Pick<AgentTurnInput, 'prompt'>> & AgentTurnInput;
 /**

package/dist/index.js

@@ -304,7 +304,7 @@ import {
   worktreeCleanupSettings,
   wrapReviewSkillMarkdown,
   writeWorktreeFile
-} from "./chunk-FO45DMJ5.js";
+} from "./chunk-IQEBC3LD.js";
 import {
   LEGACY_PLAN_FILE_REL,
   PLAN_FILE_NAME,
@@ -424,7 +424,7 @@ import {
   withEventParentId,
   withEventsParentId,
   writeInjectedMcpConfig
-} from "./chunk-YOSTWSNC.js";
+} from "./chunk-FX3P25X2.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -467,7 +467,7 @@ import {
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads,
   takenTeamSlugsForOrchestration
-} from "./chunk-VIPA75ZA.js";
+} from "./chunk-GD2WKFFA.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   GITHUB_PR_BODY_MAX_CHARS,
@@ -565,7 +565,7 @@ import {
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath,
   worktreeSlugForTicket
-} from "./chunk-WVATAIF4.js";
+} from "./chunk-EJX62RSX.js";
 import {
   ATTACHMENTS_DIR,
   CLI_DIR,
@@ -611,7 +611,7 @@ import {
   trustSystemCertificates,
   turnCostUsdFromCursorUsage,
   withMaxOldSpaceSize
-} from "./chunk-KZ7PI7FE.js";
+} from "./chunk-4YXOCLJU.js";
 import {
   FOLLOW_UP_BEHAVIORS,
   GITHUB_GIT_AUTH_MODES,
@@ -745,7 +745,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-DFUES6QU.js";
+} from "./chunk-ARR4OGLY.js";
 import {
   THINKING_EFFORTS,
   isThinkingEffort,

package/dist/mcp/run-stdio.cjs

@@ -836,6 +836,7 @@ function normalizeThread(raw) {
     effort: resolveThreadEffort(raw),
     fast: Boolean(raw.fast),
     planMode: Boolean(raw.planMode),
+    isolateCodexPlugins: raw.isolateCodexPlugins === true ? true : void 0,
     autonomy: raw.autonomy ?? "default",
     lastError: raw.lastError ?? null,
     agentPid: raw.agentPid ?? null,
@@ -1852,6 +1853,10 @@ function turnFailChatText(opts) {
 
 ${fail6}`;
 }
+function shouldRetryCodexPluginIsolate(detail, opts) {
+  if (opts?.alreadyIsolated) return false;
+  return looksLikeCodexMcpError(detail);
+}
 function looksLikeCodexMcpError(text7) {
   const t = text7.trim().toLowerCase();
   if (!t) return false;
@@ -8852,13 +8857,18 @@ function normalizeTurnInput(input) {
   return {
     prompt: input.prompt,
     cachedPrefix: input.cachedPrefix?.trim() || void 0,
-    systemPrompt: input.systemPrompt?.trim() || void 0
+    systemPrompt: input.systemPrompt?.trim() || void 0,
+    ...input.isolateCodexPlugins ? { isolateCodexPlugins: true } : {}
   };
 }
 function dropCachedPrefixOnResume(input, sessionId) {
   const turn = normalizeTurnInput(input);
   if (sessionId) {
-    return turn.systemPrompt ? { prompt: turn.prompt, systemPrompt: turn.systemPrompt } : { prompt: turn.prompt };
+    return {
+      prompt: turn.prompt,
+      ...turn.systemPrompt ? { systemPrompt: turn.systemPrompt } : {},
+      ...turn.isolateCodexPlugins ? { isolateCodexPlugins: true } : {}
+    };
   }
   return turn;
 }
@@ -11063,9 +11073,7 @@ function toCodexUnattendedAppsArgs() {
     "-c",
     "apps.posthog.enabled=false",
     "-c",
-    "features.plugins=false",
-    "-c",
-    "mcp_servers.posthog.enabled=false"
+    "features.plugins=false"
   ];
 }
 var import_node_fs28, import_node_os11, import_node_path29, import_smol_toml2;
@@ -11262,8 +11270,12 @@ var init_codex = __esm({
           }),
           orchestratorThreadId: isOrchestrator ? thread.id : null
         });
+        const isolatePlugins = isOrchestrator || Boolean(thread.isolateCodexPlugins) || Boolean(normalizeTurnInput(input).isolateCodexPlugins);
         const mcpOverrides = [
-          ...toCodexUnattendedAppsArgs(),
+          // Worktree first try keeps plugins (Claude connectors). Coordinators
+          // isolate. After a fatal plugin MCP, the orchestrator retries with
+          // isolateCodexPlugins so the turn continues. Never invent mcp_servers.posthog.
+          ...isolatePlugins ? toCodexUnattendedAppsArgs() : [],
           ...toCodexMcpConfigArgs(injected2),
           ...isOrchestrator ? toCodexDisableUserMcpArgs(
             userMcpNamesToDisable({
@@ -21599,7 +21611,12 @@ var init_orchestrator = __esm({
           const stderrTail = [];
           const handle = await spawnAgentTurn(
             fresh,
-            { cachedPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
+            {
+              cachedPrefix,
+              prompt: agentPrompt,
+              systemPrompt: turnReminders,
+              isolateCodexPlugins: fresh.isolateCodexPlugins === true
+            },
             (event) => {
               this.emit({ type: "turn_output", threadId, event });
               noteTurnLiveEvent(threadId, event);
@@ -21673,10 +21690,19 @@ var init_orchestrator = __esm({
           }
           let lastStderr = summarizeTurnStderr(stderrTail);
           let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
-          if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && shouldRetryFailedAgentTurn(detail, {
+          const liveThread = this.requireThread(threadId);
+          const isolateCodexPluginRetry = liveThread.agent === "codex" && shouldRetryCodexPluginIsolate(detail, {
+            alreadyIsolated: liveThread.isolateCodexPlugins === true
+          });
+          if (isolateCodexPluginRetry) {
+            updateThread(threadId, { isolateCodexPlugins: true });
+          }
+          if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && (isolateCodexPluginRetry || shouldRetryFailedAgentTurn(detail, {
             hasSession: Boolean(this.requireThread(threadId).sessionId)
-          })) {
-            updateThread(threadId, { sessionId: null });
+          }))) {
+            if (!isolateCodexPluginRetry) {
+              updateThread(threadId, { sessionId: null });
+            }
             try {
               const gitDirs = await resolveGitDirsForLockRecovery(thread.worktreePath);
               const clearedLocks = clearStaleIndexLocks(gitDirs, 2e3);
@@ -21685,7 +21711,7 @@ var init_orchestrator = __esm({
               }
             } catch {
             }
-            const retryNote = looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : looksLikeV8Oom(detail) ? "Agent ran out of memory \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
+            const retryNote = isolateCodexPluginRetry ? "Codex plugin/MCP failed \u2014 continuing without that vendor plugin (Settings \u2192 Connectors + HTTP API)" : looksLikeInvalidAgentSession(detail) ? "Agent session missing \u2014 starting a fresh session" : looksLikeV8Oom(detail) ? "Agent ran out of memory \u2014 starting a fresh session" : "Agent runner crashed \u2014 restarting Node once";
             pushTurnStderr(stderrTail, retryNote);
             this.emit({
               type: "turn_output",
@@ -21709,7 +21735,12 @@ var init_orchestrator = __esm({
             ].filter(Boolean).join("\n\n---\n\n");
             const retryHandle = await spawnAgentTurn(
               retryThread,
-              { cachedPrefix: retryPrefix, prompt: agentPrompt, systemPrompt: turnReminders },
+              {
+                cachedPrefix: retryPrefix,
+                prompt: agentPrompt,
+                systemPrompt: turnReminders,
+                isolateCodexPlugins: isolateCodexPluginRetry || retryThread.isolateCodexPlugins === true
+              },
               (event) => {
                 this.emit({ type: "turn_output", threadId, event });
                 if (event.type === "session_id") {

package/dist/mcp/run-stdio.js

@@ -50,7 +50,7 @@ import {
   syncBoardPins,
   updateSchedule,
   waitForDetachedJob
-} from "../chunk-ULZLWQBS.js";
+} from "../chunk-SCIMSW7C.js";
 import "../chunk-JFOPOMK7.js";
 import "../chunk-YWI3IBP2.js";
 import {
@@ -61,12 +61,12 @@ import {
   materializeSystemCaBundle,
   sideboardMcpProfile,
   trustSystemCertificates
-} from "../chunk-WF33LOP4.js";
+} from "../chunk-64L62EZY.js";
 import {
   GLOBAL_WORKSPACE_ID,
   isCloudCoordinatorThread,
   listWorkspaces
-} from "../chunk-5SMS6QTO.js";
+} from "../chunk-R7QI3O74.js";
 import "../chunk-3OHR73VK.js";
 import "../chunk-Y4MIXGPA.js";
 import "../chunk-3K257PCS.js";
@@ -84,9 +84,9 @@ import {
   resolveListPrsOptions,
   resolveRepoRoot,
   warmGithubAgentAuth
-} from "../chunk-QUW5D62C.js";
+} from "../chunk-6F2L3NTL.js";
 import "../chunk-D6JWYJ4P.js";
-import "../chunk-INNLWYXW.js";
+import "../chunk-DWGEBZ3C.js";
 import "../chunk-SYFVUF2C.js";
 import {
   gh,

package/dist/{orchestrator-CMAVNELS.js → orchestrator-NXZ5NDAM.js}

@@ -7,24 +7,24 @@ import {
   resolveSendFollowUp,
   startOrchestration,
   waitForPidExit
-} from "./chunk-FO45DMJ5.js";
+} from "./chunk-IQEBC3LD.js";
 import "./chunk-DJU54RYW.js";
-import "./chunk-YOSTWSNC.js";
-import "./chunk-VIPA75ZA.js";
-import "./chunk-WVATAIF4.js";
+import "./chunk-FX3P25X2.js";
+import "./chunk-GD2WKFFA.js";
+import "./chunk-EJX62RSX.js";
 import "./chunk-6K64FJDD.js";
 import "./chunk-QQKDGPUI.js";
 import "./chunk-SALM35KD.js";
 import "./chunk-AN3THU7F.js";
 import "./chunk-N7WZ6NIN.js";
 import "./chunk-AXQ4ZWHK.js";
-import "./chunk-KZ7PI7FE.js";
+import "./chunk-4YXOCLJU.js";
 import "./chunk-QFBBUFD4.js";
 import "./chunk-4TR3HZFT.js";
 import "./chunk-WDRMZKVB.js";
 import "./chunk-4TYXWPAJ.js";
 import "./chunk-JT7R45JB.js";
-import "./chunk-DFUES6QU.js";
+import "./chunk-ARR4OGLY.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-WFUDY6PC.js";
 import "./chunk-UFHNSFAS.js";