@atercates/claude-deck 0.2.4 → 0.2.5

package/app/api/sessions/[id]/fork/route.ts

@@ -43,7 +43,6 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
       parentId,
       parent.model,
       parent.system_prompt,
-      parent.group_path || "sessions",
       agentType,
       parent.auto_approve,
       parent.project_id || "uncategorized"

package/app/api/sessions/[id]/route.ts

@@ -121,11 +121,6 @@ export async function PATCH(request: NextRequest, { params }: RouteParams) {
       updates.push(`system_prompt = ?`);
       values.push(body.systemPrompt);
     }
-    if (body.groupPath !== undefined) {
-      updates.push(`group_path = ?`);
-      values.push(body.groupPath);
-    }
-
     if (updates.length > 0) {
       updates.push("updated_at = datetime('now')");
       values.push(id);

package/app/api/sessions/[id]/summarize/route.ts

@@ -264,8 +264,8 @@ export async function POST(
       // Create new session in DB (using cwd already fetched above)
       getDb()
         .prepare(
-          `INSERT INTO sessions (id, name, tmux_name, working_directory, parent_session_id, model, initial_prompt, group_path, agent_type, auto_approve, project_id)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+          `INSERT INTO sessions (id, name, tmux_name, working_directory, parent_session_id, model, initial_prompt, agent_type, auto_approve, project_id)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
         )
         .run(
           newId,
@@ -275,7 +275,6 @@ export async function POST(
           null,
           session.model,
           `Continue from previous session. Here's a summary of the work so far:\n\n${summary}`,
-          session.group_path,
           agentType,
           session.auto_approve ? 1 : 0,
           session.project_id || "uncategorized"

package/app/api/sessions/route.ts

@@ -8,19 +8,12 @@ import { findAvailablePort } from "@/lib/ports";
 import { runInBackground } from "@/lib/async-operations";
 import { getProject } from "@/lib/projects";
 
-// GET /api/sessions - List all sessions and groups
+// GET /api/sessions - List all sessions
 export async function GET() {
   try {
     const sessions = await queries.getAllSessions();
-    const groups = await queries.getAllGroups();
 
-    // Convert expanded from 0/1 to boolean
-    const formattedGroups = groups.map((g) => ({
-      ...g,
-      expanded: Boolean(g.expanded),
-    }));
-
-    return NextResponse.json({ sessions, groups: formattedGroups });
+    return NextResponse.json({ sessions });
   } catch (error) {
     console.error("Error fetching sessions:", error);
     return NextResponse.json(
@@ -56,7 +49,6 @@ export async function POST(request: NextRequest) {
       parentSessionId = null,
       model = "sonnet",
       systemPrompt = null,
-      groupPath = "sessions",
       claudeSessionId = null,
       agentType: rawAgentType = "claude",
       autoApprove = false,
@@ -141,7 +133,6 @@ export async function POST(request: NextRequest) {
       parentSessionId,
       model,
       systemPrompt,
-      groupPath,
       agentType,
       autoApprove,
       projectId

package/app/page.tsx

@@ -33,7 +33,7 @@ import { useDevServersManager } from "@/hooks/useDevServersManager";
 import { useSessionStatuses } from "@/hooks/useSessionStatuses";
 import type { Session } from "@/lib/db";
 import type { TerminalHandle } from "@/components/Terminal";
-import { getProvider } from "@/lib/providers";
+import { CLAUDE_COMMAND, buildClaudeFlags } from "@/lib/providers";
 import { DesktopView } from "@/components/views/DesktopView";
 import { MobileView } from "@/components/views/MobileView";
 import { getPendingPrompt, clearPendingPrompt } from "@/stores/initialPrompt";
@@ -152,16 +152,9 @@ function HomeContent() {
     async (
       session: Session
     ): Promise<{ sessionName: string; cwd: string; command: string }> => {
-      const provider = getProvider(session.agent_type || "claude");
-      const sessionName = session.tmux_name || `${provider.id}-${session.id}`;
+      const sessionName = session.tmux_name || `claude-${session.id}`;
       const cwd = session.working_directory?.replace("~", "$HOME") || "$HOME";
 
-      // TODO: Add explicit "Enable Orchestration" toggle that creates .mcp.json
-      // for conductor sessions. Removed auto-creation because it pollutes projects
-      // with .mcp.json files that aren't in their .gitignore.
-      // See: /api/sessions/[id]/mcp-config, lib/mcp-config.ts
-
-      // Get parent session ID for forking
       let parentSessionId: string | null = null;
       if (!session.claude_session_id && session.parent_session_id) {
         const parentSession = sessions.find(
@@ -170,22 +163,20 @@ function HomeContent() {
         parentSessionId = parentSession?.claude_session_id || null;
       }
 
-      // Check for pending initial prompt
       const initialPrompt = getPendingPrompt(session.id);
       if (initialPrompt) {
         clearPendingPrompt(session.id);
       }
 
-      const flags = provider.buildFlags({
+      const flags = buildClaudeFlags({
         sessionId: session.claude_session_id,
         parentSessionId,
         autoApprove: session.auto_approve,
         model: session.model,
         initialPrompt: initialPrompt || undefined,
       });
-      const flagsStr = flags.join(" ");
 
-      const agentCmd = `${provider.command} ${flagsStr}`;
+      const agentCmd = `${CLAUDE_COMMAND} ${flags.join(" ")}`;
       const command = await getInitScriptCommand(agentCmd);
 
       return { sessionName, cwd, command };
@@ -296,37 +287,6 @@ function HomeContent() {
     [addTab, focusedPaneId, buildSessionCommand, runSessionInTerminal]
   );
 
-  // Attach to an already-running tmux session (non-destructive)
-  const attachToActiveTmux = useCallback(
-    (sessionId: string, tmuxSessionName: string) => {
-      const terminalInfo = getTerminalWithFallback();
-      if (!terminalInfo) return;
-
-      const { terminal, paneId } = terminalInfo;
-      const activeTab = getActiveTab(paneId);
-      const isInTmux = !!activeTab?.attachedTmux;
-
-      if (isInTmux) {
-        terminal.sendInput("\x02d");
-      }
-
-      setTimeout(
-        () => {
-          terminal.sendInput("\x03");
-          setTimeout(() => {
-            terminal.sendCommand(
-              `tmux attach -t ${tmuxSessionName} 2>/dev/null`
-            );
-            attachSession(paneId, sessionId, tmuxSessionName);
-            terminal.focus();
-          }, 50);
-        },
-        isInTmux ? 100 : 0
-      );
-    },
-    [getTerminalWithFallback, getActiveTab, attachSession]
-  );
-
   const resumeClaudeSession = useCallback(
     (
       claudeSessionId: string,
@@ -619,7 +579,6 @@ function HomeContent() {
     updateSettings,
     requestPermission,
     attachToSession,
-    attachToActiveTmux,
     openSessionInNewTab,
     handleNewSessionInProject,
     handleOpenTerminal,

package/components/ClaudeProjects/ClaudeProjectCard.tsx

@@ -6,19 +6,12 @@ import {
   ChevronRight,
   ChevronDown,
   FolderOpen,
-  MoreHorizontal,
   Plus,
   Eye,
   EyeOff,
   Loader2,
 } from "lucide-react";
 import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import {
   ContextMenu,
   ContextMenuContent,
@@ -119,30 +112,25 @@ export function ClaudeProjectCard({
           <Plus className="h-3.5 w-3.5" />
         </Button>
       )}
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild onClick={(e) => e.stopPropagation()}>
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            className="h-7 w-7 flex-shrink-0 opacity-100 md:h-6 md:w-6 md:opacity-0 md:group-hover:opacity-100"
-          >
-            <MoreHorizontal className="h-4 w-4" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="end" onClick={(e) => e.stopPropagation()}>
-          {project.hidden ? (
-            <DropdownMenuItem onClick={handleUnhideProject}>
-              <Eye className="mr-2 h-3 w-3" />
-              Show project
-            </DropdownMenuItem>
-          ) : (
-            <DropdownMenuItem onClick={handleHideProject}>
-              <EyeOff className="mr-2 h-3 w-3" />
-              Hide project
-            </DropdownMenuItem>
-          )}
-        </DropdownMenuContent>
-      </DropdownMenu>
+      <Button
+        variant="ghost"
+        size="icon-sm"
+        className="h-7 w-7 flex-shrink-0 opacity-100 md:h-6 md:w-6 md:opacity-0 md:group-hover:opacity-100"
+        onClick={(e) => {
+          e.stopPropagation();
+          if (project.hidden) {
+            handleUnhideProject();
+          } else {
+            handleHideProject();
+          }
+        }}
+      >
+        {project.hidden ? (
+          <Eye className="h-3.5 w-3.5" />
+        ) : (
+          <EyeOff className="h-3.5 w-3.5" />
+        )}
+      </Button>
     </div>
   );
 

package/components/ClaudeProjects/ClaudeSessionCard.tsx

@@ -1,14 +1,8 @@
 "use client";
 
 import { cn } from "@/lib/utils";
-import { MessageSquare, MoreHorizontal, Eye, EyeOff } from "lucide-react";
+import { MessageSquare, Eye, EyeOff } from "lucide-react";
 import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import type { ClaudeSession } from "@/data/claude";
 
 interface ClaudeSessionCardProps {
@@ -71,30 +65,25 @@ export function ClaudeSessionCard({
       <span className="text-muted-foreground flex-shrink-0 text-[10px]">
         {getTimeAgo(session.lastActivity)}
       </span>
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild onClick={(e) => e.stopPropagation()}>
-          <Button
-            variant="ghost"
-            size="icon-sm"
-            className="h-6 w-6 flex-shrink-0 opacity-0 group-hover:opacity-100"
-          >
-            <MoreHorizontal className="h-3.5 w-3.5" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="end" onClick={(e) => e.stopPropagation()}>
-          {session.hidden ? (
-            <DropdownMenuItem onClick={onUnhide}>
-              <Eye className="mr-2 h-3 w-3" />
-              Show session
-            </DropdownMenuItem>
-          ) : (
-            <DropdownMenuItem onClick={onHide}>
-              <EyeOff className="mr-2 h-3 w-3" />
-              Hide session
-            </DropdownMenuItem>
-          )}
-        </DropdownMenuContent>
-      </DropdownMenu>
+      <Button
+        variant="ghost"
+        size="icon-sm"
+        className="h-6 w-6 flex-shrink-0 opacity-0 group-hover:opacity-100"
+        onClick={(e) => {
+          e.stopPropagation();
+          if (session.hidden) {
+            onUnhide();
+          } else {
+            onHide();
+          }
+        }}
+      >
+        {session.hidden ? (
+          <Eye className="h-3.5 w-3.5" />
+        ) : (
+          <EyeOff className="h-3.5 w-3.5" />
+        )}
+      </Button>
     </div>
   );
 }

package/components/NewSessionDialog/AdvancedSettings.tsx

@@ -1,11 +1,9 @@
 import { ChevronRight } from "lucide-react";
-import type { AgentType } from "@/lib/providers";
-import { getProviderDefinition } from "@/lib/providers";
+import { CLAUDE_AUTO_APPROVE_FLAG } from "@/lib/providers";
 
 interface AdvancedSettingsProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
-  agentType: AgentType;
   useTmux: boolean;
   onUseTmuxChange: (checked: boolean) => void;
   skipPermissions: boolean;
@@ -15,15 +13,11 @@ interface AdvancedSettingsProps {
 export function AdvancedSettings({
   open,
   onOpenChange,
-  agentType,
   useTmux,
   onUseTmuxChange,
   skipPermissions,
   onSkipPermissionsChange,
 }: AdvancedSettingsProps) {
-  const provider = getProviderDefinition(agentType);
-  const supportsAutoApprove = Boolean(provider.autoApproveFlag);
-
   return (
     <div className="border-border rounded-lg border">
       <button
@@ -58,16 +52,13 @@ export function AdvancedSettings({
               type="checkbox"
               id="skipPermissions"
               checked={skipPermissions}
-              disabled={!supportsAutoApprove}
               onChange={(e) => onSkipPermissionsChange(e.target.checked)}
-              className="border-border bg-background accent-primary h-4 w-4 rounded disabled:cursor-not-allowed disabled:opacity-50"
+              className="border-border bg-background accent-primary h-4 w-4 rounded"
             />
             <label htmlFor="skipPermissions" className="cursor-pointer text-sm">
               Auto-approve tool calls
               <span className="text-muted-foreground ml-1">
-                {supportsAutoApprove
-                  ? `(${provider.autoApproveFlag})`
-                  : "(not supported)"}
+                ({CLAUDE_AUTO_APPROVE_FLAG})
               </span>
             </label>
           </div>

package/components/NewSessionDialog/NewSessionDialog.types.ts

@@ -3,7 +3,6 @@ import type { ProjectWithDevServers } from "@/lib/projects";
 
 // LocalStorage keys
 export const SKIP_PERMISSIONS_KEY = "agentOS:skipPermissions";
-export const AGENT_TYPE_KEY = "agentOS:defaultAgentType";
 export const RECENT_DIRS_KEY = "agentOS:recentDirectories";
 export const USE_TMUX_KEY = "agentOS:useTmux";
 export const MAX_RECENT_DIRS = 5;
@@ -84,15 +83,6 @@ export interface GitInfo {
   currentBranch: string | null;
 }
 
-// Agent type options
-export const AGENT_OPTIONS: {
-  value: AgentType;
-  label: string;
-  description: string;
-}[] = [
-  { value: "claude", label: "Claude Code", description: "Anthropic's CLI" },
-];
-
 // Props for main dialog
 export interface NewSessionDialogProps {
   open: boolean;

package/components/NewSessionDialog/ProjectSelector.tsx

@@ -9,14 +9,11 @@ import {
 } from "@/components/ui/select";
 import { Plus } from "lucide-react";
 import type { ProjectWithDevServers } from "@/lib/projects";
-import type { AgentType } from "@/lib/providers";
-
 interface ProjectSelectorProps {
   projects: ProjectWithDevServers[];
   projectId: string | null;
   onProjectChange: (projectId: string | null) => void;
   workingDirectory: string;
-  agentType: AgentType;
   showNewProject: boolean;
   onShowNewProjectChange: (show: boolean) => void;
   newProjectName: string;
@@ -31,7 +28,6 @@ export function ProjectSelector({
   projectId,
   onProjectChange,
   workingDirectory,
-  agentType,
   showNewProject,
   onShowNewProjectChange,
   newProjectName,
@@ -129,7 +125,7 @@ export function ProjectSelector({
       {showNewProject && (
         <p className="text-muted-foreground text-xs">
           {workingDirectory && workingDirectory !== "~"
-            ? `New project will use: ${workingDirectory}, ${agentType}`
+            ? `New project will use: ${workingDirectory}`
             : "Enter a working directory above to create a project"}
         </p>
       )}
@@ -137,8 +133,7 @@ export function ProjectSelector({
         selectedProject &&
         !selectedProject.is_uncategorized && (
           <p className="text-muted-foreground text-xs">
-            Settings inherited: {selectedProject.working_directory},{" "}
-            {selectedProject.agent_type}
+            Settings inherited: {selectedProject.working_directory}
           </p>
         )}
     </div>

package/components/NewSessionDialog/hooks/useNewSessionForm.ts

@@ -1,16 +1,14 @@
 import { useState, useEffect, useCallback } from "react";
-import { getProviderDefinition, type AgentType } from "@/lib/providers";
+import type { AgentType } from "@/lib/providers";
 import type { ProjectWithDevServers } from "@/lib/projects";
 import { setPendingPrompt } from "@/stores/initialPrompt";
 import { useCreateSession } from "@/data/sessions";
 import {
   type GitInfo,
   SKIP_PERMISSIONS_KEY,
-  AGENT_TYPE_KEY,
   RECENT_DIRS_KEY,
   USE_TMUX_KEY,
   MAX_RECENT_DIRS,
-  AGENT_OPTIONS,
   generateFeatureName,
 } from "../NewSessionDialog.types";
 
@@ -42,7 +40,6 @@ export function useNewSessionForm({
   const [name, setName] = useState("");
   const [workingDirectory, setWorkingDirectory] = useState("~");
   const [projectId, setProjectId] = useState<string | null>(null);
-  const [agentType, setAgentType] = useState<AgentType>("claude");
   const [skipPermissions, setSkipPermissions] = useState(false);
   const [useTmux, setUseTmux] = useState(true);
   const [initialPrompt, setInitialPrompt] = useState("");
@@ -120,13 +117,6 @@ export function useNewSessionForm({
     if (savedSkipPerms !== null) {
       setSkipPermissions(savedSkipPerms === "true");
     }
-    const savedAgentType = localStorage.getItem(AGENT_TYPE_KEY);
-    if (
-      savedAgentType &&
-      AGENT_OPTIONS.some((opt) => opt.value === savedAgentType)
-    ) {
-      setAgentType(savedAgentType as AgentType);
-    }
     const savedUseTmux = localStorage.getItem(USE_TMUX_KEY);
     if (savedUseTmux !== null) {
       setUseTmux(savedUseTmux === "true");
@@ -150,7 +140,6 @@ export function useNewSessionForm({
         const project = projects.find((p) => p.id === selectedProjectId);
         if (project && !project.is_uncategorized) {
           setWorkingDirectory(project.working_directory);
-          setAgentType(project.agent_type);
         }
       } else {
         // Otherwise, select first non-uncategorized project
@@ -158,25 +147,11 @@ export function useNewSessionForm({
         if (firstProject) {
           setProjectId(firstProject.id);
           setWorkingDirectory(firstProject.working_directory);
-          setAgentType(firstProject.agent_type);
         }
       }
     }
   }, [open, selectedProjectId, projects]);
 
-  useEffect(() => {
-    if (!skipPermissions) {
-      return;
-    }
-
-    if (getProviderDefinition(agentType).autoApproveFlag) {
-      return;
-    }
-
-    setSkipPermissions(false);
-    localStorage.setItem(SKIP_PERMISSIONS_KEY, "false");
-  }, [agentType, skipPermissions]);
-
   // Save directory to recent list
   const addRecentDirectory = useCallback((dir: string) => {
     if (!dir || dir === "~") return;
@@ -196,7 +171,6 @@ export function useNewSessionForm({
         const project = projects.find((p) => p.id === newProjectId);
         if (project && !project.is_uncategorized) {
           setWorkingDirectory(project.working_directory);
-          setAgentType(project.agent_type);
         }
       }
     },
@@ -208,11 +182,6 @@ export function useNewSessionForm({
     localStorage.setItem(SKIP_PERMISSIONS_KEY, String(checked));
   };
 
-  const handleAgentTypeChange = (value: AgentType) => {
-    setAgentType(value);
-    localStorage.setItem(AGENT_TYPE_KEY, value);
-  };
-
   const handleUseTmuxChange = (checked: boolean) => {
     setUseTmux(checked);
     localStorage.setItem(USE_TMUX_KEY, String(checked));
@@ -248,7 +217,7 @@ export function useNewSessionForm({
         name: name.trim() || undefined,
         workingDirectory,
         projectId,
-        agentType,
+        agentType: "claude" as AgentType,
         useWorktree,
         featureName: useWorktree ? featureName.trim() : null,
         baseBranch: useWorktree ? baseBranch : null,
@@ -291,7 +260,7 @@ export function useNewSessionForm({
       const newId = await onCreateProject(
         newProjectName.trim(),
         workingDirectory,
-        agentType
+        "claude"
       );
       if (newId) {
         setProjectId(newId);
@@ -328,7 +297,6 @@ export function useNewSessionForm({
     workingDirectory,
     setWorkingDirectory,
     projectId,
-    agentType,
     skipPermissions,
     useTmux,
     initialPrompt,
@@ -361,7 +329,6 @@ export function useNewSessionForm({
     // Handlers
     handleProjectChange,
     handleSkipPermissionsChange,
-    handleAgentTypeChange,
     handleUseTmuxChange,
     handleSubmit,
     handleCreateProject,

package/components/NewSessionDialog/index.tsx

@@ -10,7 +10,6 @@ import {
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { useNewSessionForm } from "./hooks/useNewSessionForm";
-import { AgentSelector } from "./AgentSelector";
 import { CreatingOverlay } from "./CreatingOverlay";
 import type { NewSessionDialogProps } from "./NewSessionDialog.types";
 
@@ -56,11 +55,6 @@ export function NewSessionDialog({
             <DialogTitle>New Session</DialogTitle>
           </DialogHeader>
           <form onSubmit={form.handleSubmit} className="space-y-4">
-            <AgentSelector
-              value={form.agentType}
-              onChange={form.handleAgentTypeChange}
-            />
-
             <div className="space-y-2">
               <label className="text-sm font-medium">
                 Name{" "}
@@ -100,7 +94,6 @@ export function NewSessionDialog({
           </form>
         </DialogContent>
       </Dialog>
-
     </>
   );
 }

package/components/Projects/index.ts

@@ -1,3 +1,2 @@
-export { ProjectCard } from "./ProjectCard";
 export { NewProjectDialog } from "./NewProjectDialog";
 export { ProjectSettingsDialog } from "./ProjectSettingsDialog";

package/components/SessionList/hooks/useSessionListMutations.ts

@@ -13,7 +13,6 @@ import {
   useDeleteProject,
   useRenameProject,
 } from "@/data/projects";
-import { useToggleGroup, useCreateGroup, useDeleteGroup } from "@/data/groups";
 import {
   useStopDevServer,
   useRestartDevServer,
@@ -42,11 +41,6 @@ export function useSessionListMutations({
   const deleteProjectMutation = useDeleteProject();
   const renameProjectMutation = useRenameProject();
 
-  // Group mutations
-  const toggleGroupMutation = useToggleGroup();
-  const createGroupMutation = useCreateGroup();
-  const deleteGroupMutation = useDeleteGroup();
-
   // Dev server mutations
   const stopDevServerMutation = useStopDevServer();
   const restartDevServerMutation = useRestartDevServer();
@@ -124,30 +118,6 @@ export function useSessionListMutations({
     [renameProjectMutation]
   );
 
-  // Group handlers
-  const handleToggleGroup = useCallback(
-    async (path: string, expanded: boolean) => {
-      await toggleGroupMutation.mutateAsync({ path, expanded });
-    },
-    [toggleGroupMutation]
-  );
-
-  const handleCreateGroup = useCallback(
-    async (name: string, parentPath?: string) => {
-      await createGroupMutation.mutateAsync({ name, parentPath });
-    },
-    [createGroupMutation]
-  );
-
-  const handleDeleteGroup = useCallback(
-    async (path: string) => {
-      if (!confirm("Delete this group? Sessions will be moved to parent."))
-        return;
-      await deleteGroupMutation.mutateAsync(path);
-    },
-    [deleteGroupMutation]
-  );
-
   // Dev server handlers
   const handleStopDevServer = useCallback(
     async (serverId: string) => {
@@ -252,11 +222,6 @@ export function useSessionListMutations({
     handleDeleteProject,
     handleRenameProject,
 
-    // Group handlers
-    handleToggleGroup,
-    handleCreateGroup,
-    handleDeleteGroup,
-
     // Dev server handlers
     handleStopDevServer,
     handleRestartDevServer,

package/components/views/DesktopView.tsx

@@ -48,7 +48,6 @@ export function DesktopView({
   updateSettings,
   requestPermission,
   attachToSession,
-  attachToActiveTmux,
   openSessionInNewTab,
   handleNewSessionInProject,
   handleOpenTerminal,
@@ -62,18 +61,14 @@ export function DesktopView({
   resumeClaudeSession,
   renderPane,
 }: ViewProps) {
-  // Select a session by ID — handles both DB sessions and tmux-only sessions
   const selectSessionById = (id: string) => {
     const session = sessions.find((s) => s.id === id);
     if (session) {
       attachToSession(session);
       return;
     }
-    // Not in DB — attach directly to the running tmux session
     const status = sessionStatuses[id];
-    if (status?.sessionName) {
-      attachToActiveTmux(id, status.sessionName);
-    }
+    resumeClaudeSession(id, status?.cwd || "~");
   };
 
   return (