Add CLI instance proxy and route UI traffic through it

packages/ui/src/lib/api-client.ts

@@ -25,6 +25,8 @@ const DEFAULT_EVENTS_PATH = typeof window !== "undefined" ? window.__CODENOMAD_E
 const API_BASE = import.meta.env.VITE_CODENOMAD_API_BASE ?? DEFAULT_BASE
 const EVENTS_URL = buildEventsUrl(API_BASE, DEFAULT_EVENTS_PATH)
 
+export const CODENOMAD_API_BASE = API_BASE
+
 function buildEventsUrl(base: string | undefined, path: string): string {
   if (path.startsWith("http://") || path.startsWith("https://")) {
     return path

packages/ui/src/lib/sdk-manager.ts

@@ -1,27 +1,27 @@
 import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk/client"
+import { CODENOMAD_API_BASE } from "./api-client"
 
 class SDKManager {
-  private clients = new Map<number, OpencodeClient>()
+  private clients = new Map<string, OpencodeClient>()
 
-  createClient(port: number): OpencodeClient {
-    if (this.clients.has(port)) {
-      return this.clients.get(port)!
+  createClient(instanceId: string, proxyPath: string): OpencodeClient {
+    if (this.clients.has(instanceId)) {
+      return this.clients.get(instanceId)!
     }
 
-    const client = createOpencodeClient({
-      baseUrl: `http://localhost:${port}`,
-    })
+    const baseUrl = buildInstanceBaseUrl(proxyPath)
+    const client = createOpencodeClient({ baseUrl })
 
-    this.clients.set(port, client)
+    this.clients.set(instanceId, client)
     return client
   }
 
-  getClient(port: number): OpencodeClient | null {
-    return this.clients.get(port) || null
+  getClient(instanceId: string): OpencodeClient | null {
+    return this.clients.get(instanceId) ?? null
   }
 
-  destroyClient(port: number): void {
-    this.clients.delete(port)
+  destroyClient(instanceId: string): void {
+    this.clients.delete(instanceId)
   }
 
   destroyAll(): void {
@@ -29,4 +29,19 @@ class SDKManager {
   }
 }
 
+function buildInstanceBaseUrl(proxyPath: string): string {
+  const normalized = normalizeProxyPath(proxyPath)
+  const base = stripTrailingSlashes(CODENOMAD_API_BASE)
+  return `${base}${normalized}/`
+}
+
+function normalizeProxyPath(proxyPath: string): string {
+  const withLeading = proxyPath.startsWith("/") ? proxyPath : `/${proxyPath}`
+  return withLeading.replace(/\/+/g, "/").replace(/\/+$/, "")
+}
+
+function stripTrailingSlashes(input: string): string {
+  return input.replace(/\/+$/, "")
+}
+
 export const sdkManager = new SDKManager()

packages/ui/src/lib/sse-manager.ts

@@ -1,9 +1,9 @@
 import { createSignal } from "solid-js"
-import { 
-  MessageUpdateEvent, 
-  MessageRemovedEvent, 
-  MessagePartUpdatedEvent, 
-  MessagePartRemovedEvent 
+import {
+  MessageUpdateEvent,
+  MessageRemovedEvent,
+  MessagePartUpdatedEvent,
+  MessagePartRemovedEvent,
 } from "../types/message"
 import type {
   EventLspUpdated,
@@ -14,10 +14,11 @@ import type {
   EventSessionIdle,
   EventSessionUpdated,
 } from "@opencode-ai/sdk"
+import { CODENOMAD_API_BASE } from "./api-client"
 
 interface SSEConnection {
   instanceId: string
-  port: number
+  proxyPath: string
   eventSource: EventSource
   status: "connecting" | "connected" | "disconnected" | "error"
   reconnectAttempts: number
@@ -57,19 +58,19 @@ class SSEManager {
   private connections = new Map<string, SSEConnection>()
   private static readonly MAX_RECONNECT_ATTEMPTS = 3
 
-  connect(instanceId: string, port: number, reconnectAttempts = 0): void {
+  connect(instanceId: string, proxyPath: string, reconnectAttempts = 0): void {
     const existing = this.connections.get(instanceId)
     if (existing) {
       this.clearReconnectTimer(existing)
       existing.eventSource.close()
     }
 
-    const url = `http://localhost:${port}/event`
+    const url = buildInstanceEventsUrl(proxyPath)
     const eventSource = new EventSource(url)
 
     const connection: SSEConnection = {
       instanceId,
-      port,
+      proxyPath,
       eventSource,
       status: "connecting",
       reconnectAttempts,
@@ -180,7 +181,7 @@ class SSEManager {
 
     connection.reconnectTimer = setTimeout(() => {
       connection.reconnectTimer = undefined
-      this.connect(instanceId, connection.port, nextAttempt)
+      this.connect(instanceId, connection.proxyPath, nextAttempt)
     }, delay)
   }
 
@@ -234,4 +235,19 @@ class SSEManager {
   }
 }
 
+function buildInstanceEventsUrl(proxyPath: string): string {
+  const normalized = normalizeProxyPath(proxyPath)
+  const base = stripTrailingSlashes(CODENOMAD_API_BASE)
+  return `${base}${normalized}/event`
+}
+
+function normalizeProxyPath(proxyPath: string): string {
+  const withLeading = proxyPath.startsWith("/") ? proxyPath : `/${proxyPath}`
+  return withLeading.replace(/\/+/g, "/").replace(/\/+$/, "")
+}
+
+function stripTrailingSlashes(input: string): string {
+  return input.replace(/\/+$/, "")
+}
+
 export const sseManager = new SSEManager()