From 16a5c82b57787f42c91d49a7beadb5703fb90ae1 Mon Sep 17 00:00:00 2001
From: Harsh <harshb012@gmail.com>
Date: Wed, 11 Mar 2026 23:39:59 +0530
Subject: [PATCH] fix: align clean-branch merges with project filtering

Preserve the legacy project fallback in the shared session loader and keep the sessions route filtering by project after the clean branch cherry-pick, so the final PR branch matches the verified multi-project behavior.
---
 packages/core/src/session-manager.ts       | 16 ++++++++--------
 packages/web/src/app/api/sessions/route.ts |  7 ++++---
 packages/web/src/app/page.tsx              |  2 --
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/session-manager.ts b/packages/core/src/session-manager.ts
index 548f0694f..b2b7b0e54 100644
--- a/packages/core/src/session-manager.ts
+++ b/packages/core/src/session-manager.ts
@@ -1208,7 +1208,7 @@ export function createSessionManager(deps: SessionManagerDeps): OpenCodeSessionM
 
     const existingRaw = readMetadataRaw(sessionsDir, sessionId);
     const existingOrchestrator = existingRaw?.["runtimeHandle"]
-      ? metadataToSession(sessionId, existingRaw)
+      ? metadataToSession(sessionId, existingRaw, orchestratorConfig.projectId)
       : null;
     if (existingOrchestrator?.runtimeHandle) {
       const existingAlive = await plugins.runtime
@@ -1217,7 +1217,11 @@ export function createSessionManager(deps: SessionManagerDeps): OpenCodeSessionM
       if (existingAlive && orchestratorSessionStrategy === "reuse") {
         const persistedRaw = readMetadataRaw(sessionsDir, sessionId);
         if (persistedRaw?.["runtimeHandle"]) {
-          const persisted = metadataToSession(sessionId, persistedRaw);
+          const persisted = metadataToSession(
+            sessionId,
+            persistedRaw,
+            orchestratorConfig.projectId,
+          );
           persisted.metadata["orchestratorSessionReused"] = "true";
           return persisted;
         }
@@ -1246,7 +1250,7 @@ export function createSessionManager(deps: SessionManagerDeps): OpenCodeSessionM
       // Check if the session now exists and is alive.
       const concurrentRaw = readMetadataRaw(sessionsDir, sessionId);
       const concurrentSession = concurrentRaw?.["runtimeHandle"]
-        ? metadataToSession(sessionId, concurrentRaw)
+        ? metadataToSession(sessionId, concurrentRaw, orchestratorConfig.projectId)
         : null;
       if (concurrentSession?.runtimeHandle) {
         const concurrentAlive = await plugins.runtime
@@ -1479,17 +1483,13 @@ export function createSessionManager(deps: SessionManagerDeps): OpenCodeSessionM
         // If stat fails, timestamps will fall back to current time
       }
 
-<<<<<<< HEAD
       const repaired = repairSingleSessionMetadataOnRead(sessionsDir, {
         sessionName: sessionId,
         raw,
         modifiedAt,
       });
-=======
-      const session = metadataToSession(sessionId, raw, projectId, createdAt, modifiedAt);
->>>>>>> d502cd1 (fix: preserve project ownership for legacy sessions)
 
-      const session = metadataToSession(sessionId, repaired.raw, createdAt, modifiedAt);
+      const session = metadataToSession(sessionId, repaired.raw, projectId, createdAt, modifiedAt);
 
       const selectedAgentName = repaired.raw["agent"];
       const effectiveAgentName = selectedAgentName ?? project.agent ?? config.defaults.agent;
diff --git a/packages/web/src/app/api/sessions/route.ts b/packages/web/src/app/api/sessions/route.ts
index f35b73d8e..98c7180ca 100644
--- a/packages/web/src/app/api/sessions/route.ts
+++ b/packages/web/src/app/api/sessions/route.ts
@@ -51,12 +51,13 @@ export async function GET(request: Request) {
     const matchesRequestedProject = (session: { id: string; projectId: string }): boolean => {
       if (!projectFilter || projectFilter === "all") return true;
       if (session.projectId === projectFilter) return true;
+      if (config.projects[projectFilter]?.sessionPrefix) {
+        return session.id.startsWith(config.projects[projectFilter].sessionPrefix);
+      }
       return config.projects[session.projectId]?.sessionPrefix === projectFilter;
     };
 
-    const visibleSessions = requestedProjectId
-      ? coreSessions
-      : coreSessions.filter(matchesRequestedProject);
+    const visibleSessions = coreSessions.filter(matchesRequestedProject);
     const orchestrators = listDashboardOrchestrators(visibleSessions, config.projects);
     const orchestratorId = orchestrators.length === 1 ? (orchestrators[0]?.id ?? null) : null;
 
diff --git a/packages/web/src/app/page.tsx b/packages/web/src/app/page.tsx
index ddca05d7b..0e081d39c 100644
--- a/packages/web/src/app/page.tsx
+++ b/packages/web/src/app/page.tsx
@@ -118,8 +118,6 @@ export default async function Home(props: { searchParams: Promise<{ project?: st
     await Promise.race([Promise.allSettled(enrichPromises), enrichTimeout]);
   } catch {
     sessions = [];
-    globalPause = null;
-    orchestrators = [];
   }
 
   const projectName = getSelectedProjectName(projectFilter);