From 571ffe12081afd0c18803c06e1b90471752a8554 Mon Sep 17 00:00:00 2001
From: brsbl <57682038+brsbl@users.noreply.github.com>
Date: Thu, 27 Aug 2026 07:37:42 +0000
Subject: [PATCH 1/2] Improve follow-up environment story coverage

---
 .../promptbox/FollowUpPromptBox.stories.tsx   | 71 +++++++++++++++++--
 1 file changed, 67 insertions(+), 4 deletions(-)

diff --git a/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx b/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
index b00fc08336..3f714b52f0 100644
--- a/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
+++ b/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
@@ -298,6 +298,20 @@ const remoteWorktreeEnvironmentSummary: ReactNode = makeEnvironmentSummary({
   onCreateNewThreadInWorktree: noop,
 });
 
+const unmanagedWorktreeEnvironmentSummary: ReactNode = makeEnvironmentSummary({
+  environment: makeEnvironment({
+    name: "Linked review tree",
+    managed: false,
+    isWorktree: true,
+    workspaceProvisionType: "unmanaged",
+    status: "ready",
+  }),
+  host: localEnvironmentDisplayHost,
+  machineName: "Bersabel's MacBook Pro",
+  branchName: STORY_BRANCH_NAME,
+  onCreateNewThreadInWorktree: noop,
+});
+
 const namedWorktreeEnvironmentSummary: ReactNode = makeEnvironmentSummary({
   environment: makeEnvironment({
     name: "Design system polish",
@@ -317,6 +331,7 @@ const detachedWorktreeEnvironmentSummary: ReactNode = makeEnvironmentSummary({
     status: "ready",
   }),
   host: localEnvironmentDisplayHost,
+  machineName: "Bersabel's MacBook Pro",
   environmentCheckout: formatWorkspaceCheckoutDisplay({
     checkout: {
       kind: "detached",
@@ -842,6 +857,7 @@ function StackedCardsWithPillsRow() {
       stack={contextBannerElement}
       queuedMessages={queuedMessages}
       contextWindowUsage={usage}
+      environmentSummary={remoteEnvironmentSummary}
     />
   );
 }
@@ -854,6 +870,9 @@ export function ControlEmphasis() {
   );
 }
 
+// This catalog is intentionally mixed across direct/worktree and local/remote
+// environments. Leaving every functional row on Row's local default hides the
+// environment icon and label variants this overview is meant to expose.
 export function Overview() {
   return (
     <StoryCard>
@@ -868,6 +887,7 @@ export function Overview() {
           submitMode={{ kind: "queue", onStop: noop }}
           threadRuntimeDisplayStatus="active"
           contextWindowUsage={usage}
+          environmentSummary={worktreeEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow
@@ -877,13 +897,17 @@ export function Overview() {
         <Row
           submitMode={{ kind: "stop-only", onStop: noop }}
           threadRuntimeDisplayStatus="host-reconnecting"
+          environmentSummary={remoteEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow
         label="blocked: pending interaction"
         hint="agent is waiting on a tool decision — composer locked"
       >
-        <Row submitMode={{ kind: "blocked", reason: "pending-interaction" }} />
+        <Row
+          submitMode={{ kind: "blocked", reason: "pending-interaction" }}
+          environmentSummary={remoteWorktreeEnvironmentSummary}
+        />
       </StoryRow>
       <StoryRow
         label="stop-only: starting"
@@ -904,6 +928,7 @@ export function Overview() {
           isFollowUpSubmitting
           threadRuntimeDisplayStatus="active"
           initialMessage="And confirm the new env summary renders correctly."
+          environmentSummary={namedWorktreeEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow
@@ -923,6 +948,7 @@ export function Overview() {
               loadFailed: false,
             },
           }}
+          environmentSummary={unmanagedWorktreeEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow
@@ -943,6 +969,7 @@ export function Overview() {
               loadError: codexModelLoadError,
             },
           }}
+          environmentSummary={remoteEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow label="no models" hint="locked provider with empty catalog">
@@ -960,6 +987,7 @@ export function Overview() {
               loadError: null,
             },
           }}
+          environmentSummary={detachedWorktreeEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow
@@ -971,10 +999,15 @@ export function Overview() {
           threadRuntimeDisplayStatus="active"
           queuedMessages={queuedMessages}
           contextWindowUsage={usage}
+          environmentSummary={remoteWorktreeEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow label="with promptbox context banner">
-        <Row submitMode={{ kind: "ready" }} stack={contextBannerElement} />
+        <Row
+          submitMode={{ kind: "ready" }}
+          stack={contextBannerElement}
+          environmentSummary={localEnvironmentSummary}
+        />
       </StoryRow>
       <StoryRow
         label="plan mode: permission locked"
@@ -990,6 +1023,7 @@ export function Overview() {
             providerId: "claude-code",
             prompt: "inspect the failing command before making changes",
           }}
+          environmentSummary={remoteEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow
@@ -1022,6 +1056,7 @@ export function Overview() {
           stack={contextBannerElement}
           queuedMessages={queuedMessages}
           contextWindowUsage={usage}
+          environmentSummary={namedWorktreeEnvironmentSummary}
         />
       </StoryRow>
       <StoryRow
@@ -1084,6 +1119,7 @@ export function Overview() {
           execution={readOnlyExecution}
           permission={readOnlyPermission}
           readOnly
+          environmentSummary={remoteEnvironmentSummary}
         />
       </StoryRow>
     </StoryCard>
@@ -1130,7 +1166,7 @@ export function EnvironmentMatrix() {
       </StoryRow>
       <StoryRow
         label="ready · local worktree"
-        hint="worktree icon · Local worktree tooltip"
+        hint="managed worktree · worktree icon · Local worktree tooltip"
       >
         <Row
           submitMode={{ kind: "ready" }}
@@ -1139,13 +1175,40 @@ export function EnvironmentMatrix() {
       </StoryRow>
       <StoryRow
         label="ready · remote worktree"
-        hint="worktree icon · Remote worktree tooltip"
+        hint="managed worktree · worktree icon · Remote worktree tooltip"
       >
         <Row
           submitMode={{ kind: "ready" }}
           environmentSummary={remoteWorktreeEnvironmentSummary}
         />
       </StoryRow>
+      <StoryRow
+        label="ready · unmanaged worktree"
+        hint="linked worktree · same worktree icon; ownership is not encoded here"
+      >
+        <Row
+          submitMode={{ kind: "ready" }}
+          environmentSummary={unmanagedWorktreeEnvironmentSummary}
+        />
+      </StoryRow>
+      <StoryRow
+        label="ready · named worktree"
+        hint="worktree icon · custom environment name"
+      >
+        <Row
+          submitMode={{ kind: "ready" }}
+          environmentSummary={namedWorktreeEnvironmentSummary}
+        />
+      </StoryRow>
+      <StoryRow
+        label="ready · detached worktree"
+        hint="worktree icon · detached commit checkout"
+      >
+        <Row
+          submitMode={{ kind: "ready" }}
+          environmentSummary={detachedWorktreeEnvironmentSummary}
+        />
+      </StoryRow>
       <StoryRow
         label="destroying / destroyed"
         hint="composer hidden; lifecycle state remains in the context banner"

From 61e867f6e4922c2d5c34194759adeff27a78a807 Mon Sep 17 00:00:00 2001
From: Bersabel Tadesse <brsabel.t@gmail.com>
Date: Fri, 28 Aug 2026 17:31:46 -0700
Subject: [PATCH 2/2] Remove stale story comments

---
 .../app/src/components/promptbox/FollowUpPromptBox.stories.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx b/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
index 3f714b52f0..2131552d11 100644
--- a/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
+++ b/apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx
@@ -870,9 +870,6 @@ export function ControlEmphasis() {
   );
 }
 
-// This catalog is intentionally mixed across direct/worktree and local/remote
-// environments. Leaving every functional row on Row's local default hides the
-// environment icon and label variants this overview is meant to expose.
 export function Overview() {
   return (
     <StoryCard>