@xopcai/xopc 0.0.92 → 0.0.94

package/dist/src/gateway/hono/sse.js.map

@@ -1 +1 @@
-{"version":3,"file":"sse.js","names":[],"sources":["../../../../src/gateway/hono/sse.ts"],"sourcesContent":["import { streamSSE } from 'hono/streaming';\nimport type { Context } from 'hono';\nimport type { GatewayService } from '../service.js';\nimport { MAX_WEBCHAT_ATTACHMENT_FILE_BYTES } from '../chat-limits.js';\nimport { createLogger, updateAsyncLogContext } from '../../utils/logger.js';\nimport { stringifySSEData } from './sse-json.js';\nimport { resolveWebchatSessionKey } from '../resolve-webchat-session-key.js';\n\nconst log = createLogger('Hono:SSE');\n\n// Active SSE connections tracking for connection limiting\nconst activeConnections = new Map<string, AbortController>();\n\nexport interface SSEHandlerConfig {\n  service: GatewayService;\n  maxSseConnections?: number;\n}\n\n// Type validation for agent request body\ninterface AgentRequestBody {\n  message: string;\n  channel?: string;\n  chatId?: string;\n  /** Alias for `chatId` (gateway console + extension clients). */\n  sessionKey?: string;\n  /** Epoch ms when the client started this send (abort cutoff / stale POST drop). */\n  clientCreatedAtMs?: number;\n  /** When true and `channel` is `webchat`, start a new peer id (new session). */\n  newSession?: boolean;\n  thinking?: string;\n  attachments?: Array<{\n    type: string;\n    mimeType?: string;\n    data?: string;\n    name?: string;\n    size?: number;\n  }>;\n}\n\nfunction isValidAgentRequest(body: unknown): body is AgentRequestBody {\n  if (!body || typeof body !== 'object') return false;\n  const b = body as Record<string, unknown>;\n  // Allow empty message if attachments are provided\n  const hasMessage = typeof b.message === 'string';\n  const hasAttachments = Array.isArray(b.attachments) && b.attachments.length > 0;\n  return hasMessage || hasAttachments;\n}\n\n/** Max base64 character length that can decode to `MAX_WEBCHAT_ATTACHMENT_FILE_BYTES`. */\nfunction maxBase64CharsForBinary(maxBinaryBytes: number): number {\n  return 4 * Math.ceil(maxBinaryBytes / 3);\n}\n\n/**\n * POST /api/agent — Send a message to the agent, stream response via SSE.\n *\n * Request body: { message, channel?, chatId?, attachments? }\n * Accept: text/event-stream → SSE stream\n * Accept: application/json → wait for full response, return JSON\n *\n * SSE events:\n *   event: status   — { status, runId }\n *   event: user_message — { timestamp, content?, attachments? } (user turn accepted, before agent tokens)\n *   event: user_transcript — { text, attachments? } (voice STT complete, before agent tokens)\n *   event: token    — { content }\n *   event: error    — { content }\n *   event: result   — { ok, payload: { status, summary } }\n */\nexport function createAgentSSEHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n\n  return async (c: Context) => {\n    const body = await c.req.json().catch(() => null);\n\n    // Input validation\n    if (!isValidAgentRequest(body)) {\n      return c.json({\n        ok: false,\n        error: { code: 'BAD_REQUEST', message: 'Missing required field: message or attachments' }\n      }, 400);\n    }\n\n    const { message, channel = 'webchat', attachments, thinking } = body;\n    const clientCreatedAtMs =\n      typeof body.clientCreatedAtMs === 'number' && Number.isFinite(body.clientCreatedAtMs)\n        ? body.clientCreatedAtMs\n        : undefined;\n    const newSession = Boolean(body.newSession);\n    const cfg = service.currentConfig;\n    const resolved = resolveWebchatSessionKey({\n      cfg,\n      sessionKey: typeof body.sessionKey === 'string' ? body.sessionKey : undefined,\n      chatId: typeof body.chatId === 'string' ? body.chatId : undefined,\n      newSession,\n    });\n    if (resolved.ok === false) {\n      return c.json({\n        ok: false,\n        error: { code: 'BAD_REQUEST', message: resolved.error },\n      }, 400);\n    }\n    const chatId = resolved.sessionKey;\n\n    updateAsyncLogContext({ sessionId: String(chatId) });\n\n    if (Array.isArray(attachments)) {\n      const maxDataChars = maxBase64CharsForBinary(MAX_WEBCHAT_ATTACHMENT_FILE_BYTES);\n      for (const a of attachments) {\n        if (!a || typeof a !== 'object') continue;\n        const data = (a as { data?: unknown }).data;\n        if (typeof data === 'string' && data.length > maxDataChars) {\n          return c.json(\n            {\n              ok: false,\n              error: {\n                code: 'BAD_REQUEST',\n                message: `Attachment exceeds maximum size (${MAX_WEBCHAT_ATTACHMENT_FILE_BYTES} bytes)`,\n              },\n            },\n            400,\n          );\n        }\n      }\n    }\n\n    const accept = c.req.header('Accept') || '';\n    const wantSSE = accept.includes('text/event-stream');\n\n    const clientAbort = new AbortController();\n    const raw = c.req.raw;\n    // Keep webchat runs alive across transient disconnects (page refresh / tab route switch)\n    // so the client can reattach via /api/agent/resume using runId from `status`.\n    // Explicit cancellation still goes through /api/agent/abort.\n    if (channel !== 'webchat') {\n      if (raw.signal.aborted) {\n        clientAbort.abort();\n      } else {\n        raw.signal.addEventListener('abort', () => clientAbort.abort(), { once: true });\n      }\n    }\n\n    // --- Non-streaming fallback: collect everything, return JSON ---\n    if (!wantSSE) {\n      const jsonSessionKey = channel === 'webchat' ? chatId : undefined;\n\n      const generator = service.runAgent(message, channel, chatId, attachments, thinking, {\n        signal: clientAbort.signal,\n        ...(clientCreatedAtMs !== undefined ? { clientCreatedAtMs } : {}),\n      });\n      try {\n        let finalResult: { status: string; summary: string } | undefined;\n        const tokens: string[] = [];\n\n        while (true) {\n          const { done, value } = await generator.next();\n          if (done) {\n            finalResult = value as { status: string; summary: string };\n            break;\n          }\n          const chunk = value as { type: string; content?: string; status?: string; runId?: string };\n          if (chunk.type === 'token' && chunk.content) {\n            tokens.push(chunk.content);\n          }\n        }\n\n        return c.json({\n          ok: true,\n          payload: {\n            ...finalResult,\n            content: tokens.join(''),\n            ...(jsonSessionKey !== undefined\n              ? { sessionKey: jsonSessionKey, key: jsonSessionKey }\n              : {}),\n          },\n        });\n      } catch (error) {\n        log.error({ err: error }, 'Agent run failed (JSON mode)');\n        return c.json({\n          ok: false,\n          error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' },\n        }, 500);\n      }\n    }\n\n    // --- SSE streaming ---\n    c.header('X-Accel-Buffering', 'no');\n    return streamSSE(c, async (stream) => {\n      if (channel !== 'webchat') {\n        stream.onAbort(() => {\n          clientAbort.abort();\n        });\n      }\n\n      const generator = service.runAgent(message, channel, chatId, attachments, thinking, {\n        signal: clientAbort.signal,\n        ...(clientCreatedAtMs !== undefined ? { clientCreatedAtMs } : {}),\n      });\n\n      let eventId = 0;\n\n      try {\n        while (true) {\n          const { done, value } = await generator.next();\n\n          if (done) {\n            // Final result\n            await stream.writeSSE({\n              id: String(++eventId),\n              event: 'result',\n              data: JSON.stringify({ ok: true, payload: value }),\n            });\n            break;\n          }\n\n          const chunk = value as { type: string; content?: string; status?: string; runId?: string };\n\n          // Intermediate events: status / token / error\n          await stream.writeSSE({\n            id: String(++eventId),\n            event: chunk.type || 'message',\n            data: stringifySSEData(chunk),\n          });\n        }\n      } catch (error) {\n        log.error({ err: error }, 'Agent run failed (SSE mode)');\n        await stream.writeSSE({\n          id: String(++eventId),\n          event: 'error',\n          data: JSON.stringify({\n            ok: false,\n            error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' },\n          }),\n        });\n      }\n    });\n  };\n}\n\n/**\n * POST /api/agent/resume — Re-attach to an in-progress agent run via SSE.\n *\n * Request body: { runId, chatId }\n * The relay replays all buffered events from the beginning and then live-tails\n * until the run completes.\n *\n * SSE events are identical to those from POST /api/agent.\n */\nexport function createAgentResumeHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n\n  return async (c: Context) => {\n    const body = await c.req.json().catch(() => null);\n    if (!body || typeof body !== 'object') {\n      return c.json({ ok: false, error: { code: 'BAD_REQUEST', message: 'Invalid JSON body' } }, 400);\n    }\n\n    const { runId, chatId: resumeChatId } = body as { runId?: string; chatId?: string };\n    if (typeof resumeChatId === 'string' && resumeChatId.trim()) {\n      updateAsyncLogContext({ sessionId: resumeChatId.trim() });\n    }\n    if (!runId || typeof runId !== 'string') {\n      return c.json({ ok: false, error: { code: 'BAD_REQUEST', message: 'Missing required field: runId' } }, 400);\n    }\n\n    if (!service.runRelay.hasRun(runId)) {\n      return c.json({ ok: false, error: { code: 'NOT_FOUND', message: 'Run not found or already expired' } }, 404);\n    }\n\n    c.header('X-Accel-Buffering', 'no');\n    return streamSSE(c, async (stream) => {\n      let eventId = 0;\n      try {\n        for await (const event of service.runRelay.subscribe(runId)) {\n          await stream.writeSSE({\n            id: String(++eventId),\n            event: event.type || 'message',\n            data: stringifySSEData(event),\n          });\n        }\n        // Run completed — send a final result event\n        await stream.writeSSE({\n          id: String(++eventId),\n          event: 'result',\n          data: JSON.stringify({ ok: true, payload: { status: 'ok', summary: 'Resumed run completed' } }),\n        });\n      } catch (error) {\n        log.error({ err: error, runId }, 'Resume stream failed');\n        await stream.writeSSE({\n          id: String(++eventId),\n          event: 'error',\n          data: JSON.stringify({\n            ok: false,\n            error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' },\n          }),\n        });\n      }\n    });\n  };\n}\n\n/**\n * POST /api/send — Send a message through a channel (non-streaming).\n */\nexport function createSendHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n\n  return async (c: Context) => {\n    const body = await c.req.json().catch(() => ({}));\n    const channel = body.channel as string;\n    const chatId = body.chatId as string;\n    const content = body.content as string;\n\n    if (!channel || !chatId || !content) {\n      return c.json(\n        { ok: false, error: { code: 'BAD_REQUEST', message: 'Missing required fields: channel, chatId, content' } },\n        400,\n      );\n    }\n\n    updateAsyncLogContext({ sessionId: String(chatId) });\n\n    try {\n      const result = await service.sendMessage(channel, chatId, content);\n      return c.json({ ok: true, payload: result });\n    } catch (error) {\n      log.error({ err: error }, 'Send failed');\n      return c.json(\n        { ok: false, error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' } },\n        500,\n      );\n    }\n  };\n}\n\n/**\n * GET /api/events — Server-pushed event stream (SSE).\n *\n * The client opens this long-lived connection to receive:\n *   - channel status changes\n *   - config reload notifications\n *   - cron execution results\n *   - any other server-initiated events\n *\n * Supports Last-Event-ID for reconnection.\n * Enforces maximum connection limit to prevent DoS.\n */\nexport function createEventsSSEHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n  const maxConnections = config.maxSseConnections ?? 100;\n\n  return async (c: Context) => {\n    // Check maximum connections limit\n    if (activeConnections.size >= maxConnections) {\n      log.warn({ current: activeConnections.size, max: maxConnections }, 'SSE connection limit reached');\n      return c.json({\n        ok: false,\n        error: { code: 'TOO_MANY_CONNECTIONS', message: 'Maximum SSE connections exceeded' }\n      }, 503);\n    }\n\n    const lastEventId = c.req.header('Last-Event-ID') || undefined;\n    const sessionId = c.req.header('X-Session-Id')\n      || c.req.query('sessionId')\n      || crypto.randomUUID();\n\n    updateAsyncLogContext({ sessionId: String(sessionId) });\n\n    const abortController = new AbortController();\n    activeConnections.set(sessionId, abortController);\n\n    return streamSSE(c, async (stream) => {\n      let aborted = false;\n\n      // Send a hello event so the client knows the stream is established\n      await stream.writeSSE({\n        id: '0',\n        event: 'connected',\n        data: JSON.stringify({ sessionId }),\n      });\n\n      // Subscribe to service events\n      const cleanup = service.subscribe(sessionId, async (event) => {\n        if (aborted) return;\n        try {\n          await stream.writeSSE({\n            id: event.id,\n            event: event.type,\n            data: JSON.stringify(event.payload),\n          });\n        } catch {\n          // Stream closed, will be cleaned up by onAbort\n        }\n      });\n\n      // Replay missed events on reconnect\n      if (lastEventId) {\n        const missed = service.getEventsSince(sessionId, lastEventId);\n        for (const event of missed) {\n          await stream.writeSSE({\n            id: event.id,\n            event: event.type,\n            data: JSON.stringify(event.payload),\n          });\n        }\n      }\n\n      // Keep alive with periodic comments (every 30s)\n      const keepAlive = setInterval(async () => {\n        if (aborted) { clearInterval(keepAlive); return; }\n        try {\n          await stream.writeSSE({ event: 'ping', data: '' });\n        } catch {\n          clearInterval(keepAlive);\n        }\n      }, 30_000);\n\n      // Block until aborted — streamSSE closes when the callback returns\n      await new Promise<void>((resolve) => {\n        stream.onAbort(() => {\n          aborted = true;\n          clearInterval(keepAlive);\n          cleanup();\n          activeConnections.delete(sessionId);\n          log.debug({ sessionId }, 'Event stream disconnected');\n          resolve();\n        });\n      });\n    });\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"sse.js","names":[],"sources":["../../../../src/gateway/hono/sse.ts"],"sourcesContent":["import { streamSSE } from 'hono/streaming';\nimport type { Context } from 'hono';\nimport type { GatewayService } from '../service.js';\nimport { MAX_WEBCHAT_ATTACHMENT_FILE_BYTES } from '../chat-limits.js';\nimport { createLogger, updateAsyncLogContext } from '../../utils/logger.js';\nimport { stringifySSEData } from './sse-json.js';\nimport { resolveWebchatSessionKey } from '../resolve-webchat-session-key.js';\n\nconst log = createLogger('Gateway:SSE');\n\n// Active SSE connections tracking for connection limiting\nconst activeConnections = new Map<string, AbortController>();\n\nexport interface SSEHandlerConfig {\n  service: GatewayService;\n  maxSseConnections?: number;\n}\n\n// Type validation for agent request body\ninterface AgentRequestBody {\n  message: string;\n  channel?: string;\n  chatId?: string;\n  /** Alias for `chatId` (gateway console + extension clients). */\n  sessionKey?: string;\n  /** Epoch ms when the client started this send (abort cutoff / stale POST drop). */\n  clientCreatedAtMs?: number;\n  /** When true and `channel` is `webchat`, start a new peer id (new session). */\n  newSession?: boolean;\n  thinking?: string;\n  attachments?: Array<{\n    type: string;\n    mimeType?: string;\n    data?: string;\n    name?: string;\n    size?: number;\n  }>;\n}\n\nfunction isValidAgentRequest(body: unknown): body is AgentRequestBody {\n  if (!body || typeof body !== 'object') return false;\n  const b = body as Record<string, unknown>;\n  // Allow empty message if attachments are provided\n  const hasMessage = typeof b.message === 'string';\n  const hasAttachments = Array.isArray(b.attachments) && b.attachments.length > 0;\n  return hasMessage || hasAttachments;\n}\n\n/** Max base64 character length that can decode to `MAX_WEBCHAT_ATTACHMENT_FILE_BYTES`. */\nfunction maxBase64CharsForBinary(maxBinaryBytes: number): number {\n  return 4 * Math.ceil(maxBinaryBytes / 3);\n}\n\n/**\n * POST /api/agent — Send a message to the agent, stream response via SSE.\n *\n * Request body: { message, channel?, chatId?, attachments? }\n * Accept: text/event-stream → SSE stream\n * Accept: application/json → wait for full response, return JSON\n *\n * SSE events:\n *   event: status   — { status, runId }\n *   event: user_message — { timestamp, content?, attachments? } (user turn accepted, before agent tokens)\n *   event: user_transcript — { text, attachments? } (voice STT complete, before agent tokens)\n *   event: token    — { content }\n *   event: error    — { content }\n *   event: result   — { ok, payload: { status, summary } }\n */\nexport function createAgentSSEHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n\n  return async (c: Context) => {\n    const body = await c.req.json().catch(() => null);\n\n    // Input validation\n    if (!isValidAgentRequest(body)) {\n      return c.json({\n        ok: false,\n        error: { code: 'BAD_REQUEST', message: 'Missing required field: message or attachments' }\n      }, 400);\n    }\n\n    const { message, channel = 'webchat', attachments, thinking } = body;\n    const clientCreatedAtMs =\n      typeof body.clientCreatedAtMs === 'number' && Number.isFinite(body.clientCreatedAtMs)\n        ? body.clientCreatedAtMs\n        : undefined;\n    const newSession = Boolean(body.newSession);\n    const cfg = service.currentConfig;\n    const resolved = resolveWebchatSessionKey({\n      cfg,\n      sessionKey: typeof body.sessionKey === 'string' ? body.sessionKey : undefined,\n      chatId: typeof body.chatId === 'string' ? body.chatId : undefined,\n      newSession,\n    });\n    if (resolved.ok === false) {\n      return c.json({\n        ok: false,\n        error: { code: 'BAD_REQUEST', message: resolved.error },\n      }, 400);\n    }\n    const chatId = resolved.sessionKey;\n\n    updateAsyncLogContext({ sessionId: String(chatId) });\n\n    if (Array.isArray(attachments)) {\n      const maxDataChars = maxBase64CharsForBinary(MAX_WEBCHAT_ATTACHMENT_FILE_BYTES);\n      for (const a of attachments) {\n        if (!a || typeof a !== 'object') continue;\n        const data = (a as { data?: unknown }).data;\n        if (typeof data === 'string' && data.length > maxDataChars) {\n          return c.json(\n            {\n              ok: false,\n              error: {\n                code: 'BAD_REQUEST',\n                message: `Attachment exceeds maximum size (${MAX_WEBCHAT_ATTACHMENT_FILE_BYTES} bytes)`,\n              },\n            },\n            400,\n          );\n        }\n      }\n    }\n\n    const accept = c.req.header('Accept') || '';\n    const wantSSE = accept.includes('text/event-stream');\n\n    const clientAbort = new AbortController();\n    const raw = c.req.raw;\n    // Keep webchat runs alive across transient disconnects (page refresh / tab route switch)\n    // so the client can reattach via /api/agent/resume using runId from `status`.\n    // Explicit cancellation still goes through /api/agent/abort.\n    if (channel !== 'webchat') {\n      if (raw.signal.aborted) {\n        clientAbort.abort();\n      } else {\n        raw.signal.addEventListener('abort', () => clientAbort.abort(), { once: true });\n      }\n    }\n\n    // --- Non-streaming fallback: collect everything, return JSON ---\n    if (!wantSSE) {\n      const jsonSessionKey = channel === 'webchat' ? chatId : undefined;\n\n      const generator = service.runAgent(message, channel, chatId, attachments, thinking, {\n        signal: clientAbort.signal,\n        ...(clientCreatedAtMs !== undefined ? { clientCreatedAtMs } : {}),\n      });\n      try {\n        let finalResult: { status: string; summary: string } | undefined;\n        const tokens: string[] = [];\n\n        while (true) {\n          const { done, value } = await generator.next();\n          if (done) {\n            finalResult = value as { status: string; summary: string };\n            break;\n          }\n          const chunk = value as { type: string; content?: string; status?: string; runId?: string };\n          if (chunk.type === 'token' && chunk.content) {\n            tokens.push(chunk.content);\n          }\n        }\n\n        return c.json({\n          ok: true,\n          payload: {\n            ...finalResult,\n            content: tokens.join(''),\n            ...(jsonSessionKey !== undefined\n              ? { sessionKey: jsonSessionKey, key: jsonSessionKey }\n              : {}),\n          },\n        });\n      } catch (error) {\n        const em = error instanceof Error ? error.message : String(error);\n        log.error(\n          { err: error, errorMessage: em, phase: 'gateway.agent_run', sessionKey: jsonSessionKey, channel },\n          `Agent run failed (JSON mode): ${em}`,\n        );\n        return c.json({\n          ok: false,\n          error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' },\n        }, 500);\n      }\n    }\n\n    // --- SSE streaming ---\n    c.header('X-Accel-Buffering', 'no');\n    return streamSSE(c, async (stream) => {\n      if (channel !== 'webchat') {\n        stream.onAbort(() => {\n          clientAbort.abort();\n        });\n      }\n\n      const generator = service.runAgent(message, channel, chatId, attachments, thinking, {\n        signal: clientAbort.signal,\n        ...(clientCreatedAtMs !== undefined ? { clientCreatedAtMs } : {}),\n      });\n\n      let eventId = 0;\n\n      try {\n        while (true) {\n          const { done, value } = await generator.next();\n\n          if (done) {\n            // Final result\n            await stream.writeSSE({\n              id: String(++eventId),\n              event: 'result',\n              data: JSON.stringify({ ok: true, payload: value }),\n            });\n            break;\n          }\n\n          const chunk = value as { type: string; content?: string; status?: string; runId?: string };\n\n          // Intermediate events: status / token / error\n          await stream.writeSSE({\n            id: String(++eventId),\n            event: chunk.type || 'message',\n            data: stringifySSEData(chunk),\n          });\n        }\n      } catch (error) {\n        log.error({ err: error }, 'Agent run failed (SSE mode)');\n        await stream.writeSSE({\n          id: String(++eventId),\n          event: 'error',\n          data: JSON.stringify({\n            ok: false,\n            error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' },\n          }),\n        });\n      }\n    });\n  };\n}\n\n/**\n * POST /api/agent/resume — Re-attach to an in-progress agent run via SSE.\n *\n * Request body: { runId, chatId }\n * The relay replays all buffered events from the beginning and then live-tails\n * until the run completes.\n *\n * SSE events are identical to those from POST /api/agent.\n */\nexport function createAgentResumeHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n\n  return async (c: Context) => {\n    const body = await c.req.json().catch(() => null);\n    if (!body || typeof body !== 'object') {\n      return c.json({ ok: false, error: { code: 'BAD_REQUEST', message: 'Invalid JSON body' } }, 400);\n    }\n\n    const { runId, chatId: resumeChatId } = body as { runId?: string; chatId?: string };\n    if (typeof resumeChatId === 'string' && resumeChatId.trim()) {\n      updateAsyncLogContext({ sessionId: resumeChatId.trim() });\n    }\n    if (!runId || typeof runId !== 'string') {\n      return c.json({ ok: false, error: { code: 'BAD_REQUEST', message: 'Missing required field: runId' } }, 400);\n    }\n\n    if (!service.runRelay.hasRun(runId)) {\n      return c.json({ ok: false, error: { code: 'NOT_FOUND', message: 'Run not found or already expired' } }, 404);\n    }\n\n    c.header('X-Accel-Buffering', 'no');\n    return streamSSE(c, async (stream) => {\n      let eventId = 0;\n      try {\n        for await (const event of service.runRelay.subscribe(runId)) {\n          await stream.writeSSE({\n            id: String(++eventId),\n            event: event.type || 'message',\n            data: stringifySSEData(event),\n          });\n        }\n        // Run completed — send a final result event\n        await stream.writeSSE({\n          id: String(++eventId),\n          event: 'result',\n          data: JSON.stringify({ ok: true, payload: { status: 'ok', summary: 'Resumed run completed' } }),\n        });\n      } catch (error) {\n        log.error({ err: error, runId }, 'Resume stream failed');\n        await stream.writeSSE({\n          id: String(++eventId),\n          event: 'error',\n          data: JSON.stringify({\n            ok: false,\n            error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' },\n          }),\n        });\n      }\n    });\n  };\n}\n\n/**\n * POST /api/send — Send a message through a channel (non-streaming).\n */\nexport function createSendHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n\n  return async (c: Context) => {\n    const body = await c.req.json().catch(() => ({}));\n    const channel = body.channel as string;\n    const chatId = body.chatId as string;\n    const content = body.content as string;\n\n    if (!channel || !chatId || !content) {\n      return c.json(\n        { ok: false, error: { code: 'BAD_REQUEST', message: 'Missing required fields: channel, chatId, content' } },\n        400,\n      );\n    }\n\n    updateAsyncLogContext({ sessionId: String(chatId) });\n\n    try {\n      const result = await service.sendMessage(channel, chatId, content);\n      return c.json({ ok: true, payload: result });\n    } catch (error) {\n      log.error({ err: error }, 'Send failed');\n      return c.json(\n        { ok: false, error: { code: 'INTERNAL_ERROR', message: error instanceof Error ? error.message : 'Unknown error' } },\n        500,\n      );\n    }\n  };\n}\n\n/**\n * GET /api/events — Server-pushed event stream (SSE).\n *\n * The client opens this long-lived connection to receive:\n *   - channel status changes\n *   - config reload notifications\n *   - cron execution results\n *   - any other server-initiated events\n *\n * Supports Last-Event-ID for reconnection.\n * Enforces maximum connection limit to prevent DoS.\n */\nexport function createEventsSSEHandler(config: SSEHandlerConfig) {\n  const { service } = config;\n  const maxConnections = config.maxSseConnections ?? 100;\n\n  return async (c: Context) => {\n    // Check maximum connections limit\n    if (activeConnections.size >= maxConnections) {\n      log.warn({ current: activeConnections.size, max: maxConnections }, 'SSE connection limit reached');\n      return c.json({\n        ok: false,\n        error: { code: 'TOO_MANY_CONNECTIONS', message: 'Maximum SSE connections exceeded' }\n      }, 503);\n    }\n\n    const lastEventId = c.req.header('Last-Event-ID') || undefined;\n    const sessionId = c.req.header('X-Session-Id')\n      || c.req.query('sessionId')\n      || crypto.randomUUID();\n\n    updateAsyncLogContext({ sessionId: String(sessionId) });\n\n    const abortController = new AbortController();\n    activeConnections.set(sessionId, abortController);\n\n    return streamSSE(c, async (stream) => {\n      let aborted = false;\n\n      // Send a hello event so the client knows the stream is established\n      await stream.writeSSE({\n        id: '0',\n        event: 'connected',\n        data: JSON.stringify({ sessionId }),\n      });\n\n      // Subscribe to service events\n      const cleanup = service.subscribe(sessionId, async (event) => {\n        if (aborted) return;\n        try {\n          await stream.writeSSE({\n            id: event.id,\n            event: event.type,\n            data: JSON.stringify(event.payload),\n          });\n        } catch {\n          // Stream closed, will be cleaned up by onAbort\n        }\n      });\n\n      // Replay missed events on reconnect\n      if (lastEventId) {\n        const missed = service.getEventsSince(sessionId, lastEventId);\n        for (const event of missed) {\n          await stream.writeSSE({\n            id: event.id,\n            event: event.type,\n            data: JSON.stringify(event.payload),\n          });\n        }\n      }\n\n      // Keep alive with periodic comments (every 30s)\n      const keepAlive = setInterval(async () => {\n        if (aborted) { clearInterval(keepAlive); return; }\n        try {\n          await stream.writeSSE({ event: 'ping', data: '' });\n        } catch {\n          clearInterval(keepAlive);\n        }\n      }, 30_000);\n\n      // Block until aborted — streamSSE closes when the callback returns\n      await new Promise<void>((resolve) => {\n        stream.onAbort(() => {\n          aborted = true;\n          clearInterval(keepAlive);\n          cleanup();\n          activeConnections.delete(sessionId);\n          log.debug({ sessionId }, 'Event stream disconnected');\n          resolve();\n        });\n      });\n    });\n  };\n}\n"],"mappings":"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"}

package/dist/src/gateway/host.d.ts

@@ -4,6 +4,8 @@ export declare function isLoopbackHost(host: string | undefined): boolean;
 export declare function isAllInterfacesHost(host: string | undefined): boolean;
 /** Vite dev server origins for the gateway console (`web/` defaults to port 3000). */
 export declare const GATEWAY_DEV_CONSOLE_ORIGINS: readonly ["http://localhost:3000", "http://127.0.0.1:3000"];
+/** Expo / React Native web dev server (Metro defaults to port 8081). */
+export declare const GATEWAY_EXPO_DEV_ORIGINS: readonly ["http://localhost:8081", "http://127.0.0.1:8081"];
 /** Effective HTTP listen port: CLI `--port` override wins over config (default 18790). */
 export declare function resolveEffectiveGatewayPort(config: {
     gateway?: {

package/dist/src/gateway/host.js

@@ -14,6 +14,9 @@ function isAllInterfacesHost(host) {
 }
 /** Vite dev server origins for the gateway console (`web/` defaults to port 3000). */
 const GATEWAY_DEV_CONSOLE_ORIGINS = ["http://localhost:3000", "http://127.0.0.1:3000"];
+/** Expo / React Native web dev server (Metro defaults to port 8081). */
+const GATEWAY_EXPO_DEV_ORIGINS = ["http://localhost:8081", "http://127.0.0.1:8081"];
+const GATEWAY_LOOPBACK_DEV_ORIGINS = [...GATEWAY_DEV_CONSOLE_ORIGINS, ...GATEWAY_EXPO_DEV_ORIGINS];
 /** Effective HTTP listen port: CLI `--port` override wins over config (default 18790). */
 function resolveEffectiveGatewayPort(config, listenPortOverride) {
 	if (typeof listenPortOverride === "number" && Number.isFinite(listenPortOverride)) return listenPortOverride;
@@ -28,7 +31,7 @@ function buildDefaultCorsOrigins(params) {
 	const origins = new Set([
 		`http://localhost:${params.port}`,
 		`http://127.0.0.1:${params.port}`,
-		...GATEWAY_DEV_CONSOLE_ORIGINS
+		...GATEWAY_LOOPBACK_DEV_ORIGINS
 	]);
 	const bindHost = params.bindHost?.trim();
 	if (bindHost && !isLoopbackHost(bindHost) && !isAllInterfacesHost(bindHost)) origins.add(`http://${bindHost}:${params.port}`);
@@ -44,7 +47,7 @@ function resolveGatewayCorsOrigins(params) {
 		port: params.port,
 		bindHost: params.bindHost
 	});
-	return [...new Set([...configured, ...GATEWAY_DEV_CONSOLE_ORIGINS])];
+	return [...new Set([...configured, ...GATEWAY_LOOPBACK_DEV_ORIGINS])];
 }
 /** Browser origin (`https://host`) from a gateway public/tunnel root URL. */
 function originFromGatewayPublicUrl(publicUrl) {
@@ -70,6 +73,6 @@ function resolveAllowedBrowserOrigins(params) {
 	return origins;
 }
 //#endregion
-export { GATEWAY_DEV_CONSOLE_ORIGINS, buildDefaultCorsOrigins, isAllInterfacesHost, isLoopbackHost, originFromGatewayPublicUrl, resolveAllowedBrowserOrigins, resolveEffectiveGatewayPort, resolveGatewayCorsOrigins, resolveGatewayServiceListenPort };
+export { GATEWAY_DEV_CONSOLE_ORIGINS, GATEWAY_EXPO_DEV_ORIGINS, buildDefaultCorsOrigins, isAllInterfacesHost, isLoopbackHost, originFromGatewayPublicUrl, resolveAllowedBrowserOrigins, resolveEffectiveGatewayPort, resolveGatewayCorsOrigins, resolveGatewayServiceListenPort };
 
 //# sourceMappingURL=host.js.map

package/dist/src/gateway/host.js.map

@@ -1 +1 @@
-{"version":3,"file":"host.js","names":[],"sources":["../../../src/gateway/host.ts"],"sourcesContent":["import { DEFAULT_GATEWAY_PORT } from '../daemon/constants.js';\n\n/** True when the bind address is local-only (127.x, localhost, ::1). */\nexport function isLoopbackHost(host: string | undefined): boolean {\n  if (!host) {\n    return true;\n  }\n  const normalized = host.trim().toLowerCase();\n  return (\n    normalized === '127.0.0.1' ||\n    normalized === 'localhost' ||\n    normalized === '::1' ||\n    normalized === '0:0:0:0:0:0:0:1'\n  );\n}\n\n/** True when the gateway listens on all interfaces. */\nexport function isAllInterfacesHost(host: string | undefined): boolean {\n  if (!host) {\n    return false;\n  }\n  const normalized = host.trim();\n  return normalized === '0.0.0.0' || normalized === '::' || normalized === '*';\n}\n\n/** Vite dev server origins for the gateway console (`web/` defaults to port 3000). */\nexport const GATEWAY_DEV_CONSOLE_ORIGINS = [\n  'http://localhost:3000',\n  'http://127.0.0.1:3000',\n] as const;\n\n/** Effective HTTP listen port: CLI `--port` override wins over config (default 18790). */\nexport function resolveEffectiveGatewayPort(\n  config: { gateway?: { port?: number } },\n  listenPortOverride?: number,\n): number {\n  if (typeof listenPortOverride === 'number' && Number.isFinite(listenPortOverride)) {\n    return listenPortOverride;\n  }\n  return config.gateway?.port ?? DEFAULT_GATEWAY_PORT;\n}\n\n/** Resolve listen port from a gateway service (supports partial test mocks without `getEffectiveListenPort`). */\nexport function resolveGatewayServiceListenPort(service: {\n  currentConfig: { gateway?: { port?: number } };\n  getEffectiveListenPort?: () => number;\n}): number {\n  if (typeof service.getEffectiveListenPort === 'function') {\n    return service.getEffectiveListenPort();\n  }\n  return resolveEffectiveGatewayPort(service.currentConfig);\n}\n\nexport function buildDefaultCorsOrigins(params: { port: number; bindHost?: string }): string[] {\n  const origins = new Set<string>([\n    `http://localhost:${params.port}`,\n    `http://127.0.0.1:${params.port}`,\n    ...GATEWAY_DEV_CONSOLE_ORIGINS,\n  ]);\n  const bindHost = params.bindHost?.trim();\n  if (bindHost && !isLoopbackHost(bindHost) && !isAllInterfacesHost(bindHost)) {\n    origins.add(`http://${bindHost}:${params.port}`);\n  }\n  return [...origins];\n}\n\n/**\n * Effective browser origins for CORS and CSRF checks.\n * Custom `gateway.corsOrigins` (e.g. after LAN pairing) still merge loopback Vite dev origins.\n */\nexport function resolveGatewayCorsOrigins(params: {\n  configuredOrigins?: string[];\n  port: number;\n  bindHost?: string;\n}): string[] {\n  const configured = (params.configuredOrigins ?? [])\n    .map((origin) => origin.trim())\n    .filter(Boolean);\n  if (configured.length === 0) {\n    return buildDefaultCorsOrigins({ port: params.port, bindHost: params.bindHost });\n  }\n  return [...new Set([...configured, ...GATEWAY_DEV_CONSOLE_ORIGINS])];\n}\n\n/** Browser origin (`https://host`) from a gateway public/tunnel root URL. */\nexport function originFromGatewayPublicUrl(publicUrl: string | null | undefined): string | null {\n  const trimmed = publicUrl?.trim();\n  if (!trimmed) return null;\n  try {\n    return new URL(trimmed).origin.toLowerCase();\n  } catch {\n    return null;\n  }\n}\n\n/** CORS + CSRF allowlist including active FRP tunnel + reverse-proxy origins. */\nexport function resolveAllowedBrowserOrigins(params: {\n  configuredOrigins?: string[];\n  port: number;\n  bindHost?: string;\n  tunnelPublicUrl?: string | null;\n  /** User-configured reverse-proxy public URL (gateway.publicUrl). */\n  reverseProxyPublicUrl?: string | null;\n}): string[] {\n  const origins = resolveGatewayCorsOrigins({\n    configuredOrigins: params.configuredOrigins,\n    port: params.port,\n    bindHost: params.bindHost,\n  });\n  const tunnelOrigin = originFromGatewayPublicUrl(params.tunnelPublicUrl);\n  if (tunnelOrigin && !origins.includes(tunnelOrigin)) {\n    origins.push(tunnelOrigin);\n  }\n  const reverseProxyOrigin = originFromGatewayPublicUrl(params.reverseProxyPublicUrl);\n  if (reverseProxyOrigin && !origins.includes(reverseProxyOrigin)) {\n    origins.push(reverseProxyOrigin);\n  }\n  return origins;\n}\n"],"mappings":";;;AAGA,SAAgB,eAAe,MAAmC;AAChE,KAAI,CAAC,KACH,QAAO;CAET,MAAM,aAAa,KAAK,MAAM,CAAC,aAAa;AAC5C,QACE,eAAe,eACf,eAAe,eACf,eAAe,SACf,eAAe;;;AAKnB,SAAgB,oBAAoB,MAAmC;AACrE,KAAI,CAAC,KACH,QAAO;CAET,MAAM,aAAa,KAAK,MAAM;AAC9B,QAAO,eAAe,aAAa,eAAe,QAAQ,eAAe;;;AAI3E,MAAa,8BAA8B,CACzC,yBACA,wBACD;;AAGD,SAAgB,4BACd,QACA,oBACQ;AACR,KAAI,OAAO,uBAAuB,YAAY,OAAO,SAAS,mBAAmB,CAC/E,QAAO;AAET,QAAO,OAAO,SAAS,QAAA;;;AAIzB,SAAgB,gCAAgC,SAGrC;AACT,KAAI,OAAO,QAAQ,2BAA2B,WAC5C,QAAO,QAAQ,wBAAwB;AAEzC,QAAO,4BAA4B,QAAQ,cAAc;;AAG3D,SAAgB,wBAAwB,QAAuD;CAC7F,MAAM,UAAU,IAAI,IAAY;EAC9B,oBAAoB,OAAO;EAC3B,oBAAoB,OAAO;EAC3B,GAAG;EACJ,CAAC;CACF,MAAM,WAAW,OAAO,UAAU,MAAM;AACxC,KAAI,YAAY,CAAC,eAAe,SAAS,IAAI,CAAC,oBAAoB,SAAS,CACzE,SAAQ,IAAI,UAAU,SAAS,GAAG,OAAO,OAAO;AAElD,QAAO,CAAC,GAAG,QAAQ;;;;;;AAOrB,SAAgB,0BAA0B,QAI7B;CACX,MAAM,cAAc,OAAO,qBAAqB,EAAE,EAC/C,KAAK,WAAW,OAAO,MAAM,CAAC,CAC9B,OAAO,QAAQ;AAClB,KAAI,WAAW,WAAW,EACxB,QAAO,wBAAwB;EAAE,MAAM,OAAO;EAAM,UAAU,OAAO;EAAU,CAAC;AAElF,QAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,YAAY,GAAG,4BAA4B,CAAC,CAAC;;;AAItE,SAAgB,2BAA2B,WAAqD;CAC9F,MAAM,UAAU,WAAW,MAAM;AACjC,KAAI,CAAC,QAAS,QAAO;AACrB,KAAI;AACF,SAAO,IAAI,IAAI,QAAQ,CAAC,OAAO,aAAa;SACtC;AACN,SAAO;;;;AAKX,SAAgB,6BAA6B,QAOhC;CACX,MAAM,UAAU,0BAA0B;EACxC,mBAAmB,OAAO;EAC1B,MAAM,OAAO;EACb,UAAU,OAAO;EAClB,CAAC;CACF,MAAM,eAAe,2BAA2B,OAAO,gBAAgB;AACvE,KAAI,gBAAgB,CAAC,QAAQ,SAAS,aAAa,CACjD,SAAQ,KAAK,aAAa;CAE5B,MAAM,qBAAqB,2BAA2B,OAAO,sBAAsB;AACnF,KAAI,sBAAsB,CAAC,QAAQ,SAAS,mBAAmB,CAC7D,SAAQ,KAAK,mBAAmB;AAElC,QAAO"}
+{"version":3,"file":"host.js","names":[],"sources":["../../../src/gateway/host.ts"],"sourcesContent":["import { DEFAULT_GATEWAY_PORT } from '../daemon/constants.js';\n\n/** True when the bind address is local-only (127.x, localhost, ::1). */\nexport function isLoopbackHost(host: string | undefined): boolean {\n  if (!host) {\n    return true;\n  }\n  const normalized = host.trim().toLowerCase();\n  return (\n    normalized === '127.0.0.1' ||\n    normalized === 'localhost' ||\n    normalized === '::1' ||\n    normalized === '0:0:0:0:0:0:0:1'\n  );\n}\n\n/** True when the gateway listens on all interfaces. */\nexport function isAllInterfacesHost(host: string | undefined): boolean {\n  if (!host) {\n    return false;\n  }\n  const normalized = host.trim();\n  return normalized === '0.0.0.0' || normalized === '::' || normalized === '*';\n}\n\n/** Vite dev server origins for the gateway console (`web/` defaults to port 3000). */\nexport const GATEWAY_DEV_CONSOLE_ORIGINS = [\n  'http://localhost:3000',\n  'http://127.0.0.1:3000',\n] as const;\n\n/** Expo / React Native web dev server (Metro defaults to port 8081). */\nexport const GATEWAY_EXPO_DEV_ORIGINS = [\n  'http://localhost:8081',\n  'http://127.0.0.1:8081',\n] as const;\n\nconst GATEWAY_LOOPBACK_DEV_ORIGINS = [\n  ...GATEWAY_DEV_CONSOLE_ORIGINS,\n  ...GATEWAY_EXPO_DEV_ORIGINS,\n] as const;\n\n/** Effective HTTP listen port: CLI `--port` override wins over config (default 18790). */\nexport function resolveEffectiveGatewayPort(\n  config: { gateway?: { port?: number } },\n  listenPortOverride?: number,\n): number {\n  if (typeof listenPortOverride === 'number' && Number.isFinite(listenPortOverride)) {\n    return listenPortOverride;\n  }\n  return config.gateway?.port ?? DEFAULT_GATEWAY_PORT;\n}\n\n/** Resolve listen port from a gateway service (supports partial test mocks without `getEffectiveListenPort`). */\nexport function resolveGatewayServiceListenPort(service: {\n  currentConfig: { gateway?: { port?: number } };\n  getEffectiveListenPort?: () => number;\n}): number {\n  if (typeof service.getEffectiveListenPort === 'function') {\n    return service.getEffectiveListenPort();\n  }\n  return resolveEffectiveGatewayPort(service.currentConfig);\n}\n\nexport function buildDefaultCorsOrigins(params: { port: number; bindHost?: string }): string[] {\n  const origins = new Set<string>([\n    `http://localhost:${params.port}`,\n    `http://127.0.0.1:${params.port}`,\n    ...GATEWAY_LOOPBACK_DEV_ORIGINS,\n  ]);\n  const bindHost = params.bindHost?.trim();\n  if (bindHost && !isLoopbackHost(bindHost) && !isAllInterfacesHost(bindHost)) {\n    origins.add(`http://${bindHost}:${params.port}`);\n  }\n  return [...origins];\n}\n\n/**\n * Effective browser origins for CORS and CSRF checks.\n * Custom `gateway.corsOrigins` (e.g. after LAN pairing) still merge loopback Vite dev origins.\n */\nexport function resolveGatewayCorsOrigins(params: {\n  configuredOrigins?: string[];\n  port: number;\n  bindHost?: string;\n}): string[] {\n  const configured = (params.configuredOrigins ?? [])\n    .map((origin) => origin.trim())\n    .filter(Boolean);\n  if (configured.length === 0) {\n    return buildDefaultCorsOrigins({ port: params.port, bindHost: params.bindHost });\n  }\n  return [...new Set([...configured, ...GATEWAY_LOOPBACK_DEV_ORIGINS])];\n}\n\n/** Browser origin (`https://host`) from a gateway public/tunnel root URL. */\nexport function originFromGatewayPublicUrl(publicUrl: string | null | undefined): string | null {\n  const trimmed = publicUrl?.trim();\n  if (!trimmed) return null;\n  try {\n    return new URL(trimmed).origin.toLowerCase();\n  } catch {\n    return null;\n  }\n}\n\n/** CORS + CSRF allowlist including active FRP tunnel + reverse-proxy origins. */\nexport function resolveAllowedBrowserOrigins(params: {\n  configuredOrigins?: string[];\n  port: number;\n  bindHost?: string;\n  tunnelPublicUrl?: string | null;\n  /** User-configured reverse-proxy public URL (gateway.publicUrl). */\n  reverseProxyPublicUrl?: string | null;\n}): string[] {\n  const origins = resolveGatewayCorsOrigins({\n    configuredOrigins: params.configuredOrigins,\n    port: params.port,\n    bindHost: params.bindHost,\n  });\n  const tunnelOrigin = originFromGatewayPublicUrl(params.tunnelPublicUrl);\n  if (tunnelOrigin && !origins.includes(tunnelOrigin)) {\n    origins.push(tunnelOrigin);\n  }\n  const reverseProxyOrigin = originFromGatewayPublicUrl(params.reverseProxyPublicUrl);\n  if (reverseProxyOrigin && !origins.includes(reverseProxyOrigin)) {\n    origins.push(reverseProxyOrigin);\n  }\n  return origins;\n}\n"],"mappings":";;;AAGA,SAAgB,eAAe,MAAmC;AAChE,KAAI,CAAC,KACH,QAAO;CAET,MAAM,aAAa,KAAK,MAAM,CAAC,aAAa;AAC5C,QACE,eAAe,eACf,eAAe,eACf,eAAe,SACf,eAAe;;;AAKnB,SAAgB,oBAAoB,MAAmC;AACrE,KAAI,CAAC,KACH,QAAO;CAET,MAAM,aAAa,KAAK,MAAM;AAC9B,QAAO,eAAe,aAAa,eAAe,QAAQ,eAAe;;;AAI3E,MAAa,8BAA8B,CACzC,yBACA,wBACD;;AAGD,MAAa,2BAA2B,CACtC,yBACA,wBACD;AAED,MAAM,+BAA+B,CACnC,GAAG,6BACH,GAAG,yBACJ;;AAGD,SAAgB,4BACd,QACA,oBACQ;AACR,KAAI,OAAO,uBAAuB,YAAY,OAAO,SAAS,mBAAmB,CAC/E,QAAO;AAET,QAAO,OAAO,SAAS,QAAA;;;AAIzB,SAAgB,gCAAgC,SAGrC;AACT,KAAI,OAAO,QAAQ,2BAA2B,WAC5C,QAAO,QAAQ,wBAAwB;AAEzC,QAAO,4BAA4B,QAAQ,cAAc;;AAG3D,SAAgB,wBAAwB,QAAuD;CAC7F,MAAM,UAAU,IAAI,IAAY;EAC9B,oBAAoB,OAAO;EAC3B,oBAAoB,OAAO;EAC3B,GAAG;EACJ,CAAC;CACF,MAAM,WAAW,OAAO,UAAU,MAAM;AACxC,KAAI,YAAY,CAAC,eAAe,SAAS,IAAI,CAAC,oBAAoB,SAAS,CACzE,SAAQ,IAAI,UAAU,SAAS,GAAG,OAAO,OAAO;AAElD,QAAO,CAAC,GAAG,QAAQ;;;;;;AAOrB,SAAgB,0BAA0B,QAI7B;CACX,MAAM,cAAc,OAAO,qBAAqB,EAAE,EAC/C,KAAK,WAAW,OAAO,MAAM,CAAC,CAC9B,OAAO,QAAQ;AAClB,KAAI,WAAW,WAAW,EACxB,QAAO,wBAAwB;EAAE,MAAM,OAAO;EAAM,UAAU,OAAO;EAAU,CAAC;AAElF,QAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,YAAY,GAAG,6BAA6B,CAAC,CAAC;;;AAIvE,SAAgB,2BAA2B,WAAqD;CAC9F,MAAM,UAAU,WAAW,MAAM;AACjC,KAAI,CAAC,QAAS,QAAO;AACrB,KAAI;AACF,SAAO,IAAI,IAAI,QAAQ,CAAC,OAAO,aAAa;SACtC;AACN,SAAO;;;;AAKX,SAAgB,6BAA6B,QAOhC;CACX,MAAM,UAAU,0BAA0B;EACxC,mBAAmB,OAAO;EAC1B,MAAM,OAAO;EACb,UAAU,OAAO;EAClB,CAAC;CACF,MAAM,eAAe,2BAA2B,OAAO,gBAAgB;AACvE,KAAI,gBAAgB,CAAC,QAAQ,SAAS,aAAa,CACjD,SAAQ,KAAK,aAAa;CAE5B,MAAM,qBAAqB,2BAA2B,OAAO,sBAAsB;AACnF,KAAI,sBAAsB,CAAC,QAAQ,SAAS,mBAAmB,CAC7D,SAAQ,KAAK,mBAAmB;AAElC,QAAO"}

package/dist/src/gateway/service/agent-runner.js

@@ -9,7 +9,7 @@ import { runGatewayAgent } from "./run-gateway-agent.js";
 init_session_key();
 init_resolve_route();
 init_logger();
-const log = createLogger("GatewayAgentRunner");
+const log = createLogger("Gateway:AgentRunner");
 var GatewayAgentRunner = class {
 	opts;
 	runRelay = new AgentRunRelay();

package/dist/src/gateway/service/agent-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-runner.js","names":[],"sources":["../../../../src/gateway/service/agent-runner.ts"],"sourcesContent":["/**\n * GatewayAgentRunner — webchat agent invocation and the surrounding control\n * surface (abort, steer, clarify-bridge plumbing, scheduled continuations).\n *\n * Was 200 lines of `GatewayService` covering seven concerns that all hung off\n * the same handful of fields (`activeWebchatRunBySession`, `runAbortControllers`,\n * `clarifyBridge`, `runRelay`):\n *\n *   - `runAgent(message, channel, chatId, ...)` — wraps {@link runGatewayAgent}\n *   - `abortAgentRun(runId)` — POST /api/agent/abort + cleanup\n *   - `steerWebchatAgent(chatId, message)` — Agent.steer queue at tool boundary\n *   - `submitClarifyResponse(requestId, answer)` — UI answers a `clarify` call\n *   - `enqueueWebchatPersistentGoalKickoff(sessionKey, goalText)` — initial\n *     `/goal` kickoff posts the goal text as the next user turn\n *   - `drainScheduledWebchatContinuation(sk, msg)` — background continuation\n *     (extension scheduler + persistent-goal flow)\n *   - `clarifyForSession({ sessionKey, request })` — clarify-bridge dispatch\n *     used by `gatewayClarify.requestClarification` in AgentService\n *\n * Owns the two state maps (`activeWebchatRunBySession`, `runAbortControllers`)\n * directly so peer coordinators (sessions-api, marketplace, config) cannot\n * accidentally mutate them.\n */\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { AgentService } from '../../agent/service.js';\nimport type { ChannelManager } from '../../channels/manager.js';\nimport type { SessionIndex } from '../../session/index.js';\nimport { AgentRunRelay, type RelayEvent } from '../agent-run-relay.js';\nimport { ClarifyBridge, type ClarifyBridgeRequest } from '../clarify-bridge.js';\nimport { buildSessionKey, parseSessionKey } from '../../routing/session-key.js';\nimport { getDefaultAgentId } from '../../routing/resolve-route.js';\nimport { runGatewayAgent } from './run-gateway-agent.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('GatewayAgentRunner');\n\nexport interface GatewayAgentRunnerOptions {\n  bus: MessageBus;\n  sessionIndex: SessionIndex;\n  /** Resolved lazily — the runner is constructed before AgentService exists. */\n  getAgentService: () => AgentService;\n  getChannelManager: () => ChannelManager;\n  getConfig: () => Config;\n  /** SSE emit (re-used so `runAgent` events broadcast to subscribers). */\n  emit: (type: string, payload: unknown) => void;\n}\n\nexport class GatewayAgentRunner {\n  private readonly opts: GatewayAgentRunnerOptions;\n  readonly runRelay = new AgentRunRelay();\n  /** Per-run abort for webchat (POST /api/agent/abort or client disconnect). */\n  private readonly runAbortControllers = new Map<string, AbortController>();\n  private readonly clarifyBridge = new ClarifyBridge();\n  /** Maps webchat session key → active `runId` for `clarify` tool routing. */\n  private readonly activeWebchatRunBySession = new Map<string, string>();\n\n  constructor(opts: GatewayAgentRunnerOptions) {\n    this.opts = opts;\n  }\n\n  // ── Read-only accessors (so peers don't get a Map ref) ────────────────\n\n  /** True when a webchat agent run is currently in-flight for `sessionKey`. */\n  hasActiveRun(sessionKey: string): boolean {\n    return this.activeWebchatRunBySession.has(sessionKey);\n  }\n\n  getActiveRunId(sessionKey: string): string | undefined {\n    return this.activeWebchatRunBySession.get(sessionKey);\n  }\n\n  getClarifyBridge(): ClarifyBridge {\n    return this.clarifyBridge;\n  }\n\n  /** Called from `GatewayService.stop()` so the bridge gets cleaned up. */\n  disposeClarifyBridge(): void {\n    this.clarifyBridge.dispose();\n  }\n\n  // ── runAgent (webchat HTTP POST) ──────────────────────────────────────\n\n  async *runAgent(\n    message: string,\n    channel: string,\n    chatId: string,\n    attachments?: Array<{\n      type: string;\n      mimeType?: string;\n      data?: string;\n      name?: string;\n      size?: number;\n    }>,\n    thinking?: string,\n    runOptions?: { signal?: AbortSignal; clientCreatedAtMs?: number },\n  ): AsyncGenerator<\n    { type: string; content?: string; status?: string; runId?: string },\n    { status: string; summary: string },\n    unknown\n  > {\n    const iter = runGatewayAgent(\n      {\n        config: this.opts.getConfig(),\n        agentService: this.opts.getAgentService(),\n        bus: this.opts.bus,\n        runRelay: this.runRelay,\n        runAbortControllers: this.runAbortControllers,\n        activeWebchatRunBySession: this.activeWebchatRunBySession,\n        sessionIndex: this.opts.sessionIndex,\n        emit: this.opts.emit,\n      },\n      message,\n      channel,\n      chatId,\n      attachments,\n      thinking,\n      runOptions,\n    );\n\n    let step = await iter.next();\n    while (!step.done) {\n      yield step.value as { type: string; content?: string; status?: string; runId?: string };\n      step = await iter.next();\n    }\n    return step.value;\n  }\n\n  /** Abort an in-flight webchat agent run (matches `runId` from SSE `status`). */\n  abortAgentRun(runId: string): boolean {\n    this.clarifyBridge.cancelForRun(runId);\n    const keysToMark: string[] = [];\n    for (const [sk, id] of this.activeWebchatRunBySession) {\n      if (id === runId) {\n        keysToMark.push(sk);\n      }\n    }\n    for (const sk of keysToMark) {\n      this.activeWebchatRunBySession.delete(sk);\n    }\n    const relaySk = this.runRelay.getSessionKey(runId);\n    if (relaySk && !keysToMark.includes(relaySk)) {\n      keysToMark.push(relaySk);\n    }\n    const c = this.runAbortControllers.get(runId);\n    if (!c) {\n      return false;\n    }\n    const cutoffTs = Date.now();\n    for (const sk of keysToMark) {\n      void this.opts.sessionIndex\n        .updateSessionMetadata(sk, { abortCutoffTimestamp: cutoffTs })\n        .catch(() => {});\n      void this.opts.sessionIndex\n        .appendTranscriptContextEntry(sk, {\n          text: 'Webchat agent run aborted',\n          data: { runId, abortCutoffTimestamp: cutoffTs },\n        })\n        .catch(() => {});\n    }\n    c.abort();\n    for (const sk of keysToMark) {\n      void import('../../agent/embedded/runs.js').then(({ abortEmbeddedRun }) =>\n        abortEmbeddedRun(sk),\n      );\n    }\n    return true;\n  }\n\n  /**\n   * Queue steering text for an active webchat run (`Agent.steer` /\n   * tool-boundary injection). `chatId` is the same as `POST /api/agent` body\n   * (`sessionKey` or legacy peer id).\n   */\n  async steerWebchatAgent(\n    chatId: string,\n    message: string,\n  ): Promise<\n    { ok: true } | { ok: false; code: 'BAD_REQUEST' | 'NO_ACTIVE_RUN' | 'STEER_FAILED' }\n  > {\n    const trimmed = message.trim();\n    if (!trimmed) {\n      return { ok: false, code: 'BAD_REQUEST' };\n    }\n    const cfg = this.opts.getConfig();\n    const parsedKey = parseSessionKey(chatId);\n    const sessionKey = parsedKey\n      ? chatId\n      : buildSessionKey({\n          agentId: getDefaultAgentId(cfg),\n          source: 'webchat',\n          accountId: 'default',\n          peerKind: 'direct',\n          peerId: chatId,\n        });\n    if (!this.activeWebchatRunBySession.has(sessionKey)) {\n      return { ok: false, code: 'NO_ACTIVE_RUN' };\n    }\n    const steered = await this.opts\n      .getAgentService()\n      .turnDispatcher.steerWebchatSession(sessionKey, trimmed);\n    if (!steered) {\n      return { ok: false, code: 'STEER_FAILED' };\n    }\n    return { ok: true };\n  }\n\n  /** Deliver a user's answer to a pending `clarify` tool call. */\n  submitClarifyResponse(requestId: string, answer: string): boolean {\n    return this.clarifyBridge.handleResponse(requestId, answer);\n  }\n\n  /** Hermes-style: after HTTP sets a goal, enqueue the goal text as the next user turn. */\n  enqueueWebchatPersistentGoalKickoff(sessionKey: string, goalText: string): void {\n    queueMicrotask(() => {\n      void this.drainScheduledWebchatContinuation(sessionKey, goalText);\n    });\n  }\n\n  /** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */\n  async drainScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void> {\n    try {\n      const gen = this.runAgent(message, 'webchat', sessionKey, undefined, undefined, {\n        clientCreatedAtMs: Date.now(),\n      });\n      for await (const _ of gen) {\n        // Relay + `agent.stream` broadcast; UI attaches via pending runId + resume.\n      }\n    } catch (err) {\n      log.warn({ err, sessionKey }, 'Scheduled webchat continuation failed');\n    }\n  }\n\n  // ── Clarify dispatch (called from AgentService.gatewayClarify) ────────\n\n  /**\n   * Resolve clarify-bridge config for `sessionKey`: who delivers the question\n   * (webchat SSE, Telegram message, or both), then start the bridge request.\n   * Rejects when neither path is available (e.g. CLI without webchat or TG).\n   *\n   * `publishSseFor(runId)` is the bridge into AgentService's\n   * `turnDispatcher.enqueueWebchatSseEvent`. We take it as a callback so the\n   * runner does not import AgentService statically.\n   */\n  requestClarification(opts: {\n    sessionKey: string;\n    request: ClarifyBridgeRequest;\n    publishSseFor: (runId: string) => (e: RelayEvent) => void;\n  }): Promise<string> {\n    const { sessionKey, request, publishSseFor } = opts;\n    const runId = this.activeWebchatRunBySession.get(sessionKey);\n    const publishSse = runId ? publishSseFor(runId) : undefined;\n    const parsed = parseSessionKey(sessionKey);\n    const deliver =\n      parsed?.source === 'telegram'\n        ? async (ctx: {\n            sessionKey: string;\n            requestId: string;\n            request: ClarifyBridgeRequest;\n          }) => {\n            await this.deliverTelegramClarify(ctx);\n          }\n        : undefined;\n    if (!runId && !deliver) {\n      return Promise.reject(\n        new Error('Clarify is not available for this session (use webchat, Telegram, or CLI)'),\n      );\n    }\n    return this.clarifyBridge.startRequest({\n      sessionKey,\n      runId,\n      relay: this.runRelay,\n      publishSse,\n      request,\n      deliver,\n    });\n  }\n\n  private async deliverTelegramClarify(ctx: {\n    sessionKey: string;\n    requestId: string;\n    request: ClarifyBridgeRequest;\n  }): Promise<void> {\n    const parsed = parseSessionKey(ctx.sessionKey);\n    if (!parsed || parsed.source !== 'telegram') {\n      return;\n    }\n\n    let body = ctx.request.question;\n    if (ctx.request.default) {\n      body += `\\n\\nDefault if unsure: ${ctx.request.default}`;\n    }\n\n    const choices = ctx.request.choices;\n    const buttonRows =\n      choices && choices.length >= 2\n        ? choices.map((c, i) => [\n            {\n              text: c.length > 64 ? `${c.slice(0, 61)}…` : c,\n              callback_data: `clarify:${ctx.requestId}:${i}`,\n            },\n          ])\n        : undefined;\n\n    if (!buttonRows) {\n      body += '\\n\\nReply with your answer in this chat.';\n    }\n\n    await this.opts.getChannelManager().send({\n      channel: 'telegram',\n      chat_id: parsed.peerId,\n      content: body,\n      metadata: {\n        accountId: parsed.accountId,\n        ...(parsed.threadId ? { threadId: parsed.threadId } : {}),\n      },\n      buttons: buttonRows,\n    });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"agent-runner.js","names":[],"sources":["../../../../src/gateway/service/agent-runner.ts"],"sourcesContent":["/**\n * GatewayAgentRunner — webchat agent invocation and the surrounding control\n * surface (abort, steer, clarify-bridge plumbing, scheduled continuations).\n *\n * Was 200 lines of `GatewayService` covering seven concerns that all hung off\n * the same handful of fields (`activeWebchatRunBySession`, `runAbortControllers`,\n * `clarifyBridge`, `runRelay`):\n *\n *   - `runAgent(message, channel, chatId, ...)` — wraps {@link runGatewayAgent}\n *   - `abortAgentRun(runId)` — POST /api/agent/abort + cleanup\n *   - `steerWebchatAgent(chatId, message)` — Agent.steer queue at tool boundary\n *   - `submitClarifyResponse(requestId, answer)` — UI answers a `clarify` call\n *   - `enqueueWebchatPersistentGoalKickoff(sessionKey, goalText)` — initial\n *     `/goal` kickoff posts the goal text as the next user turn\n *   - `drainScheduledWebchatContinuation(sk, msg)` — background continuation\n *     (extension scheduler + persistent-goal flow)\n *   - `clarifyForSession({ sessionKey, request })` — clarify-bridge dispatch\n *     used by `gatewayClarify.requestClarification` in AgentService\n *\n * Owns the two state maps (`activeWebchatRunBySession`, `runAbortControllers`)\n * directly so peer coordinators (sessions-api, marketplace, config) cannot\n * accidentally mutate them.\n */\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { AgentService } from '../../agent/service.js';\nimport type { ChannelManager } from '../../channels/manager.js';\nimport type { SessionIndex } from '../../session/index.js';\nimport { AgentRunRelay, type RelayEvent } from '../agent-run-relay.js';\nimport { ClarifyBridge, type ClarifyBridgeRequest } from '../clarify-bridge.js';\nimport { buildSessionKey, parseSessionKey } from '../../routing/session-key.js';\nimport { getDefaultAgentId } from '../../routing/resolve-route.js';\nimport { runGatewayAgent } from './run-gateway-agent.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('Gateway:AgentRunner');\n\nexport interface GatewayAgentRunnerOptions {\n  bus: MessageBus;\n  sessionIndex: SessionIndex;\n  /** Resolved lazily — the runner is constructed before AgentService exists. */\n  getAgentService: () => AgentService;\n  getChannelManager: () => ChannelManager;\n  getConfig: () => Config;\n  /** SSE emit (re-used so `runAgent` events broadcast to subscribers). */\n  emit: (type: string, payload: unknown) => void;\n}\n\nexport class GatewayAgentRunner {\n  private readonly opts: GatewayAgentRunnerOptions;\n  readonly runRelay = new AgentRunRelay();\n  /** Per-run abort for webchat (POST /api/agent/abort or client disconnect). */\n  private readonly runAbortControllers = new Map<string, AbortController>();\n  private readonly clarifyBridge = new ClarifyBridge();\n  /** Maps webchat session key → active `runId` for `clarify` tool routing. */\n  private readonly activeWebchatRunBySession = new Map<string, string>();\n\n  constructor(opts: GatewayAgentRunnerOptions) {\n    this.opts = opts;\n  }\n\n  // ── Read-only accessors (so peers don't get a Map ref) ────────────────\n\n  /** True when a webchat agent run is currently in-flight for `sessionKey`. */\n  hasActiveRun(sessionKey: string): boolean {\n    return this.activeWebchatRunBySession.has(sessionKey);\n  }\n\n  getActiveRunId(sessionKey: string): string | undefined {\n    return this.activeWebchatRunBySession.get(sessionKey);\n  }\n\n  getClarifyBridge(): ClarifyBridge {\n    return this.clarifyBridge;\n  }\n\n  /** Called from `GatewayService.stop()` so the bridge gets cleaned up. */\n  disposeClarifyBridge(): void {\n    this.clarifyBridge.dispose();\n  }\n\n  // ── runAgent (webchat HTTP POST) ──────────────────────────────────────\n\n  async *runAgent(\n    message: string,\n    channel: string,\n    chatId: string,\n    attachments?: Array<{\n      type: string;\n      mimeType?: string;\n      data?: string;\n      name?: string;\n      size?: number;\n    }>,\n    thinking?: string,\n    runOptions?: { signal?: AbortSignal; clientCreatedAtMs?: number },\n  ): AsyncGenerator<\n    { type: string; content?: string; status?: string; runId?: string },\n    { status: string; summary: string },\n    unknown\n  > {\n    const iter = runGatewayAgent(\n      {\n        config: this.opts.getConfig(),\n        agentService: this.opts.getAgentService(),\n        bus: this.opts.bus,\n        runRelay: this.runRelay,\n        runAbortControllers: this.runAbortControllers,\n        activeWebchatRunBySession: this.activeWebchatRunBySession,\n        sessionIndex: this.opts.sessionIndex,\n        emit: this.opts.emit,\n      },\n      message,\n      channel,\n      chatId,\n      attachments,\n      thinking,\n      runOptions,\n    );\n\n    let step = await iter.next();\n    while (!step.done) {\n      yield step.value as { type: string; content?: string; status?: string; runId?: string };\n      step = await iter.next();\n    }\n    return step.value;\n  }\n\n  /** Abort an in-flight webchat agent run (matches `runId` from SSE `status`). */\n  abortAgentRun(runId: string): boolean {\n    this.clarifyBridge.cancelForRun(runId);\n    const keysToMark: string[] = [];\n    for (const [sk, id] of this.activeWebchatRunBySession) {\n      if (id === runId) {\n        keysToMark.push(sk);\n      }\n    }\n    for (const sk of keysToMark) {\n      this.activeWebchatRunBySession.delete(sk);\n    }\n    const relaySk = this.runRelay.getSessionKey(runId);\n    if (relaySk && !keysToMark.includes(relaySk)) {\n      keysToMark.push(relaySk);\n    }\n    const c = this.runAbortControllers.get(runId);\n    if (!c) {\n      return false;\n    }\n    const cutoffTs = Date.now();\n    for (const sk of keysToMark) {\n      void this.opts.sessionIndex\n        .updateSessionMetadata(sk, { abortCutoffTimestamp: cutoffTs })\n        .catch(() => {});\n      void this.opts.sessionIndex\n        .appendTranscriptContextEntry(sk, {\n          text: 'Webchat agent run aborted',\n          data: { runId, abortCutoffTimestamp: cutoffTs },\n        })\n        .catch(() => {});\n    }\n    c.abort();\n    for (const sk of keysToMark) {\n      void import('../../agent/embedded/runs.js').then(({ abortEmbeddedRun }) =>\n        abortEmbeddedRun(sk),\n      );\n    }\n    return true;\n  }\n\n  /**\n   * Queue steering text for an active webchat run (`Agent.steer` /\n   * tool-boundary injection). `chatId` is the same as `POST /api/agent` body\n   * (`sessionKey` or legacy peer id).\n   */\n  async steerWebchatAgent(\n    chatId: string,\n    message: string,\n  ): Promise<\n    { ok: true } | { ok: false; code: 'BAD_REQUEST' | 'NO_ACTIVE_RUN' | 'STEER_FAILED' }\n  > {\n    const trimmed = message.trim();\n    if (!trimmed) {\n      return { ok: false, code: 'BAD_REQUEST' };\n    }\n    const cfg = this.opts.getConfig();\n    const parsedKey = parseSessionKey(chatId);\n    const sessionKey = parsedKey\n      ? chatId\n      : buildSessionKey({\n          agentId: getDefaultAgentId(cfg),\n          source: 'webchat',\n          accountId: 'default',\n          peerKind: 'direct',\n          peerId: chatId,\n        });\n    if (!this.activeWebchatRunBySession.has(sessionKey)) {\n      return { ok: false, code: 'NO_ACTIVE_RUN' };\n    }\n    const steered = await this.opts\n      .getAgentService()\n      .turnDispatcher.steerWebchatSession(sessionKey, trimmed);\n    if (!steered) {\n      return { ok: false, code: 'STEER_FAILED' };\n    }\n    return { ok: true };\n  }\n\n  /** Deliver a user's answer to a pending `clarify` tool call. */\n  submitClarifyResponse(requestId: string, answer: string): boolean {\n    return this.clarifyBridge.handleResponse(requestId, answer);\n  }\n\n  /** Hermes-style: after HTTP sets a goal, enqueue the goal text as the next user turn. */\n  enqueueWebchatPersistentGoalKickoff(sessionKey: string, goalText: string): void {\n    queueMicrotask(() => {\n      void this.drainScheduledWebchatContinuation(sessionKey, goalText);\n    });\n  }\n\n  /** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */\n  async drainScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void> {\n    try {\n      const gen = this.runAgent(message, 'webchat', sessionKey, undefined, undefined, {\n        clientCreatedAtMs: Date.now(),\n      });\n      for await (const _ of gen) {\n        // Relay + `agent.stream` broadcast; UI attaches via pending runId + resume.\n      }\n    } catch (err) {\n      log.warn({ err, sessionKey }, 'Scheduled webchat continuation failed');\n    }\n  }\n\n  // ── Clarify dispatch (called from AgentService.gatewayClarify) ────────\n\n  /**\n   * Resolve clarify-bridge config for `sessionKey`: who delivers the question\n   * (webchat SSE, Telegram message, or both), then start the bridge request.\n   * Rejects when neither path is available (e.g. CLI without webchat or TG).\n   *\n   * `publishSseFor(runId)` is the bridge into AgentService's\n   * `turnDispatcher.enqueueWebchatSseEvent`. We take it as a callback so the\n   * runner does not import AgentService statically.\n   */\n  requestClarification(opts: {\n    sessionKey: string;\n    request: ClarifyBridgeRequest;\n    publishSseFor: (runId: string) => (e: RelayEvent) => void;\n  }): Promise<string> {\n    const { sessionKey, request, publishSseFor } = opts;\n    const runId = this.activeWebchatRunBySession.get(sessionKey);\n    const publishSse = runId ? publishSseFor(runId) : undefined;\n    const parsed = parseSessionKey(sessionKey);\n    const deliver =\n      parsed?.source === 'telegram'\n        ? async (ctx: {\n            sessionKey: string;\n            requestId: string;\n            request: ClarifyBridgeRequest;\n          }) => {\n            await this.deliverTelegramClarify(ctx);\n          }\n        : undefined;\n    if (!runId && !deliver) {\n      return Promise.reject(\n        new Error('Clarify is not available for this session (use webchat, Telegram, or CLI)'),\n      );\n    }\n    return this.clarifyBridge.startRequest({\n      sessionKey,\n      runId,\n      relay: this.runRelay,\n      publishSse,\n      request,\n      deliver,\n    });\n  }\n\n  private async deliverTelegramClarify(ctx: {\n    sessionKey: string;\n    requestId: string;\n    request: ClarifyBridgeRequest;\n  }): Promise<void> {\n    const parsed = parseSessionKey(ctx.sessionKey);\n    if (!parsed || parsed.source !== 'telegram') {\n      return;\n    }\n\n    let body = ctx.request.question;\n    if (ctx.request.default) {\n      body += `\\n\\nDefault if unsure: ${ctx.request.default}`;\n    }\n\n    const choices = ctx.request.choices;\n    const buttonRows =\n      choices && choices.length >= 2\n        ? choices.map((c, i) => [\n            {\n              text: c.length > 64 ? `${c.slice(0, 61)}…` : c,\n              callback_data: `clarify:${ctx.requestId}:${i}`,\n            },\n          ])\n        : undefined;\n\n    if (!buttonRows) {\n      body += '\\n\\nReply with your answer in this chat.';\n    }\n\n    await this.opts.getChannelManager().send({\n      channel: 'telegram',\n      chat_id: parsed.peerId,\n      content: body,\n      metadata: {\n        accountId: parsed.accountId,\n        ...(parsed.threadId ? { threadId: parsed.threadId } : {}),\n      },\n      buttons: buttonRows,\n    });\n  }\n}\n"],"mappings":"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"}

package/dist/src/gateway/service/config-coordinator.js

@@ -75,11 +75,15 @@ var GatewayConfigCoordinator = class {
 			this.scheduleChannelPluginsAfterPersist();
 			return { saved: true };
 		} catch (err) {
-			const error = err instanceof Error ? err.message : String(err);
-			log.error({ error }, "Failed to save config");
+			const em = err instanceof Error ? err.message : String(err);
+			log.error({
+				err,
+				errorMessage: em,
+				phase: "infra.config"
+			}, `Failed to save config: ${em}`);
 			return {
 				saved: false,
-				error
+				error: em
 			};
 		}
 	}
@@ -97,11 +101,15 @@ var GatewayConfigCoordinator = class {
 			log.debug("Configuration updated successfully");
 			return { updated: true };
 		} catch (err) {
-			const error = err instanceof Error ? err.message : String(err);
-			log.error({ error }, "Failed to update config");
+			const em = err instanceof Error ? err.message : String(err);
+			log.error({
+				err,
+				errorMessage: em,
+				phase: "infra.config"
+			}, `Failed to update config: ${em}`);
 			return {
 				updated: false,
-				error
+				error: em
 			};
 		}
 	}

package/dist/src/gateway/service/config-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-coordinator.js","names":["writeConfigToDisk"],"sources":["../../../../src/gateway/service/config-coordinator.ts"],"sourcesContent":["/**\n * GatewayConfigCoordinator — owns config persistence, hot-reload, and the\n * per-section reload handlers.\n *\n * Was 350 lines of `GatewayService` covering nine concerns:\n *   - manual `reloadConfig()` (CLI/UI trigger)\n *   - `saveConfig()` / `updateConfig()` (PATCH /api/config)\n *   - `setBundledExtensionActivationTarget` (extension store install)\n *   - `afterWeixinCredentialsPersisted` / `afterFeishuCredentialsPersisted`\n *     (QR-login follow-ups that bypass the watcher)\n *   - `ConfigHotReloader` (fs.watch → debounced per-section dispatch)\n *   - Eight section reload handlers (models / agents / channels / cron /\n *     heartbeat / tools / mcp / extensions)\n *   - `scheduleChannelPluginsAfterPersist` (coalesces rapid saves so\n *     Telegram/Weixin do not stop/start repeatedly)\n *\n * Pulled out so the gateway composition root stays focused on lifecycle, and\n * each handler is reachable from one place when adding a new config section.\n *\n * **Config state ownership.** `GatewayService.config` is still the single\n * source of truth — this coordinator reads it via `getConfig()` and writes it\n * back via `setConfig()` after every reload / persist. We pass through rather\n * than holding our own copy so other coordinators (sessions, marketplace,\n * agent runner) see the latest config the moment a reload commits.\n */\nimport type { Config } from '../../config/schema.js';\nimport type { Config as SurfaceConfig } from '../../config/config-surface.js';\nimport type { AgentService } from '../../agent/service.js';\nimport type { ChannelManager } from '../../channels/manager.js';\nimport type { CronService } from '../../cron/index.js';\nimport type { HeartbeatService } from '../heartbeat/index.js';\nimport type { ExtensionLoader } from '../../extensions/loader.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport { ConfigHotReloader } from '../../config/reload.js';\nimport { loadConfig, saveConfig as writeConfigToDisk } from '../../config/index.js';\nimport { sanitizeTunnelConfig } from '../../tunnel/tunnel-config.js';\nimport { getModelRegistry } from '../../providers/index.js';\nimport { disposeAllSessionMcpRuntimes } from '../../agent/mcp/bundle-mcp-tools.js';\nimport { computeBundledExtensionExtensionsPatch } from '../../extensions/bundled-extension-activation.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('GatewayConfigCoordinator');\n\nexport interface GatewayConfigCoordinatorOptions {\n  configPath: string;\n  bus: MessageBus;\n  /** Hot reload (fs.watch) — disabled in tests / certain CLI modes. */\n  enableHotReload: boolean;\n  getConfig: () => Config;\n  /** Writes the new config back into `GatewayService.config`. */\n  setConfig: (next: Config) => void;\n  getAgentService: () => AgentService;\n  getChannelManager: () => ChannelManager;\n  getCronService: () => CronService;\n  getHeartbeatService: () => HeartbeatService | null;\n  getExtensionLoader: () => ExtensionLoader | null;\n  /** Re-evaluate browser-extension server attachment after agent defaults change. */\n  reconcileBrowserExtensionServer: () => Promise<void>;\n  /** Latest channel status snapshot for the `channels.status` SSE event. */\n  getChannelsStatus: () => unknown;\n  /** SSE emit (used for `config.reload` + `channels.status`). */\n  emit: (type: string, payload: unknown) => void;\n}\n\nexport class GatewayConfigCoordinator {\n  private readonly opts: GatewayConfigCoordinatorOptions;\n  private configReloader: ConfigHotReloader | null = null;\n  private channelReloadFlushPromise: Promise<void> | null = null;\n  private channelReloadPending = false;\n\n  constructor(opts: GatewayConfigCoordinatorOptions) {\n    this.opts = opts;\n  }\n\n  // ── Lifecycle ──────────────────────────────────────────────────────────\n\n  /** Start the fs.watch-based reloader (idempotent — only starts once). */\n  startHotReloader(): void {\n    if (this.configReloader) return;\n    this.configReloader = new ConfigHotReloader(\n      this.opts.configPath,\n      this.opts.getConfig(),\n      {\n        onModelsReload: (newConfig) => this.handleModelsReload(newConfig),\n        onAgentDefaultsReload: (newConfig) => this.handleAgentDefaultsReload(newConfig),\n        onChannelsReload: (newConfig) => this.handleChannelsReload(newConfig),\n        onCronReload: (newConfig) => this.handleCronReload(newConfig),\n        onHeartbeatReload: (newConfig) => this.handleHeartbeatReload(newConfig),\n        onToolsReload: (newConfig) => this.handleToolsReload(newConfig),\n        onMcpReload: (newConfig) => this.handleMcpReload(newConfig),\n        onExtensionsReload: async (newConfig, changedPaths) => {\n          await this.handleExtensionsReload(newConfig, changedPaths);\n        },\n        onFullRestart: (newConfig) => {\n          log.warn(\n            { requiresProcessRestart: true, hint: 'Restart the gateway process (hot reload cannot apply this change).' },\n            'Config reload: full gateway restart required — see prior \"restartPaths\" info log',\n          );\n          this.opts.setConfig(newConfig);\n          this.opts.emit('config.reload', { section: 'full', requiresRestart: true });\n        },\n      },\n      {\n        debounceMs: 300,\n        enabled: this.opts.enableHotReload,\n      }\n    );\n    this.configReloader.start();\n  }\n\n  async stopHotReloader(): Promise<void> {\n    if (this.configReloader) {\n      await this.configReloader.stop();\n      this.configReloader = null;\n    }\n  }\n\n  // ── Manual reload (UI trigger) ─────────────────────────────────────────\n\n  async reloadConfig(): Promise<{ reloaded: boolean; error?: string }> {\n    if (!this.configReloader) {\n      return { reloaded: false, error: 'Config reloader not initialized' };\n    }\n    const result = await this.configReloader.triggerReload();\n    return { reloaded: result.success, error: result.error };\n  }\n\n  // ── Persist (PATCH /api/config, marketplace install, etc.) ─────────────\n\n  async saveConfig(config: Config): Promise<{ saved: boolean; error?: string }> {\n    try {\n      await this.writeConfigAndReloadFromDisk(config);\n      this.scheduleChannelPluginsAfterPersist();\n      return { saved: true };\n    } catch (err) {\n      const error = err instanceof Error ? err.message : String(err);\n      log.error({ error }, 'Failed to save config');\n      return { saved: false, error };\n    }\n  }\n\n  /** Merge partial updates into `currentConfig` and persist. */\n  async updateConfig(updates: Partial<Config>): Promise<{ updated: boolean; error?: string }> {\n    try {\n      log.debug('Updating configuration...');\n      const merged = { ...this.opts.getConfig(), ...updates };\n      this.opts.setConfig(merged);\n      await this.writeConfigAndReloadFromDisk(merged);\n      this.scheduleChannelPluginsAfterPersist();\n      log.debug('Configuration updated successfully');\n      return { updated: true };\n    } catch (err) {\n      const error = err instanceof Error ? err.message : String(err);\n      log.error({ error }, 'Failed to update config');\n      return { updated: false, error };\n    }\n  }\n\n  /**\n   * App store (phase 1): persist `extensions.enabled` / `extensions.disabled`\n   * for a bundled extension. Marketplace-only extensions hot-load on enable;\n   * disable still needs a gateway restart to unload.\n   */\n  async setBundledExtensionActivationTarget(\n    extensionId: string,\n    wanted: boolean,\n  ): Promise<{ ok: boolean; error?: string; requiresGatewayRestart: boolean }> {\n    const loader = this.opts.getExtensionLoader();\n    if (!loader) {\n      return { ok: false, error: 'Extension loader unavailable', requiresGatewayRestart: false };\n    }\n    const id = extensionId.trim();\n    if (!id) {\n      return { ok: false, error: 'Invalid extension id', requiresGatewayRestart: false };\n    }\n    const patch = computeBundledExtensionExtensionsPatch(loader, this.opts.getConfig(), id, wanted);\n    if (patch.ok === false) {\n      return { ok: false, error: patch.error, requiresGatewayRestart: false };\n    }\n    const newConfig = { ...this.opts.getConfig(), extensions: patch.extensions } as Config;\n    const saved = await this.saveConfig(newConfig);\n    if (!saved.saved) {\n      return { ok: false, error: saved.error ?? 'Failed to save config', requiresGatewayRestart: false };\n    }\n    loader.setConfig(this.opts.getConfig() as unknown as SurfaceConfig);\n\n    let requiresGatewayRestart = true;\n    if (wanted) {\n      try {\n        loader.invalidateManifestCache();\n        await loader.loadByActivationPlan();\n        requiresGatewayRestart = false;\n      } catch (err) {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, extensionId: id, errorMessage: em },\n          `Extension hot-load after bundled activation failed: ${em}`,\n        );\n        requiresGatewayRestart = true;\n      }\n    }\n\n    this.opts.emit('config.reload', { section: 'extensions', source: 'bundled-activation' });\n    return { ok: true, requiresGatewayRestart };\n  }\n\n  // ── QR-login follow-ups (bypass fs watcher) ────────────────────────────\n\n  async afterWeixinCredentialsPersisted(): Promise<void> {\n    const next = loadConfig(this.opts.configPath);\n    this.opts.setConfig(next);\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(next);\n    this.configReloader?.syncCurrentConfig(next);\n    await this.handleChannelsReload(next);\n    const { weixinPlugin } = await import('../../channels/weixin/index.js');\n    await weixinPlugin.reloadMonitorsWithConfig(this.opts.getConfig(), this.opts.bus);\n    log.info('Weixin monitors restarted after credential login');\n  }\n\n  async afterFeishuCredentialsPersisted(): Promise<void> {\n    const next = loadConfig(this.opts.configPath);\n    this.opts.setConfig(next);\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(next);\n    this.configReloader?.syncCurrentConfig(next);\n    await this.handleChannelsReload(next);\n    log.info('Feishu config applied after QR setup');\n  }\n\n  // ── Section reload handlers (also used by manual triggers) ─────────────\n\n  /**\n   * Apply `latest.channels` to every registered channel plugin (Telegram,\n   * Weixin, extensions). Single runtime path for: file watcher hot reload, API\n   * saves, and Weixin QR follow-up.\n   */\n  async handleChannelsReload(newConfig: Config): Promise<void> {\n    log.debug('Reloading channels config...');\n    this.opts.setConfig(newConfig);\n    await this.opts.getChannelManager().updateConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'channels' });\n    this.opts.emit('channels.status', { channels: this.opts.getChannelsStatus() });\n    log.debug('Channels config reloaded');\n  }\n\n  /**\n   * Apply `gateway.heartbeat` from current config after PATCH /api/config (and\n   * when hot reload is off). File watcher uses `handleHeartbeatReload` with\n   * the same effect when paths match.\n   */\n  reloadHeartbeatFromCurrentConfig(): void {\n    this.handleHeartbeatReload(this.opts.getConfig());\n  }\n\n  // ── Internals ──────────────────────────────────────────────────────────\n\n  private handleModelsReload(newConfig: Config): void {\n    log.debug('Reloading models config...');\n    this.opts.setConfig(newConfig);\n    getModelRegistry().refresh();\n    this.opts.emit('config.reload', { section: 'models' });\n    log.debug('Models config reloaded');\n  }\n\n  private handleAgentDefaultsReload(newConfig: Config): void {\n    log.debug('Reloading agent defaults...');\n    this.opts.setConfig(newConfig);\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(newConfig);\n    void this.opts.reconcileBrowserExtensionServer();\n    this.opts.emit('config.reload', { section: 'agents' });\n    log.debug('Agent defaults reloaded');\n  }\n\n  /**\n   * Coalesces rapid saves so Telegram/Weixin do not stop/start repeatedly.\n   * The persist path schedules the channel apply; the same coalescer absorbs\n   * follow-up saves until the first flush settles.\n   */\n  private scheduleChannelPluginsAfterPersist(): void {\n    this.channelReloadPending = true;\n    if (this.channelReloadFlushPromise) return;\n    this.channelReloadFlushPromise = (async () => {\n      try {\n        while (this.channelReloadPending) {\n          this.channelReloadPending = false;\n          await this.handleChannelsReload(this.opts.getConfig());\n        }\n      } catch (err) {\n        const em = err instanceof Error ? err.message : String(err);\n        log.error({ err, errorMessage: em }, `Channel reload after persist failed: ${em}`);\n      } finally {\n        this.channelReloadFlushPromise = null;\n        if (this.channelReloadPending) {\n          this.scheduleChannelPluginsAfterPersist();\n        }\n      }\n    })();\n  }\n\n  private handleCronReload(newConfig: Config): void {\n    log.debug('Reloading cron config...');\n    this.opts.setConfig(newConfig);\n    this.opts.getCronService().updateConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'cron' });\n    log.debug('Cron config reloaded');\n  }\n\n  private handleHeartbeatReload(newConfig: Config): void {\n    log.debug('Reloading heartbeat config...');\n    this.opts.setConfig(newConfig);\n    this.opts.getHeartbeatService()?.updateConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'heartbeat' });\n    log.debug('Heartbeat config reloaded');\n  }\n\n  private handleToolsReload(newConfig: Config): void {\n    log.debug('Reloading tools config...');\n    this.opts.setConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'tools' });\n    log.debug('Tools config reloaded');\n  }\n\n  private handleMcpReload(newConfig: Config): void {\n    log.debug('Reloading MCP config...');\n    this.opts.setConfig(newConfig);\n    void disposeAllSessionMcpRuntimes().catch((err) => {\n      log.warn({ err }, 'MCP runtime dispose on config reload failed');\n    });\n    this.opts.emit('config.reload', { section: 'mcp' });\n    log.debug('MCP config reloaded');\n  }\n\n  /** Dispatch config hot reload to extensions that registered `registerReload`. */\n  private async handleExtensionsReload(\n    newConfig: Config,\n    changedPaths: string[],\n  ): Promise<void> {\n    this.opts.setConfig(newConfig);\n    const loader = this.opts.getExtensionLoader();\n    loader?.setConfig(newConfig as unknown as SurfaceConfig);\n\n    if (!loader) {\n      this.opts.emit('config.reload', {\n        section: 'extensions',\n        source: 'extension-reload',\n        changedPaths,\n      });\n      return;\n    }\n\n    const registry = loader.getRegistry();\n    const matchingRegs = registry.getMatchingReloadRegistrations(changedPaths);\n\n    if (matchingRegs.length === 0) {\n      log.debug({ changedPaths }, 'No extension reload handlers matched');\n      this.opts.emit('config.reload', {\n        section: 'extensions',\n        source: 'extension-reload',\n        changedPaths,\n      });\n      return;\n    }\n\n    for (const reg of matchingRegs) {\n      const relevantPaths = changedPaths.filter(\n        (p) =>\n          reg.configPrefixes.length === 0 ||\n          reg.configPrefixes.some(\n            (prefix) => p === prefix || p.startsWith(`${prefix}.`),\n          ),\n      );\n\n      log.info(\n        { extensionId: reg.extensionId, relevantPaths },\n        'Calling extension reload handler',\n      );\n\n      try {\n        const result = await reg.handler(newConfig, relevantPaths);\n        if (result.success) {\n          log.info({ extensionId: reg.extensionId }, 'Extension reload succeeded');\n        } else {\n          log.warn(\n            { extensionId: reg.extensionId, error: result.error },\n            `Extension reload reported failure: ${result.error ?? 'unknown'}`,\n          );\n        }\n      } catch (err) {\n        const errorMessage = err instanceof Error ? err.message : String(err);\n        log.error(\n          { err, extensionId: reg.extensionId, errorMessage },\n          `Extension reload handler threw: ${errorMessage}`,\n        );\n      }\n    }\n\n    this.opts.emit('config.reload', {\n      section: 'extensions',\n      source: 'extension-reload',\n      changedPaths,\n    });\n  }\n\n  /**\n   * Persist and replace `currentConfig` with the validated file contents so\n   * runtime matches disk (PATCH merge objects can drift from Zod-normalized\n   * output).\n   */\n  private async writeConfigAndReloadFromDisk(configToWrite: Config): Promise<void> {\n    await writeConfigToDisk(configToWrite, this.opts.configPath);\n    const reloaded = loadConfig(this.opts.configPath);\n    this.opts.setConfig(reloaded);\n    if (sanitizeTunnelConfig(reloaded)) {\n      await writeConfigToDisk(reloaded, this.opts.configPath);\n    }\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(reloaded);\n    await this.opts.reconcileBrowserExtensionServer();\n    // Hot-apply: reconcile managed dreaming cron jobs immediately after config persists.\n    await this.opts.getAgentService().reconcileDreamingNow().catch((err) => {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn({ err, errorMessage: em }, `Dreaming cron reconcile after save failed: ${em}`);\n    });\n    // Align watcher baseline before channel hooks run so fs `change` does not\n    // re-apply the same diff concurrently.\n    this.configReloader?.syncCurrentConfig(reloaded);\n  }\n}\n"],"mappings":";;;;;;;;;;;;gBAoC4D;aAGP;AAErD,MAAM,MAAM,aAAa,2BAA2B;AAuBpD,IAAa,2BAAb,MAAsC;CACpC;CACA,iBAAmD;CACnD,4BAA0D;CAC1D,uBAA+B;CAE/B,YAAY,MAAuC;AACjD,OAAK,OAAO;;;CAMd,mBAAyB;AACvB,MAAI,KAAK,eAAgB;AACzB,OAAK,iBAAiB,IAAI,kBACxB,KAAK,KAAK,YACV,KAAK,KAAK,WAAW,EACrB;GACE,iBAAiB,cAAc,KAAK,mBAAmB,UAAU;GACjE,wBAAwB,cAAc,KAAK,0BAA0B,UAAU;GAC/E,mBAAmB,cAAc,KAAK,qBAAqB,UAAU;GACrE,eAAe,cAAc,KAAK,iBAAiB,UAAU;GAC7D,oBAAoB,cAAc,KAAK,sBAAsB,UAAU;GACvE,gBAAgB,cAAc,KAAK,kBAAkB,UAAU;GAC/D,cAAc,cAAc,KAAK,gBAAgB,UAAU;GAC3D,oBAAoB,OAAO,WAAW,iBAAiB;AACrD,UAAM,KAAK,uBAAuB,WAAW,aAAa;;GAE5D,gBAAgB,cAAc;AAC5B,QAAI,KACF;KAAE,wBAAwB;KAAM,MAAM;KAAsE,EAC5G,qFACD;AACD,SAAK,KAAK,UAAU,UAAU;AAC9B,SAAK,KAAK,KAAK,iBAAiB;KAAE,SAAS;KAAQ,iBAAiB;KAAM,CAAC;;GAE9E,EACD;GACE,YAAY;GACZ,SAAS,KAAK,KAAK;GACpB,CACF;AACD,OAAK,eAAe,OAAO;;CAG7B,MAAM,kBAAiC;AACrC,MAAI,KAAK,gBAAgB;AACvB,SAAM,KAAK,eAAe,MAAM;AAChC,QAAK,iBAAiB;;;CAM1B,MAAM,eAA+D;AACnE,MAAI,CAAC,KAAK,eACR,QAAO;GAAE,UAAU;GAAO,OAAO;GAAmC;EAEtE,MAAM,SAAS,MAAM,KAAK,eAAe,eAAe;AACxD,SAAO;GAAE,UAAU,OAAO;GAAS,OAAO,OAAO;GAAO;;CAK1D,MAAM,WAAW,QAA6D;AAC5E,MAAI;AACF,SAAM,KAAK,6BAA6B,OAAO;AAC/C,QAAK,oCAAoC;AACzC,UAAO,EAAE,OAAO,MAAM;WACf,KAAK;GACZ,MAAM,QAAQ,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC9D,OAAI,MAAM,EAAE,OAAO,EAAE,wBAAwB;AAC7C,UAAO;IAAE,OAAO;IAAO;IAAO;;;;CAKlC,MAAM,aAAa,SAAyE;AAC1F,MAAI;AACF,OAAI,MAAM,4BAA4B;GACtC,MAAM,SAAS;IAAE,GAAG,KAAK,KAAK,WAAW;IAAE,GAAG;IAAS;AACvD,QAAK,KAAK,UAAU,OAAO;AAC3B,SAAM,KAAK,6BAA6B,OAAO;AAC/C,QAAK,oCAAoC;AACzC,OAAI,MAAM,qCAAqC;AAC/C,UAAO,EAAE,SAAS,MAAM;WACjB,KAAK;GACZ,MAAM,QAAQ,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC9D,OAAI,MAAM,EAAE,OAAO,EAAE,0BAA0B;AAC/C,UAAO;IAAE,SAAS;IAAO;IAAO;;;;;;;;CASpC,MAAM,oCACJ,aACA,QAC2E;EAC3E,MAAM,SAAS,KAAK,KAAK,oBAAoB;AAC7C,MAAI,CAAC,OACH,QAAO;GAAE,IAAI;GAAO,OAAO;GAAgC,wBAAwB;GAAO;EAE5F,MAAM,KAAK,YAAY,MAAM;AAC7B,MAAI,CAAC,GACH,QAAO;GAAE,IAAI;GAAO,OAAO;GAAwB,wBAAwB;GAAO;EAEpF,MAAM,QAAQ,uCAAuC,QAAQ,KAAK,KAAK,WAAW,EAAE,IAAI,OAAO;AAC/F,MAAI,MAAM,OAAO,MACf,QAAO;GAAE,IAAI;GAAO,OAAO,MAAM;GAAO,wBAAwB;GAAO;EAEzE,MAAM,YAAY;GAAE,GAAG,KAAK,KAAK,WAAW;GAAE,YAAY,MAAM;GAAY;EAC5E,MAAM,QAAQ,MAAM,KAAK,WAAW,UAAU;AAC9C,MAAI,CAAC,MAAM,MACT,QAAO;GAAE,IAAI;GAAO,OAAO,MAAM,SAAS;GAAyB,wBAAwB;GAAO;AAEpG,SAAO,UAAU,KAAK,KAAK,WAAW,CAA6B;EAEnE,IAAI,yBAAyB;AAC7B,MAAI,OACF,KAAI;AACF,UAAO,yBAAyB;AAChC,SAAM,OAAO,sBAAsB;AACnC,4BAAyB;WAClB,KAAK;GACZ,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAI,KACF;IAAE;IAAK,aAAa;IAAI,cAAc;IAAI,EAC1C,uDAAuD,KACxD;AACD,4BAAyB;;AAI7B,OAAK,KAAK,KAAK,iBAAiB;GAAE,SAAS;GAAc,QAAQ;GAAsB,CAAC;AACxF,SAAO;GAAE,IAAI;GAAM;GAAwB;;CAK7C,MAAM,kCAAiD;EACrD,MAAM,OAAO,WAAW,KAAK,KAAK,WAAW;AAC7C,OAAK,KAAK,UAAU,KAAK;AACzB,OAAK,KAAK,iBAAiB,CAAC,6BAA6B,KAAK;AAC9D,OAAK,gBAAgB,kBAAkB,KAAK;AAC5C,QAAM,KAAK,qBAAqB,KAAK;EACrC,MAAM,EAAE,iBAAiB,MAAM,OAAO;AACtC,QAAM,aAAa,yBAAyB,KAAK,KAAK,WAAW,EAAE,KAAK,KAAK,IAAI;AACjF,MAAI,KAAK,mDAAmD;;CAG9D,MAAM,kCAAiD;EACrD,MAAM,OAAO,WAAW,KAAK,KAAK,WAAW;AAC7C,OAAK,KAAK,UAAU,KAAK;AACzB,OAAK,KAAK,iBAAiB,CAAC,6BAA6B,KAAK;AAC9D,OAAK,gBAAgB,kBAAkB,KAAK;AAC5C,QAAM,KAAK,qBAAqB,KAAK;AACrC,MAAI,KAAK,uCAAuC;;;;;;;CAUlD,MAAM,qBAAqB,WAAkC;AAC3D,MAAI,MAAM,+BAA+B;AACzC,OAAK,KAAK,UAAU,UAAU;AAC9B,QAAM,KAAK,KAAK,mBAAmB,CAAC,aAAa,UAAU;AAC3D,OAAK,KAAK,KAAK,iBAAiB,EAAE,SAAS,YAAY,CAAC;AACxD,OAAK,KAAK,KAAK,mBAAmB,EAAE,UAAU,KAAK,KAAK,mBAAmB,EAAE,CAAC;AAC9E,MAAI,MAAM,2BAA2B;;;;;;;CAQvC,mCAAyC;AACvC,OAAK,sBAAsB,KAAK,KAAK,WAAW,CAAC;;CAKnD,mBAA2B,WAAyB;AAClD,MAAI,MAAM,6BAA6B;AACvC,OAAK,KAAK,UAAU,UAAU;AAC9B,oBAAkB,CAAC,SAAS;AAC5B,OAAK,KAAK,KAAK,iBAAiB,EAAE,SAAS,UAAU,CAAC;AACtD,MAAI,MAAM,yBAAyB;;CAGrC,0BAAkC,WAAyB;AACzD,MAAI,MAAM,8BAA8B;AACxC,OAAK,KAAK,UAAU,UAAU;AAC9B,OAAK,KAAK,iBAAiB,CAAC,6BAA6B,UAAU;AAC9D,OAAK,KAAK,iCAAiC;AAChD,OAAK,KAAK,KAAK,iBAAiB,EAAE,SAAS,UAAU,CAAC;AACtD,MAAI,MAAM,0BAA0B;;;;;;;CAQtC,qCAAmD;AACjD,OAAK,uBAAuB;AAC5B,MAAI,KAAK,0BAA2B;AACpC,OAAK,6BAA6B,YAAY;AAC5C,OAAI;AACF,WAAO,KAAK,sBAAsB;AAChC,UAAK,uBAAuB;AAC5B,WAAM,KAAK,qBAAqB,KAAK,KAAK,WAAW,CAAC;;YAEjD,KAAK;IACZ,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,QAAI,MAAM;KAAE;KAAK,cAAc;KAAI,EAAE,wCAAwC,KAAK;aAC1E;AACR,SAAK,4BAA4B;AACjC,QAAI,KAAK,qBACP,MAAK,oCAAoC;;MAG3C;;CAGN,iBAAyB,WAAyB;AAChD,MAAI,MAAM,2BAA2B;AACrC,OAAK,KAAK,UAAU,UAAU;AAC9B,OAAK,KAAK,gBAAgB,CAAC,aAAa,UAAU;AAClD,OAAK,KAAK,KAAK,iBAAiB,EAAE,SAAS,QAAQ,CAAC;AACpD,MAAI,MAAM,uBAAuB;;CAGnC,sBAA8B,WAAyB;AACrD,MAAI,MAAM,gCAAgC;AAC1C,OAAK,KAAK,UAAU,UAAU;AAC9B,OAAK,KAAK,qBAAqB,EAAE,aAAa,UAAU;AACxD,OAAK,KAAK,KAAK,iBAAiB,EAAE,SAAS,aAAa,CAAC;AACzD,MAAI,MAAM,4BAA4B;;CAGxC,kBAA0B,WAAyB;AACjD,MAAI,MAAM,4BAA4B;AACtC,OAAK,KAAK,UAAU,UAAU;AAC9B,OAAK,KAAK,KAAK,iBAAiB,EAAE,SAAS,SAAS,CAAC;AACrD,MAAI,MAAM,wBAAwB;;CAGpC,gBAAwB,WAAyB;AAC/C,MAAI,MAAM,0BAA0B;AACpC,OAAK,KAAK,UAAU,UAAU;AACzB,gCAA8B,CAAC,OAAO,QAAQ;AACjD,OAAI,KAAK,EAAE,KAAK,EAAE,8CAA8C;IAChE;AACF,OAAK,KAAK,KAAK,iBAAiB,EAAE,SAAS,OAAO,CAAC;AACnD,MAAI,MAAM,sBAAsB;;;CAIlC,MAAc,uBACZ,WACA,cACe;AACf,OAAK,KAAK,UAAU,UAAU;EAC9B,MAAM,SAAS,KAAK,KAAK,oBAAoB;AAC7C,UAAQ,UAAU,UAAsC;AAExD,MAAI,CAAC,QAAQ;AACX,QAAK,KAAK,KAAK,iBAAiB;IAC9B,SAAS;IACT,QAAQ;IACR;IACD,CAAC;AACF;;EAIF,MAAM,eADW,OAAO,aACK,CAAC,+BAA+B,aAAa;AAE1E,MAAI,aAAa,WAAW,GAAG;AAC7B,OAAI,MAAM,EAAE,cAAc,EAAE,uCAAuC;AACnE,QAAK,KAAK,KAAK,iBAAiB;IAC9B,SAAS;IACT,QAAQ;IACR;IACD,CAAC;AACF;;AAGF,OAAK,MAAM,OAAO,cAAc;GAC9B,MAAM,gBAAgB,aAAa,QAChC,MACC,IAAI,eAAe,WAAW,KAC9B,IAAI,eAAe,MAChB,WAAW,MAAM,UAAU,EAAE,WAAW,GAAG,OAAO,GAAG,CACvD,CACJ;AAED,OAAI,KACF;IAAE,aAAa,IAAI;IAAa;IAAe,EAC/C,mCACD;AAED,OAAI;IACF,MAAM,SAAS,MAAM,IAAI,QAAQ,WAAW,cAAc;AAC1D,QAAI,OAAO,QACT,KAAI,KAAK,EAAE,aAAa,IAAI,aAAa,EAAE,6BAA6B;QAExE,KAAI,KACF;KAAE,aAAa,IAAI;KAAa,OAAO,OAAO;KAAO,EACrD,sCAAsC,OAAO,SAAS,YACvD;YAEI,KAAK;IACZ,MAAM,eAAe,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AACrE,QAAI,MACF;KAAE;KAAK,aAAa,IAAI;KAAa;KAAc,EACnD,mCAAmC,eACpC;;;AAIL,OAAK,KAAK,KAAK,iBAAiB;GAC9B,SAAS;GACT,QAAQ;GACR;GACD,CAAC;;;;;;;CAQJ,MAAc,6BAA6B,eAAsC;AAC/E,QAAMA,WAAkB,eAAe,KAAK,KAAK,WAAW;EAC5D,MAAM,WAAW,WAAW,KAAK,KAAK,WAAW;AACjD,OAAK,KAAK,UAAU,SAAS;AAC7B,MAAI,qBAAqB,SAAS,CAChC,OAAMA,WAAkB,UAAU,KAAK,KAAK,WAAW;AAEzD,OAAK,KAAK,iBAAiB,CAAC,6BAA6B,SAAS;AAClE,QAAM,KAAK,KAAK,iCAAiC;AAEjD,QAAM,KAAK,KAAK,iBAAiB,CAAC,sBAAsB,CAAC,OAAO,QAAQ;GACtE,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAI,KAAK;IAAE;IAAK,cAAc;IAAI,EAAE,8CAA8C,KAAK;IACvF;AAGF,OAAK,gBAAgB,kBAAkB,SAAS"}
+{"version":3,"file":"config-coordinator.js","names":["writeConfigToDisk"],"sources":["../../../../src/gateway/service/config-coordinator.ts"],"sourcesContent":["/**\n * GatewayConfigCoordinator — owns config persistence, hot-reload, and the\n * per-section reload handlers.\n *\n * Was 350 lines of `GatewayService` covering nine concerns:\n *   - manual `reloadConfig()` (CLI/UI trigger)\n *   - `saveConfig()` / `updateConfig()` (PATCH /api/config)\n *   - `setBundledExtensionActivationTarget` (extension store install)\n *   - `afterWeixinCredentialsPersisted` / `afterFeishuCredentialsPersisted`\n *     (QR-login follow-ups that bypass the watcher)\n *   - `ConfigHotReloader` (fs.watch → debounced per-section dispatch)\n *   - Eight section reload handlers (models / agents / channels / cron /\n *     heartbeat / tools / mcp / extensions)\n *   - `scheduleChannelPluginsAfterPersist` (coalesces rapid saves so\n *     Telegram/Weixin do not stop/start repeatedly)\n *\n * Pulled out so the gateway composition root stays focused on lifecycle, and\n * each handler is reachable from one place when adding a new config section.\n *\n * **Config state ownership.** `GatewayService.config` is still the single\n * source of truth — this coordinator reads it via `getConfig()` and writes it\n * back via `setConfig()` after every reload / persist. We pass through rather\n * than holding our own copy so other coordinators (sessions, marketplace,\n * agent runner) see the latest config the moment a reload commits.\n */\nimport type { Config } from '../../config/schema.js';\nimport type { Config as SurfaceConfig } from '../../config/config-surface.js';\nimport type { AgentService } from '../../agent/service.js';\nimport type { ChannelManager } from '../../channels/manager.js';\nimport type { CronService } from '../../cron/index.js';\nimport type { HeartbeatService } from '../heartbeat/index.js';\nimport type { ExtensionLoader } from '../../extensions/loader.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport { ConfigHotReloader } from '../../config/reload.js';\nimport { loadConfig, saveConfig as writeConfigToDisk } from '../../config/index.js';\nimport { sanitizeTunnelConfig } from '../../tunnel/tunnel-config.js';\nimport { getModelRegistry } from '../../providers/index.js';\nimport { disposeAllSessionMcpRuntimes } from '../../agent/mcp/bundle-mcp-tools.js';\nimport { computeBundledExtensionExtensionsPatch } from '../../extensions/bundled-extension-activation.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('GatewayConfigCoordinator');\n\nexport interface GatewayConfigCoordinatorOptions {\n  configPath: string;\n  bus: MessageBus;\n  /** Hot reload (fs.watch) — disabled in tests / certain CLI modes. */\n  enableHotReload: boolean;\n  getConfig: () => Config;\n  /** Writes the new config back into `GatewayService.config`. */\n  setConfig: (next: Config) => void;\n  getAgentService: () => AgentService;\n  getChannelManager: () => ChannelManager;\n  getCronService: () => CronService;\n  getHeartbeatService: () => HeartbeatService | null;\n  getExtensionLoader: () => ExtensionLoader | null;\n  /** Re-evaluate browser-extension server attachment after agent defaults change. */\n  reconcileBrowserExtensionServer: () => Promise<void>;\n  /** Latest channel status snapshot for the `channels.status` SSE event. */\n  getChannelsStatus: () => unknown;\n  /** SSE emit (used for `config.reload` + `channels.status`). */\n  emit: (type: string, payload: unknown) => void;\n}\n\nexport class GatewayConfigCoordinator {\n  private readonly opts: GatewayConfigCoordinatorOptions;\n  private configReloader: ConfigHotReloader | null = null;\n  private channelReloadFlushPromise: Promise<void> | null = null;\n  private channelReloadPending = false;\n\n  constructor(opts: GatewayConfigCoordinatorOptions) {\n    this.opts = opts;\n  }\n\n  // ── Lifecycle ──────────────────────────────────────────────────────────\n\n  /** Start the fs.watch-based reloader (idempotent — only starts once). */\n  startHotReloader(): void {\n    if (this.configReloader) return;\n    this.configReloader = new ConfigHotReloader(\n      this.opts.configPath,\n      this.opts.getConfig(),\n      {\n        onModelsReload: (newConfig) => this.handleModelsReload(newConfig),\n        onAgentDefaultsReload: (newConfig) => this.handleAgentDefaultsReload(newConfig),\n        onChannelsReload: (newConfig) => this.handleChannelsReload(newConfig),\n        onCronReload: (newConfig) => this.handleCronReload(newConfig),\n        onHeartbeatReload: (newConfig) => this.handleHeartbeatReload(newConfig),\n        onToolsReload: (newConfig) => this.handleToolsReload(newConfig),\n        onMcpReload: (newConfig) => this.handleMcpReload(newConfig),\n        onExtensionsReload: async (newConfig, changedPaths) => {\n          await this.handleExtensionsReload(newConfig, changedPaths);\n        },\n        onFullRestart: (newConfig) => {\n          log.warn(\n            { requiresProcessRestart: true, hint: 'Restart the gateway process (hot reload cannot apply this change).' },\n            'Config reload: full gateway restart required — see prior \"restartPaths\" info log',\n          );\n          this.opts.setConfig(newConfig);\n          this.opts.emit('config.reload', { section: 'full', requiresRestart: true });\n        },\n      },\n      {\n        debounceMs: 300,\n        enabled: this.opts.enableHotReload,\n      }\n    );\n    this.configReloader.start();\n  }\n\n  async stopHotReloader(): Promise<void> {\n    if (this.configReloader) {\n      await this.configReloader.stop();\n      this.configReloader = null;\n    }\n  }\n\n  // ── Manual reload (UI trigger) ─────────────────────────────────────────\n\n  async reloadConfig(): Promise<{ reloaded: boolean; error?: string }> {\n    if (!this.configReloader) {\n      return { reloaded: false, error: 'Config reloader not initialized' };\n    }\n    const result = await this.configReloader.triggerReload();\n    return { reloaded: result.success, error: result.error };\n  }\n\n  // ── Persist (PATCH /api/config, marketplace install, etc.) ─────────────\n\n  async saveConfig(config: Config): Promise<{ saved: boolean; error?: string }> {\n    try {\n      await this.writeConfigAndReloadFromDisk(config);\n      this.scheduleChannelPluginsAfterPersist();\n      return { saved: true };\n    } catch (err) {\n      const em = err instanceof Error ? err.message : String(err);\n      log.error({ err, errorMessage: em, phase: 'infra.config' }, `Failed to save config: ${em}`);\n      return { saved: false, error: em };\n    }\n  }\n\n  /** Merge partial updates into `currentConfig` and persist. */\n  async updateConfig(updates: Partial<Config>): Promise<{ updated: boolean; error?: string }> {\n    try {\n      log.debug('Updating configuration...');\n      const merged = { ...this.opts.getConfig(), ...updates };\n      this.opts.setConfig(merged);\n      await this.writeConfigAndReloadFromDisk(merged);\n      this.scheduleChannelPluginsAfterPersist();\n      log.debug('Configuration updated successfully');\n      return { updated: true };\n    } catch (err) {\n      const em = err instanceof Error ? err.message : String(err);\n      log.error({ err, errorMessage: em, phase: 'infra.config' }, `Failed to update config: ${em}`);\n      return { updated: false, error: em };\n    }\n  }\n\n  /**\n   * App store (phase 1): persist `extensions.enabled` / `extensions.disabled`\n   * for a bundled extension. Marketplace-only extensions hot-load on enable;\n   * disable still needs a gateway restart to unload.\n   */\n  async setBundledExtensionActivationTarget(\n    extensionId: string,\n    wanted: boolean,\n  ): Promise<{ ok: boolean; error?: string; requiresGatewayRestart: boolean }> {\n    const loader = this.opts.getExtensionLoader();\n    if (!loader) {\n      return { ok: false, error: 'Extension loader unavailable', requiresGatewayRestart: false };\n    }\n    const id = extensionId.trim();\n    if (!id) {\n      return { ok: false, error: 'Invalid extension id', requiresGatewayRestart: false };\n    }\n    const patch = computeBundledExtensionExtensionsPatch(loader, this.opts.getConfig(), id, wanted);\n    if (patch.ok === false) {\n      return { ok: false, error: patch.error, requiresGatewayRestart: false };\n    }\n    const newConfig = { ...this.opts.getConfig(), extensions: patch.extensions } as Config;\n    const saved = await this.saveConfig(newConfig);\n    if (!saved.saved) {\n      return { ok: false, error: saved.error ?? 'Failed to save config', requiresGatewayRestart: false };\n    }\n    loader.setConfig(this.opts.getConfig() as unknown as SurfaceConfig);\n\n    let requiresGatewayRestart = true;\n    if (wanted) {\n      try {\n        loader.invalidateManifestCache();\n        await loader.loadByActivationPlan();\n        requiresGatewayRestart = false;\n      } catch (err) {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, extensionId: id, errorMessage: em },\n          `Extension hot-load after bundled activation failed: ${em}`,\n        );\n        requiresGatewayRestart = true;\n      }\n    }\n\n    this.opts.emit('config.reload', { section: 'extensions', source: 'bundled-activation' });\n    return { ok: true, requiresGatewayRestart };\n  }\n\n  // ── QR-login follow-ups (bypass fs watcher) ────────────────────────────\n\n  async afterWeixinCredentialsPersisted(): Promise<void> {\n    const next = loadConfig(this.opts.configPath);\n    this.opts.setConfig(next);\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(next);\n    this.configReloader?.syncCurrentConfig(next);\n    await this.handleChannelsReload(next);\n    const { weixinPlugin } = await import('../../channels/weixin/index.js');\n    await weixinPlugin.reloadMonitorsWithConfig(this.opts.getConfig(), this.opts.bus);\n    log.info('Weixin monitors restarted after credential login');\n  }\n\n  async afterFeishuCredentialsPersisted(): Promise<void> {\n    const next = loadConfig(this.opts.configPath);\n    this.opts.setConfig(next);\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(next);\n    this.configReloader?.syncCurrentConfig(next);\n    await this.handleChannelsReload(next);\n    log.info('Feishu config applied after QR setup');\n  }\n\n  // ── Section reload handlers (also used by manual triggers) ─────────────\n\n  /**\n   * Apply `latest.channels` to every registered channel plugin (Telegram,\n   * Weixin, extensions). Single runtime path for: file watcher hot reload, API\n   * saves, and Weixin QR follow-up.\n   */\n  async handleChannelsReload(newConfig: Config): Promise<void> {\n    log.debug('Reloading channels config...');\n    this.opts.setConfig(newConfig);\n    await this.opts.getChannelManager().updateConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'channels' });\n    this.opts.emit('channels.status', { channels: this.opts.getChannelsStatus() });\n    log.debug('Channels config reloaded');\n  }\n\n  /**\n   * Apply `gateway.heartbeat` from current config after PATCH /api/config (and\n   * when hot reload is off). File watcher uses `handleHeartbeatReload` with\n   * the same effect when paths match.\n   */\n  reloadHeartbeatFromCurrentConfig(): void {\n    this.handleHeartbeatReload(this.opts.getConfig());\n  }\n\n  // ── Internals ──────────────────────────────────────────────────────────\n\n  private handleModelsReload(newConfig: Config): void {\n    log.debug('Reloading models config...');\n    this.opts.setConfig(newConfig);\n    getModelRegistry().refresh();\n    this.opts.emit('config.reload', { section: 'models' });\n    log.debug('Models config reloaded');\n  }\n\n  private handleAgentDefaultsReload(newConfig: Config): void {\n    log.debug('Reloading agent defaults...');\n    this.opts.setConfig(newConfig);\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(newConfig);\n    void this.opts.reconcileBrowserExtensionServer();\n    this.opts.emit('config.reload', { section: 'agents' });\n    log.debug('Agent defaults reloaded');\n  }\n\n  /**\n   * Coalesces rapid saves so Telegram/Weixin do not stop/start repeatedly.\n   * The persist path schedules the channel apply; the same coalescer absorbs\n   * follow-up saves until the first flush settles.\n   */\n  private scheduleChannelPluginsAfterPersist(): void {\n    this.channelReloadPending = true;\n    if (this.channelReloadFlushPromise) return;\n    this.channelReloadFlushPromise = (async () => {\n      try {\n        while (this.channelReloadPending) {\n          this.channelReloadPending = false;\n          await this.handleChannelsReload(this.opts.getConfig());\n        }\n      } catch (err) {\n        const em = err instanceof Error ? err.message : String(err);\n        log.error({ err, errorMessage: em }, `Channel reload after persist failed: ${em}`);\n      } finally {\n        this.channelReloadFlushPromise = null;\n        if (this.channelReloadPending) {\n          this.scheduleChannelPluginsAfterPersist();\n        }\n      }\n    })();\n  }\n\n  private handleCronReload(newConfig: Config): void {\n    log.debug('Reloading cron config...');\n    this.opts.setConfig(newConfig);\n    this.opts.getCronService().updateConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'cron' });\n    log.debug('Cron config reloaded');\n  }\n\n  private handleHeartbeatReload(newConfig: Config): void {\n    log.debug('Reloading heartbeat config...');\n    this.opts.setConfig(newConfig);\n    this.opts.getHeartbeatService()?.updateConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'heartbeat' });\n    log.debug('Heartbeat config reloaded');\n  }\n\n  private handleToolsReload(newConfig: Config): void {\n    log.debug('Reloading tools config...');\n    this.opts.setConfig(newConfig);\n    this.opts.emit('config.reload', { section: 'tools' });\n    log.debug('Tools config reloaded');\n  }\n\n  private handleMcpReload(newConfig: Config): void {\n    log.debug('Reloading MCP config...');\n    this.opts.setConfig(newConfig);\n    void disposeAllSessionMcpRuntimes().catch((err) => {\n      log.warn({ err }, 'MCP runtime dispose on config reload failed');\n    });\n    this.opts.emit('config.reload', { section: 'mcp' });\n    log.debug('MCP config reloaded');\n  }\n\n  /** Dispatch config hot reload to extensions that registered `registerReload`. */\n  private async handleExtensionsReload(\n    newConfig: Config,\n    changedPaths: string[],\n  ): Promise<void> {\n    this.opts.setConfig(newConfig);\n    const loader = this.opts.getExtensionLoader();\n    loader?.setConfig(newConfig as unknown as SurfaceConfig);\n\n    if (!loader) {\n      this.opts.emit('config.reload', {\n        section: 'extensions',\n        source: 'extension-reload',\n        changedPaths,\n      });\n      return;\n    }\n\n    const registry = loader.getRegistry();\n    const matchingRegs = registry.getMatchingReloadRegistrations(changedPaths);\n\n    if (matchingRegs.length === 0) {\n      log.debug({ changedPaths }, 'No extension reload handlers matched');\n      this.opts.emit('config.reload', {\n        section: 'extensions',\n        source: 'extension-reload',\n        changedPaths,\n      });\n      return;\n    }\n\n    for (const reg of matchingRegs) {\n      const relevantPaths = changedPaths.filter(\n        (p) =>\n          reg.configPrefixes.length === 0 ||\n          reg.configPrefixes.some(\n            (prefix) => p === prefix || p.startsWith(`${prefix}.`),\n          ),\n      );\n\n      log.info(\n        { extensionId: reg.extensionId, relevantPaths },\n        'Calling extension reload handler',\n      );\n\n      try {\n        const result = await reg.handler(newConfig, relevantPaths);\n        if (result.success) {\n          log.info({ extensionId: reg.extensionId }, 'Extension reload succeeded');\n        } else {\n          log.warn(\n            { extensionId: reg.extensionId, error: result.error },\n            `Extension reload reported failure: ${result.error ?? 'unknown'}`,\n          );\n        }\n      } catch (err) {\n        const errorMessage = err instanceof Error ? err.message : String(err);\n        log.error(\n          { err, extensionId: reg.extensionId, errorMessage },\n          `Extension reload handler threw: ${errorMessage}`,\n        );\n      }\n    }\n\n    this.opts.emit('config.reload', {\n      section: 'extensions',\n      source: 'extension-reload',\n      changedPaths,\n    });\n  }\n\n  /**\n   * Persist and replace `currentConfig` with the validated file contents so\n   * runtime matches disk (PATCH merge objects can drift from Zod-normalized\n   * output).\n   */\n  private async writeConfigAndReloadFromDisk(configToWrite: Config): Promise<void> {\n    await writeConfigToDisk(configToWrite, this.opts.configPath);\n    const reloaded = loadConfig(this.opts.configPath);\n    this.opts.setConfig(reloaded);\n    if (sanitizeTunnelConfig(reloaded)) {\n      await writeConfigToDisk(reloaded, this.opts.configPath);\n    }\n    this.opts.getAgentService().applyAgentDefaultsFromConfig(reloaded);\n    await this.opts.reconcileBrowserExtensionServer();\n    // Hot-apply: reconcile managed dreaming cron jobs immediately after config persists.\n    await this.opts.getAgentService().reconcileDreamingNow().catch((err) => {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn({ err, errorMessage: em }, `Dreaming cron reconcile after save failed: ${em}`);\n    });\n    // Align watcher baseline before channel hooks run so fs `change` does not\n    // re-apply the same diff concurrently.\n    this.configReloader?.syncCurrentConfig(reloaded);\n  }\n}\n"],"mappings":"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"}

package/dist/src/gateway/service/marketplace-service.js

@@ -33,7 +33,7 @@ import { existsSync, mkdirSync, rmSync } from "node:fs";
 */
 init_paths();
 init_logger();
-const log = createLogger("GatewayMarketplace");
+const log = createLogger("Gateway:Marketplace");
 var GatewayMarketplaceService = class {
 	opts;
 	constructor(opts) {

package/dist/src/gateway/service/marketplace-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-service.js","names":[],"sources":["../../../../src/gateway/service/marketplace-service.ts"],"sourcesContent":["/**\n * GatewayMarketplaceService — install / browse / remove for the two marketplaces\n * the gateway exposes:\n *\n *   • **Skills** (`~/.xopc/skills/managed/<id>`) — zip-bundled markdown skills\n *     pulled from a provider catalog (`agent/skills/skills-marketplace.ts`).\n *   • **Extensions** (`~/.xopc/extensions/<id>`) — full extension packages from\n *     the xopc-store.\n *\n * Owns the install/uninstall composite operations:\n *   - download zip → unpack → upsert lockfile → refresh loader → emit reload\n *   - rm dir → remove from `extensions.enabled` → refresh loader → emit reload\n *\n * Local-only skill management (install-from-zip, delete, enable/disable, list)\n * lives here too so callers (commands-skills routes) depend on a single narrow\n * service instead of the full `GatewayService`.\n */\nimport { existsSync, mkdirSync, rmSync } from 'node:fs';\nimport { join } from 'node:path';\n\nimport type { Config } from '../../config/schema.js';\nimport type { AgentService } from '../../agent/service.js';\nimport type { ChannelManager } from '../../channels/manager.js';\nimport type { ExtensionLoader } from '../../extensions/loader.js';\nimport type { SkillCatalogEntry } from '../../agent/agent-manager.js';\nimport type {\n  ManagedSkillListItem,\n} from '../../agent/skills/managed-store.js';\nimport type { SkillMarkdownPreviewPayload } from '../../agent/skills/types.js';\nimport type {\n  MarketplaceCategoryOption,\n  SkillsStoreListParams,\n  UnifiedMarketplaceListResponse,\n  UnifiedMarketplacePackageDetail,\n} from '../../agent/skills/skills-marketplace.js';\nimport type { MarketplacePackageDetail } from '../../agent/skills/marketplace/adapters/store/store-api-client.js';\nimport {\n  deleteManagedSkill as deleteManagedSkillDir,\n  installSkillFromZip,\n  listManagedSkillDirs,\n} from '../../agent/skills/managed-store.js';\nimport {\n  downloadFromMarketplace,\n  getMarketplacePackageDetail,\n  getMarketplaceProviderDisplayName,\n  listMarketplaceCategories,\n  listMarketplacePackages,\n  listRegisteredProviders,\n  resolveSkillsMarketplaceProvider,\n} from '../../agent/skills/skills-marketplace.js';\nimport {\n  downloadExtensionStoreZipBuffer,\n  fetchMarketplacePackageDetail,\n  resolveExtensionZipDownloadUrl,\n  resolveExtensionsStoreBaseUrl,\n} from '../../agent/skills/marketplace/adapters/store/store-api-client.js';\nimport { installExtensionFromStoreZip, peekExtensionIdFromStoreZip } from '../../extensions/install.js';\nimport { createSkillConfigManager } from '../../agent/skills/config.js';\nimport { removeSkillsLockEntry } from '../../agent/skills/hub-lock.js';\nimport { getExtensionLockfileManager } from '../../extensions/lockfile.js';\nimport { resolveExtensionsDir, resolveStateDir } from '../../config/paths.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('GatewayMarketplace');\n\nexport interface GatewayMarketplaceServiceOptions {\n  getConfig: () => Config;\n  getAgentService: () => AgentService;\n  getExtensionLoader: () => ExtensionLoader | null;\n  getChannelManager: () => ChannelManager;\n  saveConfig: (config: Config) => Promise<{ saved: boolean; error?: string }>;\n  emit: (type: string, payload: unknown) => void;\n}\n\nexport class GatewayMarketplaceService {\n  private readonly opts: GatewayMarketplaceServiceOptions;\n\n  constructor(opts: GatewayMarketplaceServiceOptions) {\n    this.opts = opts;\n  }\n\n  // ── Local skills (managed dir) ────────────────────────────────────────\n\n  getSkillsApi(lang?: string): {\n    catalog: SkillCatalogEntry[];\n    managed: ManagedSkillListItem[];\n  } {\n    return {\n      catalog: this.opts.getAgentService().getSkillCatalog(lang),\n      managed: listManagedSkillDirs(),\n    };\n  }\n\n  getSkillMarkdownSource(skillName: string, lang?: string): SkillMarkdownPreviewPayload | null {\n    return this.opts.getAgentService().getSkillMarkdownSource(skillName, lang);\n  }\n\n  deleteSkill(skillId: string): void {\n    removeSkillsLockEntry(skillId);\n    deleteManagedSkillDir(skillId);\n    this.opts.getAgentService().refreshSkillsAfterDiskChange();\n  }\n\n  installSkillZip(\n    buffer: Buffer,\n    opts: { skillId?: string; overwrite?: boolean },\n  ): { skillId: string; path: string } {\n    const result = installSkillFromZip(buffer, opts);\n    removeSkillsLockEntry(result.skillId);\n    this.opts.getAgentService().refreshSkillsAfterDiskChange();\n    return result;\n  }\n\n  reloadSkills(): void {\n    this.opts.getAgentService().refreshSkillsAfterDiskChange();\n  }\n\n  patchSkillEnabled(skillName: string, enabled: boolean): void {\n    createSkillConfigManager(resolveStateDir()).setSkillEnabled(skillName, enabled);\n    this.opts.getAgentService().refreshSkillsAfterSkillConfigChange();\n  }\n\n  // ── Skills marketplace catalog ────────────────────────────────────────\n\n  async fetchSkillsCatalog(\n    params: SkillsStoreListParams,\n    provider?: string,\n  ): Promise<UnifiedMarketplaceListResponse> {\n    return listMarketplacePackages(this.opts.getConfig(), params, provider);\n  }\n\n  async fetchSkillsCategories(\n    provider?: string,\n  ): Promise<{ items: MarketplaceCategoryOption[] }> {\n    return listMarketplaceCategories(this.opts.getConfig(), provider);\n  }\n\n  async fetchSkillsPackageDetail(\n    packageName: string,\n    provider?: string,\n  ): Promise<UnifiedMarketplacePackageDetail> {\n    return getMarketplacePackageDetail(this.opts.getConfig(), packageName, provider);\n  }\n\n  async installSkill(opts: {\n    name: string;\n    version?: string;\n    overwrite?: boolean;\n    provider?: string;\n  }): Promise<{ skillId: string; path: string }> {\n    const { buffer, skillId } = await downloadFromMarketplace(\n      this.opts.getConfig(),\n      opts.name,\n      opts.version,\n      opts.provider,\n    );\n    return this.installSkillZip(buffer, { skillId, overwrite: opts.overwrite ?? false });\n  }\n\n  getSkillsProvider(): { provider: string; displayName: string } {\n    const provider = resolveSkillsMarketplaceProvider(this.opts.getConfig());\n    return {\n      provider,\n      displayName: getMarketplaceProviderDisplayName(provider),\n    };\n  }\n\n  /** All registered marketplace providers (built-in + extension-contributed). */\n  getSkillsProviders(): Array<{ id: string; displayName: string }> {\n    return listRegisteredProviders();\n  }\n\n  // ── Extension marketplace ─────────────────────────────────────────────\n\n  /** xopc-store extension package preview (type must be `extension`). */\n  async fetchExtensionPackageDetail(packageName: string): Promise<MarketplacePackageDetail> {\n    const base = resolveExtensionsStoreBaseUrl(this.opts.getConfig());\n    const detail = await fetchMarketplacePackageDetail(base, packageName.trim());\n    if (detail.type !== 'extension') {\n      throw new Error(\n        `Package \"${packageName}\" is not an extension (store type: ${detail.type}).`,\n      );\n    }\n    return detail;\n  }\n\n  /**\n   * Install an extension from xopc-store into `~/.xopc/extensions`, append id\n   * to `extensions.enabled`, refresh the loader, and emit `config.reload`.\n   * Returns `requiresGatewayRestart=true` when a new channel plugin would have\n   * to wire into the running gateway (channel registration cannot hot-patch).\n   */\n  async installExtension(opts: {\n    name: string;\n    version?: string;\n    overwrite?: boolean;\n  }): Promise<{ extensionId: string; version: string; requiresGatewayRestart: boolean }> {\n    const packageName = opts.name.trim();\n    if (!packageName) {\n      throw new Error('Package name is required');\n    }\n    const cfg = this.opts.getConfig();\n    const storeBase = resolveExtensionsStoreBaseUrl(cfg);\n    const targetDir = resolveExtensionsDir();\n    mkdirSync(targetDir, { recursive: true });\n\n    const { downloadUrl, version } = await resolveExtensionZipDownloadUrl(\n      storeBase,\n      packageName,\n      opts.version,\n    );\n    const buf = await downloadExtensionStoreZipBuffer(storeBase, downloadUrl);\n\n    if (opts.overwrite) {\n      const peekId = peekExtensionIdFromStoreZip(buf);\n      if (peekId && existsSync(join(targetDir, peekId))) {\n        rmSync(join(targetDir, peekId), { recursive: true, force: true });\n      }\n    }\n\n    const result = await installExtensionFromStoreZip(buf, targetDir);\n    if (!result.ok || !result.extensionId) {\n      throw new Error(result.error ?? 'Extension install failed');\n    }\n\n    const lock = getExtensionLockfileManager();\n    await lock.upsert(result.extensionId, {\n      name: result.extensionId,\n      version,\n      resolved: packageName,\n      source: 'store',\n    });\n\n    const nextConfig = this.mergeExtensionEnabledIntoConfig(cfg, result.extensionId);\n    const saved = await this.opts.saveConfig(nextConfig);\n    if (!saved.saved) {\n      throw new Error(saved.error ?? 'Failed to save config after extension install');\n    }\n\n    const channelIdsBefore = new Set(this.opts.getChannelManager().getAllPlugins().map((p) => p.id));\n    let requiresGatewayRestart = false;\n    const loader = this.opts.getExtensionLoader();\n    try {\n      if (loader) {\n        loader.invalidateManifestCache();\n        await loader.loadByActivationPlan();\n        const reg = loader.getRegistry();\n        for (const p of reg.channelPlugins) {\n          if (!channelIdsBefore.has(p.id)) {\n            requiresGatewayRestart = true;\n            break;\n          }\n        }\n      }\n    } catch (err) {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn({ err, errorMessage: em }, `Extension loader refresh after marketplace install failed: ${em}`);\n      requiresGatewayRestart = true;\n    }\n\n    this.opts.emit('config.reload', { section: 'extensions', source: 'marketplace-install' });\n    return { extensionId: result.extensionId, version, requiresGatewayRestart };\n  }\n\n  /** Remove a user-installed extension (global or per-agent dir) from disk and config. */\n  async uninstallExtension(extensionId: string): Promise<{ requiresGatewayRestart: boolean }> {\n    const id = extensionId.trim();\n    if (!id) {\n      throw new Error('extensionId is required');\n    }\n    const loader = this.opts.getExtensionLoader();\n    if (!loader) {\n      throw new Error('Extensions unavailable');\n    }\n    const discovered = loader.discoverExtensions();\n    const ext = discovered.find((e) => e.id === id);\n    if (!ext) {\n      throw new Error(`Extension not found: ${id}`);\n    }\n    if (ext.source === 'bundled') {\n      throw new Error('Built-in extensions cannot be uninstalled from the marketplace UI');\n    }\n    if (existsSync(ext.path)) {\n      rmSync(ext.path, { recursive: true, force: true });\n    }\n    await getExtensionLockfileManager().remove(id);\n\n    const nextConfig = this.mergeExtensionRemovedFromEnabledConfig(this.opts.getConfig(), id);\n    const saved = await this.opts.saveConfig(nextConfig);\n    if (!saved.saved) {\n      throw new Error(saved.error ?? 'Failed to save config after extension uninstall');\n    }\n    try {\n      loader.invalidateManifestCache();\n      await loader.loadByActivationPlan();\n    } catch (err) {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn({ err, errorMessage: em }, `Extension loader refresh after uninstall failed: ${em}`);\n    }\n    this.opts.emit('config.reload', { section: 'extensions', source: 'marketplace-uninstall' });\n    return { requiresGatewayRestart: true };\n  }\n\n  // ── Internals ─────────────────────────────────────────────────────────\n\n  private mergeExtensionEnabledIntoConfig(currentConfig: Config, extensionId: string): Config {\n    const id = extensionId.trim();\n    const prevExt = currentConfig.extensions;\n    const baseExt =\n      prevExt && typeof prevExt === 'object' && !Array.isArray(prevExt)\n        ? { ...(prevExt as Record<string, unknown>) }\n        : {};\n    const enabledRaw = baseExt.enabled;\n    const enabled = Array.isArray(enabledRaw)\n      ? [...enabledRaw.filter((x): x is string => typeof x === 'string')]\n      : [];\n    if (!enabled.includes(id)) enabled.push(id);\n\n    const disabledRaw = baseExt.disabled;\n    const nextExt: Record<string, unknown> = { ...baseExt, enabled };\n    if (Array.isArray(disabledRaw)) {\n      const next = disabledRaw.filter((x): x is string => typeof x === 'string' && x !== id);\n      if (next.length > 0) nextExt.disabled = next;\n      else delete nextExt.disabled;\n    }\n\n    return {\n      ...currentConfig,\n      extensions: nextExt,\n    } as Config;\n  }\n\n  private mergeExtensionRemovedFromEnabledConfig(currentConfig: Config, extensionId: string): Config {\n    const id = extensionId.trim();\n    const prevExt = currentConfig.extensions;\n    const baseExt =\n      prevExt && typeof prevExt === 'object' && !Array.isArray(prevExt)\n        ? { ...(prevExt as Record<string, unknown>) }\n        : {};\n    const enabledRaw = baseExt.enabled;\n    const enabled = Array.isArray(enabledRaw)\n      ? enabledRaw.filter((x): x is string => typeof x === 'string' && x !== id)\n      : [];\n    return {\n      ...currentConfig,\n      extensions: { ...baseExt, enabled },\n    } as Config;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"marketplace-service.js","names":[],"sources":["../../../../src/gateway/service/marketplace-service.ts"],"sourcesContent":["/**\n * GatewayMarketplaceService — install / browse / remove for the two marketplaces\n * the gateway exposes:\n *\n *   • **Skills** (`~/.xopc/skills/managed/<id>`) — zip-bundled markdown skills\n *     pulled from a provider catalog (`agent/skills/skills-marketplace.ts`).\n *   • **Extensions** (`~/.xopc/extensions/<id>`) — full extension packages from\n *     the xopc-store.\n *\n * Owns the install/uninstall composite operations:\n *   - download zip → unpack → upsert lockfile → refresh loader → emit reload\n *   - rm dir → remove from `extensions.enabled` → refresh loader → emit reload\n *\n * Local-only skill management (install-from-zip, delete, enable/disable, list)\n * lives here too so callers (commands-skills routes) depend on a single narrow\n * service instead of the full `GatewayService`.\n */\nimport { existsSync, mkdirSync, rmSync } from 'node:fs';\nimport { join } from 'node:path';\n\nimport type { Config } from '../../config/schema.js';\nimport type { AgentService } from '../../agent/service.js';\nimport type { ChannelManager } from '../../channels/manager.js';\nimport type { ExtensionLoader } from '../../extensions/loader.js';\nimport type { SkillCatalogEntry } from '../../agent/agent-manager.js';\nimport type {\n  ManagedSkillListItem,\n} from '../../agent/skills/managed-store.js';\nimport type { SkillMarkdownPreviewPayload } from '../../agent/skills/types.js';\nimport type {\n  MarketplaceCategoryOption,\n  SkillsStoreListParams,\n  UnifiedMarketplaceListResponse,\n  UnifiedMarketplacePackageDetail,\n} from '../../agent/skills/skills-marketplace.js';\nimport type { MarketplacePackageDetail } from '../../agent/skills/marketplace/adapters/store/store-api-client.js';\nimport {\n  deleteManagedSkill as deleteManagedSkillDir,\n  installSkillFromZip,\n  listManagedSkillDirs,\n} from '../../agent/skills/managed-store.js';\nimport {\n  downloadFromMarketplace,\n  getMarketplacePackageDetail,\n  getMarketplaceProviderDisplayName,\n  listMarketplaceCategories,\n  listMarketplacePackages,\n  listRegisteredProviders,\n  resolveSkillsMarketplaceProvider,\n} from '../../agent/skills/skills-marketplace.js';\nimport {\n  downloadExtensionStoreZipBuffer,\n  fetchMarketplacePackageDetail,\n  resolveExtensionZipDownloadUrl,\n  resolveExtensionsStoreBaseUrl,\n} from '../../agent/skills/marketplace/adapters/store/store-api-client.js';\nimport { installExtensionFromStoreZip, peekExtensionIdFromStoreZip } from '../../extensions/install.js';\nimport { createSkillConfigManager } from '../../agent/skills/config.js';\nimport { removeSkillsLockEntry } from '../../agent/skills/hub-lock.js';\nimport { getExtensionLockfileManager } from '../../extensions/lockfile.js';\nimport { resolveExtensionsDir, resolveStateDir } from '../../config/paths.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('Gateway:Marketplace');\n\nexport interface GatewayMarketplaceServiceOptions {\n  getConfig: () => Config;\n  getAgentService: () => AgentService;\n  getExtensionLoader: () => ExtensionLoader | null;\n  getChannelManager: () => ChannelManager;\n  saveConfig: (config: Config) => Promise<{ saved: boolean; error?: string }>;\n  emit: (type: string, payload: unknown) => void;\n}\n\nexport class GatewayMarketplaceService {\n  private readonly opts: GatewayMarketplaceServiceOptions;\n\n  constructor(opts: GatewayMarketplaceServiceOptions) {\n    this.opts = opts;\n  }\n\n  // ── Local skills (managed dir) ────────────────────────────────────────\n\n  getSkillsApi(lang?: string): {\n    catalog: SkillCatalogEntry[];\n    managed: ManagedSkillListItem[];\n  } {\n    return {\n      catalog: this.opts.getAgentService().getSkillCatalog(lang),\n      managed: listManagedSkillDirs(),\n    };\n  }\n\n  getSkillMarkdownSource(skillName: string, lang?: string): SkillMarkdownPreviewPayload | null {\n    return this.opts.getAgentService().getSkillMarkdownSource(skillName, lang);\n  }\n\n  deleteSkill(skillId: string): void {\n    removeSkillsLockEntry(skillId);\n    deleteManagedSkillDir(skillId);\n    this.opts.getAgentService().refreshSkillsAfterDiskChange();\n  }\n\n  installSkillZip(\n    buffer: Buffer,\n    opts: { skillId?: string; overwrite?: boolean },\n  ): { skillId: string; path: string } {\n    const result = installSkillFromZip(buffer, opts);\n    removeSkillsLockEntry(result.skillId);\n    this.opts.getAgentService().refreshSkillsAfterDiskChange();\n    return result;\n  }\n\n  reloadSkills(): void {\n    this.opts.getAgentService().refreshSkillsAfterDiskChange();\n  }\n\n  patchSkillEnabled(skillName: string, enabled: boolean): void {\n    createSkillConfigManager(resolveStateDir()).setSkillEnabled(skillName, enabled);\n    this.opts.getAgentService().refreshSkillsAfterSkillConfigChange();\n  }\n\n  // ── Skills marketplace catalog ────────────────────────────────────────\n\n  async fetchSkillsCatalog(\n    params: SkillsStoreListParams,\n    provider?: string,\n  ): Promise<UnifiedMarketplaceListResponse> {\n    return listMarketplacePackages(this.opts.getConfig(), params, provider);\n  }\n\n  async fetchSkillsCategories(\n    provider?: string,\n  ): Promise<{ items: MarketplaceCategoryOption[] }> {\n    return listMarketplaceCategories(this.opts.getConfig(), provider);\n  }\n\n  async fetchSkillsPackageDetail(\n    packageName: string,\n    provider?: string,\n  ): Promise<UnifiedMarketplacePackageDetail> {\n    return getMarketplacePackageDetail(this.opts.getConfig(), packageName, provider);\n  }\n\n  async installSkill(opts: {\n    name: string;\n    version?: string;\n    overwrite?: boolean;\n    provider?: string;\n  }): Promise<{ skillId: string; path: string }> {\n    const { buffer, skillId } = await downloadFromMarketplace(\n      this.opts.getConfig(),\n      opts.name,\n      opts.version,\n      opts.provider,\n    );\n    return this.installSkillZip(buffer, { skillId, overwrite: opts.overwrite ?? false });\n  }\n\n  getSkillsProvider(): { provider: string; displayName: string } {\n    const provider = resolveSkillsMarketplaceProvider(this.opts.getConfig());\n    return {\n      provider,\n      displayName: getMarketplaceProviderDisplayName(provider),\n    };\n  }\n\n  /** All registered marketplace providers (built-in + extension-contributed). */\n  getSkillsProviders(): Array<{ id: string; displayName: string }> {\n    return listRegisteredProviders();\n  }\n\n  // ── Extension marketplace ─────────────────────────────────────────────\n\n  /** xopc-store extension package preview (type must be `extension`). */\n  async fetchExtensionPackageDetail(packageName: string): Promise<MarketplacePackageDetail> {\n    const base = resolveExtensionsStoreBaseUrl(this.opts.getConfig());\n    const detail = await fetchMarketplacePackageDetail(base, packageName.trim());\n    if (detail.type !== 'extension') {\n      throw new Error(\n        `Package \"${packageName}\" is not an extension (store type: ${detail.type}).`,\n      );\n    }\n    return detail;\n  }\n\n  /**\n   * Install an extension from xopc-store into `~/.xopc/extensions`, append id\n   * to `extensions.enabled`, refresh the loader, and emit `config.reload`.\n   * Returns `requiresGatewayRestart=true` when a new channel plugin would have\n   * to wire into the running gateway (channel registration cannot hot-patch).\n   */\n  async installExtension(opts: {\n    name: string;\n    version?: string;\n    overwrite?: boolean;\n  }): Promise<{ extensionId: string; version: string; requiresGatewayRestart: boolean }> {\n    const packageName = opts.name.trim();\n    if (!packageName) {\n      throw new Error('Package name is required');\n    }\n    const cfg = this.opts.getConfig();\n    const storeBase = resolveExtensionsStoreBaseUrl(cfg);\n    const targetDir = resolveExtensionsDir();\n    mkdirSync(targetDir, { recursive: true });\n\n    const { downloadUrl, version } = await resolveExtensionZipDownloadUrl(\n      storeBase,\n      packageName,\n      opts.version,\n    );\n    const buf = await downloadExtensionStoreZipBuffer(storeBase, downloadUrl);\n\n    if (opts.overwrite) {\n      const peekId = peekExtensionIdFromStoreZip(buf);\n      if (peekId && existsSync(join(targetDir, peekId))) {\n        rmSync(join(targetDir, peekId), { recursive: true, force: true });\n      }\n    }\n\n    const result = await installExtensionFromStoreZip(buf, targetDir);\n    if (!result.ok || !result.extensionId) {\n      throw new Error(result.error ?? 'Extension install failed');\n    }\n\n    const lock = getExtensionLockfileManager();\n    await lock.upsert(result.extensionId, {\n      name: result.extensionId,\n      version,\n      resolved: packageName,\n      source: 'store',\n    });\n\n    const nextConfig = this.mergeExtensionEnabledIntoConfig(cfg, result.extensionId);\n    const saved = await this.opts.saveConfig(nextConfig);\n    if (!saved.saved) {\n      throw new Error(saved.error ?? 'Failed to save config after extension install');\n    }\n\n    const channelIdsBefore = new Set(this.opts.getChannelManager().getAllPlugins().map((p) => p.id));\n    let requiresGatewayRestart = false;\n    const loader = this.opts.getExtensionLoader();\n    try {\n      if (loader) {\n        loader.invalidateManifestCache();\n        await loader.loadByActivationPlan();\n        const reg = loader.getRegistry();\n        for (const p of reg.channelPlugins) {\n          if (!channelIdsBefore.has(p.id)) {\n            requiresGatewayRestart = true;\n            break;\n          }\n        }\n      }\n    } catch (err) {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn({ err, errorMessage: em }, `Extension loader refresh after marketplace install failed: ${em}`);\n      requiresGatewayRestart = true;\n    }\n\n    this.opts.emit('config.reload', { section: 'extensions', source: 'marketplace-install' });\n    return { extensionId: result.extensionId, version, requiresGatewayRestart };\n  }\n\n  /** Remove a user-installed extension (global or per-agent dir) from disk and config. */\n  async uninstallExtension(extensionId: string): Promise<{ requiresGatewayRestart: boolean }> {\n    const id = extensionId.trim();\n    if (!id) {\n      throw new Error('extensionId is required');\n    }\n    const loader = this.opts.getExtensionLoader();\n    if (!loader) {\n      throw new Error('Extensions unavailable');\n    }\n    const discovered = loader.discoverExtensions();\n    const ext = discovered.find((e) => e.id === id);\n    if (!ext) {\n      throw new Error(`Extension not found: ${id}`);\n    }\n    if (ext.source === 'bundled') {\n      throw new Error('Built-in extensions cannot be uninstalled from the marketplace UI');\n    }\n    if (existsSync(ext.path)) {\n      rmSync(ext.path, { recursive: true, force: true });\n    }\n    await getExtensionLockfileManager().remove(id);\n\n    const nextConfig = this.mergeExtensionRemovedFromEnabledConfig(this.opts.getConfig(), id);\n    const saved = await this.opts.saveConfig(nextConfig);\n    if (!saved.saved) {\n      throw new Error(saved.error ?? 'Failed to save config after extension uninstall');\n    }\n    try {\n      loader.invalidateManifestCache();\n      await loader.loadByActivationPlan();\n    } catch (err) {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn({ err, errorMessage: em }, `Extension loader refresh after uninstall failed: ${em}`);\n    }\n    this.opts.emit('config.reload', { section: 'extensions', source: 'marketplace-uninstall' });\n    return { requiresGatewayRestart: true };\n  }\n\n  // ── Internals ─────────────────────────────────────────────────────────\n\n  private mergeExtensionEnabledIntoConfig(currentConfig: Config, extensionId: string): Config {\n    const id = extensionId.trim();\n    const prevExt = currentConfig.extensions;\n    const baseExt =\n      prevExt && typeof prevExt === 'object' && !Array.isArray(prevExt)\n        ? { ...(prevExt as Record<string, unknown>) }\n        : {};\n    const enabledRaw = baseExt.enabled;\n    const enabled = Array.isArray(enabledRaw)\n      ? [...enabledRaw.filter((x): x is string => typeof x === 'string')]\n      : [];\n    if (!enabled.includes(id)) enabled.push(id);\n\n    const disabledRaw = baseExt.disabled;\n    const nextExt: Record<string, unknown> = { ...baseExt, enabled };\n    if (Array.isArray(disabledRaw)) {\n      const next = disabledRaw.filter((x): x is string => typeof x === 'string' && x !== id);\n      if (next.length > 0) nextExt.disabled = next;\n      else delete nextExt.disabled;\n    }\n\n    return {\n      ...currentConfig,\n      extensions: nextExt,\n    } as Config;\n  }\n\n  private mergeExtensionRemovedFromEnabledConfig(currentConfig: Config, extensionId: string): Config {\n    const id = extensionId.trim();\n    const prevExt = currentConfig.extensions;\n    const baseExt =\n      prevExt && typeof prevExt === 'object' && !Array.isArray(prevExt)\n        ? { ...(prevExt as Record<string, unknown>) }\n        : {};\n    const enabledRaw = baseExt.enabled;\n    const enabled = Array.isArray(enabledRaw)\n      ? enabledRaw.filter((x): x is string => typeof x === 'string' && x !== id)\n      : [];\n    return {\n      ...currentConfig,\n      extensions: { ...baseExt, enabled },\n    } as Config;\n  }\n}\n"],"mappings":"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"}

package/dist/src/gateway/service/run-gateway-agent.js

@@ -1,4 +1,4 @@
-import { inboundCorrelationMetadataFromAsyncLogContext } from "../../utils/logger/context.js";
+import { inboundCorrelationMetadataFromAsyncLogContext, updateAsyncLogContext } from "../../utils/logger/context.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { formatAgentRunErrorForClient } from "../../agent/client-error-format.js";
@@ -9,7 +9,7 @@ import { resolveWebchatSessionKey } from "../resolve-webchat-session-key.js";
 import crypto from "crypto";
 //#region src/gateway/service/run-gateway-agent.ts
 init_logger();
-const log = createLogger("GatewayService");
+const log = createLogger("Gateway:Service");
 /**
 * @param runOptions.signal — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.
 */
@@ -56,6 +56,7 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 				};
 			}
 			const sessionKey = webchatSessionKey;
+			updateAsyncLogContext({ sessionId: sessionKey });
 			const timezone = agentService.resolveUserTimezoneForSession(sessionKey);
 			const stampedMessage = message.trimStart().startsWith("/") ? message : prependEnvelopeTimestamp(message, timezone);
 			const prepared = await agentService.prepareInboundAttachments(sessionKey, cappedAttachments);
@@ -92,8 +93,16 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 					summary: mergedSignal.aborted ? "Interrupted" : "Message processed successfully"
 				};
 			} catch (error) {
-				log.error({ error }, "Agent processing failed");
-				streamError = error instanceof Error ? error.message : "Unknown error";
+				const em = error instanceof Error ? error.message : String(error);
+				log.error({
+					err: error,
+					errorMessage: em,
+					phase: "gateway.agent_run",
+					sessionKey,
+					runId,
+					channel: "webchat"
+				}, `Agent processing failed: ${em}`);
+				streamError = em;
 				const errorEvent = {
 					type: "error",
 					content: formatAgentRunErrorForClient(streamError)
@@ -157,7 +166,15 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 			summary: "Message processed"
 		};
 	} catch (error) {
-		log.error({ error }, "Agent run failed");
+		const em = error instanceof Error ? error.message : String(error);
+		log.error({
+			err: error,
+			errorMessage: em,
+			phase: "gateway.agent_run",
+			runId,
+			channel,
+			chatId
+		}, `Agent run failed: ${em}`);
 		throw error;
 	}
 }