fix(restore): preserve saved tab order during startup

Bind saved tabs to workspaces that are still starting instead of treating them as missing until readiness. This preserves each workspace identity and saved position before the active workspace can be placed first, while terminal stopped and error workspaces remain excluded from restoration.

Add a regression case matching the observed DreamX and CodeNomad startup order. Validated with 46 UI restoration tests, UI typecheck and production build, plus 38 targeted Tauri client-state tests.

Author: pascalandr

packages/ui/src/lib/hooks/use-app-session-restore.ts

@@ -110,8 +110,7 @@ async function restoreTabs(context: RestoreContext): Promise<void> {
   const matches = reconcileWorkspaceTabs(snapshot.tabs.map((tab) => tab.kind === "workspace"
     ? { kind: tab.kind, folderPath: tab.folder, occurrence: tab.occurrence }
      : { kind: tab.kind }), Array.from(instances().values())
-       .filter(({ status }) => status === "ready")
-       .map(({ id, folder }) => ({ id, folderPath: folder })))
+       .map(({ id, folder, status }) => ({ id, folderPath: folder, status })))
   const existing = matches.filter(({ existingWorkspaceId }) => existingWorkspaceId)
   const missing = matches.filter(({ existingWorkspaceId }) => !existingWorkspaceId)
   existing.forEach(({ tabIndex, existingWorkspaceId }) =>

packages/ui/src/stores/app-session-reconciliation.test.ts

@@ -16,6 +16,23 @@ describe("app session reconciliation", () => {
   for (const [label, saved, live, expected] of workspaceCases) it(label, () => assert.deepEqual(
     reconcileWorkspaceTabs([...saved], [...live]).map(({ existingWorkspaceId }) => existingWorkspaceId), expected,
   ))
+  it("keeps saved order while a restored workspace is still starting", () => {
+    const saved = [
+      { kind: "workspace", folderPath: "D:/DreamX-World" },
+      { kind: "workspace", folderPath: "D:/CodeNomad" },
+      { kind: "workspace", folderPath: "D:/stale" },
+    ]
+    const live = [
+      { id: "codenomad", folderPath: "D:/CodeNomad", status: "ready" },
+      { id: "dreamx", folderPath: "D:/DreamX-World", status: "starting" },
+      { id: "stale", folderPath: "D:/stale", status: "stopped" },
+    ] as const
+
+    assert.deepEqual(
+      reconcileWorkspaceTabs(saved, live).map(({ existingWorkspaceId }) => existingWorkspaceId),
+      ["dreamx", "codenomad", null],
+    )
+  })
   const selectionCases = [
     ["falls back to a valid parent when the active session is stale", [{ id: "parent", parentId: null }, { id: "child", parentId: "parent" }], "parent", "deleted-child", { parentSessionId: "parent", activeSessionId: "parent" }],
     ["restores a grandchild under its root session", [{ id: "root", parentId: null }, { id: "child", parentId: "root" }, { id: "grandchild", parentId: "child" }], "root", "grandchild", { parentSessionId: "root", activeSessionId: "grandchild" }],

packages/ui/src/stores/app-session-reconciliation.ts

@@ -1,4 +1,5 @@
 export type ReconcileTabDescriptor = { kind: string; folderPath?: string; occurrence?: number }
+type LiveWorkspaceDescriptor = { id: string; folderPath: string; status?: string }
 export type SessionDescriptor = { id: string; parentId?: string | null }
 export interface RestoredSessionReferences {
   activeParentSessionId?: string
@@ -16,10 +17,11 @@ export function normalizeWorkspacePath(folderPath: string): string {
 }
 export function reconcileWorkspaceTabs(
   tabs: readonly ReconcileTabDescriptor[],
-  liveWorkspaces: readonly { id: string; folderPath: string }[],
+  liveWorkspaces: readonly LiveWorkspaceDescriptor[],
 ) {
-  const liveByPath = new Map<string, Array<{ id: string; folderPath: string }>>()
+  const liveByPath = new Map<string, LiveWorkspaceDescriptor[]>()
   for (const workspace of liveWorkspaces) {
+    if (workspace.status === "stopped" || workspace.status === "error") continue
     const path = normalizeWorkspacePath(workspace.folderPath)
     liveByPath.set(path, [...(liveByPath.get(path) ?? []), workspace])
   }