From c5083eb64ac24c1a0847f4662a54009c2d302cb6 Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Tue, 4 Aug 2026 22:02:43 -0700
Subject: [PATCH] fix(linear): apply search filter in 'in-orca' mode to prevent
 drops

- Apply search filter in 'in-orca' mode even without active context label to prevent
  team filters from silently hiding linked tickets (no "Fetch more" recovery path)
- Add aria-label to workspace-open button for accessibility
- Update tooltip from "local worktree" to "Orca workspace"
- Reorganize i18n: move workspace.open from lib.linear to components.issue
- Expand test coverage for workspace start and activation scenarios
---
 .../src/components/LinearIssueWorkspace.tsx     |  4 ++++
 src/renderer/src/components/TaskPage.tsx        |  6 ++++--
 src/renderer/src/i18n/locales/es.json           | 16 +++++++---------
 src/renderer/src/i18n/locales/ja.json           | 16 +++++++---------
 src/renderer/src/i18n/locales/ko.json           | 16 +++++++---------
 src/renderer/src/i18n/locales/zh.json           | 16 +++++++---------
 .../src/lib/linear-issue-workspace-open.test.ts | 17 +++++++++++++++++
 7 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/src/renderer/src/components/LinearIssueWorkspace.tsx b/src/renderer/src/components/LinearIssueWorkspace.tsx
