@xopcai/xopc 0.0.115 → 0.0.117

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

@@ -98,17 +98,17 @@ var GatewayAgentRunner = class {
 	submitClarifyResponse(requestId, answer) {
 		return this.clarifyBridge.handleResponse(requestId, answer);
 	}
-	/** Hermes-style: after HTTP sets a goal, enqueue the goal text as the next user turn. */
-	enqueueWebchatPersistentGoalKickoff(sessionKey, goalText) {
-		queueMicrotask(() => {
-			this.drainScheduledWebchatContinuation(sessionKey, goalText);
-		});
-	}
 	/** Same execution path as scheduled continuation, but lets callers observe failures. */
-	async runScheduledWebchatContinuation(sessionKey, message) {
-		const gen = this.runAgent(message, "webchat", sessionKey, void 0, void 0, { clientCreatedAtMs: Date.now() });
+	async runScheduledWebchatTurn(sessionKey, userTurn) {
+		const gen = this.runAgent(userTurn.text, "webchat", sessionKey, userTurn.attachments, void 0, { clientCreatedAtMs: userTurn.clientCreatedAtMs ?? Date.now() });
 		for await (const _ of gen);
 	}
+	async runScheduledWebchatContinuation(sessionKey, message) {
+		await this.runScheduledWebchatTurn(sessionKey, {
+			text: message,
+			clientCreatedAtMs: Date.now()
+		});
+	}
 	/** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */
 	async drainScheduledWebchatContinuation(sessionKey, message) {
 		try {

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 { 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; [key: string]: unknown },\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 unknown as { type: string; [key: string]: unknown };\n      step = await iter.next();\n    }\n    return step.value;\n  }\n\n  /** Abort an in-flight webchat agent run (matches `runId` from SSE `run_start`). */\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). The caller must pass the session key.\n   */\n  async steerWebchatAgent(\n    sessionKey: 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    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  /** Same execution path as scheduled continuation, but lets callers observe failures. */\n  async runScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void> {\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  }\n\n  /** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */\n  async drainScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void> {\n    try {\n      await this.runScheduledWebchatContinuation(sessionKey, message);\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  async 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 metadata = await this.opts.sessionIndex.getSessionMetadata(sessionKey).catch(() => null);\n    const routing = metadata?.routing;\n    const deliver =\n      routing?.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 metadata = await this.opts.sessionIndex.getSessionMetadata(ctx.sessionKey).catch(() => null);\n    const routing = metadata?.routing;\n    if (!routing || routing.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: routing.peerId,\n      content: body,\n      metadata: {\n        accountId: routing.accountId,\n        ...(routing.threadId ? { threadId: routing.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 *   - `runScheduledWebchatTurn(sk, userTurn)` — background webchat user turn\n *   - `drainScheduledWebchatContinuation(sk, msg)` — background text 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 { runGatewayAgent } from './run-gateway-agent.js';\nimport type { UserTurnAttachment, UserTurnInput } from '../user-turn-input.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?: UserTurnAttachment[],\n    thinking?: string,\n    runOptions?: { signal?: AbortSignal; clientCreatedAtMs?: number },\n  ): AsyncGenerator<\n    { type: string; [key: string]: unknown },\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 unknown as { type: string; [key: string]: unknown };\n      step = await iter.next();\n    }\n    return step.value;\n  }\n\n  /** Abort an in-flight webchat agent run (matches `runId` from SSE `run_start`). */\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). The caller must pass the session key.\n   */\n  async steerWebchatAgent(\n    sessionKey: 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    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  /** Same execution path as scheduled continuation, but lets callers observe failures. */\n  async runScheduledWebchatTurn(sessionKey: string, userTurn: UserTurnInput): Promise<void> {\n    const gen = this.runAgent(userTurn.text, 'webchat', sessionKey, userTurn.attachments, undefined, {\n      clientCreatedAtMs: userTurn.clientCreatedAtMs ?? Date.now(),\n    });\n    for await (const _ of gen) {\n      // Relay + `agent.stream` broadcast; UI attaches via pending runId + resume.\n    }\n  }\n\n  async runScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void> {\n    await this.runScheduledWebchatTurn(sessionKey, { text: message, clientCreatedAtMs: Date.now() });\n  }\n\n  /** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */\n  async drainScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void> {\n    try {\n      await this.runScheduledWebchatContinuation(sessionKey, message);\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  async 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 metadata = await this.opts.sessionIndex.getSessionMetadata(sessionKey).catch(() => null);\n    const routing = metadata?.routing;\n    const deliver =\n      routing?.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 metadata = await this.opts.sessionIndex.getSessionMetadata(ctx.sessionKey).catch(() => null);\n    const routing = metadata?.routing;\n    if (!routing || routing.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: routing.peerId,\n      content: body,\n      metadata: {\n        accountId: routing.accountId,\n        ...(routing.threadId ? { threadId: routing.threadId } : {}),\n      },\n      buttons: buttonRows,\n    });\n  }\n}\n"],"mappings":"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"}

package/dist/src/gateway/service/run-gateway-agent.d.ts

@@ -4,6 +4,7 @@ import type { MessageBus } from '../../infra/bus/index.js';
 import type { SessionIndex } from '../../session/index.js';
 import type { ChatStreamEvent } from '../chat-stream/protocol.js';
 import type { AgentRunRelay } from '../agent-run-relay.js';
+import type { UserTurnAttachment } from '../user-turn-input.js';
 export type RunGatewayAgentYield = ChatStreamEvent;
 export type RunGatewayAgentDeps = {
     config: Config;
@@ -18,16 +19,7 @@ export type RunGatewayAgentDeps = {
 /**
  * @param runOptions.signal — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.
  */
-export declare function runGatewayAgent(deps: RunGatewayAgentDeps, message: string, channel: string, chatId: string, attachments?: Array<{
-    type: string;
-    mimeType?: string;
-    data?: string;
-    uri?: string;
-    name?: string;
-    size?: number;
-    workspaceRelativePath?: string;
-    durationSeconds?: number;
-}>, thinking?: string, runOptions?: {
+export declare function runGatewayAgent(deps: RunGatewayAgentDeps, message: string, channel: string, chatId: string, attachments?: UserTurnAttachment[], thinking?: string, runOptions?: {
     signal?: AbortSignal;
     clientCreatedAtMs?: number;
 }): AsyncGenerator<RunGatewayAgentYield, {

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

@@ -1 +1 @@
-{"version":3,"file":"run-gateway-agent.js","names":[],"sources":["../../../../src/gateway/service/run-gateway-agent.ts"],"sourcesContent":["import crypto from 'crypto';\n\nimport type { AgentService } from '../../agent/service.js';\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport { prependEnvelopeTimestamp } from '../../channels/envelope-timestamp.js';\nimport { resolveWebchatSessionKey } from '../resolve-webchat-session-key.js';\nimport type { SessionIndex } from '../../session/index.js';\nimport {\n  createLogger,\n  inboundCorrelationMetadataFromAsyncLogContext,\n  updateAsyncLogContext,\n} from '../../utils/logger.js';\nimport { shouldSkipWebchatInboundByAbortCutoff } from '../../session/abort-cutoff.js';\n\nimport { formatAgentRunErrorForClient } from '../../agent/client-error-format.js';\n\nimport { ChatStreamMapper } from '../chat-stream/mapper.js';\nimport type { ChatStreamEvent } from '../chat-stream/protocol.js';\nimport type { AgentRunRelay } from '../agent-run-relay.js';\nimport { MAX_CHAT_ATTACHMENTS } from '../chat-limits.js';\nconst log = createLogger('Gateway:Service');\n\nexport type RunGatewayAgentYield = ChatStreamEvent;\n\nexport type RunGatewayAgentDeps = {\n  config: Config;\n  agentService: AgentService;\n  bus: MessageBus;\n  runRelay: AgentRunRelay;\n  runAbortControllers: Map<string, AbortController>;\n  activeWebchatRunBySession: Map<string, string>;\n  sessionIndex: SessionIndex;\n  emit: (type: string, payload: unknown) => void;\n};\n\n/**\n * @param runOptions.signal — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.\n */\nexport async function *runGatewayAgent(\n  deps: RunGatewayAgentDeps,\n  message: string,\n  channel: string,\n  chatId: string,\n  attachments?: Array<{\n    type: string;\n    mimeType?: string;\n    data?: string;\n    uri?: string;\n    name?: string;\n    size?: number;\n    workspaceRelativePath?: string;\n    durationSeconds?: number;\n  }>,\n  thinking?: string,\n  runOptions?: { signal?: AbortSignal; clientCreatedAtMs?: number },\n): AsyncGenerator<RunGatewayAgentYield, { status: string; summary: string }, unknown> {\n  const cappedAttachments =\n    attachments && attachments.length > MAX_CHAT_ATTACHMENTS\n      ? attachments.slice(0, MAX_CHAT_ATTACHMENTS)\n      : attachments;\n  if (attachments && cappedAttachments && attachments.length > cappedAttachments.length) {\n    log.debug(\n      { dropped: attachments.length - cappedAttachments.length, max: MAX_CHAT_ATTACHMENTS },\n      'Attachments capped for webchat',\n    );\n  }\n\n  const runId = crypto.randomUUID();\n  const {\n    agentService,\n    bus,\n    runRelay,\n    runAbortControllers,\n    activeWebchatRunBySession,\n    sessionIndex: sessionIndexFromDeps,\n    emit,\n  } = deps;\n  const sessionIndex = sessionIndexFromDeps;\n\n  let webchatSessionKey: string | undefined;\n  let webchatSessionId: string | undefined;\n  let webchatStaleSkip = false;\n  if (channel === 'webchat') {\n    const resolved = resolveWebchatSessionKey({ sessionKey: chatId });\n    if (resolved.ok === false) {\n      throw new Error(resolved.error);\n    }\n    webchatSessionKey = resolved.sessionKey;\n    const meta = await sessionIndex.getSessionMetadata(webchatSessionKey);\n    if (!meta) {\n      throw new Error('Session not found; create sessions via POST /api/sessions');\n    }\n    webchatSessionId = meta?.sessionId;\n    webchatStaleSkip = shouldSkipWebchatInboundByAbortCutoff(meta, runOptions?.clientCreatedAtMs);\n    if (!webchatStaleSkip && meta?.abortCutoffTimestamp !== undefined) {\n      await sessionIndex\n        .updateSessionMetadata(webchatSessionKey, { abortCutoffTimestamp: undefined })\n        .catch(() => {});\n    }\n    runRelay.ensureRun(runId, webchatSessionKey);\n    runAbortControllers.set(runId, new AbortController());\n  }\n\n  const streamSessionKey = webchatSessionKey ?? chatId;\n  const mapper = new ChatStreamMapper({ runId, sessionKey: streamSessionKey, channel });\n  const publishStreamEvent = (event: ChatStreamEvent): ChatStreamEvent =>\n    channel === 'webchat'\n      ? ((runRelay.publish(runId, event as unknown as import('../agent-run-relay.js').RelayEvent) as unknown as ChatStreamEvent | undefined) ?? event)\n      : event;\n  const emitAndYield = function *(events: ChatStreamEvent[]): Generator<ChatStreamEvent> {\n    for (const event of events) {\n      const relayedEvent = publishStreamEvent(event);\n      if (channel === 'webchat') emit('agent.stream', { sessionKey: streamSessionKey, event: relayedEvent });\n      yield relayedEvent;\n    }\n  };\n\n  yield* emitAndYield(mapper.start());\n\n  try {\n    if (channel === 'webchat' && webchatSessionKey) {\n      if (webchatStaleSkip) {\n        yield* emitAndYield(mapper.end('cancelled', 'Stale inbound after abort (clientCreatedAtMs before cutoff)'));\n        runRelay.complete(runId);\n        runAbortControllers.delete(runId);\n        return {\n          status: 'skipped',\n          summary: 'Stale inbound after abort (clientCreatedAtMs before cutoff)',\n        };\n      }\n\n      const sessionKey = webchatSessionKey;\n      updateAsyncLogContext({\n        sessionKey,\n        ...(webchatSessionId ? { sessionId: webchatSessionId } : {}),\n      });\n\n      const timezone = agentService.resolveUserTimezoneForSession(sessionKey);\n      const stampedMessage = message.trimStart().startsWith('/')\n        ? message\n        : prependEnvelopeTimestamp(message, timezone);\n      const prepared = await agentService.prepareInboundAttachments(sessionKey, cappedAttachments);\n\n      const runAbort = runAbortControllers.get(runId);\n      if (!runAbort) {\n        throw new Error('run abort controller missing for webchat');\n      }\n      const mergedSignal = runOptions?.signal\n        ? AbortSignal.any([runOptions.signal, runAbort.signal])\n        : runAbort.signal;\n\n      agentService.beginInboundTurn(sessionKey);\n      activeWebchatRunBySession.set(sessionKey, runId);\n      let streamError: string | undefined;\n      try {\n        const eventStream = agentService.turnDispatcher.processDirectStreaming(\n          stampedMessage,\n          sessionKey,\n          prepared,\n          thinking,\n          { signal: mergedSignal, runId },\n        );\n\n        for await (const event of eventStream) {\n          yield* emitAndYield(mapper.map(event));\n        }\n\n        const endStatus = mergedSignal.aborted ? 'cancelled' : 'success';\n        const endSummary = mergedSignal.aborted ? 'Interrupted' : 'Message processed successfully';\n        yield* emitAndYield(mapper.end(endStatus, endSummary));\n        runRelay.complete(runId);\n        try {\n          const metaAfter = await sessionIndex.getSessionMetadata(sessionKey);\n          if (metaAfter?.name) {\n            emit('session.updated', { key: sessionKey, name: metaAfter.name });\n          }\n        } catch {\n          /* ignore */\n        }\n        return {\n          status: mergedSignal.aborted ? 'aborted' : 'ok',\n          summary: mergedSignal.aborted ? 'Interrupted' : 'Message processed successfully',\n        };\n      } catch (error) {\n        const em = error instanceof Error ? error.message : String(error);\n        log.error(\n          {\n            err: error,\n            errorMessage: em,\n            phase: 'gateway.agent_run',\n            sessionKey,\n            runId,\n            channel: 'webchat',\n          },\n          `Agent processing failed: ${em}`,\n        );\n        streamError = em;\n        const errorContent = formatAgentRunErrorForClient(streamError);\n        yield* emitAndYield(mapper.error(errorContent));\n        yield* emitAndYield(mapper.end('error', streamError));\n        runRelay.complete(runId);\n        return { status: 'error', summary: streamError };\n      } finally {\n        activeWebchatRunBySession.delete(sessionKey);\n        runAbortControllers.delete(runId);\n        const assistantPlainText = agentService.getLastAssistantPlainText(sessionKey);\n        const streamOutcome = agentService.persistentGoals.takeStreamOutcome(sessionKey);\n        try {\n          await agentService.outboundCoordinator.emitSessionTurnComplete({\n            sessionKey,\n            channel: 'webchat',\n            chatId: sessionKey,\n            inboundUserText: message,\n            assistantPlainText,\n            aborted: mergedSignal.aborted,\n            ...(streamError !== undefined ? { streamError } : {}),\n            skipPersistentGoalPostTurn: streamOutcome?.skipPersistentGoalPostTurn ?? false,\n            outboundMetadata: {},\n          });\n        } catch (goalErr) {\n          log.warn(\n            { err: goalErr, sessionKey },\n            `Session turn complete failed: ${goalErr instanceof Error ? goalErr.message : String(goalErr)}`,\n          );\n        }\n        agentService.endInboundTurn(sessionKey);\n      }\n    }\n\n    const correlationMeta = inboundCorrelationMetadataFromAsyncLogContext();\n    await bus.publishInbound({\n      channel,\n      sender_id: 'gateway',\n      chat_id: chatId,\n      content: message,\n      ...(correlationMeta ? { metadata: correlationMeta } : {}),\n    });\n\n    const messageId = `msg_${runId.replace(/[^a-zA-Z0-9_-]/g, '_')}_1`;\n    yield* emitAndYield([\n      {\n        type: 'assistant_message_start',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId },\n      },\n      {\n        type: 'assistant_delta',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId, delta: 'Processing...\\n' },\n      },\n    ]);\n    await new Promise((resolve) => setTimeout(resolve, 1000));\n    yield* emitAndYield([\n      {\n        type: 'assistant_delta',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId, delta: 'Done\\n' },\n      },\n      {\n        type: 'assistant_message_end',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId },\n      },\n    ]);\n    yield* emitAndYield(mapper.end('success', 'Message processed'));\n    return { status: 'ok', summary: 'Message processed' };\n  } catch (error) {\n    const em = error instanceof Error ? error.message : String(error);\n    log.error(\n      {\n        err: error,\n        errorMessage: em,\n        phase: 'gateway.agent_run',\n        runId,\n        channel,\n        chatId,\n      },\n      `Agent run failed: ${em}`,\n    );\n    throw error;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"run-gateway-agent.js","names":[],"sources":["../../../../src/gateway/service/run-gateway-agent.ts"],"sourcesContent":["import crypto from 'crypto';\n\nimport type { AgentService } from '../../agent/service.js';\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport { prependEnvelopeTimestamp } from '../../channels/envelope-timestamp.js';\nimport { resolveWebchatSessionKey } from '../resolve-webchat-session-key.js';\nimport type { SessionIndex } from '../../session/index.js';\nimport {\n  createLogger,\n  inboundCorrelationMetadataFromAsyncLogContext,\n  updateAsyncLogContext,\n} from '../../utils/logger.js';\nimport { shouldSkipWebchatInboundByAbortCutoff } from '../../session/abort-cutoff.js';\n\nimport { formatAgentRunErrorForClient } from '../../agent/client-error-format.js';\n\nimport { ChatStreamMapper } from '../chat-stream/mapper.js';\nimport type { ChatStreamEvent } from '../chat-stream/protocol.js';\nimport type { AgentRunRelay } from '../agent-run-relay.js';\nimport { MAX_CHAT_ATTACHMENTS } from '../chat-limits.js';\nimport type { UserTurnAttachment } from '../user-turn-input.js';\nconst log = createLogger('Gateway:Service');\n\nexport type RunGatewayAgentYield = ChatStreamEvent;\n\nexport type RunGatewayAgentDeps = {\n  config: Config;\n  agentService: AgentService;\n  bus: MessageBus;\n  runRelay: AgentRunRelay;\n  runAbortControllers: Map<string, AbortController>;\n  activeWebchatRunBySession: Map<string, string>;\n  sessionIndex: SessionIndex;\n  emit: (type: string, payload: unknown) => void;\n};\n\n/**\n * @param runOptions.signal — When set (e.g. client disconnect), aborts in-flight generation and persists partial output.\n */\nexport async function *runGatewayAgent(\n  deps: RunGatewayAgentDeps,\n  message: string,\n  channel: string,\n  chatId: string,\n  attachments?: UserTurnAttachment[],\n  thinking?: string,\n  runOptions?: { signal?: AbortSignal; clientCreatedAtMs?: number },\n): AsyncGenerator<RunGatewayAgentYield, { status: string; summary: string }, unknown> {\n  const cappedAttachments =\n    attachments && attachments.length > MAX_CHAT_ATTACHMENTS\n      ? attachments.slice(0, MAX_CHAT_ATTACHMENTS)\n      : attachments;\n  if (attachments && cappedAttachments && attachments.length > cappedAttachments.length) {\n    log.debug(\n      { dropped: attachments.length - cappedAttachments.length, max: MAX_CHAT_ATTACHMENTS },\n      'Attachments capped for webchat',\n    );\n  }\n\n  const runId = crypto.randomUUID();\n  const {\n    agentService,\n    bus,\n    runRelay,\n    runAbortControllers,\n    activeWebchatRunBySession,\n    sessionIndex: sessionIndexFromDeps,\n    emit,\n  } = deps;\n  const sessionIndex = sessionIndexFromDeps;\n\n  let webchatSessionKey: string | undefined;\n  let webchatSessionId: string | undefined;\n  let webchatStaleSkip = false;\n  if (channel === 'webchat') {\n    const resolved = resolveWebchatSessionKey({ sessionKey: chatId });\n    if (resolved.ok === false) {\n      throw new Error(resolved.error);\n    }\n    webchatSessionKey = resolved.sessionKey;\n    const meta = await sessionIndex.getSessionMetadata(webchatSessionKey);\n    if (!meta) {\n      throw new Error('Session not found; create sessions via POST /api/sessions');\n    }\n    webchatSessionId = meta?.sessionId;\n    webchatStaleSkip = shouldSkipWebchatInboundByAbortCutoff(meta, runOptions?.clientCreatedAtMs);\n    if (!webchatStaleSkip && meta?.abortCutoffTimestamp !== undefined) {\n      await sessionIndex\n        .updateSessionMetadata(webchatSessionKey, { abortCutoffTimestamp: undefined })\n        .catch(() => {});\n    }\n    runRelay.ensureRun(runId, webchatSessionKey);\n    runAbortControllers.set(runId, new AbortController());\n  }\n\n  const streamSessionKey = webchatSessionKey ?? chatId;\n  const mapper = new ChatStreamMapper({ runId, sessionKey: streamSessionKey, channel });\n  const publishStreamEvent = (event: ChatStreamEvent): ChatStreamEvent =>\n    channel === 'webchat'\n      ? ((runRelay.publish(runId, event as unknown as import('../agent-run-relay.js').RelayEvent) as unknown as ChatStreamEvent | undefined) ?? event)\n      : event;\n  const emitAndYield = function *(events: ChatStreamEvent[]): Generator<ChatStreamEvent> {\n    for (const event of events) {\n      const relayedEvent = publishStreamEvent(event);\n      if (channel === 'webchat') emit('agent.stream', { sessionKey: streamSessionKey, event: relayedEvent });\n      yield relayedEvent;\n    }\n  };\n\n  yield* emitAndYield(mapper.start());\n\n  try {\n    if (channel === 'webchat' && webchatSessionKey) {\n      if (webchatStaleSkip) {\n        yield* emitAndYield(mapper.end('cancelled', 'Stale inbound after abort (clientCreatedAtMs before cutoff)'));\n        runRelay.complete(runId);\n        runAbortControllers.delete(runId);\n        return {\n          status: 'skipped',\n          summary: 'Stale inbound after abort (clientCreatedAtMs before cutoff)',\n        };\n      }\n\n      const sessionKey = webchatSessionKey;\n      updateAsyncLogContext({\n        sessionKey,\n        ...(webchatSessionId ? { sessionId: webchatSessionId } : {}),\n      });\n\n      const timezone = agentService.resolveUserTimezoneForSession(sessionKey);\n      const stampedMessage = message.trimStart().startsWith('/')\n        ? message\n        : prependEnvelopeTimestamp(message, timezone);\n      const prepared = await agentService.prepareInboundAttachments(sessionKey, cappedAttachments);\n\n      const runAbort = runAbortControllers.get(runId);\n      if (!runAbort) {\n        throw new Error('run abort controller missing for webchat');\n      }\n      const mergedSignal = runOptions?.signal\n        ? AbortSignal.any([runOptions.signal, runAbort.signal])\n        : runAbort.signal;\n\n      agentService.beginInboundTurn(sessionKey);\n      activeWebchatRunBySession.set(sessionKey, runId);\n      let streamError: string | undefined;\n      try {\n        const eventStream = agentService.turnDispatcher.processDirectStreaming(\n          stampedMessage,\n          sessionKey,\n          prepared,\n          thinking,\n          { signal: mergedSignal, runId },\n        );\n\n        for await (const event of eventStream) {\n          yield* emitAndYield(mapper.map(event));\n        }\n\n        const endStatus = mergedSignal.aborted ? 'cancelled' : 'success';\n        const endSummary = mergedSignal.aborted ? 'Interrupted' : 'Message processed successfully';\n        yield* emitAndYield(mapper.end(endStatus, endSummary));\n        runRelay.complete(runId);\n        try {\n          const metaAfter = await sessionIndex.getSessionMetadata(sessionKey);\n          if (metaAfter?.name) {\n            emit('session.updated', { key: sessionKey, name: metaAfter.name });\n          }\n        } catch {\n          /* ignore */\n        }\n        return {\n          status: mergedSignal.aborted ? 'aborted' : 'ok',\n          summary: mergedSignal.aborted ? 'Interrupted' : 'Message processed successfully',\n        };\n      } catch (error) {\n        const em = error instanceof Error ? error.message : String(error);\n        log.error(\n          {\n            err: error,\n            errorMessage: em,\n            phase: 'gateway.agent_run',\n            sessionKey,\n            runId,\n            channel: 'webchat',\n          },\n          `Agent processing failed: ${em}`,\n        );\n        streamError = em;\n        const errorContent = formatAgentRunErrorForClient(streamError);\n        yield* emitAndYield(mapper.error(errorContent));\n        yield* emitAndYield(mapper.end('error', streamError));\n        runRelay.complete(runId);\n        return { status: 'error', summary: streamError };\n      } finally {\n        activeWebchatRunBySession.delete(sessionKey);\n        runAbortControllers.delete(runId);\n        const assistantPlainText = agentService.getLastAssistantPlainText(sessionKey);\n        const streamOutcome = agentService.persistentGoals.takeStreamOutcome(sessionKey);\n        try {\n          await agentService.outboundCoordinator.emitSessionTurnComplete({\n            sessionKey,\n            channel: 'webchat',\n            chatId: sessionKey,\n            inboundUserText: message,\n            assistantPlainText,\n            aborted: mergedSignal.aborted,\n            ...(streamError !== undefined ? { streamError } : {}),\n            skipPersistentGoalPostTurn: streamOutcome?.skipPersistentGoalPostTurn ?? false,\n            outboundMetadata: {},\n          });\n        } catch (goalErr) {\n          log.warn(\n            { err: goalErr, sessionKey },\n            `Session turn complete failed: ${goalErr instanceof Error ? goalErr.message : String(goalErr)}`,\n          );\n        }\n        agentService.endInboundTurn(sessionKey);\n      }\n    }\n\n    const correlationMeta = inboundCorrelationMetadataFromAsyncLogContext();\n    await bus.publishInbound({\n      channel,\n      sender_id: 'gateway',\n      chat_id: chatId,\n      content: message,\n      ...(correlationMeta ? { metadata: correlationMeta } : {}),\n    });\n\n    const messageId = `msg_${runId.replace(/[^a-zA-Z0-9_-]/g, '_')}_1`;\n    yield* emitAndYield([\n      {\n        type: 'assistant_message_start',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId },\n      },\n      {\n        type: 'assistant_delta',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId, delta: 'Processing...\\n' },\n      },\n    ]);\n    await new Promise((resolve) => setTimeout(resolve, 1000));\n    yield* emitAndYield([\n      {\n        type: 'assistant_delta',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId, delta: 'Done\\n' },\n      },\n      {\n        type: 'assistant_message_end',\n        runId,\n        sessionKey: streamSessionKey,\n        timestamp: Date.now(),\n        payload: { messageId },\n      },\n    ]);\n    yield* emitAndYield(mapper.end('success', 'Message processed'));\n    return { status: 'ok', summary: 'Message processed' };\n  } catch (error) {\n    const em = error instanceof Error ? error.message : String(error);\n    log.error(\n      {\n        err: error,\n        errorMessage: em,\n        phase: 'gateway.agent_run',\n        runId,\n        channel,\n        chatId,\n      },\n      `Agent run failed: ${em}`,\n    );\n    throw error;\n  }\n}\n"],"mappings":"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"}

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

@@ -52,6 +52,7 @@ export declare class GatewayService {
     private workflowRunServiceInstance;
     private goalRunner;
     private goalNotifications;
+    private connectorSupervisor;
     /**
      * Webchat agent invocation surface (`runAgent`, `abortAgentRun`, `steer*`,
      * `submitClarifyResponse`, clarify-bridge dispatch). Owns the
@@ -80,7 +81,6 @@ export declare class GatewayService {
     private createGoalNotificationService;
     enqueueGoalRun(goalId: string, options?: EnqueueGoalRunOptions): import("../goals/goal-queue-types.js").GoalQueueItemSnapshot;
     getGoalQueueSnapshot(): import("../goals/goal-queue-types.js").GoalQueueItemSnapshot[];
-    enqueueWebchatPersistentGoalKickoff(sessionKey: string, goalText: string): void;
     runAgent(...args: Parameters<GatewayAgentRunner['runAgent']>): ReturnType<GatewayAgentRunner['runAgent']>;
     abortAgentRun(runId: string): boolean;
     getActiveWebchatRunId(sessionKey: string): string | undefined;
@@ -117,7 +117,7 @@ export declare class GatewayService {
     /** Release the gateway's hold on the shared extension bridge (does not restart). */
     releaseBrowserExtensionBridge(): Promise<void>;
     /**
-     * Start/stop/rebind the Chrome extension bridge when `agents.defaults.browser` changes.
+     * Start/stop/rebind the Chrome extension bridge.
      * PATCH saves update config in memory without re-running gateway startup, so this must run on save too.
      */
     reconcileBrowserExtensionServer(): Promise<void>;

package/dist/src/gateway/service.js

@@ -1,5 +1,6 @@
 import { __toCommonJS } from "../../_virtual/_rolldown/runtime.js";
 import { PACKAGE_VERSION, init_package_version } from "../package-version.js";
+import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveDefaultAgentId } from "../agent/agent-scope.js";
 import { buildSessionKey, init_session_key, sanitizeSegment } from "../routing/session-key.js";
 import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
@@ -14,14 +15,14 @@ import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, init_cha
 import { loadConfig, saveConfig } from "../config/loader.js";
 import { prewarmModelRegistry } from "../providers/model-registry.js";
 import { init_providers, providers_exports } from "../providers/index.js";
-import { closeXopcDatabase, openXopcDatabase } from "../storage/sqlite/connection.js";
-import "../storage/sqlite/index.js";
 import { resolveEffectiveGatewayPort } from "./host.js";
+import { closeXopcDatabase, openXopcDatabase } from "../storage/sqlite/connection.js";
 import { GoalRunner } from "../goals/goal-runner.js";
 import { GoalNotificationService } from "../goals/goal-notifications.js";
 import "../goals/index.js";
 import { disposeAllSessionMcpRuntimes } from "../agent/mcp/bundle-mcp-runtime.js";
 import "../agent/mcp/bundle-mcp-tools.js";
+import "../storage/sqlite/index.js";
 import { SessionIndex } from "../session/manager.js";
 import "../session/index.js";
 import { ExtensionLoader } from "../extensions/loader.js";
@@ -35,6 +36,7 @@ import { registerClarifyBridge } from "./clarify-runtime.js";
 import { ChannelManager } from "../channels/manager.js";
 import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import "../config/index.js";
+import { startConnectorSupervisor } from "../connectors/supervisor.js";
 import { CronService } from "../cron/service.js";
 import "../cron/index.js";
 import { assertGatewayAuthConfigured, extractToken, resolveGatewayAuth, validateToken } from "./auth.js";
@@ -71,6 +73,7 @@ import crypto from "crypto";
 //#region src/gateway/service.ts
 init_agent_scope();
 init_channel_catalog_service();
+init_schema();
 init_providers();
 init_logger();
 init_paths();
@@ -116,6 +119,7 @@ var GatewayService = class {
 	workflowRunServiceInstance = null;
 	goalRunner = null;
 	goalNotifications = null;
+	connectorSupervisor = null;
 	/**
 	* Webchat agent invocation surface (`runAgent`, `abortAgentRun`, `steer*`,
 	* `submitClarifyResponse`, clarify-bridge dispatch). Owns the
@@ -250,7 +254,7 @@ var GatewayService = class {
 		const cronRef = { service: this.cronService };
 		this._agentService = new AgentService(this.bus, {
 			workspace: this.workspacePath,
-			model: this.config.agents?.defaults?.models?.chat?.primary,
+			model: getAgentDefaultModelRef(this.config),
 			config: this.config,
 			sessionStore: this.sessionIndex.getStore(),
 			onSessionMetadataUpdated: (sessionKey, patch) => {
@@ -371,7 +375,7 @@ var GatewayService = class {
 				return sessionKey;
 			},
 			hasActiveRun: (sessionKey) => this.agentRunner.hasActiveRun(sessionKey),
-			runContinuation: (sessionKey, message) => this.agentRunner.runScheduledWebchatContinuation(sessionKey, message),
+			runTurn: (sessionKey, userTurn) => this.agentRunner.runScheduledWebchatTurn(sessionKey, userTurn),
 			emit: (type, payload) => this.emit(type, payload)
 		});
 		return this.goalRunner;
@@ -403,9 +407,6 @@ var GatewayService = class {
 	getGoalQueueSnapshot() {
 		return this.createGoalRunner().snapshot();
 	}
-	enqueueWebchatPersistentGoalKickoff(sessionKey, goalText) {
-		this.agentRunner.enqueueWebchatPersistentGoalKickoff(sessionKey, goalText);
-	}
 	runAgent(...args) {
 		return this.agentRunner.runAgent(...args);
 	}
@@ -633,6 +634,10 @@ var GatewayService = class {
 		if (this.config.cron?.enabled !== false) await trace.measure("cron.initialize", () => this.cronService.initialize());
 		await this.notesService.initialize();
 		this.ensureHeartbeatService().start(heartbeatRunnerConfigFromConfig(this.config));
+		this.connectorSupervisor = startConnectorSupervisor({
+			getConfig: () => this.config,
+			saveConfig: (cfg) => this.saveConfig(cfg)
+		});
 		import("../browser/providers/browser-ext-install.js").then(({ ensureBrowserExtensionOnStartup }) => ensureBrowserExtensionOnStartup(this.config)).catch((err) => log.warn({ err }, "Browser extension artifact ensure failed"));
 		await trace.measure("browser-extension.start", () => this.startBrowserExtensionServerIfNeeded());
 		this.agentService.start().catch((err) => {
@@ -750,6 +755,8 @@ var GatewayService = class {
 		}
 		await this.configCoordinator.stopHotReloader();
 		this.heartbeatService?.stop();
+		this.connectorSupervisor?.stop();
+		this.connectorSupervisor = null;
 		if (this.browserExtensionRelease) {
 			await this.browserExtensionRelease();
 			this.browserExtensionRelease = null;
@@ -788,7 +795,7 @@ var GatewayService = class {
 		log.debug("Browser extension WS server released");
 	}
 	/**
-	* Start/stop/rebind the Chrome extension bridge when `agents.defaults.browser` changes.
+	* Start/stop/rebind the Chrome extension bridge.
 	* PATCH saves update config in memory without re-running gateway startup, so this must run on save too.
 	*/
 	async reconcileBrowserExtensionServer() {
@@ -803,13 +810,10 @@ var GatewayService = class {
 			}
 			return;
 		}
-		const browser = (this.config.agents?.defaults)?.browser;
-		const ext = browser?.extension;
-		const port = typeof ext?.port === "number" ? ext.port : 19820;
-		const host = typeof ext?.host === "string" && ext.host ? ext.host : "127.0.0.1";
-		const connectionTimeout = typeof ext?.connectionTimeout === "number" && ext.connectionTimeout >= 1e3 ? Math.floor(ext.connectionTimeout) : void 0;
-		const cmdSec = browser?.commandTimeout;
-		const commandTimeout = typeof cmdSec === "number" && Number.isFinite(cmdSec) && cmdSec > 0 ? Math.floor(cmdSec * 1e3) : void 0;
+		const port = 19820;
+		const host = "127.0.0.1";
+		const connectionTimeout = void 0;
+		const commandTimeout = void 0;
 		const bindKey = `${host}:${port}`;
 		if (this.browserExtensionRelease && this.browserExtensionBindKey === bindKey) return;
 		if (this.browserExtensionRelease) {
@@ -840,7 +844,7 @@ var GatewayService = class {
 					phase: "browser_extension_ws",
 					bindPort: port,
 					bindHost: host,
-					hint: "Another process holds this port (default 19820). Stop it or set agents.defaults.browser.extension.port."
+					hint: "Another process holds the browser extension bridge port 19820. Stop it before starting xopc."
 				}, `Browser extension WS server port is already in use: ${host}:${port}`);
 				return;
 			}