diff --git a/apps/cli/src/lib/launch/config.ts b/apps/cli/src/lib/launch/config.ts index d0051c85c69..ac0fe9d8a7c 100644 --- a/apps/cli/src/lib/launch/config.ts +++ b/apps/cli/src/lib/launch/config.ts @@ -1,58 +1,31 @@ import type { Agent, AgentType } from "../../types/process"; -/** - * Default launch commands for each agent type - */ const DEFAULT_LAUNCH_COMMANDS: Record = { claude: "claude", codex: "codex", cursor: "cursor", }; -/** - * Get launch command for an agent, considering: - * 1. Agent's stored launchCommand (highest priority) - * 2. Environment variable override (SUPERSET_AGENT_LAUNCH_) - * 3. User config file (~/.superset-cli.json) - * 4. Default for agent type - */ export function getLaunchCommand(agent: Agent): string | null { - // 1. Use agent's stored launch command if available if (agent.launchCommand) { return agent.launchCommand; } - const agentType = agent.agentType; - - // 2. Check environment variable override - const envKey = `SUPERSET_AGENT_LAUNCH_${agentType.toUpperCase()}`; + const envKey = `SUPERSET_AGENT_LAUNCH_${agent.agentType.toUpperCase()}`; const envOverride = process.env[envKey]; if (envOverride) { return envOverride; } - // 3. Check user config file (TODO: implement config file reading) - // const userConfig = loadUserConfig(); - // if (userConfig?.launchers?.[agentType]) { - // return userConfig.launchers[agentType]; - // } - - // 4. Use default - return DEFAULT_LAUNCH_COMMANDS[agentType] || null; + return DEFAULT_LAUNCH_COMMANDS[agent.agentType] || null; } -/** - * Get the default launch command for an agent type - * Used when creating new agents - */ export function getDefaultLaunchCommand(agentType: AgentType): string { - // Check environment variable override const envKey = `SUPERSET_AGENT_LAUNCH_${agentType.toUpperCase()}`; const envOverride = process.env[envKey]; if (envOverride) { return envOverride; } - // Return default return DEFAULT_LAUNCH_COMMANDS[agentType]; } diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx index 1185e2f2c62..752294c8676 100644 --- a/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx +++ b/apps/desktop/src/renderer/screens/main/components/TasksView/components/TasksTableView/TasksTableView.tsx @@ -14,13 +14,9 @@ export function TasksTableView({ return (
{table.getRowModel().rows.map((row) => { - // Group header rows have subRows, leaf rows don't const isGroupHeader = row.subRows && row.subRows.length > 0; if (isGroupHeader) { - // Group header - only render the status column (first cell) - // All other cells return null because they're placeholders - // DOM order handles stacking - later headers naturally overlap earlier ones const firstCell = row.getVisibleCells()[0]; return ( @@ -36,9 +32,6 @@ export function TasksTableView({ ); } - // Leaf row - render all cells horizontally with grid for consistent column widths - // Layout: [Checkbox] [Priority] [ID] [Title] ... [Labels] [Assignee] [Due] [gap] - // Note: Status column (index 0) returns null for leaf rows, so we skip it const cells = row.getVisibleCells(); const task = row.original; @@ -47,7 +40,6 @@ export function TasksTableView({ key={row.id} task={task} onDelete={() => { - // TODO: Implement delete console.log("Delete task:", task.id); }} > @@ -57,7 +49,6 @@ export function TasksTableView({ gridTemplateColumns: `auto auto ${slugColumnWidth} 1fr auto auto`, }} > - {/* Skip status column (index 0), render checkbox, priority, id, title+labels, assignee, created */} {cells.slice(1).map((cell) => (
{flexRender(cell.column.columnDef.cell, cell.getContext())} diff --git a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx index 87da531a9c2..6a02d2ae030 100644 --- a/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx +++ b/apps/desktop/src/renderer/screens/main/components/TasksView/hooks/useTasksTable/useTasksTable.tsx @@ -102,7 +102,6 @@ export function useTasksTable({ setColumnFilters(newColumnFilters); }, [filterTab]); - // Calculate optimal slug column width based on longest slug const slugColumnWidth = useMemo(() => { if (!data || data.length === 0) return "5rem"; @@ -110,18 +109,13 @@ export function useTasksTable({ return task.slug.length > longest.length ? task.slug : longest; }, ""); - // Monospace font-mono at text-xs (0.75rem = 12px) - // Each character is ~0.5em of the font size = 0.5 * 0.75rem = 0.375rem per char - const remPerChar = 0.5 * 0.75; // 0.375rem per character - const padding = 0.5; // rem for horizontal padding - const width = longestSlug.length * remPerChar + padding; + const REM_PER_CHAR = 0.5 * 0.75; + const PADDING_REM = 0.5; + const width = longestSlug.length * REM_PER_CHAR + PADDING_REM; - return `${Math.ceil(width * 10) / 10}rem`; // Round to 1 decimal + return `${Math.ceil(width * 10) / 10}rem`; }, [data]); - // TODO: Add localStorage persistence for collapsed groups - - // Define columns with useMemo (following official docs pattern) const columns = useMemo( () => [ columnHelper.accessor((row) => row.status, { @@ -182,7 +176,6 @@ export function useTasksTable({ getGroupingValue: (row) => row.status.name, }), - // Checkbox column (placeholder for future selection) columnHelper.display({ id: "checkbox", header: "", diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx index e5be43c3685..3fc79c7401b 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx @@ -2,8 +2,11 @@ import { Button } from "@superset/ui/button"; import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip"; import { cn } from "@superset/ui/utils"; import { useEffect, useRef, useState } from "react"; +import { useDrop } from "react-dnd"; import { HiMiniXMark } from "react-icons/hi2"; +import { MosaicDragType } from "react-mosaic-component"; import { StatusIndicator } from "renderer/screens/main/components/StatusIndicator"; +import { useDragPaneStore } from "renderer/stores/drag-pane-store"; import type { PaneStatus, Tab } from "renderer/stores/tabs/types"; import { getTabDisplayName } from "renderer/stores/tabs/utils"; @@ -14,6 +17,7 @@ interface GroupItemProps { onSelect: () => void; onClose: () => void; onRename: (newName: string) => void; + onPaneDrop?: (paneId: string) => void; } export function GroupItem({ @@ -23,12 +27,51 @@ export function GroupItem({ onSelect, onClose, onRename, + onPaneDrop, }: GroupItemProps) { const displayName = getTabDisplayName(tab); const [isEditing, setIsEditing] = useState(false); const [editValue, setEditValue] = useState(""); const inputRef = useRef(null); + const [{ isOver, canDrop }, drop] = useDrop< + unknown, + { handled: true }, + { isOver: boolean; canDrop: boolean } + >( + () => ({ + accept: MosaicDragType.WINDOW, + canDrop: () => { + const { draggingPaneId, draggingSourceTabId } = + useDragPaneStore.getState(); + // Must have valid drag state AND be dropping on a different tab + return ( + !!draggingPaneId && + !!draggingSourceTabId && + draggingSourceTabId !== tab.id + ); + }, + drop: () => { + const { draggingPaneId, draggingSourceTabId, clearDragging } = + useDragPaneStore.getState(); + if ( + draggingPaneId && + draggingSourceTabId && + draggingSourceTabId !== tab.id + ) { + onPaneDrop?.(draggingPaneId); + } + clearDragging(); + return { handled: true }; + }, + collect: (monitor) => ({ + isOver: monitor.isOver(), + canDrop: monitor.canDrop(), + }), + }), + [onPaneDrop, tab.id], + ); + useEffect(() => { if (isEditing && inputRef.current) { inputRef.current.focus(); @@ -67,7 +110,15 @@ export function GroupItem({ ); return ( -
+
{ + drop(node); + }} + className={cn( + "group relative flex items-center shrink-0 h-full border-r border-border", + isOver && canDrop && "bg-primary/5", + )} + > {isEditing ? (
s.renameTab); const removeTab = useTabsStore((s) => s.removeTab); const setActiveTab = useTabsStore((s) => s.setActiveTab); + const movePaneToTab = useTabsStore((s) => s.movePaneToTab); + const movePaneToNewTab = useTabsStore((s) => s.movePaneToNewTab); const { presets } = usePresets(); const isDark = useIsDarkTheme(); @@ -116,11 +122,19 @@ export function GroupStrip() { renameTab(tabId, newName); }; + const checkIsLastPaneInTab = useCallback((paneId: string) => { + // Get fresh panes from store to avoid stale closure issues during drag-drop + const freshPanes = useTabsStore.getState().panes; + const pane = freshPanes[paneId]; + if (!pane) return true; + return isLastPaneInTab(freshPanes, pane.tabId); + }, []); + return (
{tabs.length > 0 && (
{tabs.map((tab) => ( @@ -136,77 +150,85 @@ export function GroupStrip() { onSelect={() => handleSelectGroup(tab.id)} onClose={() => handleCloseGroup(tab.id)} onRename={(newName) => handleRenameGroup(tab.id, newName)} + onPaneDrop={(paneId) => movePaneToTab(paneId, tab.id)} />
))}
)} - -
- - + movePaneToNewTab(paneId)} + isLastPaneInTab={checkIsLastPaneInTab} + > + +
+ + + + + + + + + - - - - - - -
+ + {presets.length > 0 && ( + <> + {presets.map((preset) => { + const presetIcon = getPresetIcon(preset.name, isDark); + return ( + handleSelectPreset(preset)} + className="gap-2" + > + {presetIcon ? ( + + ) : ( + + )} + + {preset.name || "default"} + + {preset.isDefault && ( + + )} + + ); + })} + + + )} + - - - -
- - {presets.length > 0 && ( - <> - {presets.map((preset) => { - const presetIcon = getPresetIcon(preset.name, isDark); - return ( - handleSelectPreset(preset)} - className="gap-2" - > - {presetIcon ? ( - - ) : ( - - )} - {preset.name || "default"} - {preset.isDefault && ( - - )} - - ); - })} - - - )} - - - Configure Presets - - -
+ + Configure Presets + + + +
); } diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx new file mode 100644 index 00000000000..429e2161b46 --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx @@ -0,0 +1,58 @@ +import type { ReactNode } from "react"; +import { useDrop } from "react-dnd"; +import { MosaicDragType } from "react-mosaic-component"; +import { useDragPaneStore } from "renderer/stores/drag-pane-store"; + +interface NewTabDropZoneProps { + onDrop: (paneId: string) => void; + isLastPaneInTab: (paneId: string) => boolean; + children: ReactNode; +} + +export function NewTabDropZone({ + onDrop, + isLastPaneInTab, + children, +}: NewTabDropZoneProps) { + const [{ isOver, canDrop }, drop] = useDrop< + unknown, + { handled: true }, + { isOver: boolean; canDrop: boolean } + >( + () => ({ + accept: MosaicDragType.WINDOW, + canDrop: () => { + const { draggingPaneId } = useDragPaneStore.getState(); + if (!draggingPaneId) return false; + return !isLastPaneInTab(draggingPaneId); + }, + drop: () => { + const { draggingPaneId, clearDragging } = useDragPaneStore.getState(); + if (draggingPaneId && !isLastPaneInTab(draggingPaneId)) { + onDrop(draggingPaneId); + } + clearDragging(); + return { handled: true }; + }, + collect: (monitor) => ({ + isOver: monitor.isOver(), + canDrop: monitor.canDrop(), + }), + }), + [onDrop, isLastPaneInTab], + ); + + return ( +
{ + drop(node); + }} + className="relative flex items-center h-full flex-1 min-w-0 pl-2" + > + {isOver && canDrop && ( +
+ )} + {children} +
+ ); +} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx index 7e7c3d0b2a8..2ee835df905 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx @@ -1,6 +1,7 @@ import { useRef } from "react"; import type { MosaicBranch } from "react-mosaic-component"; import { MosaicWindow } from "react-mosaic-component"; +import { useDragPaneStore } from "renderer/stores/drag-pane-store"; import type { SplitOrientation } from "../../hooks"; import { useSplitOrientation } from "../../hooks"; @@ -43,6 +44,8 @@ export function BasePaneWindow({ }: BasePaneWindowProps) { const containerRef = useRef(null); const splitOrientation = useSplitOrientation(containerRef); + const setDragging = useDragPaneStore((s) => s.setDragging); + const clearDragging = useDragPaneStore((s) => s.clearDragging); const handleFocus = () => { setFocusedPane(tabId, paneId); @@ -75,6 +78,8 @@ export function BasePaneWindow({ title="" renderToolbar={() => renderToolbar(handlers)} className={isActive ? "mosaic-window-focused" : ""} + onDragStart={() => setDragging(paneId, tabId)} + onDragEnd={() => clearDragging()} > {/* biome-ignore lint/a11y/useKeyWithClickEvents lint/a11y/noStaticElementInteractions: Focus handler for pane */}
t.id === tab.id); + const freshPanes = state.panes; + + // Use fresh tab layout to determine what panes were removed + const oldPaneIds = extractPaneIdsFromLayout( + freshTab?.layout ?? newLayout, + ); const newPaneIds = extractPaneIdsFromLayout(newLayout); // Find removed panes (e.g., from Mosaic close button) @@ -92,13 +102,18 @@ export function TabView({ tab }: TabViewProps) { ); // Remove panes that were removed via Mosaic UI + // But skip panes that were moved to another tab (their tabId changed) for (const removedId of removedPaneIds) { - removePane(removedId); + const pane = freshPanes[removedId]; + // Only remove if pane still belongs to this tab (actual removal, not move) + if (pane && pane.tabId === tab.id) { + removePane(removedId); + } } updateTabLayout(tab.id, newLayout); }, - [tab.id, tab.layout, updateTabLayout, removePane], + [tab.id, updateTabLayout, removePane], ); const renderPane = useCallback( diff --git a/apps/desktop/src/renderer/stores/drag-pane-store.ts b/apps/desktop/src/renderer/stores/drag-pane-store.ts new file mode 100644 index 00000000000..eda33cbac35 --- /dev/null +++ b/apps/desktop/src/renderer/stores/drag-pane-store.ts @@ -0,0 +1,22 @@ +import { create } from "zustand"; + +interface DragPaneState { + draggingPaneId: string | null; + draggingSourceTabId: string | null; +} + +interface DragPaneActions { + setDragging: (paneId: string, tabId: string) => void; + clearDragging: () => void; +} + +export const useDragPaneStore = create( + (set) => ({ + draggingPaneId: null, + draggingSourceTabId: null, + setDragging: (paneId, tabId) => + set({ draggingPaneId: paneId, draggingSourceTabId: tabId }), + clearDragging: () => + set({ draggingPaneId: null, draggingSourceTabId: null }), + }), +); diff --git a/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts b/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts index f3dbe83b487..dcb2d87ac09 100644 --- a/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts +++ b/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts @@ -2,6 +2,7 @@ import type { MosaicNode } from "react-mosaic-component"; import type { Pane, Tab, TabsState } from "../types"; import { addPaneToLayout, + extractPaneIdsFromLayout, generateId, generateTabName, getFirstPaneId, @@ -36,6 +37,13 @@ export function movePaneToTab( ) return null; + // Defense in depth: Check for duplicate pane in target tab + const targetPaneIds = extractPaneIdsFromLayout(targetTab.layout); + if (targetPaneIds.includes(paneId)) { + console.warn("[move-pane] Attempted to add duplicate pane:", paneId); + return null; + } + const isLastPane = isLastPaneInTab(state.panes, sourceTab.id); const newSourceLayout = removePaneFromLayout(sourceTab.layout, paneId); const newTargetLayout = addPaneToLayout(targetTab.layout, paneId); diff --git a/apps/desktop/src/renderer/stores/tabs/store.ts b/apps/desktop/src/renderer/stores/tabs/store.ts index ca7755507bb..bdb8ca25e62 100644 --- a/apps/desktop/src/renderer/stores/tabs/store.ts +++ b/apps/desktop/src/renderer/stores/tabs/store.ts @@ -305,11 +305,16 @@ export const useTabsStore = create()( const newPanes = { ...state.panes }; for (const paneId of removedPaneIds) { - // P2: Only kill terminal for actual terminal panes (avoid unnecessary IPC) - if (state.panes[paneId]?.type === "terminal") { - killTerminalForPane(paneId); + const pane = state.panes[paneId]; + // Only delete panes that actually belong to this tab + // During drag operations, Mosaic may temporarily include foreign panes + // in layouts - we must not delete those when they're "removed" + if (pane && pane.tabId === tabId) { + if (pane.type === "terminal") { + killTerminalForPane(paneId); + } + delete newPanes[paneId]; } - delete newPanes[paneId]; } // Update focused pane if it was removed