talon-agent 3.32.1 → 3.33.1

package/src/backend/opencode/server.ts

@@ -1,19 +1,14 @@
 /**
- * OpenCode server lifecycle — thin wrapper around `backend/remote-server/`.
+ * OpenCode server lifecycle — the OpenCode profile bound through
+ * `backend/remote-server/server-bindings.ts`.
  *
- * The MCP / session / provider plumbing is identical to Kilo (Kilo is a
- * fork of OpenCode that exposes the same HTTP API), so this module
- * keeps only the OpenCode-specific bits:
- *
- *   - Constants (port 4096, system-prompt suffix wording).
- *   - SDK-specific client factory (`createOpencodeClient` +
- *     `createOpencodeServer`).
- *   - Backend-specific model parser (the fuzzy `provider/model` splitter
- *     from `./models.ts`).
- *   - Pre-warm hook that triggers immediately at init.
- *
- * The shared machinery (server spawn, MCP registration, session creation,
- * provider resolution) lives in `backend/remote-server/`.
+ * The server spawn, MCP registration, session creation, and provider
+ * resolution are the shared remote-server family implementation (Kilo is
+ * a fork with the same HTTP API). This module holds only what is
+ * OpenCode's: the SDK constructors, port 4096, the text-preferred
+ * delivery contract, and the fuzzy `provider/model` parser. The exports
+ * keep their historical names — the models module, one-shot runner,
+ * tests, and `vi.mock("../backend/opencode/server.js")` all address them.
  */
 
 import {
@@ -21,228 +16,64 @@ import {
   createOpencodeServer,
   type OpencodeClient,
 } from "@opencode-ai/sdk/v2";
-import type { TalonConfig } from "../../util/config.js";
-import type { FrontendName } from "../../core/agent-runtime/backend-registry.js";
-import { buildDeliveryContract } from "../shared/delivery-contract.js";
 import {
-  guessProviderID,
-  getBucketPriority,
   normalizeModelLookup,
-  parseRemoteModelQuery as parseOpenCodeModelQuery,
+  parseRemoteModelQuery,
 } from "../remote-server/model-catalog/index.js";
 import {
-  createRemoteServerState,
-  ensureRemoteServer as ensureRemoteServerShared,
-  stopRemoteServer,
-  ensureChatMcpServer as ensureChatMcpServerShared,
-  ensurePluginMcpServers as ensurePluginMcpServersShared,
-  buildToolOverrides as buildToolOverridesShared,
-  disconnectChatMcpServer as disconnectChatMcpServerShared,
-  refreshPluginMcpServers as refreshPluginMcpServersShared,
-  ensureRemoteSession,
-  warmRemoteSession,
-  resolveProviderID as resolveProviderIDShared,
-  getRegisteredMcpServerNames as getRegisteredMcpServerNamesShared,
-  errMsg as sharedErrMsg,
-  TALON_MCP_SERVER_NAME as SHARED_TALON_MCP_SERVER_NAME,
-  type RemoteServerState,
-} from "../remote-server/index.js";
-
-// ── Constants ───────────────────────────────────────────────────────────────
-
-const OPENCODE_HOSTNAME = "127.0.0.1";
-// Overridable via `OPENCODE_PORT` env so integration tests can spawn an
-// isolated server alongside a running production Talon (which holds 4096).
-const OPENCODE_PORT = Number(process.env.OPENCODE_PORT ?? 4096);
-const OPENCODE_BASE_URL = `http://${OPENCODE_HOSTNAME}:${OPENCODE_PORT}`;
-const TALON_MCP_SERVER_NAME = SHARED_TALON_MCP_SERVER_NAME;
-// Text-preferred delivery: plain assistant text is the reply; tools
-// only for genuine side effects. Single-sourced from the shared
-// contract templates (prompts/system/contract-text-preferred.md).
-export function opencodeSystemPromptSuffix(frontend: string): string {
-  return `\n\n${buildDeliveryContract("text-preferred", frontend)}\n`;
-}
-
-/** Telegram-shaped default, kept for one-shot (cross-surface) paths. */
-const OPENCODE_SYSTEM_PROMPT_SUFFIX = opencodeSystemPromptSuffix("telegram");
-
-// ── State ───────────────────────────────────────────────────────────────────
-
-const state: RemoteServerState<OpencodeClient> =
-  createRemoteServerState<OpencodeClient>({
-    label: "OpenCode",
-    hostname: OPENCODE_HOSTNAME,
-    port: OPENCODE_PORT,
-  });
-
-function createStrictOpencodeClient(baseUrl: string): OpencodeClient {
-  return createOpencodeClient({
-    baseUrl,
-    throwOnError: true,
-  });
-}
-
-// ── Init / teardown ─────────────────────────────────────────────────────────
-
-export function initOpenCodeAgent(
-  cfg: TalonConfig,
-  getGatewayPort?: () => number,
-  frontend?: FrontendName,
-): void {
-  state.config = cfg;
-  if (getGatewayPort) state.gatewayPortFn = getGatewayPort;
-  if (frontend) state.frontendName = frontend;
-}
+  bindRemoteServer,
+  type RemoteModelSelection,
+} from "../remote-server/server-bindings.js";
 
 /**
- * Callbacks run when the server stops — cache invalidation lives with the
- * caches. The models module registers its clear here at load time, so the
- * server never has to import it (which would be a cycle).
+ * Parse the stored model-selection string into a `{providerID?, modelID}`
+ * pair. The parser is fuzzy — it tries to extract a provider hint from the
+ * prefix while preserving the full model id when ambiguous. See
+ * `remote-server/model-catalog/` for the underlying `parseRemoteModelQuery`.
  */
