From dca7fc266dcbae0a00be249374b79af69cb3e577 Mon Sep 17 00:00:00 2001
From: noamzbr <noamzbr@gmail.com>
Date: Wed, 21 Jan 2026 15:21:29 +0200
Subject: [PATCH] Persist loaded model and mode on session load

---
 packages/opencode/src/acp/agent.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/opencode/src/acp/agent.ts b/packages/opencode/src/acp/agent.ts
index 6330fae97a2..7e0ed33ddcb 100644
--- a/packages/opencode/src/acp/agent.ts
+++ b/packages/opencode/src/acp/agent.ts
@@ -512,8 +512,13 @@ export namespace ACP {
         const lastUser = messages?.findLast((m) => m.info.role === "user")?.info
         if (lastUser?.role === "user") {
           result.models.currentModelId = `${lastUser.model.providerID}/${lastUser.model.modelID}`
+          this.sessionManager.setModel(sessionId, {
+            providerID: lastUser.model.providerID,
+            modelID: lastUser.model.modelID,
+          })
           if (result.modes.availableModes.some((m) => m.id === lastUser.agent)) {
             result.modes.currentModeId = lastUser.agent
+            this.sessionManager.setMode(sessionId, lastUser.agent)
           }
         }