@xopcai/xopc 0.0.103 → 0.0.104

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

@@ -64,14 +64,12 @@ export declare class GatewayAgentRunner {
         clientCreatedAtMs?: number;
     }): AsyncGenerator<{
         type: string;
-        content?: string;
-        status?: string;
-        runId?: string;
+        [key: string]: unknown;
     }, {
         status: string;
         summary: string;
     }, unknown>;
-    /** Abort an in-flight webchat agent run (matches `runId` from SSE `status`). */
+    /** Abort an in-flight webchat agent run (matches `runId` from SSE `run_start`). */
     abortAgentRun(runId: string): boolean;
     /**
      * Queue steering text for an active webchat run (`Agent.steer` /

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

@@ -53,7 +53,7 @@ var GatewayAgentRunner = class {
 		}
 		return step.value;
 	}
-	/** Abort an in-flight webchat agent run (matches `runId` from SSE `status`). */
+	/** Abort an in-flight webchat agent run (matches `runId` from SSE `run_start`). */
 	abortAgentRun(runId) {
 		this.clarifyBridge.cancelForRun(runId);
 		const keysToMark = [];

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('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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"}
+{"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; [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). `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/marketplace-service.d.ts

@@ -2,7 +2,7 @@ import type { Config } from '../../config/schema.js';
 import type { AgentService } from '../../agent/service.js';
 import type { ChannelManager } from '../../channels/manager.js';
 import type { ExtensionLoader } from '../../extensions/loader.js';
-import type { SkillCatalogEntry } from '../../agent/agent-manager.js';
+import type { AgentSkillAvailabilityPayload, SkillCatalogEntry } from '../../agent/agent-manager.js';
 import type { ManagedSkillListItem } from '../../agent/skills/managed-store.js';
 import type { SkillMarkdownPreviewPayload } from '../../agent/skills/types.js';
 import type { MarketplaceCategoryOption, SkillsStoreListParams, UnifiedMarketplaceListResponse, UnifiedMarketplacePackageDetail } from '../../agent/skills/skills-marketplace.js';
@@ -21,11 +21,12 @@ export interface GatewayMarketplaceServiceOptions {
 export declare class GatewayMarketplaceService {
     private readonly opts;
     constructor(opts: GatewayMarketplaceServiceOptions);
-    getSkillsApi(lang?: string): {
+    getSkillsApi(): {
         catalog: SkillCatalogEntry[];
         managed: ManagedSkillListItem[];
     };
-    getSkillMarkdownSource(skillName: string, lang?: string): SkillMarkdownPreviewPayload | null;
+    getAgentSkillsApi(agentId: string): AgentSkillAvailabilityPayload;
+    getSkillMarkdownSource(skillName: string): SkillMarkdownPreviewPayload | null;
     deleteSkill(skillId: string): void;
     installSkillZip(buffer: Buffer, opts: {
         skillId?: string;

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

@@ -39,14 +39,17 @@ var GatewayMarketplaceService = class {
 	constructor(opts) {
 		this.opts = opts;
 	}
-	getSkillsApi(lang) {
+	getSkillsApi() {
 		return {
-			catalog: this.opts.getAgentService().getSkillCatalog(lang),
+			catalog: this.opts.getAgentService().getSkillCatalog(),
 			managed: listManagedSkillDirs()
 		};
 	}
-	getSkillMarkdownSource(skillName, lang) {
-		return this.opts.getAgentService().getSkillMarkdownSource(skillName, lang);
+	getAgentSkillsApi(agentId) {
+		return this.opts.getAgentService().getAgentSkillAvailability(agentId);
+	}
+	getSkillMarkdownSource(skillName) {
+		return this.opts.getAgentService().getSkillMarkdownSource(skillName);
 	}
 	deleteSkill(skillId) {
 		removeSkillsLockEntry(skillId);

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('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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"}
+{"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 { AgentSkillAvailabilityPayload, 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(): {\n    catalog: SkillCatalogEntry[];\n    managed: ManagedSkillListItem[];\n  } {\n    return {\n      catalog: this.opts.getAgentService().getSkillCatalog(),\n      managed: listManagedSkillDirs(),\n    };\n  }\n\n  getAgentSkillsApi(agentId: string): AgentSkillAvailabilityPayload {\n    return this.opts.getAgentService().getAgentSkillAvailability(agentId);\n  }\n\n  getSkillMarkdownSource(skillName: string): SkillMarkdownPreviewPayload | null {\n    return this.opts.getAgentService().getSkillMarkdownSource(skillName);\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.d.ts

@@ -2,13 +2,9 @@ import type { AgentService } from '../../agent/service.js';
 import type { Config } from '../../config/schema.js';
 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';
-export type RunGatewayAgentYield = {
-    type: string;
-    content?: string;
-    status?: string;
-    runId?: string;
-};
+export type RunGatewayAgentYield = ChatStreamEvent;
 export type RunGatewayAgentDeps = {
     config: Config;
     agentService: AgentService;

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

@@ -6,6 +6,7 @@ import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { shouldSkipWebchatInboundByAbortCutoff } from "../../session/abort-cutoff.js";
 import "../chat-limits.js";
 import { resolveWebchatSessionKey } from "../resolve-webchat-session-key.js";
+import { ChatStreamMapper } from "../chat-stream/mapper.js";
 import crypto from "crypto";
 //#region src/gateway/service/run-gateway-agent.ts
 init_logger();
@@ -38,16 +39,28 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 		runRelay.ensureRun(runId, webchatSessionKey);
 		runAbortControllers.set(runId, new AbortController());
 	}
-	const statusEvent = {
-		type: "status",
-		status: "accepted",
-		runId
+	const streamSessionKey = webchatSessionKey ?? chatId;
+	const mapper = new ChatStreamMapper({
+		runId,
+		sessionKey: streamSessionKey,
+		channel
+	});
+	const publishStreamEvent = (event) => channel === "webchat" ? runRelay.publish(runId, event) ?? event : event;
+	const emitAndYield = function* (events) {
+		for (const event of events) {
+			const relayedEvent = publishStreamEvent(event);
+			if (channel === "webchat") emit("agent.stream", {
+				sessionKey: streamSessionKey,
+				event: relayedEvent
+			});
+			yield relayedEvent;
+		}
 	};
-	if (channel === "webchat") runRelay.publish(runId, statusEvent);
-	yield statusEvent;
+	yield* emitAndYield(mapper.start());
 	try {
 		if (channel === "webchat" && webchatSessionKey) {
 			if (webchatStaleSkip) {
+				yield* emitAndYield(mapper.end("cancelled", "Stale inbound after abort (clientCreatedAtMs before cutoff)"));
 				runRelay.complete(runId);
 				runAbortControllers.delete(runId);
 				return {
@@ -67,19 +80,14 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 			activeWebchatRunBySession.set(sessionKey, runId);
 			let streamError;
 			try {
-				emit("agent.stream", {
-					sessionKey,
-					event: statusEvent
+				const eventStream = agentService.turnDispatcher.processDirectStreaming(stampedMessage, sessionKey, prepared, thinking, {
+					signal: mergedSignal,
+					runId
 				});
-				const eventStream = agentService.turnDispatcher.processDirectStreaming(stampedMessage, sessionKey, prepared, thinking, { signal: mergedSignal });
-				for await (const event of eventStream) {
-					runRelay.publish(runId, event);
-					emit("agent.stream", {
-						sessionKey,
-						event
-					});
-					yield event;
-				}
+				for await (const event of eventStream) yield* emitAndYield(mapper.map(event));
+				const endStatus = mergedSignal.aborted ? "cancelled" : "success";
+				const endSummary = mergedSignal.aborted ? "Interrupted" : "Message processed successfully";
+				yield* emitAndYield(mapper.end(endStatus, endSummary));
 				runRelay.complete(runId);
 				try {
 					const metaAfter = await sessionIndex.getSessionMetadata(sessionKey);
@@ -103,17 +111,10 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 					channel: "webchat"
 				}, `Agent processing failed: ${em}`);
 				streamError = em;
-				const errorEvent = {
-					type: "error",
-					content: formatAgentRunErrorForClient(streamError)
-				};
-				runRelay.publish(runId, errorEvent);
-				emit("agent.stream", {
-					sessionKey,
-					event: errorEvent
-				});
+				const errorContent = formatAgentRunErrorForClient(streamError);
+				yield* emitAndYield(mapper.error(errorContent));
+				yield* emitAndYield(mapper.end("error", streamError));
 				runRelay.complete(runId);
-				yield errorEvent;
 				return {
 					status: "error",
 					summary: streamError
@@ -152,15 +153,41 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 			content: message,
 			...correlationMeta ? { metadata: correlationMeta } : {}
 		});
-		yield {
-			type: "token",
-			content: "Processing...\n"
-		};
+		const messageId = `msg_${runId.replace(/[^a-zA-Z0-9_-]/g, "_")}_1`;
+		yield* emitAndYield([{
+			type: "assistant_message_start",
+			runId,
+			sessionKey: streamSessionKey,
+			timestamp: Date.now(),
+			payload: { messageId }
+		}, {
+			type: "assistant_delta",
+			runId,
+			sessionKey: streamSessionKey,
+			timestamp: Date.now(),
+			payload: {
+				messageId,
+				delta: "Processing...\n"
+			}
+		}]);
 		await new Promise((resolve) => setTimeout(resolve, 1e3));
-		yield {
-			type: "token",
-			content: "Done\n"
-		};
+		yield* emitAndYield([{
+			type: "assistant_delta",
+			runId,
+			sessionKey: streamSessionKey,
+			timestamp: Date.now(),
+			payload: {
+				messageId,
+				delta: "Done\n"
+			}
+		}, {
+			type: "assistant_message_end",
+			runId,
+			sessionKey: streamSessionKey,
+			timestamp: Date.now(),
+			payload: { messageId }
+		}]);
+		yield* emitAndYield(mapper.end("success", "Message processed"));
 		return {
 			status: "ok",
 			summary: "Message processed"

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 type { AgentRunRelay } from '../agent-run-relay.js';\nimport { MAX_CHAT_ATTACHMENTS } from '../chat-limits.js';\nconst log = createLogger('Gateway:Service');\n\nexport type RunGatewayAgentYield = {\n  type: string;\n  content?: string;\n  status?: string;\n  runId?: string;\n};\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    name?: string;\n    size?: 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    config,\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 webchatStaleSkip = false;\n  if (channel === 'webchat') {\n    const resolved = resolveWebchatSessionKey({ cfg: config, chatId, newSession: false });\n    if (resolved.ok === false) {\n      throw new Error(resolved.error);\n    }\n    webchatSessionKey = resolved.sessionKey;\n    const meta = await sessionIndex.getSessionMetadata(webchatSessionKey);\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 statusEvent = { type: 'status', status: 'accepted', runId };\n  if (channel === 'webchat') runRelay.publish(runId, statusEvent);\n  yield statusEvent;\n\n  try {\n    if (channel === 'webchat' && webchatSessionKey) {\n      if (webchatStaleSkip) {\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({ sessionId: sessionKey });\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        emit('agent.stream', { sessionKey, event: statusEvent });\n        const eventStream = agentService.turnDispatcher.processDirectStreaming(\n          stampedMessage,\n          sessionKey,\n          prepared,\n          thinking,\n          { signal: mergedSignal },\n        );\n\n        for await (const event of eventStream) {\n          runRelay.publish(runId, event);\n          emit('agent.stream', { sessionKey, event });\n          yield event as RunGatewayAgentYield;\n        }\n\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        const errorEvent = { type: 'error', content: errorContent };\n        runRelay.publish(runId, errorEvent);\n        emit('agent.stream', { sessionKey, event: errorEvent });\n        runRelay.complete(runId);\n        yield errorEvent;\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    yield { type: 'token', content: 'Processing...\\n' };\n    await new Promise((resolve) => setTimeout(resolve, 1000));\n    yield { type: 'token', content: 'Done\\n' };\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';\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    name?: string;\n    size?: 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    config,\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 webchatStaleSkip = false;\n  if (channel === 'webchat') {\n    const resolved = resolveWebchatSessionKey({ cfg: config, chatId, newSession: false });\n    if (resolved.ok === false) {\n      throw new Error(resolved.error);\n    }\n    webchatSessionKey = resolved.sessionKey;\n    const meta = await sessionIndex.getSessionMetadata(webchatSessionKey);\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({ sessionId: sessionKey });\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":";;;;;;;;;;;aAY+B;AAS/B,MAAM,MAAM,aAAa,kBAAkB;;;;AAkB3C,gBAAuB,gBACrB,MACA,SACA,SACA,QACA,aAOA,UACA,YACoF;CACpF,MAAM,oBACJ,eAAe,YAAY,SAAA,KACvB,YAAY,MAAM,GAAA,GAAwB,GAC1C;AACN,KAAI,eAAe,qBAAqB,YAAY,SAAS,kBAAkB,OAC7E,KAAI,MACF;EAAE,SAAS,YAAY,SAAS,kBAAkB;EAAQ,KAAA;EAA2B,EACrF,iCACD;CAGH,MAAM,QAAQ,OAAO,YAAY;CACjC,MAAM,EACJ,QACA,cACA,KACA,UACA,qBACA,2BACA,cAAc,sBACd,SACE;CACJ,MAAM,eAAe;CAErB,IAAI;CACJ,IAAI,mBAAmB;AACvB,KAAI,YAAY,WAAW;EACzB,MAAM,WAAW,yBAAyB;GAAE,KAAK;GAAQ;GAAQ,YAAY;GAAO,CAAC;AACrF,MAAI,SAAS,OAAO,MAClB,OAAM,IAAI,MAAM,SAAS,MAAM;AAEjC,sBAAoB,SAAS;EAC7B,MAAM,OAAO,MAAM,aAAa,mBAAmB,kBAAkB;AACrE,qBAAmB,sCAAsC,MAAM,YAAY,kBAAkB;AAC7F,MAAI,CAAC,oBAAoB,MAAM,yBAAyB,KAAA,EACtD,OAAM,aACH,sBAAsB,mBAAmB,EAAE,sBAAsB,KAAA,GAAW,CAAC,CAC7E,YAAY,GAAG;AAEpB,WAAS,UAAU,OAAO,kBAAkB;AAC5C,sBAAoB,IAAI,OAAO,IAAI,iBAAiB,CAAC;;CAGvD,MAAM,mBAAmB,qBAAqB;CAC9C,MAAM,SAAS,IAAI,iBAAiB;EAAE;EAAO,YAAY;EAAkB;EAAS,CAAC;CACrF,MAAM,sBAAsB,UAC1B,YAAY,YACN,SAAS,QAAQ,OAAO,MAA+D,IAA+C,QACxI;CACN,MAAM,eAAe,WAAW,QAAuD;AACrF,OAAK,MAAM,SAAS,QAAQ;GAC1B,MAAM,eAAe,mBAAmB,MAAM;AAC9C,OAAI,YAAY,UAAW,MAAK,gBAAgB;IAAE,YAAY;IAAkB,OAAO;IAAc,CAAC;AACtG,SAAM;;;AAIV,QAAO,aAAa,OAAO,OAAO,CAAC;AAEnC,KAAI;AACF,MAAI,YAAY,aAAa,mBAAmB;AAC9C,OAAI,kBAAkB;AACpB,WAAO,aAAa,OAAO,IAAI,aAAa,8DAA8D,CAAC;AAC3G,aAAS,SAAS,MAAM;AACxB,wBAAoB,OAAO,MAAM;AACjC,WAAO;KACL,QAAQ;KACR,SAAS;KACV;;GAGH,MAAM,aAAa;AACnB,yBAAsB,EAAE,WAAW,YAAY,CAAC;GAEhD,MAAM,WAAW,aAAa,8BAA8B,WAAW;GACvE,MAAM,iBAAiB,QAAQ,WAAW,CAAC,WAAW,IAAI,GACtD,UACA,yBAAyB,SAAS,SAAS;GAC/C,MAAM,WAAW,MAAM,aAAa,0BAA0B,YAAY,kBAAkB;GAE5F,MAAM,WAAW,oBAAoB,IAAI,MAAM;AAC/C,OAAI,CAAC,SACH,OAAM,IAAI,MAAM,2CAA2C;GAE7D,MAAM,eAAe,YAAY,SAC7B,YAAY,IAAI,CAAC,WAAW,QAAQ,SAAS,OAAO,CAAC,GACrD,SAAS;AAEb,gBAAa,iBAAiB,WAAW;AACzC,6BAA0B,IAAI,YAAY,MAAM;GAChD,IAAI;AACJ,OAAI;IACF,MAAM,cAAc,aAAa,eAAe,uBAC9C,gBACA,YACA,UACA,UACA;KAAE,QAAQ;KAAc;KAAO,CAChC;AAED,eAAW,MAAM,SAAS,YACxB,QAAO,aAAa,OAAO,IAAI,MAAM,CAAC;IAGxC,MAAM,YAAY,aAAa,UAAU,cAAc;IACvD,MAAM,aAAa,aAAa,UAAU,gBAAgB;AAC1D,WAAO,aAAa,OAAO,IAAI,WAAW,WAAW,CAAC;AACtD,aAAS,SAAS,MAAM;AACxB,QAAI;KACF,MAAM,YAAY,MAAM,aAAa,mBAAmB,WAAW;AACnE,SAAI,WAAW,KACb,MAAK,mBAAmB;MAAE,KAAK;MAAY,MAAM,UAAU;MAAM,CAAC;YAE9D;AAGR,WAAO;KACL,QAAQ,aAAa,UAAU,YAAY;KAC3C,SAAS,aAAa,UAAU,gBAAgB;KACjD;YACM,OAAO;IACd,MAAM,KAAK,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;AACjE,QAAI,MACF;KACE,KAAK;KACL,cAAc;KACd,OAAO;KACP;KACA;KACA,SAAS;KACV,EACD,4BAA4B,KAC7B;AACD,kBAAc;IACd,MAAM,eAAe,6BAA6B,YAAY;AAC9D,WAAO,aAAa,OAAO,MAAM,aAAa,CAAC;AAC/C,WAAO,aAAa,OAAO,IAAI,SAAS,YAAY,CAAC;AACrD,aAAS,SAAS,MAAM;AACxB,WAAO;KAAE,QAAQ;KAAS,SAAS;KAAa;aACxC;AACR,8BAA0B,OAAO,WAAW;AAC5C,wBAAoB,OAAO,MAAM;IACjC,MAAM,qBAAqB,aAAa,0BAA0B,WAAW;IAC7E,MAAM,gBAAgB,aAAa,gBAAgB,kBAAkB,WAAW;AAChF,QAAI;AACF,WAAM,aAAa,oBAAoB,wBAAwB;MAC7D;MACA,SAAS;MACT,QAAQ;MACR,iBAAiB;MACjB;MACA,SAAS,aAAa;MACtB,GAAI,gBAAgB,KAAA,IAAY,EAAE,aAAa,GAAG,EAAE;MACpD,4BAA4B,eAAe,8BAA8B;MACzE,kBAAkB,EAAE;MACrB,CAAC;aACK,SAAS;AAChB,SAAI,KACF;MAAE,KAAK;MAAS;MAAY,EAC5B,iCAAiC,mBAAmB,QAAQ,QAAQ,UAAU,OAAO,QAAQ,GAC9F;;AAEH,iBAAa,eAAe,WAAW;;;EAI3C,MAAM,kBAAkB,+CAA+C;AACvE,QAAM,IAAI,eAAe;GACvB;GACA,WAAW;GACX,SAAS;GACT,SAAS;GACT,GAAI,kBAAkB,EAAE,UAAU,iBAAiB,GAAG,EAAE;GACzD,CAAC;EAEF,MAAM,YAAY,OAAO,MAAM,QAAQ,mBAAmB,IAAI,CAAC;AAC/D,SAAO,aAAa,CAClB;GACE,MAAM;GACN;GACA,YAAY;GACZ,WAAW,KAAK,KAAK;GACrB,SAAS,EAAE,WAAW;GACvB,EACD;GACE,MAAM;GACN;GACA,YAAY;GACZ,WAAW,KAAK,KAAK;GACrB,SAAS;IAAE;IAAW,OAAO;IAAmB;GACjD,CACF,CAAC;AACF,QAAM,IAAI,SAAS,YAAY,WAAW,SAAS,IAAK,CAAC;AACzD,SAAO,aAAa,CAClB;GACE,MAAM;GACN;GACA,YAAY;GACZ,WAAW,KAAK,KAAK;GACrB,SAAS;IAAE;IAAW,OAAO;IAAU;GACxC,EACD;GACE,MAAM;GACN;GACA,YAAY;GACZ,WAAW,KAAK,KAAK;GACrB,SAAS,EAAE,WAAW;GACvB,CACF,CAAC;AACF,SAAO,aAAa,OAAO,IAAI,WAAW,oBAAoB,CAAC;AAC/D,SAAO;GAAE,QAAQ;GAAM,SAAS;GAAqB;UAC9C,OAAO;EACd,MAAM,KAAK,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;AACjE,MAAI,MACF;GACE,KAAK;GACL,cAAc;GACd,OAAO;GACP;GACA;GACA;GACD,EACD,qBAAqB,KACtB;AACD,QAAM"}

package/dist/src/gateway/service/sessions-api.d.ts

@@ -68,6 +68,7 @@ export declare class GatewaySessionsApi {
         thinkingLevel?: string;
         model?: string | null;
         reasoningLevel?: string;
+        verboseLevel?: string;
         workingDirectory?: string;
     }): Promise<import("../../agent/session/session-config-service.js").PatchSessionAgentConfigResult>;
     listCompactionCheckpoints(key: string): Promise<import("../../session/types.js").CompactionCheckpointSummary[]>;
@@ -112,6 +113,24 @@ export declare class GatewaySessionsApi {
     export(key: string, format: ExportFormat): Promise<{
         content: string;
     }>;
+    importExport(targetKey: string, jsonContent: string): Promise<{
+        sessionKey: string;
+        rowCount: number;
+    }>;
+    fork(key: string, targetKey: string): Promise<{
+        sessionKey: string;
+        rowCount: number;
+    }>;
+    forkRows(key: string, targetKey: string, options?: {
+        throughRow?: number;
+    }): Promise<{
+        sessionKey: string;
+        rowCount: number;
+    }>;
+    btwQuery(sessionKey: string, question: string): Promise<{
+        text: string;
+        error?: string;
+    }>;
     stats(): Promise<import("../../session/types.js").GlobalSessionStats>;
     /**
      * Distinct chat-id pairs from sessions, grouped by channel. Used by cron job

package/dist/src/gateway/service/sessions-api.js

@@ -129,6 +129,18 @@ var GatewaySessionsApi = class {
 	async export(key, format) {
 		return { content: await this.opts.sessionIndex.exportSession(key, format) };
 	}
+	importExport(targetKey, jsonContent) {
+		return this.opts.sessionIndex.importSessionExport(targetKey, jsonContent);
+	}
+	fork(key, targetKey) {
+		return this.opts.sessionIndex.forkSession(key, targetKey);
+	}
+	forkRows(key, targetKey, options = {}) {
+		return this.opts.sessionIndex.forkSessionRows(key, targetKey, options);
+	}
+	btwQuery(sessionKey, question) {
+		return this.opts.getAgentService().sessionInspector.btwQuery(sessionKey, question);
+	}
 	stats() {
 		return this.opts.sessionIndex.getStats();
 	}

package/dist/src/gateway/service/sessions-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessions-api.js","names":[],"sources":["../../../../src/gateway/service/sessions-api.ts"],"sourcesContent":["/**\n * GatewaySessionsApi — session CRUD, search, compaction, tag/pin/archive,\n * stats, and chat-id grouping for the gateway REST surface.\n *\n * Twenty-four methods, previously sitting on `GatewayService` as a mix of\n * one-line `sessionIndex.*` delegations and small composite operations (e.g.\n * `restoreCheckpoint` also evicts the in-memory agent, `runCompaction` also\n * appends a transcript context entry). Centralising them here lets routes\n * depend on the narrow `GatewaySessionsApi` surface instead of the full\n * `GatewayService`, and keeps the gateway composition root focused on\n * lifecycle + wiring.\n */\n\nimport type { AgentService } from '../../agent/service.js';\nimport type { CompactionResult } from '../../agent/memory/compaction.js';\nimport { retireSessionMcpRuntimeForSessionKey } from '../../agent/mcp/bundle-mcp-tools.js';\nimport { SessionIndex } from '../../session/index.js';\nimport type { ExportFormat, SessionListQuery } from '../../session/types.js';\nimport type { SessionPatchBody } from '../../session/patch-metadata.js';\nimport { collectMediaUrisFromMessages, deleteMediaUris } from '../../media/session-references.js';\nimport { getDistinctSessionChatIds } from './session-chat-ids.js';\nimport { performSessionReset, type SessionResetResult } from '../session-reset-service.js';\n\nexport interface GatewaySessionsApiOptions {\n  sessionIndex: SessionIndex;\n  /** Resolves the live agent service (created lazily; throws if gateway is starting). */\n  getAgentService: () => AgentService;\n  /** Read-only view of in-flight webchat runs (per session key → run id). */\n  getActiveWebchatRunId: (sessionKey: string) => string | undefined;\n}\n\nexport class GatewaySessionsApi {\n  private readonly opts: GatewaySessionsApiOptions;\n\n  constructor(opts: GatewaySessionsApiOptions) {\n    this.opts = opts;\n  }\n\n  // ── List / get ─────────────────────────────────────────────────────────\n\n  listSessions(query?: SessionListQuery) {\n    return this.opts.sessionIndex.listSessions(query);\n  }\n\n  /** Subagent sessions have keys starting with `subagent:`. */\n  listSubagents(query?: SessionListQuery) {\n    return this.opts.sessionIndex.listSubagents(query);\n  }\n\n  getSession(\n    key: string,\n    options?: { includeTranscriptSummary?: boolean; includeTranscriptRows?: boolean },\n  ) {\n    return this.opts.sessionIndex.getSession(key, options);\n  }\n\n  /** Read-only: in-flight webchat agent run for this session key, if any. */\n  getActiveRun(sessionKey: string): { active: boolean; runId?: string } {\n    const key = sessionKey.trim();\n    if (!key) return { active: false };\n    const runId = this.opts.getActiveWebchatRunId(key)?.trim();\n    if (!runId) return { active: false };\n    return { active: true, runId };\n  }\n\n  getMessagePage(\n    key: string,\n    options?: {\n      offset?: number;\n      limit?: number;\n      before?: string;\n      includeTranscriptSummary?: boolean;\n      includeTranscriptRows?: boolean;\n    },\n  ) {\n    return this.opts.sessionIndex.getSessionMessagePage(key, options);\n  }\n\n  // ── Metadata patches ──────────────────────────────────────────────────\n\n  patch(key: string, body: SessionPatchBody): Promise<{ ok: true } | { ok: false; error: string }> {\n    return this.opts.sessionIndex.patchSession(key, body);\n  }\n\n  async getAgentConfig(sessionKey: string) {\n    return this.opts.getAgentService().sessionInspector.agentConfig(sessionKey);\n  }\n\n  /** Resolved markdown workspace for a session (after hydration / mkdir). */\n  getEffectiveWorkspacePath(sessionKey: string): Promise<string> {\n    return this.opts.getAgentService().getEffectiveWorkspacePathForSession(sessionKey);\n  }\n\n  patchAgentConfig(\n    sessionKey: string,\n    body: {\n      thinkingLevel?: string;\n      model?: string | null;\n      reasoningLevel?: string;\n      workingDirectory?: string;\n    },\n  ) {\n    return this.opts.getAgentService().sessionConfig.patch(sessionKey, body);\n  }\n\n  // ── Compaction checkpoints ────────────────────────────────────────────\n\n  listCompactionCheckpoints(key: string) {\n    return this.opts.sessionIndex.listCompactionCheckpoints(key);\n  }\n\n  getCompactionCheckpoint(key: string, checkpointId: string) {\n    return this.opts.sessionIndex.getCompactionCheckpointDetail(key, checkpointId);\n  }\n\n  async restoreCompactionCheckpoint(key: string, checkpointId: string): Promise<void> {\n    await this.opts.sessionIndex.restoreCompactionCheckpoint(key, checkpointId);\n    this.opts.getAgentService().evictSessionAgent(key);\n  }\n\n  async runCompaction(\n    key: string,\n    options?: { instructions?: string; force?: boolean },\n  ): Promise<CompactionResult> {\n    const result = await this.opts.getAgentService().sessionInspector.compact(key, options);\n    if (result.compacted) {\n      void this.opts.sessionIndex\n        .appendTranscriptContextEntry(key, {\n          text: 'Session transcript compacted',\n          data: {\n            firstKeptIndex: result.firstKeptIndex,\n            tokensBefore: result.tokensBefore,\n            tokensAfter: result.tokensAfter,\n            summaryPreview: result.summary.slice(0, 500),\n          },\n        })\n        .catch(() => {});\n    }\n    return result;\n  }\n\n  // ── Lifecycle (delete / rename / tag / pin / archive) ─────────────────\n\n  async delete(key: string): Promise<{ deleted: boolean }> {\n    const messages = await this.opts.sessionIndex.loadMessages(key).catch(() => []);\n    const result = await this.opts.sessionIndex.deleteSession(key);\n    if (result) {\n      await deleteMediaUris(collectMediaUrisFromMessages(messages));\n      this.opts.getAgentService().evictSessionAgent(key);\n      await retireSessionMcpRuntimeForSessionKey({ sessionKey: key, reason: 'session-delete' });\n    }\n    return { deleted: result };\n  }\n\n  /** Reset transcript in place (archive + new session id); preserves session key and overrides. */\n  reset(key: string): Promise<SessionResetResult> {\n    return performSessionReset(key, {\n      sessionIndex: this.opts.sessionIndex,\n      getAgentService: this.opts.getAgentService,\n    });\n  }\n\n  deleteMany(keys: string[]): Promise<{ success: string[]; failed: string[] }> {\n    return this.opts.sessionIndex.deleteSessions(keys);\n  }\n\n  async rename(key: string, name: string): Promise<{ renamed: boolean }> {\n    await this.opts.sessionIndex.renameSession(key, name);\n    return { renamed: true };\n  }\n\n  async tag(key: string, tags: string[]): Promise<{ tagged: boolean }> {\n    await this.opts.sessionIndex.tagSession(key, tags);\n    return { tagged: true };\n  }\n\n  async untag(key: string, tags: string[]): Promise<{ untagged: boolean }> {\n    await this.opts.sessionIndex.untagSession(key, tags);\n    return { untagged: true };\n  }\n\n  async archive(key: string): Promise<{ archived: boolean }> {\n    await this.opts.sessionIndex.archiveSession(key);\n    return { archived: true };\n  }\n\n  async unarchive(key: string): Promise<{ unarchived: boolean }> {\n    await this.opts.sessionIndex.unarchiveSession(key);\n    return { unarchived: true };\n  }\n\n  async pin(key: string): Promise<{ pinned: boolean }> {\n    await this.opts.sessionIndex.pinSession(key);\n    return { pinned: true };\n  }\n\n  async unpin(key: string): Promise<{ unpinned: boolean }> {\n    await this.opts.sessionIndex.unpinSession(key);\n    return { unpinned: true };\n  }\n\n  // ── Search + export + stats ───────────────────────────────────────────\n\n  search(query: string) {\n    return this.opts.sessionIndex.searchSessions(query);\n  }\n\n  searchIn(key: string, keyword: string) {\n    return this.opts.sessionIndex.searchInSession(key, keyword);\n  }\n\n  async export(key: string, format: ExportFormat): Promise<{ content: string }> {\n    const content = await this.opts.sessionIndex.exportSession(key, format);\n    return { content };\n  }\n\n  stats() {\n    return this.opts.sessionIndex.getStats();\n  }\n\n  /**\n   * Distinct chat-id pairs from sessions, grouped by channel. Used by cron job\n   * configuration UI to seed the \"send to existing chat\" picker.\n   */\n  chatIds(channel?: string): Promise<\n    Array<{\n      channel: string;\n      chatId: string;\n      lastActive: string;\n      accountId?: string;\n      peerKind?: string;\n      peerId?: string;\n    }>\n  > {\n    return getDistinctSessionChatIds(this.opts.sessionIndex, channel);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"sessions-api.js","names":[],"sources":["../../../../src/gateway/service/sessions-api.ts"],"sourcesContent":["/**\n * GatewaySessionsApi — session CRUD, search, compaction, tag/pin/archive,\n * stats, and chat-id grouping for the gateway REST surface.\n *\n * Twenty-four methods, previously sitting on `GatewayService` as a mix of\n * one-line `sessionIndex.*` delegations and small composite operations (e.g.\n * `restoreCheckpoint` also evicts the in-memory agent, `runCompaction` also\n * appends a transcript context entry). Centralising them here lets routes\n * depend on the narrow `GatewaySessionsApi` surface instead of the full\n * `GatewayService`, and keeps the gateway composition root focused on\n * lifecycle + wiring.\n */\n\nimport type { AgentService } from '../../agent/service.js';\nimport type { CompactionResult } from '../../agent/memory/compaction.js';\nimport { retireSessionMcpRuntimeForSessionKey } from '../../agent/mcp/bundle-mcp-tools.js';\nimport { SessionIndex } from '../../session/index.js';\nimport type { ExportFormat, SessionListQuery } from '../../session/types.js';\nimport type { SessionPatchBody } from '../../session/patch-metadata.js';\nimport { collectMediaUrisFromMessages, deleteMediaUris } from '../../media/session-references.js';\nimport { getDistinctSessionChatIds } from './session-chat-ids.js';\nimport { performSessionReset, type SessionResetResult } from '../session-reset-service.js';\n\nexport interface GatewaySessionsApiOptions {\n  sessionIndex: SessionIndex;\n  /** Resolves the live agent service (created lazily; throws if gateway is starting). */\n  getAgentService: () => AgentService;\n  /** Read-only view of in-flight webchat runs (per session key → run id). */\n  getActiveWebchatRunId: (sessionKey: string) => string | undefined;\n}\n\nexport class GatewaySessionsApi {\n  private readonly opts: GatewaySessionsApiOptions;\n\n  constructor(opts: GatewaySessionsApiOptions) {\n    this.opts = opts;\n  }\n\n  // ── List / get ─────────────────────────────────────────────────────────\n\n  listSessions(query?: SessionListQuery) {\n    return this.opts.sessionIndex.listSessions(query);\n  }\n\n  /** Subagent sessions have keys starting with `subagent:`. */\n  listSubagents(query?: SessionListQuery) {\n    return this.opts.sessionIndex.listSubagents(query);\n  }\n\n  getSession(\n    key: string,\n    options?: { includeTranscriptSummary?: boolean; includeTranscriptRows?: boolean },\n  ) {\n    return this.opts.sessionIndex.getSession(key, options);\n  }\n\n  /** Read-only: in-flight webchat agent run for this session key, if any. */\n  getActiveRun(sessionKey: string): { active: boolean; runId?: string } {\n    const key = sessionKey.trim();\n    if (!key) return { active: false };\n    const runId = this.opts.getActiveWebchatRunId(key)?.trim();\n    if (!runId) return { active: false };\n    return { active: true, runId };\n  }\n\n  getMessagePage(\n    key: string,\n    options?: {\n      offset?: number;\n      limit?: number;\n      before?: string;\n      includeTranscriptSummary?: boolean;\n      includeTranscriptRows?: boolean;\n    },\n  ) {\n    return this.opts.sessionIndex.getSessionMessagePage(key, options);\n  }\n\n  // ── Metadata patches ──────────────────────────────────────────────────\n\n  patch(key: string, body: SessionPatchBody): Promise<{ ok: true } | { ok: false; error: string }> {\n    return this.opts.sessionIndex.patchSession(key, body);\n  }\n\n  async getAgentConfig(sessionKey: string) {\n    return this.opts.getAgentService().sessionInspector.agentConfig(sessionKey);\n  }\n\n  /** Resolved markdown workspace for a session (after hydration / mkdir). */\n  getEffectiveWorkspacePath(sessionKey: string): Promise<string> {\n    return this.opts.getAgentService().getEffectiveWorkspacePathForSession(sessionKey);\n  }\n\n  patchAgentConfig(\n    sessionKey: string,\n    body: {\n      thinkingLevel?: string;\n      model?: string | null;\n      reasoningLevel?: string;\n      verboseLevel?: string;\n      workingDirectory?: string;\n    },\n  ) {\n    return this.opts.getAgentService().sessionConfig.patch(sessionKey, body);\n  }\n\n  // ── Compaction checkpoints ────────────────────────────────────────────\n\n  listCompactionCheckpoints(key: string) {\n    return this.opts.sessionIndex.listCompactionCheckpoints(key);\n  }\n\n  getCompactionCheckpoint(key: string, checkpointId: string) {\n    return this.opts.sessionIndex.getCompactionCheckpointDetail(key, checkpointId);\n  }\n\n  async restoreCompactionCheckpoint(key: string, checkpointId: string): Promise<void> {\n    await this.opts.sessionIndex.restoreCompactionCheckpoint(key, checkpointId);\n    this.opts.getAgentService().evictSessionAgent(key);\n  }\n\n  async runCompaction(\n    key: string,\n    options?: { instructions?: string; force?: boolean },\n  ): Promise<CompactionResult> {\n    const result = await this.opts.getAgentService().sessionInspector.compact(key, options);\n    if (result.compacted) {\n      void this.opts.sessionIndex\n        .appendTranscriptContextEntry(key, {\n          text: 'Session transcript compacted',\n          data: {\n            firstKeptIndex: result.firstKeptIndex,\n            tokensBefore: result.tokensBefore,\n            tokensAfter: result.tokensAfter,\n            summaryPreview: result.summary.slice(0, 500),\n          },\n        })\n        .catch(() => {});\n    }\n    return result;\n  }\n\n  // ── Lifecycle (delete / rename / tag / pin / archive) ─────────────────\n\n  async delete(key: string): Promise<{ deleted: boolean }> {\n    const messages = await this.opts.sessionIndex.loadMessages(key).catch(() => []);\n    const result = await this.opts.sessionIndex.deleteSession(key);\n    if (result) {\n      await deleteMediaUris(collectMediaUrisFromMessages(messages));\n      this.opts.getAgentService().evictSessionAgent(key);\n      await retireSessionMcpRuntimeForSessionKey({ sessionKey: key, reason: 'session-delete' });\n    }\n    return { deleted: result };\n  }\n\n  /** Reset transcript in place (archive + new session id); preserves session key and overrides. */\n  reset(key: string): Promise<SessionResetResult> {\n    return performSessionReset(key, {\n      sessionIndex: this.opts.sessionIndex,\n      getAgentService: this.opts.getAgentService,\n    });\n  }\n\n  deleteMany(keys: string[]): Promise<{ success: string[]; failed: string[] }> {\n    return this.opts.sessionIndex.deleteSessions(keys);\n  }\n\n  async rename(key: string, name: string): Promise<{ renamed: boolean }> {\n    await this.opts.sessionIndex.renameSession(key, name);\n    return { renamed: true };\n  }\n\n  async tag(key: string, tags: string[]): Promise<{ tagged: boolean }> {\n    await this.opts.sessionIndex.tagSession(key, tags);\n    return { tagged: true };\n  }\n\n  async untag(key: string, tags: string[]): Promise<{ untagged: boolean }> {\n    await this.opts.sessionIndex.untagSession(key, tags);\n    return { untagged: true };\n  }\n\n  async archive(key: string): Promise<{ archived: boolean }> {\n    await this.opts.sessionIndex.archiveSession(key);\n    return { archived: true };\n  }\n\n  async unarchive(key: string): Promise<{ unarchived: boolean }> {\n    await this.opts.sessionIndex.unarchiveSession(key);\n    return { unarchived: true };\n  }\n\n  async pin(key: string): Promise<{ pinned: boolean }> {\n    await this.opts.sessionIndex.pinSession(key);\n    return { pinned: true };\n  }\n\n  async unpin(key: string): Promise<{ unpinned: boolean }> {\n    await this.opts.sessionIndex.unpinSession(key);\n    return { unpinned: true };\n  }\n\n  // ── Search + export + stats ───────────────────────────────────────────\n\n  search(query: string) {\n    return this.opts.sessionIndex.searchSessions(query);\n  }\n\n  searchIn(key: string, keyword: string) {\n    return this.opts.sessionIndex.searchInSession(key, keyword);\n  }\n\n  async export(key: string, format: ExportFormat): Promise<{ content: string }> {\n    const content = await this.opts.sessionIndex.exportSession(key, format);\n    return { content };\n  }\n\n  importExport(\n    targetKey: string,\n    jsonContent: string,\n  ): Promise<{ sessionKey: string; rowCount: number }> {\n    return this.opts.sessionIndex.importSessionExport(targetKey, jsonContent);\n  }\n\n  fork(\n    key: string,\n    targetKey: string,\n  ): Promise<{ sessionKey: string; rowCount: number }> {\n    return this.opts.sessionIndex.forkSession(key, targetKey);\n  }\n\n  forkRows(\n    key: string,\n    targetKey: string,\n    options: { throughRow?: number } = {},\n  ): Promise<{ sessionKey: string; rowCount: number }> {\n    return this.opts.sessionIndex.forkSessionRows(key, targetKey, options);\n  }\n\n  btwQuery(sessionKey: string, question: string): Promise<{ text: string; error?: string }> {\n    return this.opts.getAgentService().sessionInspector.btwQuery(sessionKey, question);\n  }\n\n  stats() {\n    return this.opts.sessionIndex.getStats();\n  }\n\n  /**\n   * Distinct chat-id pairs from sessions, grouped by channel. Used by cron job\n   * configuration UI to seed the \"send to existing chat\" picker.\n   */\n  chatIds(channel?: string): Promise<\n    Array<{\n      channel: string;\n      chatId: string;\n      lastActive: string;\n      accountId?: string;\n      peerKind?: string;\n      peerId?: string;\n    }>\n  > {\n    return getDistinctSessionChatIds(this.opts.sessionIndex, channel);\n  }\n}\n"],"mappings":"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"}

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

@@ -37,6 +37,7 @@ export declare class GatewayService {
     private readonly configCoordinator;
     private auth;
     private readonly sse;
+    getConfig(): Config;
     private stopGatewayUpdateCheck;
     /** When set (e.g. by `GatewayServer`), `triggerGatewayProcessRestart` can stop HTTP then exit. */
     private gatewayShutdownForRestart;
@@ -83,6 +84,8 @@ export declare class GatewayService {
      * Load extensions and register SDK / full ChannelPlugin instances with ChannelManager.
      */
     private loadExtensionsAndRegisterChannels;
+    private findChannelContributionExtension;
+    ensureChannelRuntimePlugin(channelId: string): Promise<import("../channels/plugin-types.js").ChannelPlugin<any>>;
     private loadDeferredExtensions;
     private schedulePostReadySidecars;
     private runPostReadySidecars;
@@ -149,6 +152,9 @@ export declare class GatewayService {
         enabled: boolean;
         connected: boolean;
     }>;
+    getRunningChannelIds(): string[];
+    getChannelRuntimePlugin(channelId: string): import("../channels/plugin-types.js").ChannelPlugin<any>;
+    restartChannel(channelId: string): Promise<void>;
     /**
      * Hub metadata for gateway console (built-in registry + registered channel plugins).
      */