From 4759633df195ac625a10b95f46aa8c13319bed75 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 11 Jan 2026 02:44:24 +0100
Subject: [PATCH] fix(cli): keep build/lint green

---
 src/agents/cli-runner.ts                     | 10 +++++-----
 src/gateway/gateway-cli-backend.live.test.ts |  8 ++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/agents/cli-runner.ts b/src/agents/cli-runner.ts
index 09f7849e4..743bbb8c1 100644
--- a/src/agents/cli-runner.ts
+++ b/src/agents/cli-runner.ts
@@ -278,8 +278,7 @@ function parseCliJsonl(
     }
     const item = isRecord(parsed.item) ? parsed.item : null;
     if (item && typeof item.text === "string") {
-      const type =
-        typeof item.type === "string" ? item.type.toLowerCase() : "";
+      const type = typeof item.type === "string" ? item.type.toLowerCase() : "";
       if (!type || type.includes("message")) {
         texts.push(item.text);
       }
@@ -633,8 +632,9 @@ export async function runCliAgent(params: {
         });
       }
 
-      const outputMode =
-        useResume ? backend.resumeOutput ?? backend.output : backend.output;
+      const outputMode = useResume
+        ? (backend.resumeOutput ?? backend.output)
+        : backend.output;
 
       if (outputMode === "text") {
         return { text: stdout, sessionId: undefined };
@@ -656,7 +656,7 @@ export async function runCliAgent(params: {
       meta: {
         durationMs: Date.now() - started,
         agentMeta: {
-          sessionId: output.sessionId ?? sessionIdSent,
+          sessionId: output.sessionId ?? sessionIdSent ?? params.sessionId,
           provider: params.provider,
           model: modelId,
           usage: output.usage,
diff --git a/src/gateway/gateway-cli-backend.live.test.ts b/src/gateway/gateway-cli-backend.live.test.ts
index a0d3dce82..45a7b1712 100644
--- a/src/gateway/gateway-cli-backend.live.test.ts
+++ b/src/gateway/gateway-cli-backend.live.test.ts
@@ -378,17 +378,13 @@ describeLive("gateway live (cli backend)", () => {
           { expectFinal: true },
         );
         if (resumePayload?.status !== "ok") {
-          throw new Error(
-            `resume status=${String(resumePayload?.status)}`,
-          );
+          throw new Error(`resume status=${String(resumePayload?.status)}`);
         }
         const resumeText = extractPayloadText(resumePayload?.result);
         if (providerId === "codex-cli") {
           expect(resumeText).toContain(`CLI-RESUME-${resumeNonce}`);
         } else {
-          expect(resumeText).toContain(
-            `CLI backend RESUME OK ${resumeNonce}.`,
-          );
+          expect(resumeText).toContain(`CLI backend RESUME OK ${resumeNonce}.`);
         }
       }