agor-live 0.22.0 → 0.23.2

package/dist/executor/sdk-handlers/gemini/gemini-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gemini-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/gemini/gemini-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gemini-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/gemini/gemini-tool.ts"],"names":[],"mappings":"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"}

package/dist/executor/sdk-handlers/gemini/gemini-tool.js

@@ -24,12 +24,12 @@ export class GeminiTool {
     name = 'Google Gemini';
     promptService;
     constructor(messagesRepo, sessionsRepo, apiKey, messagesService, tasksService, branchesRepo, reposRepo, mcpServerRepo, sessionMCPRepo, mcpEnabled, useNativeAuth, // Flag to use OAuth when no API key
-    usersRepo) {
+    usersRepo, mcpOAuthAuthHeadersRepo) {
         this.messagesRepo = messagesRepo;
         this.messagesService = messagesService;
         this.tasksService = tasksService;
         if (messagesRepo && sessionsRepo) {
-            this.promptService = new GeminiPromptService(messagesRepo, sessionsRepo, apiKey, branchesRepo, reposRepo, mcpServerRepo, sessionMCPRepo, mcpEnabled, useNativeAuth, usersRepo, this.tasksService);
+            this.promptService = new GeminiPromptService(messagesRepo, sessionsRepo, apiKey, branchesRepo, reposRepo, mcpServerRepo, sessionMCPRepo, mcpEnabled, useNativeAuth, usersRepo, this.tasksService, mcpOAuthAuthHeadersRepo);
         }
     }
     getCapabilities() {

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

@@ -8,7 +8,7 @@
  * - Event-driven architecture (13 event types)
  * - CLAUDE.md auto-loading
  */
-import type { BranchRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
+import type { BranchRepository, MCPOAuthAuthHeadersRepository, MCPServerRepository, MessagesRepository, RepoRepository, SessionMCPServerRepository, SessionRepository, UsersRepository } from '../../db/feathers-repositories.js';
 import type { TokenUsage } from '../../types/token-usage.js';
 import type { PermissionMode, SessionID, TaskID } from '../../types.js';
 import type { TasksService } from '../base/index.js';
@@ -61,6 +61,7 @@ export declare class GeminiPromptService {
     private sessionMCPRepo?;
     private mcpEnabled?;
     private tasksService?;
+    private mcpOAuthAuthHeadersRepo?;
     private sessionClients;
     /** Invocation model bound on each cached client — triggers recreate when it changes. */
     private sessionClientInvocationModels;
@@ -68,7 +69,7 @@ export declare class GeminiPromptService {
     private apiKey?;
     private useNativeAuth;
     constructor(_messagesRepo: MessagesRepository, sessionsRepo: SessionRepository, apiKey?: string, branchesRepo?: BranchRepository | undefined, _reposRepo?: RepoRepository, mcpServerRepo?: MCPServerRepository | undefined, sessionMCPRepo?: SessionMCPServerRepository | undefined, mcpEnabled?: boolean | undefined, useNativeAuth?: boolean, // Flag from base-executor indicating OAuth should be used
-    _usersRepo?: UsersRepository, tasksService?: TasksService | undefined);
+    _usersRepo?: UsersRepository, tasksService?: TasksService | undefined, mcpOAuthAuthHeadersRepo?: MCPOAuthAuthHeadersRepository | undefined);
     /**
      * Execute prompt with streaming via @google/gemini-cli-core SDK
      *

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

@@ -1 +1 @@
-{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/gemini/prompt-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt-service.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/gemini/prompt-service.ts"],"names":[],"mappings":"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"}

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

@@ -35,6 +35,7 @@ export class GeminiPromptService {
     sessionMCPRepo;
     mcpEnabled;
     tasksService;
+    mcpOAuthAuthHeadersRepo;
     sessionClients = new Map();
     /** Invocation model bound on each cached client — triggers recreate when it changes. */
     sessionClientInvocationModels = new Map();
@@ -42,13 +43,14 @@ export class GeminiPromptService {
     apiKey; // Resolved API key from base-executor
     useNativeAuth; // Whether to use OAuth (no API key found)
     constructor(_messagesRepo, sessionsRepo, apiKey, branchesRepo, _reposRepo, mcpServerRepo, sessionMCPRepo, mcpEnabled, useNativeAuth, // Flag from base-executor indicating OAuth should be used
-    _usersRepo, tasksService) {
+    _usersRepo, tasksService, mcpOAuthAuthHeadersRepo) {
         this.sessionsRepo = sessionsRepo;
         this.branchesRepo = branchesRepo;
         this.mcpServerRepo = mcpServerRepo;
         this.sessionMCPRepo = sessionMCPRepo;
         this.mcpEnabled = mcpEnabled;
         this.tasksService = tasksService;
+        this.mcpOAuthAuthHeadersRepo = mcpOAuthAuthHeadersRepo;
         this.apiKey = apiKey;
         this.useNativeAuth = useNativeAuth ?? false; // Default to false if not provided
     }
@@ -527,6 +529,7 @@ export class GeminiPromptService {
                 const serversWithSource = await getMcpServersForSession(sessionId, {
                     sessionMCPRepo: this.sessionMCPRepo,
                     mcpServerRepo: this.mcpServerRepo,
+                    mcpOAuthAuthHeadersRepo: this.mcpOAuthAuthHeadersRepo,
                     forUserId: contextUserId,
                 });
                 // Convert to Gemini SDK format

package/dist/executor/sdk-handlers/opencode/opencode-tool.d.ts

@@ -14,7 +14,7 @@
  * - ⏳ Session import (future: when OpenCode provides export API)
  */
 import type { Message } from '@agor/core/types';
-import type { MCPServerRepository, SessionMCPServerRepository } from '../../db/feathers-repositories.js';
+import type { MCPOAuthAuthHeadersRepository, MCPServerRepository, SessionMCPServerRepository } from '../../db/feathers-repositories.js';
 import type { NormalizedSdkResponse, RawSdkResponse } from '../../types/sdk-response.js';
 import type { CreateSessionConfig, MessagesService, SessionHandle, SessionMetadata, StreamingCallbacks, TaskResult, ToolCapabilities } from '../base/index.js';
 import type { ITool } from '../base/tool.interface.js';
@@ -23,6 +23,7 @@ export interface OpenCodeConfig {
     serverUrl: string;
 }
 export declare class OpenCodeTool implements ITool {
+    private mcpOAuthAuthHeadersRepo?;
     readonly toolType: "opencode";
     readonly name = "OpenCode";
     /** Default client (no directory override) */
@@ -42,7 +43,7 @@ export declare class OpenCodeTool implements ITool {
      * Prefers explicit text parts and falls back to reasoning text when no text parts exist.
      */
     private extractDisplayTextFromParts;
-    constructor(config: OpenCodeConfig, messagesService?: MessagesService, sessionMCPRepo?: SessionMCPServerRepository, mcpServerRepo?: MCPServerRepository);
+    constructor(config: OpenCodeConfig, messagesService?: MessagesService, sessionMCPRepo?: SessionMCPServerRepository, mcpServerRepo?: MCPServerRepository, mcpOAuthAuthHeadersRepo?: MCPOAuthAuthHeadersRepository | undefined);
     /**
      * Set session context (OpenCode session ID, model, provider, branch path, and MCP token) for an Agor session
      * Must be called before executeTask

package/dist/executor/sdk-handlers/opencode/opencode-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/opencode/opencode-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAgC,MAAM,kBAAkB,CAAC;AAK9E,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,UAAU,EACV,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAeD,qBAAa,YAAa,YAAW,KAAK;IACxC,QAAQ,CAAC,QAAQ,EAAG,UAAU,CAAU;IACxC,QAAQ,CAAC,IAAI,cAAc;IAE3B,6CAA6C;IAC7C,OAAO,CAAC,MAAM,CAAwD;IACtE,oDAAoD;IACpD,OAAO,CAAC,gBAAgB,CAAmE;IAC3F,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,eAAe,CAA0C;IACjE,uEAAuE;IACvE,OAAO,CAAC,eAAe,CAAkC;IACzD,yEAAyE;IACzE,OAAO,CAAC,cAAc,CAAC,CAA6B;IACpD,OAAO,CAAC,aAAa,CAAC,CAAsB;IAE5C;;;OAGG;IACH,OAAO,CAAC,2BAA2B;gBAmBjC,MAAM,EAAE,cAAc,EACtB,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,CAAC,EAAE,0BAA0B,EAC3C,aAAa,CAAC,EAAE,mBAAmB;IAQrC;;;;;;;;;;OAUG;IACH,iBAAiB,CACf,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,KAAK,CAAC,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI;IAUP;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACH,OAAO,CAAC,SAAS;IAIjB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAyB7B;;;;;;;;;OASG;YACW,gBAAgB;IA+F9B;;;;;;;OAOG;IACH,OAAO,CAAC,2BAA2B;IAmEnC;;OAEG;IACH,eAAe,IAAI,gBAAgB;IAYnC;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAWxC;;OAEG;IACG,aAAa,CAAC,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;IA+BzE;;;;;;;;;;;;;;OAcG;IACG,WAAW,CAAC,CAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC;IA4ctB;;OAEG;YACW,uBAAuB;IA8HrC;;OAEG;IACG,kBAAkB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA0BtE;;OAEG;IACG,kBAAkB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAuBhE;;OAEG;IACG,YAAY,CAAC,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA8BjD;;;;;OAKG;IACH,qBAAqB,CAAC,YAAY,EAAE,cAAc,GAAG,qBAAqB;CAK3E"}
+{"version":3,"file":"opencode-tool.d.ts","sourceRoot":"","sources":["../../../src/sdk-handlers/opencode/opencode-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAgC,MAAM,kBAAkB,CAAC;AAK9E,OAAO,KAAK,EACV,6BAA6B,EAC7B,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF,OAAO,KAAK,EACV,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,UAAU,EACV,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAeD,qBAAa,YAAa,YAAW,KAAK;IA4CtC,OAAO,CAAC,uBAAuB,CAAC;IA3ClC,QAAQ,CAAC,QAAQ,EAAG,UAAU,CAAU;IACxC,QAAQ,CAAC,IAAI,cAAc;IAE3B,6CAA6C;IAC7C,OAAO,CAAC,MAAM,CAAwD;IACtE,oDAAoD;IACpD,OAAO,CAAC,gBAAgB,CAAmE;IAC3F,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,eAAe,CAA0C;IACjE,uEAAuE;IACvE,OAAO,CAAC,eAAe,CAAkC;IACzD,yEAAyE;IACzE,OAAO,CAAC,cAAc,CAAC,CAA6B;IACpD,OAAO,CAAC,aAAa,CAAC,CAAsB;IAE5C;;;OAGG;IACH,OAAO,CAAC,2BAA2B;gBAmBjC,MAAM,EAAE,cAAc,EACtB,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,CAAC,EAAE,0BAA0B,EAC3C,aAAa,CAAC,EAAE,mBAAmB,EAC3B,uBAAuB,CAAC,EAAE,6BAA6B,YAAA;IAQjE;;;;;;;;;;OAUG;IACH,iBAAiB,CACf,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,KAAK,CAAC,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI;IAUP;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACH,OAAO,CAAC,SAAS;IAIjB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAyB7B;;;;;;;;;OASG;YACW,gBAAgB;IAgG9B;;;;;;;OAOG;IACH,OAAO,CAAC,2BAA2B;IAmEnC;;OAEG;IACH,eAAe,IAAI,gBAAgB;IAYnC;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAWxC;;OAEG;IACG,aAAa,CAAC,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;IA+BzE;;;;;;;;;;;;;;OAcG;IACG,WAAW,CAAC,CAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,CAAC;IA4ctB;;OAEG;YACW,uBAAuB;IA8HrC;;OAEG;IACG,kBAAkB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA0BtE;;OAEG;IACG,kBAAkB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAuBhE;;OAEG;IACG,YAAY,CAAC,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA8BjD;;;;;OAKG;IACH,qBAAqB,CAAC,YAAY,EAAE,cAAc,GAAG,qBAAqB;CAK3E"}

package/dist/executor/sdk-handlers/opencode/opencode-tool.js

@@ -22,6 +22,7 @@ import { getDaemonUrl } from '../../config.js';
 import { enrichContentBlocks } from '../base/diff-enrichment.js';
 import { getMcpServersForSession } from '../base/mcp-scoping.js';
 export class OpenCodeTool {
+    mcpOAuthAuthHeadersRepo;
     toolType = 'opencode';
     name = 'OpenCode';
     /** Default client (no directory override) */
@@ -52,7 +53,8 @@ export class OpenCodeTool {
             .map((part) => part.text);
         return reasoningParts.join('\n');
     }
-    constructor(config, messagesService, sessionMCPRepo, mcpServerRepo) {
+    constructor(config, messagesService, sessionMCPRepo, mcpServerRepo, mcpOAuthAuthHeadersRepo) {
+        this.mcpOAuthAuthHeadersRepo = mcpOAuthAuthHeadersRepo;
         this.config = config;
         this.messagesService = messagesService;
         this.sessionMCPRepo = sessionMCPRepo;
@@ -162,6 +164,7 @@ export class OpenCodeTool {
                 const servers = await getMcpServersForSession(sessionId, {
                     sessionMCPRepo: this.sessionMCPRepo,
                     mcpServerRepo: this.mcpServerRepo,
+                    mcpOAuthAuthHeadersRepo: this.mcpOAuthAuthHeadersRepo,
                 });
                 for (const { server } of servers) {
                     const sanitizedName = server.name.toLowerCase().replace(/[^a-z0-9]+/g, '_');

package/dist/executor/services/feathers-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feathers-client.d.ts","sourceRoot":"","sources":["../../src/services/feathers-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,gBAAgB,CAAC;AAG/D,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AA+BjD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,UAAU,CAAC,CA6ErB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,6BAAuB,CAAC"}
+{"version":3,"file":"feathers-client.d.ts","sourceRoot":"","sources":["../../src/services/feathers-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,gBAAgB,CAAC;AAG/D,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAoCjD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,UAAU,CAAC,CAsMrB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,6BAAuB,CAAC"}

package/dist/executor/services/feathers-client.js

@@ -6,6 +6,10 @@
  */
 import { createClient } from '@agor/core/api';
 const DEBUG_FEATHERS_CLIENT = process.env.AGOR_DEBUG_FEATHERS_CLIENT === '1' || process.env.DEBUG?.includes('feathers-client');
+const SERVER_DISCONNECT_RECONNECT_BASE_DELAY_MS = 1000;
+const SERVER_DISCONNECT_RECONNECT_MAX_DELAY_MS = 30_000;
+const SERVER_DISCONNECT_RECONNECT_MAX_ATTEMPTS = 8;
+const SERVER_DISCONNECT_RECONNECT_MAX_AUTH_FAILURES = 3;
 function feathersClientDebug(...args) {
     if (DEBUG_FEATHERS_CLIENT) {
         console.debug(...args);
@@ -35,20 +39,132 @@ class MemoryStorage {
  * @returns Authenticated Feathers client
  */
 export async function createExecutorClient(daemonUrl, sessionToken) {
+    const startedAt = Date.now();
+    const logSocketEvent = (event, detail) => {
+        const elapsedSeconds = Math.round((Date.now() - startedAt) / 1000);
+        const suffix = detail === undefined ? '' : `: ${detail instanceof Error ? detail.message : String(detail)}`;
+        console.log(`[executor] Socket ${event} after ${elapsedSeconds}s${suffix}`);
+    };
     // CRITICAL FIX: Use in-memory storage for authentication
     // Without this, the authentication result is discarded and subsequent requests fail
     const storage = new MemoryStorage();
     // Create client with custom storage (don't auto-connect, we'll connect manually)
     const client = createClient(daemonUrl, false, {
         verbose: DEBUG_FEATHERS_CLIENT, // Log connection status for debugging
-        reconnectionAttempts: 5, // Allow more retries for transient network hiccups during long-running tasks
+        // Executors may run for much longer than common proxy/websocket connection
+        // caps (for example, 15-minute ingress/LB limits). A short retry budget
+        // turns a recoverable transport rotation into a permanent daemon
+        // disconnect: heartbeats stop, terminal task patches are lost, and the
+        // daemon eventually marks the task failed via stale heartbeat/onExit
+        // safety nets. Match the browser client and keep retrying for the task's
+        // lifetime; the existing reconnect handler below re-authenticates the
+        // socket after each successful reconnect.
+        reconnectionAttempts: Number.POSITIVE_INFINITY,
+        authStorage: storage,
     });
-    // Re-configure authentication with memory storage
-    // This overrides the default `storage: undefined` for Node.js environments
-    // Import authentication client from @agor/core (re-exported from @feathersjs/authentication-client)
-    const { authenticationClient } = await import('@agor/core/api');
-    client.configure(authenticationClient({ storage }));
+    // Keep the executor JWT available for daemon endpoints that need an explicit
+    // task-scoped proof. Socket.io auth can preserve the session creator user
+    // while dropping custom JWT claims from subsequent service params.
+    client.executorSessionToken = sessionToken;
+    let serverDisconnectReconnectAttempts = 0;
+    let serverDisconnectAuthFailures = 0;
+    let serverDisconnectReconnectTimer;
+    const resetServerDisconnectRecovery = () => {
+        serverDisconnectReconnectAttempts = 0;
+        serverDisconnectAuthFailures = 0;
+        if (serverDisconnectReconnectTimer) {
+            clearTimeout(serverDisconnectReconnectTimer);
+            serverDisconnectReconnectTimer = undefined;
+        }
+    };
+    let reauthenticating = false;
+    const reauthenticateSocket = async (label) => {
+        if (reauthenticating)
+            return true;
+        reauthenticating = true;
+        try {
+            // Try reAuthenticate first — uses stored credentials from MemoryStorage
+            await client.reAuthenticate(true);
+            console.log(`[executor] Re-authenticated successfully after ${label}`);
+            resetServerDisconnectRecovery();
+            return true;
+        }
+        catch {
+            // Fallback: authenticate with raw JWT if storage-based re-auth fails
+            try {
+                await client.authenticate({
+                    strategy: 'jwt',
+                    accessToken: sessionToken,
+                });
+                console.log(`[executor] Re-authenticated with JWT fallback after ${label}`);
+                resetServerDisconnectRecovery();
+                return true;
+            }
+            catch (error) {
+                console.error(`[executor] Re-authentication failed after ${label}:`, error);
+                return false;
+            }
+        }
+        finally {
+            reauthenticating = false;
+        }
+    };
+    const scheduleServerDisconnectReconnect = () => {
+        if (serverDisconnectReconnectTimer)
+            return;
+        if (serverDisconnectReconnectAttempts >= SERVER_DISCONNECT_RECONNECT_MAX_ATTEMPTS) {
+            logSocketEvent('server_disconnect_reconnect_abandoned', `after ${serverDisconnectReconnectAttempts} attempts`);
+            return;
+        }
+        serverDisconnectReconnectAttempts += 1;
+        const delayMs = serverDisconnectReconnectAttempts === 1
+            ? 0
+            : Math.min(SERVER_DISCONNECT_RECONNECT_BASE_DELAY_MS *
+                2 ** (serverDisconnectReconnectAttempts - 2), SERVER_DISCONNECT_RECONNECT_MAX_DELAY_MS);
+        logSocketEvent('server_disconnect_reconnect_scheduled', `attempt ${serverDisconnectReconnectAttempts} in ${delayMs}ms`);
+        serverDisconnectReconnectTimer = setTimeout(() => {
+            serverDisconnectReconnectTimer = undefined;
+            client.io.once('connect', async () => {
+                const reauthenticated = await reauthenticateSocket('server disconnect reconnect');
+                if (reauthenticated)
+                    return;
+                serverDisconnectAuthFailures += 1;
+                if (serverDisconnectAuthFailures >= SERVER_DISCONNECT_RECONNECT_MAX_AUTH_FAILURES) {
+                    logSocketEvent('server_disconnect_reconnect_auth_abandoned', `after ${serverDisconnectAuthFailures} auth failures`);
+                    client.io.disconnect();
+                    return;
+                }
+                client.io.disconnect();
+                scheduleServerDisconnectReconnect();
+            });
+            client.io.connect();
+        }, delayMs);
+    };
     // Connect the socket
+    client.io.on('disconnect', (reason) => {
+        logSocketEvent('disconnected', reason);
+        if (reason === 'io server disconnect') {
+            // Socket.IO intentionally disables automatic reconnect after a server-
+            // initiated namespace disconnect. In practice, long executor tasks can
+            // see this at the same ~15-minute boundary as proxy transport rotation.
+            // Treat it as recoverable for executor lifetimes and explicitly reopen
+            // the socket; the one-shot connect handler below re-authenticates the new
+            // socket because Manager "reconnect" is not emitted for this path.
+            scheduleServerDisconnectReconnect();
+        }
+    });
+    client.io.on('connect_error', (error) => {
+        logSocketEvent('connect_error', error);
+    });
+    client.io.io.on('reconnect_attempt', (attemptNumber) => {
+        logSocketEvent('reconnect_attempt', `attempt ${attemptNumber}`);
+    });
+    client.io.io.on('reconnect_error', (error) => {
+        logSocketEvent('reconnect_error', error);
+    });
+    client.io.io.on('reconnect_failed', () => {
+        logSocketEvent('reconnect_failed');
+    });
     client.io.connect();
     // Wait for connection
     await new Promise((resolve, reject) => {
@@ -81,25 +197,8 @@ export async function createExecutorClient(daemonUrl, sessionToken) {
     // NOTE: 'reconnect' is a Manager event, not a Socket event.
     // client.io is the Socket; client.io.io is the Manager.
     client.io.io.on('reconnect', async (attemptNumber) => {
-        console.log(`[executor] Socket reconnected (attempt ${attemptNumber}), re-authenticating...`);
-        try {
-            // Try reAuthenticate first — uses stored credentials from MemoryStorage
-            await client.reAuthenticate(true);
-            console.log('[executor] Re-authenticated successfully after reconnect');
-        }
-        catch {
-            // Fallback: authenticate with raw JWT if storage-based re-auth fails
-            try {
-                await client.authenticate({
-                    strategy: 'jwt',
-                    accessToken: sessionToken,
-                });
-                console.log('[executor] Re-authenticated with JWT fallback after reconnect');
-            }
-            catch (error) {
-                console.error('[executor] Re-authentication failed after reconnect:', error);
-            }
-        }
+        logSocketEvent('reconnected', `attempt ${attemptNumber}; re-authenticating`);
+        await reauthenticateSocket('reconnect');
     });
     return client;
 }