fix(shell): use correct session id

2026-06-25 03:46:49 +08:00 · 2026-06-11 21:04:31 +03:00
parent 00e526b6e9
commit 89f05247ed
2 changed files with 61 additions and 33 deletions
--- a/server/index.js
+++ b/server/index.js
@@ -112,7 +112,17 @@ const wss = createWebSocketServer(server, {
        getPendingApprovalsForSession,
    },
    shell: {
-        getSessionById: (sessionId) => sessionManager.getSession(sessionId),
+        resolveProviderSessionId: (sessionId, provider) => {
+            const dbSession = sessionsDb.getSessionById(sessionId);
+            const legacyGeminiSession =
+                provider === 'gemini' ? sessionManager.getSession(sessionId) : null;
+
+            if (dbSession) {
+                return dbSession.provider_session_id ?? legacyGeminiSession?.cliSessionId ?? null;
+            }
+
+            return legacyGeminiSession?.cliSessionId;
+        },
        stripAnsiSequences,
        normalizeDetectedUrl,
        extractUrlsFromText,