agor-live 0.21.2 → 0.22.0

package/dist/executor/sdk-handlers/base/mcp-scoping.js

@@ -23,6 +23,9 @@ function mcpDebug(...args) {
         console.debug(...args);
     }
 }
+function compareStrings(a, b) {
+    return a < b ? -1 : a > b ? 1 : 0;
+}
 /**
  * Get MCP servers that should be attached to a session
  *
@@ -147,6 +150,17 @@ export async function getMcpServersForSession(sessionId, deps) {
         if (serversSkipped > 0) {
             console.warn(`   ⚠️  Skipped ${serversSkipped} MCP server(s) due to unresolved required templates`);
         }
+        // Keep MCP config order stable across turns. Provider SDKs serialize MCP
+        // tools into the prompt prefix, so DB/default ordering drift can reduce
+        // server-side prompt-cache hits even when the effective server set is the
+        // same. Global servers stay before session-assigned servers to preserve the
+        // historical scoping precedence; names and IDs make the ordering total.
+        servers.sort((a, b) => {
+            const sourceRank = (source) => (source === 'global' ? 0 : 1);
+            return (sourceRank(a.source) - sourceRank(b.source) ||
+                compareStrings(a.server.name, b.server.name) ||
+                compareStrings(String(a.server.mcp_server_id), String(b.server.mcp_server_id)));
+        });
     }
     catch (error) {
         console.warn(`⚠️  Failed to resolve MCP servers: ${error instanceof Error ? error.message : String(error)}`);

package/dist/executor/sdk-handlers/claude/message-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-processor.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/message-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH,OAAO,KAAK,EAGV,UAAU,EAEV,gBAAgB,EAIjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA0B/C;;GAEG;AACH,MAAM,MAAM,cAAc,GACtB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACD;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,mBAAmB,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,WAAW,CAAC,SAAS,GAAG,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC;IACpE,OAAO,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAAC;IAC/E,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,qBAAqB,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;CACxB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;QAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,GACD;IACE,IAAI,EAAE,2BAA2B,CAAC;IAClC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,SAAS,GAAG,iBAAiB,GAAG,UAAU,CAAC;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,sFAAsF;IACtF,YAAY,EAAE,OAAO,gBAAgB,EAAE,iCAAiC,CAAC;CAC1E,GACD;IACE,IAAI,EAAE,SAAS,CAAC;CACjB,GACD;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,QAAQ,GAAG,gBAAgB,GAAG,SAAS,CAAC;CACjD,CAAC;AAEN;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,SAAS,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAOD;;GAEG;AACH,UAAU,cAAc;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;IACzB,wBAAwB,EAAE,MAAM,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IAErB,iBAAiB,EAAE,KAAK,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IAEH,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;GAKG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,KAAK,CAAiB;gBAElB,OAAO,EAAE,gBAAgB;IAoBrC;;;;;OAKG;IACG,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IA0BzD;;;OAGG;IACH,WAAW,IAAI,OAAO;IAKtB;;OAEG;IACH,QAAQ,IAAI,QAAQ,CAAC,cAAc,CAAC;IAIpC;;OAEG;YACW,YAAY;IAqB1B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAiBxB;;OAEG;IACH,OAAO,CAAC,eAAe;IAoBvB;;OAEG;IACH,OAAO,CAAC,UAAU;IAgElB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAqJzB;;OAEG;IACH,OAAO,CAAC,YAAY;IAqEpB;;OAEG;IACH,OAAO,CAAC,YAAY;IAsHpB;;;;;;;OAOG;IACH,OAAO,CAAC,oBAAoB;IA6C5B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAG7C;IAEH;;;OAGG;IACH,OAAO,CAAC,aAAa;IAoBrB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA8DxB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAyC5B;;OAEG;IACH,OAAO,CAAC,eAAe;CAgBxB"}
+{"version":3,"file":"message-processor.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/message-processor.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/claude/message-processor.js

@@ -480,7 +480,6 @@ export class SDKMessageProcessor {
         // Blacklist approach: surface unhandled system subtypes by default
         const subtype = ('subtype' in msg ? msg.subtype : undefined) || 'unknown';
         if (shouldSuppressClaudeSystemEvent(msg)) {
-            console.debug(`🔇 Suppressed system subtype: ${subtype}`);
             return [];
         }
         console.log(`📡 Surfacing unhandled system subtype: ${subtype}`);

package/dist/executor/sdk-handlers/claude/query-builder.d.ts

@@ -10,6 +10,7 @@ import type { BranchRepository, MCPServerRepository, MessagesRepository, RepoRep
 import type { PermissionService } from '../../permissions/permission-service.js';
 import type { SessionID, TaskID } from '../../types.js';
 import type { MessagesService, SessionsPatchClient, TasksService } from '../base/index.js';
+export declare function formatListForLog(items: string[], maxItems?: number): string;
 export interface QuerySetupDeps {
     sessionsRepo: SessionRepository;
     reposRepo?: RepoRepository;

package/dist/executor/sdk-handlers/claude/query-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/query-builder.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAMxC,KAAK,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;AAI5C,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE1E,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAuE3F,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,iBAAiB,CAAC;IAChC,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,eAAe,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,eAAe,IAAI,OAAO,CAAC,OAAO,gBAAgB,EAAE,iCAAiC,CAAC,CAAC;IACvF;;;;OAIG;IACH,YAAY,IAAI,IAAI,CAAC;IAErB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC;CAC9C;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,cAAc,EACpB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,eAAe,CAAC;CAC9B,GACL,OAAO,CAAC;IACT,KAAK,EAAE,kBAAkB,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,MAAM,CAAC;CACzB,CAAC,CAqhBD"}
+{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/claude/query-builder.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAOxC,KAAK,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;AAI5C,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE1E,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA+B3F,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,SAAI,GAAG,MAAM,CAKtE;AAgDD,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,iBAAiB,CAAC;IAChC,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,eAAe,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,eAAe,IAAI,OAAO,CAAC,OAAO,gBAAgB,EAAE,iCAAiC,CAAC,CAAC;IACvF;;;;OAIG;IACH,YAAY,IAAI,IAAI,CAAC;IAErB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC;CAC9C;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,cAAc,EACpB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,EAAE,eAAe,CAAC;CAC9B,GACL,OAAO,CAAC;IACT,KAAK,EAAE,kBAAkB,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,MAAM,CAAC;CACzB,CAAC,CAqjBD"}

package/dist/executor/sdk-handlers/claude/query-builder.js

@@ -11,6 +11,7 @@ import { Claude } from '@agor/core/sdk';
 import { renderAgorSystemPrompt } from '@agor/core/templates/session-context';
 import { mergeMCPRemoteHeaders } from '@agor/core/tools/mcp/http-headers';
 import { resolveMCPAuthHeaders } from '@agor/core/tools/mcp/jwt-auth';
+import { isGatewaySession } from '@agor/core/types';
 const { query } = Claude;
 import { getDaemonUrl, resolveUserEnvironment } from '../../config.js';
 import { resolveContextUserId } from '../base/context-user.js';
@@ -19,21 +20,33 @@ import { CLAUDE_CODE_DISALLOWED_TOOLS } from './constants.js';
 import { parseModelWithBetas } from './model-utils.js';
 import { DEFAULT_CLAUDE_MODEL } from './models.js';
 import { createCanUseToolCallback } from './permissions/permission-hooks.js';
-/**
- * Summarize MCP config for logging without exposing sensitive env values.
- * Returns a safe object showing server names and transport types only.
- */
-function summarizeMcpConfig(config) {
+function summarizeMcpConfigCounts(config) {
     if (!config || typeof config !== 'object')
-        return undefined;
-    const summary = {};
-    for (const [name, server] of Object.entries(config)) {
-        summary[name] = {
-            type: server.type || 'stdio',
-            hasEnv: !!(server.env && Object.keys(server.env).length > 0),
-        };
+        return 'none';
+    let total = 0;
+    let remote = 0;
+    let stdio = 0;
+    let withEnv = 0;
+    for (const server of Object.values(config)) {
+        total += 1;
+        const type = server.type || 'stdio';
+        if (type === 'stdio') {
+            stdio += 1;
+        }
+        else {
+            remote += 1;
+        }
+        if (server.env && Object.keys(server.env).length > 0) {
+            withEnv += 1;
+        }
     }
-    return summary;
+    return `total=${total} remote=${remote} stdio=${stdio} with_env=${withEnv}`;
+}
+export function formatListForLog(items, maxItems = 5) {
+    if (items.length <= maxItems) {
+        return items.join(', ');
+    }
+    return `${items.slice(0, maxItems).join(', ')} +${items.length - maxItems} more`;
 }
 /**
  * Get path to Claude Code executable
@@ -78,6 +91,7 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
     if (!session) {
         throw new Error(`Session not found: ${sessionId}`);
     }
+    const shouldBlockOnMcpStartup = isGatewaySession(session);
     // Determine which user's context to use for environment variables and API
     // keys: the task creator (prompter) when known, else the session owner.
     const contextUserId = await resolveContextUserId({
@@ -150,19 +164,14 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
     const claudeCodePath = getClaudeCodePath();
     // Buffer to capture stderr for better error messages
     let stderrBuffer = '';
-    // Render Agor system prompt with full session/branch/repo context
-    const agorSystemPrompt = await renderAgorSystemPrompt(sessionId, {
-        sessions: deps.sessionsRepo,
-        branches: deps.branchesRepo,
-        repos: deps.reposRepo,
-        users: deps.usersRepo,
-    });
+    // Append static Agor orientation. Dynamic context is available through Agor MCP.
+    const agorSystemPrompt = await renderAgorSystemPrompt();
     const queryOptions = {
         cwd,
         systemPrompt: {
             type: 'preset',
             preset: 'claude_code',
-            append: agorSystemPrompt, // Append rich Agor context (session, branch, repo)
+            append: agorSystemPrompt,
         },
         settingSources: ['user', 'project', 'local'], // Load user + project + local permissions, auto-loads CLAUDE.md
         // Defensive copy — the const is readonly but the SDK option is typed `string[]`.
@@ -210,18 +219,29 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
         console.log(`🧠 Effort level: high (default)`);
     }
     // Configure Claude Code's server-side advisor tool model when a session-level
-    // override is present. The Agent SDK exposes this through Claude Code settings
-    // (not as a first-class top-level option or MCP tool declaration).
+    // override is present. Pass it through the CLI's first-class `--advisor` flag
+    // (via the SDK's `extraArgs`) — NOT through the `settings` object.
+    //
+    // Why not `settings`: passing `settings` as an object makes the Agent SDK emit
+    // `--settings '<inline JSON>'`, which the Claude CLI can materialize into a
+    // CONTENT-ADDRESSED temp file at `${os.tmpdir()}/claude-settings-<hash>.json`
+    // when it hands the resolved flag-settings layer to its workers. In the daemon,
+    // `os.tmpdir()` resolves to the shared, sticky-bit `/tmp` (the daemon runs with
+    // TMPDIR stripped), so every session with identical advisor settings targets the
+    // SAME path. The first writer owns it mode 0600; later sessions — or other Unix
+    // users under insulated/strict isolation — then fail to open it with
+    // `EACCES ... claude-settings-*.json`, crashing the CLI before the first message.
+    // `--advisor <model>` is the CLI's dedicated, server-validated flag (Claude Code
+    // >= 2.1.175) and writes no settings file, so it sidesteps the collision entirely.
     const rawAdvisorModel = session.model_config?.advisorModel?.trim();
     if (rawAdvisorModel) {
         const { model: advisorModel, betas: advisorBetas } = parseModelWithBetas(rawAdvisorModel);
         for (const beta of advisorBetas)
             sdkBetas.add(beta);
-        queryOptions.settings = {
-            ...(queryOptions.settings ?? {}),
-            advisorModel,
-        };
-        console.log(`🧭 Advisor model: ${advisorModel}`);
+        const extraArgs = queryOptions.extraArgs ?? {};
+        extraArgs.advisor = advisorModel;
+        queryOptions.extraArgs = extraArgs;
+        console.log(`🧭 Advisor model: ${advisorModel} (via --advisor)`);
     }
     // Add beta flags (e.g., 1M context window for [1m] model variants)
     const betaList = [...sdkBetas];
@@ -385,6 +405,7 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
                     headers: {
                         Authorization: `Bearer ${mcpToken}`,
                     },
+                    ...(shouldBlockOnMcpStartup ? { alwaysLoad: true } : {}),
                 },
             };
             queryOptions.mcpServers = mcpConfig;
@@ -407,14 +428,26 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
                 // Convert to SDK format
                 const mcpConfig = {};
                 const allowedTools = [];
+                let remoteServerCount = 0;
+                let stdioServerCount = 0;
+                let serversWithHeaders = 0;
+                const missingAuthServers = [];
+                const unresolvedAuthServers = [];
                 for (const { server } of serversWithSource) {
                     // Infer transport if missing (backwards compatibility)
                     const transport = server.transport || (server.url ? 'sse' : 'stdio');
+                    if (transport === 'stdio') {
+                        stdioServerCount += 1;
+                    }
+                    else {
+                        remoteServerCount += 1;
+                    }
                     // Build server config (convert 'transport' field to 'type' for Claude Code)
                     const serverConfig = {
                         type: transport,
                         env: server.env,
                     };
+                    let canAlwaysLoad = shouldBlockOnMcpStartup;
                     // Add transport-specific fields
                     if (transport === 'stdio') {
                         serverConfig.command = server.command;
@@ -427,19 +460,28 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
                     try {
                         // Pass mcpUrl for OAuth token cache lookup
                         const authHeaders = await resolveMCPAuthHeaders(server.auth, server.url);
+                        const missingRequiredAuth = !!server.auth &&
+                            server.auth.type !== 'none' &&
+                            transport !== 'stdio' &&
+                            !authHeaders?.Authorization;
                         const headers = mergeMCPRemoteHeaders({ custom: server.headers, auth: authHeaders });
                         if (headers && transport !== 'stdio') {
                             serverConfig.headers = headers;
-                            console.log(`     🔐 Added ${Object.keys(headers).length} HTTP header(s) for ${server.name}`);
+                            serversWithHeaders += 1;
                         }
-                        else if (server.auth?.type === 'oauth' && transport !== 'stdio') {
-                            // OAuth server but no token - track for notification
-                            console.warn(`   ⚠️  MCP server "${server.name}" requires OAuth authentication but no valid token found`);
-                            console.warn(`      💡 Go to Settings → MCP Servers → ${server.name} → Start OAuth Flow to authenticate`);
+                        if (missingRequiredAuth) {
+                            // Auth-backed remote server but no usable token. Track one concise summary below.
+                            missingAuthServers.push(server.name);
+                            canAlwaysLoad = false;
                         }
                     }
                     catch (error) {
-                        console.warn(`   ⚠️  Failed to resolve MCP auth headers for ${server.name}:`, error instanceof Error ? error.message : String(error));
+                        const message = error instanceof Error ? error.message : String(error);
+                        unresolvedAuthServers.push(`${server.name}: ${message}`);
+                        canAlwaysLoad = false;
+                    }
+                    if (canAlwaysLoad) {
+                        serverConfig.alwaysLoad = true;
                     }
                     mcpConfig[server.name] = serverConfig;
                     // Add tools to allowlist
@@ -454,11 +496,21 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
                     ...(queryOptions.mcpServers || {}),
                     ...mcpConfig,
                 };
-                // Log summary only (env values may contain secrets after template resolution)
-                console.log(`   🔧 MCP servers configured:`, JSON.stringify(summarizeMcpConfig(queryOptions.mcpServers), null, 2));
+                // Log one safe summary line. Env/header values may contain secrets after template resolution.
+                console.log(`   🔧 MCP servers configured: total=${serversWithSource.length} remote=${remoteServerCount} ` +
+                    `stdio=${stdioServerCount} headers=${serversWithHeaders} missing_auth=${missingAuthServers.length} ` +
+                    `auth_errors=${unresolvedAuthServers.length}`);
+                if (missingAuthServers.length > 0) {
+                    console.warn(`   ⚠️  ${missingAuthServers.length} MCP server(s) have configured auth but no valid token: ` +
+                        `${formatListForLog(missingAuthServers)}. Check Settings → MCP Servers.`);
+                }
+                if (unresolvedAuthServers.length > 0) {
+                    console.warn(`   ⚠️  Failed to resolve MCP auth for ${unresolvedAuthServers.length} server(s): ` +
+                        formatListForLog(unresolvedAuthServers, 3));
+                }
                 if (allowedTools.length > 0) {
                     queryOptions.allowedTools = allowedTools;
-                    console.log(`   🔧 Allowing ${allowedTools.length} MCP tools`);
+                    console.log(`   🔧 MCP tools allowlist: ${allowedTools.length} tool(s)`);
                 }
             }
         }
@@ -470,8 +522,8 @@ export async function setupQuery(sessionId, prompt, deps, options = {}) {
     console.log('📤 Calling query() with:');
     console.log(`   prompt: "${prompt.substring(0, 100)}${prompt.length > 100 ? '...' : ''}"`);
     console.log(`   queryOptions keys: ${Object.keys(queryOptions).join(', ')}`);
-    // Log MCP summary only (env values may contain secrets)
-    console.log(`   MCP servers:`, queryOptions.mcpServers ? JSON.stringify(summarizeMcpConfig(queryOptions.mcpServers)) : 'none');
+    // Log safe MCP counts only. Per-server names/details are intentionally omitted from this per-query log.
+    console.log(`   MCP servers: ${summarizeMcpConfigCounts(queryOptions.mcpServers)}`);
     // Wrap the string prompt in an AsyncIterable so the SDK treats this as a
     // streaming-input query.  When a plain string is passed, the SDK sets
     // `isSingleUserTurn = true` and closes stdin right after the first result

package/dist/executor/sdk-handlers/codex/prompt-service.d.ts

@@ -107,11 +107,9 @@ export declare class CodexPromptService {
     private sessionsRepo;
     private sessionMCPServerRepo?;
     private branchesRepo?;
-    private reposRepo?;
     private mcpServerRepo?;
-    private usersRepo?;
     private tasksService?;
-    private codex;
+    private codex?;
     private lastApiKey;
     private lastBaseUrl;
     private lastClientFingerprint;
@@ -130,7 +128,7 @@ export declare class CodexPromptService {
      * Logged at DEBUG only (could leak internal hostnames).
      */
     private resolveBaseUrl;
-    constructor(_messagesRepo: MessagesRepository, sessionsRepo: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository | undefined, branchesRepo?: BranchRepository | undefined, reposRepo?: RepoRepository | undefined, apiKey?: string, mcpServerRepo?: MCPServerRepository | undefined, usersRepo?: UsersRepository | undefined, useNativeAuth?: boolean, tasksService?: TasksService | undefined);
+    constructor(_messagesRepo: MessagesRepository, sessionsRepo: SessionRepository, sessionMCPServerRepo?: SessionMCPServerRepository | undefined, branchesRepo?: BranchRepository | undefined, _reposRepo?: RepoRepository, apiKey?: string, mcpServerRepo?: MCPServerRepository | undefined, _usersRepo?: UsersRepository, useNativeAuth?: boolean, tasksService?: TasksService | undefined);
     /**
      * Delete `agor-codex-instructions-*.md` files in `os.tmpdir()` (and the
      * `~/.agor/tmp` fallback dir) older than 24h. Bounds the disk leak from
@@ -184,7 +182,16 @@ export declare class CodexPromptService {
      */
     private ensureCodexClient;
     /**
-     * Write the rendered Agor session-context prompt to a single file under
+     * Best-effort close for SDK clients that expose a lifecycle method. The
+     * current Codex SDK API has changed over time, so probe common method names
+     * rather than depending on one concrete type. Awaiting close before replacement
+     * keeps abandoned app-server/MCP transports from overlapping the new client.
+     */
+    private closeCodexClient;
+    private replaceCodexClient;
+    private getCodexClient;
+    /**
+     * Write the rendered static Agor orientation prompt to a single file under
      * `os.tmpdir()` and return its absolute path.
      *
      * Replaces the per-session CODEX_HOME directory + AGENTS.md mechanism — we

package/dist/executor/sdk-handlers/codex/prompt-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/prompt-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAWH,OAAO,KAAK,EAAoB,oBAAoB,EAAe,MAAM,kBAAkB,CAAC;AAG5F,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAU,MAAM,gBAAgB,CAAC;AAEhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmDrD,MAAM,WAAW,iBAAiB;IAChC,6CAA6C;IAC7C,QAAQ,EAAE,KAAK,CAAC;QACd,OAAO,EAAE,KAAK,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,EAAE,CAAC,EAAE,MAAM,CAAC;YACZ,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACjC,CAAC,CAAC;QACH,QAAQ,CAAC,EAAE,KAAK,CAAC;YACf,EAAE,EAAE,MAAM,CAAC;YACX,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAChC,CAAC,CAAC;KACJ,CAAC,CAAC;IACH,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kCAAkC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,MAAM,gBAAgB,GACxB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE;QACP,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE;QACP,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACjC,CAAC,CAAC;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC;QACf,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC,CAAC,CAAC;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,0BAA0B,EAAE,gBAAgB,CAAC;IAClE,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEN,qBAAa,kBAAkB;IA2B3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,oBAAoB,CAAC;IAC7B,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,SAAS,CAAC;IAElB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,SAAS,CAAC;IAElB,OAAO,CAAC,YAAY,CAAC;IAlCvB,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,qBAAqB,CAAuB;IACpD,OAAO,CAAC,aAAa,CAAiC;IACtD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,qBAAqB,CAAgC;IAE7D;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;gBAMpB,aAAa,EAAE,kBAAkB,EACzB,YAAY,EAAE,iBAAiB,EAC/B,oBAAoB,CAAC,EAAE,0BAA0B,YAAA,EACjD,YAAY,CAAC,EAAE,gBAAgB,YAAA,EAC/B,SAAS,CAAC,EAAE,cAAc,YAAA,EAClC,MAAM,CAAC,EAAE,MAAM,EACP,aAAa,CAAC,EAAE,mBAAmB,YAAA,EACnC,SAAS,CAAC,EAAE,eAAe,YAAA,EACnC,aAAa,GAAE,OAAe,EACtB,YAAY,CAAC,EAAE,YAAY,YAAA;IA4CrC;;;;OAIG;YACW,2BAA2B;IA6CzC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,iBAAiB;IA0BzB;;;;;;;;;OASG;IACH,OAAO,CAAC,aAAa;IAkBrB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;;;;;;OAQG;IACH,OAAO,CAAC,iBAAiB;IAuBzB;;;;;;;;;;OAUG;YACW,2BAA2B;IA8BzC;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IA0B1B;;;;;;;;;;;;;;;OAeG;YACW,qBAAqB;IA+InC;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IAwBlC;;;OAGG;IACH,OAAO,CAAC,aAAa;IA0FrB;;;;;;;OAOG;YACW,uBAAuB;IA2CrC;;;;;;;;;;;;OAYG;IACI,sBAAsB,CAC3B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,cAAc,EAC/B,eAAe,CAAC,EAAE,eAAe,GAChC,cAAc,CAAC,gBAAgB,CAAC;IA0enC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC;IAyC7B;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IASrE;;;;;;;;;;;;;OAaG;IACG,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BxD"}
+{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/codex/prompt-service.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/codex/prompt-service.js

@@ -30,6 +30,7 @@ import { Codex } from '@agor/core/sdk';
 import { renderAgorSystemPrompt } from '@agor/core/templates/session-context';
 import { mergeMCPRemoteHeaders } from '@agor/core/tools/mcp/http-headers';
 import { resolveMCPAuthHeaders } from '@agor/core/tools/mcp/jwt-auth';
+import { isGatewaySession } from '@agor/core/types';
 import { getDefaultCodexPermissionConfig } from '@agor/core/utils/permission-mode-mapper';
 import { getDaemonUrl } from '../../config.js';
 import { resolveContextUserId } from '../base/context-user.js';
@@ -62,19 +63,24 @@ function toCodexReasoningEffort(effort) {
  * clears the prompt.
  */
 const MCP_AUTO_APPROVE = { default_tools_approval_mode: 'approve' };
+const GATEWAY_MCP_STARTUP_TIMEOUT_MS = 30_000;
 const DEBUG_CODEX = process.env.AGOR_DEBUG_CODEX === '1' || process.env.DEBUG?.includes('codex');
 function codexDebug(...args) {
     if (DEBUG_CODEX) {
         console.debug(...args);
     }
 }
+function applyGatewayMcpStartupGuard(config, requireMcpServers) {
+    if (!requireMcpServers)
+        return;
+    config.required = true;
+    config.startup_timeout_ms = GATEWAY_MCP_STARTUP_TIMEOUT_MS;
+}
 export class CodexPromptService {
     sessionsRepo;
     sessionMCPServerRepo;
     branchesRepo;
-    reposRepo;
     mcpServerRepo;
-    usersRepo;
     tasksService;
     codex;
     lastApiKey = null;
@@ -98,13 +104,11 @@ export class CodexPromptService {
         const raw = process.env.OPENAI_BASE_URL?.trim();
         return raw && raw.length > 0 ? raw : undefined;
     }
-    constructor(_messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, reposRepo, apiKey, mcpServerRepo, usersRepo, useNativeAuth = false, tasksService) {
+    constructor(_messagesRepo, sessionsRepo, sessionMCPServerRepo, branchesRepo, _reposRepo, apiKey, mcpServerRepo, _usersRepo, useNativeAuth = false, tasksService) {
         this.sessionsRepo = sessionsRepo;
         this.sessionMCPServerRepo = sessionMCPServerRepo;
         this.branchesRepo = branchesRepo;
-        this.reposRepo = reposRepo;
         this.mcpServerRepo = mcpServerRepo;
-        this.usersRepo = usersRepo;
         this.tasksService = tasksService;
         // Store API key from base-executor (already resolved with proper precedence)
         this.apiKey = apiKey || '';
@@ -126,10 +130,11 @@ export class CodexPromptService {
         if (baseUrl) {
             codexDebug(`🔗 [Codex] Using custom OPENAI_BASE_URL`);
         }
-        // Bootstrap Codex SDK without per-session config (rebuilt lazily in
-        // promptSessionStreaming once we know the session's instructions file +
-        // MCP servers).
-        this.codex = new Codex.Codex(this.buildCodexOptions(this.apiKey, baseUrl, undefined));
+        // Do not construct the Codex SDK client until promptSessionStreaming has
+        // resolved the session-scoped config (instructions file + MCP servers).
+        // Constructing here with no MCP config and then replacing it moments later
+        // makes the SDK/app-server briefly start with the wrong lifecycle, which is
+        // visible as MCP disconnect/reconnect waves in gateway-driven turns.
         this.lastClientFingerprint = null;
         // Best-effort sweep of orphaned per-session instructions files in
         // tmpdir. `closeSession()` removes a session's file when called, but
@@ -235,13 +240,12 @@ export class CodexPromptService {
         const currentBaseUrl = this.resolveBaseUrl();
         const baseUrlChanged = (this.lastBaseUrl ?? null) !== (currentBaseUrl ?? null);
         if (this.lastApiKey !== currentApiKey || baseUrlChanged) {
-            console.log(`🔄 [Codex] ${this.lastApiKey !== currentApiKey ? 'API key' : 'Base URL'} changed, reinitializing SDK...`);
-            this.codex = new Codex.Codex(this.buildCodexOptions(currentApiKey, currentBaseUrl, undefined));
+            console.log(`🔄 [Codex] ${this.lastApiKey !== currentApiKey ? 'API key' : 'Base URL'} changed, invalidating SDK client...`);
             this.apiKey = currentApiKey;
             this.lastApiKey = currentApiKey;
             this.lastBaseUrl = currentBaseUrl ?? null;
             this.lastClientFingerprint = null;
-            console.log('✅ [Codex] SDK reinitialized');
+            console.log('✅ [Codex] SDK configuration invalidated');
         }
     }
     /**
@@ -274,7 +278,7 @@ export class CodexPromptService {
      * rotated MCP bearer tokens invalidate the cache even when the config
      * shape stays the same — see `snapshotMcpEnvValues()`.
      */
-    ensureCodexClient(config) {
+    async ensureCodexClient(config) {
         const baseUrl = this.resolveBaseUrl();
         const fingerprint = JSON.stringify({
             apiKey: this.apiKey || '',
@@ -287,13 +291,45 @@ export class CodexPromptService {
             return;
         }
         codexDebug(`🔄 [Codex] Per-session config changed, reinitializing SDK (apiKey=${this.apiKey ? 'set' : 'unset'}, useNativeAuth=${this.useNativeAuth})`);
-        this.codex = new Codex.Codex(this.buildCodexOptions(this.apiKey, baseUrl, config));
+        await this.replaceCodexClient(this.buildCodexOptions(this.apiKey, baseUrl, config));
         this.lastApiKey = this.apiKey || null;
         this.lastBaseUrl = baseUrl ?? null;
         this.lastClientFingerprint = fingerprint;
     }
     /**
-     * Write the rendered Agor session-context prompt to a single file under
+     * Best-effort close for SDK clients that expose a lifecycle method. The
+     * current Codex SDK API has changed over time, so probe common method names
+     * rather than depending on one concrete type. Awaiting close before replacement
+     * keeps abandoned app-server/MCP transports from overlapping the new client.
+     */
+    async closeCodexClient(client) {
+        if (!client)
+            return;
+        const candidate = client;
+        const close = candidate.close ?? candidate.dispose ?? candidate.shutdown;
+        if (!close)
+            return;
+        try {
+            await Promise.resolve(close.call(candidate));
+        }
+        catch (error) {
+            console.warn('⚠️  [Codex] Failed to close previous SDK client:', error);
+        }
+    }
+    async replaceCodexClient(options) {
+        const previous = this.codex;
+        this.codex = undefined;
+        await this.closeCodexClient(previous);
+        this.codex = new Codex.Codex(options);
+    }
+    getCodexClient() {
+        if (!this.codex) {
+            throw new Error('Codex SDK client was not initialized before use');
+        }
+        return this.codex;
+    }
+    /**
+     * Write the rendered static Agor orientation prompt to a single file under
      * `os.tmpdir()` and return its absolute path.
      *
      * Replaces the per-session CODEX_HOME directory + AGENTS.md mechanism — we
@@ -304,12 +340,7 @@ export class CodexPromptService {
      * config.toml stay where they are.
      */
     async ensureCodexInstructionsFile(sessionId) {
-        const agorSystemPrompt = await renderAgorSystemPrompt(sessionId, {
-            sessions: this.sessionsRepo,
-            branches: this.branchesRepo,
-            repos: this.reposRepo,
-            users: this.usersRepo,
-        });
+        const agorSystemPrompt = await renderAgorSystemPrompt();
         const fileName = `agor-codex-instructions-${sessionId}.md`;
         // Try /tmp first; fall back to ~/.agor/tmp if /tmp is unavailable
         // (sandboxed executors / containers without /tmp).
@@ -371,7 +402,7 @@ export class CodexPromptService {
      * scoping layer — without it, OAuth-protected MCP servers won't pick up
      * the requesting user's stored OAuth tokens.
      */
-    async buildMcpServersConfig(sessionId, mcpToken, forUserId) {
+    async buildMcpServersConfig(sessionId, mcpToken, forUserId, requireMcpServers = false) {
         codexDebug(`🔍 [Codex MCP] Fetching MCP servers for session ${shortId(sessionId)}...`);
         codexDebug(`   [Codex MCP] forUserId: ${forUserId || 'NOT SET'}`);
         const serversWithSource = await getMcpServersForSession(sessionId, {
@@ -399,14 +430,15 @@ export class CodexPromptService {
             result.agor = {
                 url: `${daemonUrl}/mcp`,
                 bearer_token_env_var: agorBearerEnvVar,
-                required: false,
                 ...MCP_AUTO_APPROVE,
             };
+            applyGatewayMcpStartupGuard(result.agor, requireMcpServers);
             codexDebug(`   📝 [Codex MCP] Configuring built-in Agor MCP server (HTTP) at ${daemonUrl}/mcp`);
         }
         for (const server of stdioServers) {
             const serverName = this.claimMcpServerName(server.name, claimedNames, server.name.toLowerCase() === 'agor' ? 'conflicts with built-in Agor MCP server' : undefined);
             const serverConfig = { ...MCP_AUTO_APPROVE };
+            applyGatewayMcpStartupGuard(serverConfig, requireMcpServers);
             codexDebug(`   📝 [Codex MCP] Configuring STDIO server: ${server.name} -> ${serverName}`);
             if (server.command) {
                 serverConfig.command = server.command;
@@ -425,6 +457,7 @@ export class CodexPromptService {
         for (const server of httpServers) {
             const serverName = this.claimMcpServerName(server.name, claimedNames, server.name.toLowerCase() === 'agor' ? 'conflicts with built-in Agor MCP server' : undefined);
             const serverConfig = { ...MCP_AUTO_APPROVE };
+            let canRequireServer = requireMcpServers;
             codexDebug(`   📝 [Codex MCP] Configuring HTTP server: ${server.name} -> ${serverName}`);
             if (server.url) {
                 serverConfig.url = server.url;
@@ -440,6 +473,7 @@ export class CodexPromptService {
                 const authHeaders = await resolveMCPAuthHeaders(server.auth, server.url);
                 const headers = mergeMCPRemoteHeaders({ custom: server.headers, auth: authHeaders });
                 const authHeader = headers?.Authorization;
+                const missingRequiredAuth = !!server.auth && server.auth.type !== 'none' && !authHeader;
                 const customHeaders = headers ? { ...headers } : undefined;
                 if (customHeaders)
                     delete customHeaders.Authorization;
@@ -456,17 +490,24 @@ export class CodexPromptService {
                         codexDebug(`      auth: ${server.auth?.type ?? 'bearer'} token via ${envVarName}`);
                     }
                     else {
+                        canRequireServer = false;
                         console.warn(`      ⚠️  auth: resolved Authorization header for "${server.name}" is not a Bearer scheme (Codex CLI only supports bearer); skipping injection`);
                     }
                 }
-                else if (server.auth?.type === 'oauth') {
-                    console.warn(`   ⚠️  [Codex MCP] Server "${server.name}" requires OAuth but no valid token found.`);
-                    console.warn(`      💡 Go to Settings → MCP Servers → ${server.name} → Start OAuth Flow to authenticate.`);
+                else if (missingRequiredAuth) {
+                    canRequireServer = false;
+                    console.warn(`   ⚠️  [Codex MCP] Server "${server.name}" has configured auth but no valid token found.`);
+                    const action = server.auth?.type === 'oauth'
+                        ? `Start OAuth Flow for ${server.name}`
+                        : `check credentials for ${server.name}`;
+                    console.warn(`      💡 Go to Settings → MCP Servers → ${action}.`);
                 }
             }
             catch (error) {
                 console.warn(`   ⚠️  [Codex MCP] Failed to resolve auth headers for "${server.name}":`, error instanceof Error ? error.message : String(error));
+                canRequireServer = false;
             }
+            applyGatewayMcpStartupGuard(serverConfig, canRequireServer);
             result[serverName] = serverConfig;
         }
         const total = stdioServers.length + httpServers.length + (mcpToken ? 1 : 0);
@@ -684,14 +725,15 @@ export class CodexPromptService {
             taskId,
             tasksService: this.tasksService,
         });
-        const { servers: mcpServersConfig, total: mcpServerCount } = await this.buildMcpServersConfig(sessionId, mcpToken, forUserId);
+        const requireMcpServers = isGatewaySession(session);
+        const { servers: mcpServersConfig, total: mcpServerCount } = await this.buildMcpServersConfig(sessionId, mcpToken, forUserId, requireMcpServers);
         const codexConfigPayload = {
             model_instructions_file: instructionsFile,
             ...(Object.keys(mcpServersConfig).length > 0 ? { mcp_servers: mcpServersConfig } : {}),
         };
         // Recreate Codex instance only if the per-session config payload (or
         // apiKey/baseUrl) actually changed — issue #133 protection.
-        this.ensureCodexClient(codexConfigPayload);
+        await this.ensureCodexClient(codexConfigPayload);
         codexDebug(`   Configured: sandboxMode=${sandboxMode}, approvalPolicy=${approvalPolicy}, networkAccess=${networkAccess}, ${mcpServerCount} MCP server(s)`);
         // Fetch branch to get working directory
         const branch = this.branchesRepo ? await this.branchesRepo.findById(session.branch_id) : null;
@@ -756,7 +798,7 @@ export class CodexPromptService {
         let thread;
         if (session.sdk_session_id) {
             codexDebug(`🔄 [Codex] Resuming thread: ${session.sdk_session_id}`);
-            thread = this.codex.resumeThread(session.sdk_session_id, threadOptions);
+            thread = this.getCodexClient().resumeThread(session.sdk_session_id, threadOptions);
             // If approval policy changed, send slash command to update thread settings
             if (approvalPolicyChanged) {
                 console.log(`⚙️  [Codex] Approval policy changed: ${previousApprovalPolicy} → ${approvalPolicy}`);
@@ -781,7 +823,7 @@ export class CodexPromptService {
             if (mcpServerCount > 0) {
                 codexDebug(`✅ [Codex MCP] New thread will have ${mcpServerCount} MCP server(s) available via --config flags`);
             }
-            thread = this.codex.startThread(threadOptions);
+            thread = this.getCodexClient().startThread(threadOptions);
         }
         try {
             codexDebug(`▶️  [Codex] Running prompt: "${prompt.substring(0, 50)}${prompt.length > 50 ? '...' : ''}"`);