From 72b6e6fb360741c1d5a45f39c0319f7b6832f368 Mon Sep 17 00:00:00 2001
From: Charles Vien <charles.v@posthog.com>
Date: Sun, 29 Mar 2026 10:18:22 +0100
Subject: [PATCH 1/2] Open active file in external app instead of repo
 directory

---
 .../components/ExternalAppsOpener.tsx         | 16 +++++++--
 .../task-detail/components/TaskDetail.tsx     | 33 ++++++++++++++++---
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx b/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx
index 11055e041..9725ae35d 100644
--- a/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx
+++ b/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx
@@ -4,7 +4,7 @@ import { ChevronDownIcon } from "@radix-ui/react-icons";
 import { Button, DropdownMenu, Flex, Text } from "@radix-ui/themes";
 import { SHORTCUTS } from "@renderer/constants/keyboard-shortcuts";
 import { handleExternalAppAction } from "@utils/handleExternalAppAction";
-import { useCallback } from "react";
+import { useCallback, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 
 const THUMBNAIL_ICON_SIZE = 20;
@@ -74,6 +74,8 @@ export function ExternalAppsOpener({
     [handleCopyPath],
   );
 
+  const [dropdownOpen, setDropdownOpen] = useState(false);
+
   if (!targetPath) {
     return null;
   }
@@ -81,7 +83,17 @@ export function ExternalAppsOpener({
   const isReady = !isLoading && detectedApps.length > 0;
 
   return (
-    <DropdownMenu.Root>
+    <DropdownMenu.Root open={dropdownOpen} onOpenChange={setDropdownOpen}>
+      {dropdownOpen && (
+        <div
+          className="no-drag"
+          style={{
+            position: "fixed",
+            inset: 0,
+            zIndex: 1,
+          }}
+        />
+      )}
       <Flex className="no-drag">
         <Button
           size="1"
diff --git a/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx b/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx
index 829b5195c..bbb42caa4 100644
--- a/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx
+++ b/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx
@@ -1,5 +1,10 @@
 import { FilePicker } from "@features/command/components/FilePicker";
 import { PanelLayout } from "@features/panels";
+import { usePanelLayoutStore } from "@features/panels/store/panelLayoutStore";
+import {
+  getLeafPanel,
+  parseTabId,
+} from "@features/panels/store/panelStoreHelpers";
 import { useCwd } from "@features/sidebar/hooks/useCwd";
 import { useTaskData } from "@features/task-detail/hooks/useTaskData";
 import { useTaskStore } from "@features/tasks/stores/taskStore";
@@ -30,6 +35,28 @@ export function TaskDetail({ task: initialTask }: TaskDetailProps) {
 
   const effectiveRepoPath = useCwd(taskId);
 
+  const activeRelativePath = usePanelLayoutStore((state) => {
+    const layout = state.getLayout(taskId);
+    if (!layout) return null;
+
+    const panelId = layout.focusedPanelId;
+    if (!panelId) return null;
+
+    const panel = getLeafPanel(layout.panelTree, panelId);
+    if (!panel) return null;
+
+    const parsed = parseTabId(panel.content.activeTabId);
+    if (parsed.type === "file" || parsed.type === "diff") {
+      return parsed.value;
+    }
+    return null;
+  });
+
+  const openTargetPath =
+    activeRelativePath && effectiveRepoPath
+      ? `${effectiveRepoPath}/${activeRelativePath}`
+      : effectiveRepoPath;
+
   const [filePickerOpen, setFilePickerOpen] = useState(false);
 
   const { enableScope, disableScope } = useHotkeysContext();
@@ -60,12 +87,10 @@ export function TaskDetail({ task: initialTask }: TaskDetailProps) {
             {task.title}
           </Text>
         </Flex>
-        {effectiveRepoPath && (
-          <ExternalAppsOpener targetPath={effectiveRepoPath} />
-        )}
+        {openTargetPath && <ExternalAppsOpener targetPath={openTargetPath} />}
       </Flex>
     ),
-    [task.title, effectiveRepoPath],
+    [task.title, openTargetPath],
   );
 
   useSetHeaderContent(headerContent);

From be9ee22e8c54c58fb65e5cdeb877fe4294fb0d8f Mon Sep 17 00:00:00 2001
From: Charles Vien <charles.v@posthog.com>
Date: Thu, 2 Apr 2026 14:56:42 -0700
Subject: [PATCH 2/2] Fix dead diff type check, normalize path join, reorder
 hooks

---
 .../features/task-detail/components/ExternalAppsOpener.tsx    | 3 +--
 .../renderer/features/task-detail/components/TaskDetail.tsx   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx b/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx
index 9725ae35d..dd7ba8df7 100644
--- a/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx
+++ b/apps/code/src/renderer/features/task-detail/components/ExternalAppsOpener.tsx
@@ -20,6 +20,7 @@ export function ExternalAppsOpener({
   label = "Open",
 }: ExternalAppsOpenerProps) {
   const { detectedApps, defaultApp, isLoading } = useExternalApps();
+  const [dropdownOpen, setDropdownOpen] = useState(false);
 
   const handleOpenDefault = useCallback(async () => {
     if (!defaultApp || !targetPath) return;
@@ -74,8 +75,6 @@ export function ExternalAppsOpener({
     [handleCopyPath],
   );
 
-  const [dropdownOpen, setDropdownOpen] = useState(false);
-
   if (!targetPath) {
     return null;
   }
diff --git a/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx b/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx
index bbb42caa4..be9f7d923 100644
--- a/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx
+++ b/apps/code/src/renderer/features/task-detail/components/TaskDetail.tsx
@@ -46,7 +46,7 @@ export function TaskDetail({ task: initialTask }: TaskDetailProps) {
     if (!panel) return null;
 
     const parsed = parseTabId(panel.content.activeTabId);
-    if (parsed.type === "file" || parsed.type === "diff") {
+    if (parsed.type === "file") {
       return parsed.value;
     }
     return null;
@@ -54,7 +54,7 @@ export function TaskDetail({ task: initialTask }: TaskDetailProps) {
 
   const openTargetPath =
     activeRelativePath && effectiveRepoPath
-      ? `${effectiveRepoPath}/${activeRelativePath}`
+      ? [effectiveRepoPath, activeRelativePath].join("/").replace(/\/+/g, "/")
       : effectiveRepoPath;
 
   const [filePickerOpen, setFilePickerOpen] = useState(false);