@xopcai/xopc 0.0.86 → 0.0.88

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

@@ -1,6 +1,6 @@
-import { resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { resolveStateDir } from "../../config/paths-state.js";
 import { init_paths, resolveExtensionsDir } from "../../config/paths.js";
 import { createSkillConfigManager } from "../../agent/skills/config.js";
 import { removeSkillsLockEntry } from "../../agent/skills/hub-lock.js";
@@ -11,8 +11,8 @@ import { installExtensionFromStoreZip, peekExtensionIdFromStoreZip } from "../..
 import { downloadExtensionStoreZipBuffer, fetchMarketplacePackageDetail, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl } from "../../agent/skills/marketplace/adapters/store/store-api-client.js";
 import { getMarketplaceProviderDisplayName, resolveSkillsMarketplaceProvider } from "../../agent/skills/marketplace/resolve-adapter.js";
 import { downloadFromMarketplace, getMarketplacePackageDetail, listMarketplaceCategories, listMarketplacePackages } from "../../agent/skills/skills-marketplace.js";
-import { join } from "node:path";
 import { existsSync, mkdirSync, rmSync } from "node:fs";
+import { join } from "node:path";
 //#region src/gateway/service/marketplace-service.ts
 /**
 * GatewayMarketplaceService — install / browse / remove for the two marketplaces

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

@@ -1,15 +1,13 @@
-import { buildSessionKey, init_session_key, parseSessionKey } from "../../routing/session-key.js";
-import { getDefaultAgentId, init_resolve_route } from "../../routing/resolve-route.js";
 import { inboundCorrelationMetadataFromAsyncLogContext } from "../../utils/logger/context.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { formatAgentRunErrorForClient } from "../../agent/client-error-format.js";
 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 crypto from "crypto";
 //#region src/gateway/service/run-gateway-agent.ts
-init_session_key();
-init_resolve_route();
 init_logger();
 const log = createLogger("GatewayService");
 /**
@@ -27,13 +25,13 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 	let webchatSessionKey;
 	let webchatStaleSkip = false;
 	if (channel === "webchat") {
-		webchatSessionKey = parseSessionKey(chatId) ? chatId : buildSessionKey({
-			agentId: getDefaultAgentId(config),
-			source: "webchat",
-			accountId: "default",
-			peerKind: "direct",
-			peerId: chatId
+		const resolved = resolveWebchatSessionKey({
+			cfg: config,
+			chatId,
+			newSession: false
 		});
+		if (resolved.ok === false) throw new Error(resolved.error);
+		webchatSessionKey = resolved.sessionKey;
 		const meta = await sessionIndex.getSessionMetadata(webchatSessionKey);
 		webchatStaleSkip = shouldSkipWebchatInboundByAbortCutoff(meta, runOptions?.clientCreatedAtMs);
 		if (!webchatStaleSkip && meta?.abortCutoffTimestamp !== void 0) await sessionIndex.updateSessionMetadata(webchatSessionKey, { abortCutoffTimestamp: void 0 }).catch(() => {});
@@ -98,7 +96,7 @@ async function* runGatewayAgent(deps, message, channel, chatId, attachments, thi
 				streamError = error instanceof Error ? error.message : "Unknown error";
 				const errorEvent = {
 					type: "error",
-					content: `Error: ${streamError}`
+					content: formatAgentRunErrorForClient(streamError)
 				};
 				runRelay.publish(runId, errorEvent);
 				emit("agent.stream", {

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 { prependEnvelopeTimestamp } from '../../channels/envelope-timestamp.js';\nimport type { Config } from '../../config/schema.js';\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport { buildSessionKey, parseSessionKey } from '../../routing/session-key.js';\nimport { getDefaultAgentId } from '../../routing/resolve-route.js';\nimport type { SessionIndex } from '../../session/index.js';\nimport {\n  createLogger,\n  inboundCorrelationMetadataFromAsyncLogContext,\n} from '../../utils/logger.js';\nimport { shouldSkipWebchatInboundByAbortCutoff } from '../../session/abort-cutoff.js';\n\nimport type { AgentRunRelay } from '../agent-run-relay.js';\nimport { MAX_CHAT_ATTACHMENTS } from '../chat-limits.js';\nconst log = createLogger('GatewayService');\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 parsedKey = parseSessionKey(chatId);\n    webchatSessionKey = parsedKey\n      ? chatId\n      : buildSessionKey({\n          agentId: getDefaultAgentId(config),\n          source: 'webchat',\n          accountId: 'default',\n          peerKind: 'direct',\n          peerId: chatId,\n        });\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\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        log.error({ error }, 'Agent processing failed');\n        streamError = error instanceof Error ? error.message : 'Unknown error';\n        const errorEvent = { type: 'error', content: `Error: ${streamError}` };\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    log.error({ error }, 'Agent run failed');\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} 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('GatewayService');\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\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        log.error({ error }, 'Agent processing failed');\n        streamError = error instanceof Error ? error.message : 'Unknown error';\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    log.error({ error }, 'Agent run failed');\n    throw error;\n  }\n}\n"],"mappings":"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"}

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

@@ -15,6 +15,7 @@ import type { CompactionResult } from '../../agent/memory/compaction.js';
 import { SessionIndex } from '../../session/index.js';
 import type { ExportFormat, SessionListQuery } from '../../session/types.js';
 import type { SessionPatchBody } from '../../session/patch-metadata.js';
+import { type SessionResetResult } from '../session-reset-service.js';
 export interface GatewaySessionsApiOptions {
     sessionIndex: SessionIndex;
     /** Resolves the live agent service (created lazily; throws if gateway is starting). */
@@ -79,6 +80,8 @@ export declare class GatewaySessionsApi {
     delete(key: string): Promise<{
         deleted: boolean;
     }>;
+    /** Reset transcript in place (archive + new session id); preserves session key and overrides. */
+    reset(key: string): Promise<SessionResetResult>;
     deleteMany(keys: string[]): Promise<{
         success: string[];
         failed: string[];

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

@@ -1,6 +1,7 @@
 import { retireSessionMcpRuntimeForSessionKey } from "../../agent/mcp/bundle-mcp-runtime.js";
 import "../../agent/mcp/bundle-mcp-tools.js";
 import { getDistinctSessionChatIds } from "./session-chat-ids.js";
+import { performSessionReset } from "../session-reset-service.js";
 //#region src/gateway/service/sessions-api.ts
 var GatewaySessionsApi = class {
 	opts;
@@ -78,6 +79,13 @@ var GatewaySessionsApi = class {
 		}
 		return { deleted: result };
 	}
+	/** Reset transcript in place (archive + new session id); preserves session key and overrides. */
+	reset(key) {
+		return performSessionReset(key, {
+			sessionIndex: this.opts.sessionIndex,
+			getAgentService: this.opts.getAgentService
+		});
+	}
 	deleteMany(keys) {
 		return this.opts.sessionIndex.deleteSessions(keys);
 	}

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 { getDistinctSessionChatIds } from './session-chat-ids.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 result = await this.opts.sessionIndex.deleteSession(key);\n    if (result) {\n      this.opts.getAgentService().evictSessionAgent(key);\n      await retireSessionMcpRuntimeForSessionKey({ sessionKey: key, reason: 'session-delete' });\n    }\n    return { deleted: result };\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 { 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 result = await this.opts.sessionIndex.deleteSession(key);\n    if (result) {\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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"}

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

@@ -1,4 +1,5 @@
 import { AgentService } from '../agent/service.js';
+import { MessageBus } from '../infra/bus/index.js';
 import { CronService } from '../cron/index.js';
 import { ExtensionLoader } from '../extensions/index.js';
 import { SessionIndex } from '../session/index.js';
@@ -209,12 +210,12 @@ export declare class GatewayService {
      */
     invokeGatewayMethod(method: string, params: Record<string, unknown>): Promise<unknown>;
     get currentConfig(): Config;
+    get currentWorkspacePath(): string;
+    get messageBusInstance(): MessageBus;
     /** Effective HTTP listen port (CLI `--port` override or config default). */
     getEffectiveListenPort(): number;
     get cronServiceInstance(): CronService;
     get sessionIndexInstance(): SessionIndex;
-    /** @deprecated Use {@link sessionIndexInstance}. */
-    get sessionManagerInstance(): SessionIndex;
     /** Process a message directly through the agent (for CLI mode). */
     processDirect(content: string, sessionKey?: string): Promise<string>;
     subscribe(sessionId: string, listener: (event: ServiceEvent) => Promise<void> | void): () => void;

package/dist/src/gateway/service.js

@@ -1,12 +1,12 @@
 import { __toCommonJS } from "../../_virtual/_rolldown/runtime.js";
 import { PACKAGE_VERSION, init_package_version } from "../package-version.js";
-import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 import { getLogDir } from "../utils/logger/config.js";
 import { getLogStats } from "../utils/logger/stats.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_paths, resolveAgentDir, resolveConfigPath, resolveCronJobsPath, resolveExtensionsDir } from "../config/paths.js";
 import { loadConfig, saveConfig } from "../config/loader.js";
+import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 import { prewarmModelRegistry } from "../providers/model-registry.js";
 import { init_providers, providers_exports } from "../providers/index.js";
 import { resolveEffectiveGatewayPort } from "./host.js";
@@ -208,11 +208,10 @@ var GatewayService = class {
 	}
 	ensureAgentService() {
 		if (this._agentService) return this._agentService;
-		const modelConfig = this.config.agents?.defaults?.model;
 		const cronRef = { service: this.cronService };
 		this._agentService = new AgentService(this.bus, {
 			workspace: this.workspacePath,
-			model: typeof modelConfig === "string" ? modelConfig : modelConfig?.primary,
+			model: this.config.agents?.defaults?.model?.primary,
 			config: this.config,
 			sessionStore: this.sessionIndex.getStore(),
 			onSessionMetadataUpdated: (sessionKey) => {
@@ -905,6 +904,12 @@ var GatewayService = class {
 	get currentConfig() {
 		return this.config;
 	}
+	get currentWorkspacePath() {
+		return this.workspacePath;
+	}
+	get messageBusInstance() {
+		return this.bus;
+	}
 	/** Effective HTTP listen port (CLI `--port` override or config default). */
 	getEffectiveListenPort() {
 		return resolveEffectiveGatewayPort(this.config, this.serviceConfig.listenPort);
@@ -915,12 +920,8 @@ var GatewayService = class {
 	get sessionIndexInstance() {
 		return this.sessionIndex;
 	}
-	/** @deprecated Use {@link sessionIndexInstance}. */
-	get sessionManagerInstance() {
-		return this.sessionIndex;
-	}
 	/** Process a message directly through the agent (for CLI mode). */
-	async processDirect(content, sessionKey = "cli:direct") {
+	async processDirect(content, sessionKey = "agent:main:main") {
 		return this.agentService.turnDispatcher.processDirect(content, sessionKey);
 	}
 	subscribe(sessionId, listener) {