diff --git a/packages/app/src/components/workspace-hover-card.tsx b/packages/app/src/components/workspace-hover-card.tsx
index af1019074..5d1f9100f 100644
--- a/packages/app/src/components/workspace-hover-card.tsx
+++ b/packages/app/src/components/workspace-hover-card.tsx
@@ -365,15 +365,26 @@ function WorkspaceHoverCardContent({
                       backgroundColor:
                         service.status === "running"
                           ? theme.colors.palette.green[500]
-                          : theme.colors.palette.red[500],
+                          : theme.colors.foregroundMuted,
                     },
                   ]}
                 />
-                <Text style={styles.serviceName} numberOfLines={1}>
+                <Text
+                  style={[
+                    styles.serviceName,
+                    { color: service.status === "running" ? theme.colors.foreground : theme.colors.foregroundMuted },
+                  ]}
+                  numberOfLines={1}
+                >
                   {service.serviceName}
                 </Text>
                 {service.url ? (
-                  <ExternalLink size={12} color={theme.colors.foregroundMuted} />
+                  <Text style={styles.serviceUrl} numberOfLines={1}>
+                    {service.url.replace(/^https?:\/\//, "")}
+                  </Text>
+                ) : null}
+                {service.url ? (
+                  <ExternalLink size={11} color={theme.colors.foregroundMuted} />
                 ) : null}
               </Pressable>
             ))}
@@ -482,8 +493,12 @@ const styles = StyleSheet.create((theme) => ({
     flexShrink: 0,
   },
   serviceName: {
-    color: theme.colors.foreground,
     fontSize: theme.fontSize.sm,
+    flexShrink: 0,
+  },
+  serviceUrl: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.xs,
     flex: 1,
     minWidth: 0,
   },
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index 92e17a585..0288b475a 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -22,6 +22,7 @@ import {
   EllipsisVertical,
   PanelRight,
   RotateCw,
+  Settings,
   SquarePen,
   SquareTerminal,
   X,
@@ -1363,6 +1364,23 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
     }
   }, [currentBranchName, toast]);
 
+  const handleOpenSetupTab = useCallback(() => {
+    if (!persistenceKey) {
+      return;
+    }
+    const target = normalizeWorkspaceTabTarget({
+      kind: "setup",
+      workspaceId: normalizedWorkspaceId,
+    });
+    if (!target) {
+      return;
+    }
+    const tabId = openWorkspaceTab(persistenceKey, target);
+    if (tabId) {
+      focusWorkspaceTab(persistenceKey, tabId);
+    }
+  }, [focusWorkspaceTab, normalizedWorkspaceId, openWorkspaceTab, persistenceKey]);
+
   const handleBulkCloseTabs = useCallback(
     async (input: { tabsToClose: WorkspaceTabDescriptor[]; title: string; logLabel: string }) => {
       const { tabsToClose, title, logLabel } = input;
@@ -2021,6 +2039,14 @@ function WorkspaceScreenContent({ serverId, workspaceId }: WorkspaceScreenProps)
                           Copy branch name
                         </DropdownMenuItem>
                       ) : null}
+                      <DropdownMenuSeparator />
+                      <DropdownMenuItem
+                        testID="workspace-header-show-setup"
+                        leading={<Settings size={16} color={theme.colors.foregroundMuted} />}
+                        onSelect={handleOpenSetupTab}
+                      >
+                        Show setup
+                      </DropdownMenuItem>
                     </DropdownMenuContent>
                   </DropdownMenu>
                 </View>
