refactor: unify agent session persistence

src/routes/chatStream.ts

@@ -13,7 +13,7 @@ export type SupportedModel = (typeof supportedModels)[number];
 
 type StreamPromptOptions = {
   runtime: OpencodeRuntimeAdapter;
-  opencodeSessionId: string;
+  sessionId: string;
   clientSessionId: string;
   message: string;
   model?: SupportedModel;
@@ -168,11 +168,11 @@ export const collectTextContent = (parts: Part[]) =>
 
 const emitFallbackMessage = async (
   runtime: OpencodeRuntimeAdapter,
-  opencodeSessionId: string,
+  sessionId: string,
   clientSessionId: string,
   write: (event: string, data: Record<string, unknown>) => void,
 ) => {
-  const messages = await runtime.messages(opencodeSessionId);
+  const messages = await runtime.messages(sessionId);
   const assistantMessage = [...messages]
     .reverse()
     .find((message) => message.info.role === "assistant");
@@ -293,7 +293,7 @@ const getToolProgressTitle = (tool: string, status: string) => {
 
 export const streamPromptResponse = async ({
   runtime,
-  opencodeSessionId,
+  sessionId,
   clientSessionId,
   message,
   model,
@@ -332,7 +332,7 @@ export const streamPromptResponse = async ({
   let aborted = signal?.aborted ?? false;
   let failed = false;
   const debugContext = {
-    opencodeSessionId,
+    sessionId,
     clientSessionId,
     traceId,
     projectId,
@@ -406,7 +406,7 @@ export const streamPromptResponse = async ({
   });
 
   const promptPromise = runtime
-    .prompt(opencodeSessionId, message, toRuntimeModel(model))
+    .prompt(sessionId, message, toRuntimeModel(model))
     .then(() => {
       promptSettled = true;
       logDevelopmentDebug("runtime.prompt resolved", {
@@ -471,7 +471,7 @@ export const streamPromptResponse = async ({
       }
 
       const event = next.result.value as OpencodeEvent;
-      if (!isSessionEvent(event, opencodeSessionId)) {
+      if (!isSessionEvent(event, sessionId)) {
         continue;
       }
 
@@ -541,7 +541,7 @@ export const streamPromptResponse = async ({
         });
         void writeLlmRequestAuditLog({
           kind: "skill",
-          sessionId: opencodeSessionId,
+          sessionId: sessionId,
           clientSessionId,
           traceId,
           projectId,
@@ -691,7 +691,7 @@ export const streamPromptResponse = async ({
               logger.warn(
                 {
                   tool: part.tool,
-                  sessionId: opencodeSessionId,
+                  sessionId: sessionId,
                   clientSessionId,
                 },
                 "llm tool request missing reason",
@@ -699,7 +699,7 @@ export const streamPromptResponse = async ({
             }
             void writeLlmRequestAuditLog({
               kind: "tool",
-              sessionId: opencodeSessionId,
+              sessionId: sessionId,
               clientSessionId,
               traceId,
               projectId,
@@ -781,12 +781,12 @@ export const streamPromptResponse = async ({
         ...debugContext,
         elapsedMs: Math.max(0, Date.now() - requestStartedAt),
       });
-      await runtime.abortSession(opencodeSessionId).catch((error) => {
-        logger.warn({ sessionId: opencodeSessionId, err: error }, "failed to abort opencode session");
+      await runtime.abortSession(sessionId).catch((error) => {
+        logger.warn({ sessionId: sessionId, err: error }, "failed to abort opencode session");
       });
-      await runtime.waitForSessionIdle(opencodeSessionId).catch((error) => {
+      await runtime.waitForSessionIdle(sessionId).catch((error) => {
         logger.warn(
-          { sessionId: opencodeSessionId, err: error },
+          { sessionId: sessionId, err: error },
           "failed while waiting for aborted opencode session to become idle",
         );
       });
@@ -803,7 +803,7 @@ export const streamPromptResponse = async ({
         ...debugContext,
         elapsedMs: Math.max(0, Date.now() - requestStartedAt),
       });
-      await emitFallbackMessage(runtime, opencodeSessionId, clientSessionId, write);
+      await emitFallbackMessage(runtime, sessionId, clientSessionId, write);
     }
     emitProgress({
       id: "request-received",