index bbee6c74004..690f2d42655 100644
--- a/src/renderer/src/components/LinearIssueWorkspace.tsx
+++ b/src/renderer/src/components/LinearIssueWorkspace.tsx
@@ -1040,6 +1040,10 @@ export default function LinearIssueWorkspace({
                   <button
                     type="button"
                     onClick={handleOpenOrUseIssue}
+                    aria-label={translate(
+                      'auto.components.LinearIssueWorkspace.openAttachedWorkspace',
+                      'Open workspace attached to issue'
+                    )}
                     className="flex min-h-9 w-full min-w-0 items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm text-muted-foreground transition hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
                   >
                     <FolderOpen className="size-4 shrink-0" />
diff --git a/src/renderer/src/components/TaskPage.tsx b/src/renderer/src/components/TaskPage.tsx
index 270c7d8390d..faf8c35e1d3 100644
--- a/src/renderer/src/components/TaskPage.tsx
+++ b/src/renderer/src/components/TaskPage.tsx
@@ -5244,7 +5244,9 @@ export default function TaskPage(): React.JSX.Element {
       linearMode === 'in-orca'
         ? filterLinearIssuesBySearchQuery(displayedLinearIssues, appliedLinearSearch)
         : displayedLinearIssues
-    if (activeLinearIssueContextLabel) {
+    // Why: 'in-orca' is scoped by local workspace links, not by team, and it has no "Fetch more" —
+    // a team filter would silently drop a linked ticket with no way to recover it.
+    if (activeLinearIssueContextLabel || linearMode === 'in-orca') {
       return searchedIssues
     }
     // Why: team options can arrive after issue rows render; treat an empty selection as "all" until reconciliation sets teams.
@@ -8794,7 +8796,7 @@ export default function TaskPage(): React.JSX.Element {
                                 <TooltipContent side="bottom" sideOffset={6}>
                                   {translate(
                                     'auto.components.TaskPage.linearModeHasWorktreeTooltip',
-                                    'Linear tickets linked to a local Orca worktree'
+                                    'Linear tickets linked to an Orca workspace'
                                   )}
                                 </TooltipContent>
                               </Tooltip>
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index b1d2c2ac182..095de652a6a 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -302,15 +302,6 @@
       }
     },
     "lib": {
-      "linear": {
-        "issue": {
-          "workspace": {
-            "open": {
-              "4f2c1d8a3b": "No se pudo abrir el espacio de trabajo vinculado a este issue."
-            }
-          }
-        }
-      },
       "agent": {
         "catalog": {
           "5dff448636": "OpenClaw",
@@ -638,6 +629,13 @@
             "triageFollowupsSummary": "Set assignee, priority, or estimate, and file parented follow-up tickets.",
             "triageFollowupsPrompt": "Use {{value0}} to triage the linked Linear issue — set priority and estimate — and create a parented follow-up ticket for the deferred cleanup."
           }
+        },
+        "issue": {
+          "workspace": {
+            "open": {
+              "4f2c1d8a3b": "No se pudo abrir el espacio de trabajo vinculado a este issue."
+            }
+          }
         }
       },
       "codex": {
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 7d1402487ee..4ed7237ae84 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -302,15 +302,6 @@
       }
     },
     "lib": {
-      "linear": {
-        "issue": {
-          "workspace": {
-            "open": {
-              "4f2c1d8a3b": "このイシューにリンクされたワークスペースを開けませんでした。"
-            }
-          }
-        }
-      },
       "agent": {
         "catalog": {
           "5dff448636": "OpenClaw",
@@ -638,6 +629,13 @@
             "triageFollowupsSummary": "Set assignee, priority, or estimate, and file parented follow-up tickets.",
             "triageFollowupsPrompt": "Use {{value0}} to triage the linked Linear issue — set priority and estimate — and create a parented follow-up ticket for the deferred cleanup."
           }
+        },
+        "issue": {
+          "workspace": {
+            "open": {
+              "4f2c1d8a3b": "このイシューにリンクされたワークスペースを開けませんでした。"
+            }
+          }
         }
       },
       "codex": {
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index cea36d2f8de..bb5bbc4b4da 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -302,15 +302,6 @@
       }
     },
     "lib": {
-      "linear": {
-        "issue": {
-          "workspace": {
-            "open": {
-              "4f2c1d8a3b": "이 이슈에 연결된 워크스페이스를 열 수 없습니다."
-            }
-          }
-        }
-      },
       "agent": {
         "catalog": {
           "5dff448636": "OpenClaw",
@@ -638,6 +629,13 @@
             "triageFollowupsSummary": "Set assignee, priority, or estimate, and file parented follow-up tickets.",
             "triageFollowupsPrompt": "Use {{value0}} to triage the linked Linear issue — set priority and estimate — and create a parented follow-up ticket for the deferred cleanup."
           }
+        },
+        "issue": {
+          "workspace": {
+            "open": {
+              "4f2c1d8a3b": "이 이슈에 연결된 워크스페이스를 열 수 없습니다."
+            }
+          }
         }
       },
       "codex": {
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 3e34044163c..e7529643e5e 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -302,15 +302,6 @@
       }
     },
     "lib": {
-      "linear": {
-        "issue": {
-          "workspace": {
-            "open": {
-              "4f2c1d8a3b": "无法打开关联到此议题的工作区。"
-            }
-          }
-        }
-      },
       "agent": {
         "catalog": {
           "5dff448636": "OpenClaw",
@@ -638,6 +629,13 @@
             "triageFollowupsSummary": "设置负责人、优先级或预估工时，并创建带父级关联的后续议题。",
             "triageFollowupsPrompt": "使用 {{value0}} 对关联的 Linear 议题进行分类处理 — 设置优先级和预估工时 — 并为延后清理创建带父级关联的后续议题。"
           }
+        },
+        "issue": {
+          "workspace": {
+            "open": {
+              "4f2c1d8a3b": "无法打开关联到此议题的工作区。"
+            }
+          }
         }
       },
       "codex": {
diff --git a/src/renderer/src/lib/linear-issue-workspace-open.test.ts b/src/renderer/src/lib/linear-issue-workspace-open.test.ts
index b8f5d5fef1a..0d6dd0211bc 100644
--- a/src/renderer/src/lib/linear-issue-workspace-open.test.ts
+++ b/src/renderer/src/lib/linear-issue-workspace-open.test.ts
@@ -100,4 +100,21 @@ describe('openLinearIssueWorkspaceOrStart', () => {
     })
     expect(startWorkspace).not.toHaveBeenCalled()
   })
+
+  it('starts a workspace when the issue has none attached', () => {
+    const startWorkspace = vi.fn()
+
+    expect(openLinearIssueWorkspaceOrStart({ identifier: 'ENG-1' }, startWorkspace)).toBe('started')
+    expect(startWorkspace).toHaveBeenCalledTimes(1)
+    expect(mocks.activateAndRevealWorktree).not.toHaveBeenCalled()
+  })
+
+  it('reports failure when activation is refused', () => {
+    mocks.worktrees = [worktree()]
+    mocks.activateAndRevealWorktree.mockReturnValue(false)
+    const startWorkspace = vi.fn()
+
+    expect(openLinearIssueWorkspaceOrStart({ identifier: 'ENG-1' }, startWorkspace)).toBe('failed')
+    expect(startWorkspace).not.toHaveBeenCalled()
+  })
 })