diff --git a/packages/server/src/server/worktree-session.test.ts b/packages/server/src/server/worktree-session.test.ts
index 83e7484e9..847008c20 100644
--- a/packages/server/src/server/worktree-session.test.ts
+++ b/packages/server/src/server/worktree-session.test.ts
@@ -146,6 +146,7 @@ describe("createPaseoWorktreeInBackground", () => {
       {
         requestCwd: repoDir,
         repoRoot: repoDir,
+        workspaceId: 42,
         worktree: {
           branchName: "feature-no-setup",
           worktreePath,
@@ -160,7 +161,7 @@ describe("createPaseoWorktreeInBackground", () => {
     );
     expect(progressMessages).toHaveLength(2);
     expect(progressMessages[0]?.payload).toMatchObject({
-      workspaceId: worktreePath,
+      workspaceId: "42",
       status: "running",
       error: null,
       detail: {
@@ -172,7 +173,7 @@ describe("createPaseoWorktreeInBackground", () => {
       },
     });
     expect(progressMessages[1]?.payload).toMatchObject({
-      workspaceId: worktreePath,
+      workspaceId: "42",
       status: "completed",
       error: null,
       detail: {
@@ -183,7 +184,7 @@ describe("createPaseoWorktreeInBackground", () => {
         commands: [],
       },
     });
-    expect(snapshots.get(worktreePath)).toMatchObject({
+    expect(snapshots.get("42")).toMatchObject({
       status: "completed",
       error: null,
       detail: {
@@ -274,7 +275,7 @@ describe("createPaseoWorktreeInBackground", () => {
     expect(progressMessages[1]?.payload.status).toBe("failed");
     expect(progressMessages[1]?.payload.error).toContain("Failed to parse paseo.json");
     expect(progressMessages[1]?.payload.detail.commands).toEqual([]);
-    expect(snapshots.get(worktreePath)).toMatchObject({
+    expect(snapshots.get("101")).toMatchObject({
       status: "failed",
       error: expect.stringContaining("Failed to parse paseo.json"),
     });
@@ -323,6 +324,7 @@ describe("createPaseoWorktreeInBackground", () => {
       {
         requestCwd: repoDir,
         repoRoot: repoDir,
+        workspaceId: 43,
         worktree: {
           branchName: "feature-running-setup",
           worktreePath,
@@ -337,7 +339,7 @@ describe("createPaseoWorktreeInBackground", () => {
     );
     expect(progressMessages.length).toBeGreaterThan(1);
     expect(progressMessages[0]?.payload).toMatchObject({
-      workspaceId: worktreePath,
+      workspaceId: "43",
       status: "running",
       error: null,
       detail: {
@@ -368,7 +370,7 @@ describe("createPaseoWorktreeInBackground", () => {
     });
 
     expect(progressMessages.at(-1)?.payload).toMatchObject({
-      workspaceId: worktreePath,
+      workspaceId: "43",
       status: "completed",
       error: null,
       detail: {
@@ -385,7 +387,7 @@ describe("createPaseoWorktreeInBackground", () => {
       status: "completed",
       exitCode: 0,
     });
-    expect(snapshots.get(worktreePath)).toMatchObject({
+    expect(snapshots.get("43")).toMatchObject({
       status: "completed",
       error: null,
     });
@@ -439,6 +441,7 @@ describe("createPaseoWorktreeInBackground", () => {
       {
         requestCwd: repoDir,
         repoRoot: repoDir,
+        workspaceId: 44,
         worktree: {
           branchName: "reused-worktree",
           worktreePath: existingWorktree.worktreePath,
@@ -453,12 +456,12 @@ describe("createPaseoWorktreeInBackground", () => {
     );
     expect(progressMessages).toHaveLength(2);
     expect(progressMessages[0]?.payload).toMatchObject({
-      workspaceId: existingWorktree.worktreePath,
+      workspaceId: "44",
       status: "running",
       error: null,
     });
     expect(progressMessages[1]?.payload).toMatchObject({
-      workspaceId: existingWorktree.worktreePath,
+      workspaceId: "44",
       status: "completed",
       error: null,
       detail: {
@@ -487,7 +490,7 @@ describe("createPaseoWorktreeInBackground", () => {
       readFileSync(path.join(existingWorktree.worktreePath, "README.md"), "utf8"),
     ).toContain("hello");
     expect(() => readFileSync(path.join(existingWorktree.worktreePath, "setup-ran.txt"), "utf8")).toThrow();
-    expect(snapshots.get(existingWorktree.worktreePath)).toMatchObject({
+    expect(snapshots.get("44")).toMatchObject({
       status: "completed",
       error: null,
     });
@@ -544,6 +547,7 @@ describe("createPaseoWorktreeInBackground", () => {
       {
         requestCwd: repoDir,
         repoRoot: repoDir,
+        workspaceId: 45,
         worktree: {
           branchName: "feature-service-failure",
           worktreePath,
@@ -572,7 +576,7 @@ describe("createPaseoWorktreeInBackground", () => {
       }),
       "Failed to spawn worktree services after workspace setup completed",
     );
-    expect(snapshots.get(worktreePath)).toMatchObject({
+    expect(snapshots.get("45")).toMatchObject({
       status: "completed",
       error: null,
     });
@@ -625,6 +629,7 @@ describe("createPaseoWorktreeInBackground", () => {
       {
         requestCwd: repoDir,
         repoRoot: repoDir,
+        workspaceId: 46,
         worktree: {
           branchName: "feature-socket-mode",
           worktreePath,
@@ -646,7 +651,7 @@ describe("createPaseoWorktreeInBackground", () => {
     expect(terminalManager.terminals[0]?.env?.PORT).toEqual(expect.any(String));
     expect(terminalManager.terminals[0]?.env?.PASEO_SERVICE_URL).toBeUndefined();
     expect(terminalManager.terminals[0]?.sent).toEqual(["npm run dev\r"]);
-    expect(snapshots.get(worktreePath)).toMatchObject({
+    expect(snapshots.get("46")).toMatchObject({
       status: "completed",
       error: null,
     });
diff --git a/packages/server/src/server/worktree-session.ts b/packages/server/src/server/worktree-session.ts
index 21e441324..ed618143d 100644
--- a/packages/server/src/server/worktree-session.ts
+++ b/packages/server/src/server/worktree-session.ts
@@ -644,7 +644,7 @@ export async function handleWorkspaceSetupStatusRequest(
   dependencies: HandleWorkspaceSetupStatusRequestDependencies,
   request: Extract<SessionInboundMessage, { type: "workspace_setup_status_request" }>,
 ): Promise<void> {
-  const workspaceId = normalizePersistedWorkspaceId(request.workspaceId);
+  const workspaceId = request.workspaceId;
   dependencies.emit({
     type: "workspace_setup_status_response",
     payload: {
@@ -669,7 +669,7 @@ export async function createPaseoWorktreeInBackground(
   let setupResults: WorktreeSetupCommandResult[] = [];
   let setupStarted = false;
   const progressAccumulator = createWorktreeSetupProgressAccumulator();
-  const workspaceId = normalizePersistedWorkspaceId(worktree.worktreePath);
+  const workspaceId = String(options.workspaceId);
 
   const emitSetupProgress = (status: "running" | "completed" | "failed", error: string | null) => {
     const snapshot: WorkspaceSetupSnapshot = {