-const stopHooks = new Set<() => void>();
-
-/** Register a callback to run whenever the OpenCode server is stopped. */
-export function onServerStop(hook: () => void): void {
-  stopHooks.add(hook);
-}
-
-export function stopOpenCodeServer(): void {
-  stopRemoteServer(state, () => {
-    for (const hook of stopHooks) hook();
-  });
-}
-
-// ── Server lifecycle ────────────────────────────────────────────────────────
-
-export function ensureServer(): Promise<OpencodeClient> {
-  return ensureRemoteServerShared({
-    state,
-    createClient: createStrictOpencodeClient,
-    createServer: ({ hostname, port, timeout }) =>
-      createOpencodeServer({ hostname, port, timeout }),
-  });
-}
-
-// ── MCP server registration ─────────────────────────────────────────────────
-
-export function ensureChatMcpServer(
-  oc: OpencodeClient,
-  chatId: string,
-): Promise<string> {
-  return ensureChatMcpServerShared(oc, state, chatId);
-}
-
-export function ensurePluginMcpServers(
-  oc: OpencodeClient,
-  chatId: string,
-): Promise<string[]> {
-  return ensurePluginMcpServersShared(oc, state, chatId);
-}
-
-export function buildToolOverrides(
-  oc: OpencodeClient,
-  chatServerName: string,
-  pluginServerNames: readonly string[] = [],
-): Promise<Record<string, boolean> | undefined> {
-  return buildToolOverridesShared(oc, state, chatServerName, pluginServerNames);
-}
-
-export function disconnectChatMcpServer(
-  oc: OpencodeClient,
-  serverName: string,
-): Promise<void> {
-  return disconnectChatMcpServerShared(oc, state, serverName);
-}
-
-export async function refreshPluginMcpServers(chatId: string) {
-  const oc = await ensureServer();
-  return refreshPluginMcpServersShared(oc, state, chatId);
-}
-
-export function updateSystemPrompt(prompt: string): void {
-  if (state.config) state.config.systemPrompt = prompt;
-}
-
-// ── Session management ─────────────────────────────────────────────────────
-
-export function ensureSession(
-  oc: OpencodeClient,
-  chatId: string,
-): Promise<string> {
-  return ensureRemoteSession(oc, state, chatId);
-}
-
-/**
- * Front-load a chat's cold start after `/reset`. Mirrors the Claude
- * backend's `warmSession` so the `sessions` capability slot behaves the
- * same across backends. Never throws — see `warmRemoteSession`.
- */
-export function warmSession(chatId: string): Promise<void> {
-  return warmRemoteSession(state, chatId, {
-    ensureServer,
-    ensureSession,
-    ensureChatMcpServer,
-    ensurePluginMcpServers,
-  });
-}
-
-// ── Provider resolution ────────────────────────────────────────────────────
-
-export function resolveProviderID(
-  oc: OpencodeClient,
-  modelID: string,
-): Promise<string> {
-  return resolveProviderIDShared(oc, state, modelID, {
-    guessProviderID,
-    getBucketPriority,
-  });
-}
-
-/**
- * Parse the stored model-selection string into a `{providerID?, modelID}` pair.
- *
- * OpenCode model ids occasionally encode the provider as a `provider/model`
- * prefix (e.g. `openrouter/anthropic/claude-3.5-sonnet`). The parser here
- * is fuzzy — it tries to extract a provider hint from the prefix while
- * preserving the full model id when ambiguous. See `./models.ts` for the
- * underlying `parseOpenCodeModelQuery` logic.
- */
-export function parseStoredOpenCodeModelSelection(value: string): {
-  providerID?: string;
-  modelID: string;
-} {
-  const { providerQuery, modelQuery } = parseOpenCodeModelQuery(value);
+export function parseStoredOpenCodeModelSelection(
+  value: string,
+): RemoteModelSelection {
+  const { providerQuery, modelQuery } = parseRemoteModelQuery(value);
   return {
     providerID: providerQuery ? normalizeModelLookup(providerQuery) : undefined,
     modelID: modelQuery,
   };
 }
 
-// ── Internal accessors ─────────────────────────────────────────────────────
-
-export function getConfig(): TalonConfig {
-  if (!state.config) {
-    throw new Error(
-      "OpenCode agent not initialized — call initOpenCodeAgent first",
-    );
-  }
-  return state.config;
-}
-
-/**
- * Snapshot of the locally-cached MCP server registrations. Test-only.
- */
-export function getRegisteredMcpServerNames(): string[] {
-  return getRegisteredMcpServerNamesShared(state);
-}
-
-const errMsg = sharedErrMsg;
-
-export {
-  OPENCODE_HOSTNAME,
-  OPENCODE_PORT,
-  OPENCODE_BASE_URL,
-  TALON_MCP_SERVER_NAME,
-  OPENCODE_SYSTEM_PROMPT_SUFFIX,
+// Text-preferred delivery: plain assistant text is the reply; tools only
+// for genuine side effects. Single-sourced from the shared contract
+// templates (prompts/system/contract-text-preferred.md).
+const opencode = bindRemoteServer<OpencodeClient>({
+  label: "OpenCode",
+  defaultPort: 4096,
+  portEnv: "OPENCODE_PORT",
+  deliveryContract: "text-preferred",
+  createClient: (baseUrl) =>
+    createOpencodeClient({ baseUrl, throwOnError: true }),
+  createServer: ({ hostname, port, timeout }) =>
+    createOpencodeServer({ hostname, port, timeout }),
+  parseModelSelection: parseStoredOpenCodeModelSelection,
+});
+
+export const OPENCODE_BASE_URL = opencode.baseUrl;
+export const opencodeSystemPromptSuffix = opencode.systemPromptSuffix;
+export const OPENCODE_SYSTEM_PROMPT_SUFFIX = opencode.defaultSystemPromptSuffix;
+export const initOpenCodeAgent = opencode.init;
+export const stopOpenCodeServer = opencode.stop;
+export const {
+  onServerStop,
+  ensureServer,
+  ensureChatMcpServer,
+  ensurePluginMcpServers,
+  buildToolOverrides,
+  disconnectChatMcpServer,
+  refreshPluginMcpServers,
+  updateSystemPrompt,
+  ensureSession,
+  warmSession,
+  resolveProviderID,
+  getConfig,
+  getRegisteredMcpServerNames,
   errMsg,
-};
+} = opencode;

package/src/backend/opencode/sessions.ts

@@ -1,116 +1,35 @@
 /**
- * OpenCode session helpers — thin wrapper around
- * `backend/remote-server/session-helpers.ts`.
- *
- * Kilo is a fork of OpenCode that exposes the same session message shape
- * and question API, so the parsing / summarisation / snapshot logic
- * lives in the shared module. This file binds the OpenCode backend label
- * and re-exports under OpenCode-named symbols for back-compat with the
- * handler and the public OpenCode barrel.
+ * OpenCode session helpers — the shared `remote-server/session-helpers.ts`
+ * bound to the OpenCode client, re-exported under OpenCode-named symbols
+ * for the handler / index / test imports.
  */
 
 import type { OpencodeClient } from "@opencode-ai/sdk/v2";
 import {
-  REMOTE_SESSION_MESSAGE_LIMIT,
   extractPartsSummary as extractPartsSummaryShared,
-  extractAssistantUsage as extractAssistantUsageShared,
   summarizeAssistantMessages,
-  getTurnSummary,
   getSessionSnapshot,
-  rejectPendingQuestions as rejectPendingQuestionsShared,
-  approvePendingPermissions as approvePendingPermissionsShared,
-  type RemoteAssistantInfo,
   type RemoteSessionSnapshot,
   type RemoteSessionClient,
 } from "../remote-server/session-helpers.js";
 import { ensureServer } from "./server.js";
 
-// ── Constants / type aliases (OpenCode-named surface) ──────────────────────
-
-export const OPENCODE_SESSION_MESSAGE_LIMIT = REMOTE_SESSION_MESSAGE_LIMIT;
-
-/** Subset of OpenCode's `Message.info` used by Talon for usage accounting. */
-export type OpenCodeAssistantInfo = RemoteAssistantInfo;
-
 /** Snapshot of an OpenCode session's lifetime + last-turn assistant info. */
 export type OpenCodeSessionSnapshot = RemoteSessionSnapshot;
 
-// ── Re-exports of pure helpers ─────────────────────────────────────────────
-
 export const extractPartsSummary = extractPartsSummaryShared;
-export const extractAssistantUsage = extractAssistantUsageShared;
 
-/**
- * Summarise a batch of session messages into per-turn usage totals.
- * Re-exported under the OpenCode-prefixed name for back-compat with
- * existing imports.
- */
+/** Summarise a batch of session messages into per-turn usage totals. */
 export const summarizeOpenCodeAssistantMessages = summarizeAssistantMessages;
 
-// ── Session-messages aggregators ──────────────────────────────────────────
-
-/**
- * Aggregate the most recent turn's assistant messages into a usage
- * summary. Delegates to the shared helper with an OpenCode-typed client.
- */
-export function getOpenCodeTurnSummary(
-  oc: OpencodeClient,
-  sessionId: string,
-  minCreatedAt: number,
-): Promise<ReturnType<typeof summarizeAssistantMessages>> {
-  return getTurnSummary(
-    oc as unknown as RemoteSessionClient,
-    sessionId,
-    minCreatedAt,
-  );
-}
-
 /**
  * Build an {@link OpenCodeSessionSnapshot} for the given session id.
- *
  * Returns `undefined` if no session id was provided.
  */
 export async function getOpenCodeSessionSnapshot(
   sessionId: string | undefined,
 ): Promise<OpenCodeSessionSnapshot | undefined> {
   if (!sessionId) return undefined;
-  const oc = await ensureServer();
+  const oc: OpencodeClient = await ensureServer();
   return getSessionSnapshot(oc as unknown as RemoteSessionClient, sessionId);
 }
-
-// ── Pending-question guard ─────────────────────────────────────────────────
-
-/**
- * Auto-respond to pending OpenCode questions for this session. Delegates
- * to the shared helper with the OpenCode backend label.
- */
-export function rejectPendingQuestions(
-  oc: OpencodeClient,
-  sessionId: string,
-  chatId: string,
-  seenQuestionIds: Set<string>,
-): Promise<void> {
-  return rejectPendingQuestionsShared(
-    oc as unknown as RemoteSessionClient,
-    sessionId,
-    chatId,
-    seenQuestionIds,
-    "OpenCode",
-  );
-}
-
-/** Auto-approve pending OpenCode permissions for this headless session. */
-export function approvePendingPermissions(
-  oc: OpencodeClient,
-  sessionId: string,
-  chatId: string,
-  seenPermissionIds: Set<string>,
-): Promise<void> {
-  return approvePendingPermissionsShared(
-    oc as unknown as RemoteSessionClient,
-    sessionId,
-    chatId,
-    seenPermissionIds,
-    "OpenCode",
-  );
-}