@atercates/claude-deck 0.2.3 → 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/api/sessions/status/acknowledge/route.ts

@@ -0,0 +1,8 @@
+import { NextResponse } from "next/server";
+
+export async function POST() {
+  // With JSONL-based detection, acknowledge is a no-op.
+  // Status is determined by file content, not by a flag.
+  // The endpoint exists for API compatibility.
+  return NextResponse.json({ ok: true });
+}

package/app/api/sessions/status/route.ts

@@ -1,237 +1,6 @@
 import { NextResponse } from "next/server";
-import { exec } from "child_process";
-import { promisify } from "util";
-import * as fs from "fs";
-import * as path from "path";
-import * as os from "os";
-import { statusDetector, type SessionStatus } from "@/lib/status-detector";
-import type { AgentType } from "@/lib/providers";
-import {
-  getManagedSessionPattern,
-  getProviderIdFromSessionName,
-  getSessionIdFromName,
-} from "@/lib/providers/registry";
-import { getDb } from "@/lib/db";
-
-const execAsync = promisify(exec);
-
-interface SessionStatusResponse {
-  sessionName: string;
-  status: SessionStatus;
-  lastLine?: string;
-  claudeSessionId?: string | null;
-  agentType?: AgentType;
-}
-
-async function getTmuxSessions(): Promise<string[]> {
-  try {
-    const { stdout } = await execAsync(
-      "tmux list-sessions -F '#{session_name}' 2>/dev/null || true"
-    );
-    return stdout.trim().split("\n").filter(Boolean);
-  } catch {
-    return [];
-  }
-}
-
-async function getTmuxSessionCwd(sessionName: string): Promise<string | null> {
-  try {
-    const { stdout } = await execAsync(
-      `tmux display-message -t "${sessionName}" -p "#{pane_current_path}" 2>/dev/null || echo ""`
-    );
-    const cwd = stdout.trim();
-    return cwd || null;
-  } catch {
-    return null;
-  }
-}
-
-// Get Claude session ID from tmux environment variable
-async function getClaudeSessionIdFromEnv(
-  sessionName: string
-): Promise<string | null> {
-  try {
-    const { stdout } = await execAsync(
-      `tmux show-environment -t "${sessionName}" CLAUDE_SESSION_ID 2>/dev/null || echo ""`
-    );
-    const line = stdout.trim();
-    if (line.startsWith("CLAUDE_SESSION_ID=")) {
-      const sessionId = line.replace("CLAUDE_SESSION_ID=", "");
-      if (sessionId && sessionId !== "null") {
-        return sessionId;
-      }
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-// Get Claude session ID by looking at session files on disk
-function getClaudeSessionIdFromFiles(projectPath: string): string | null {
-  const home = os.homedir();
-  const claudeDir = process.env.CLAUDE_CONFIG_DIR || path.join(home, ".claude");
-  const projectDirName = projectPath.replace(/\//g, "-");
-  const projectDir = path.join(claudeDir, "projects", projectDirName);
-
-  if (!fs.existsSync(projectDir)) {
-    return null;
-  }
-
-  const uuidPattern =
-    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.jsonl$/;
-
-  try {
-    const files = fs.readdirSync(projectDir);
-    let mostRecent: string | null = null;
-    let mostRecentTime = 0;
-
-    for (const file of files) {
-      if (file.startsWith("agent-")) continue;
-      if (!uuidPattern.test(file)) continue;
-
-      const filePath = path.join(projectDir, file);
-      const stat = fs.statSync(filePath);
-
-      if (stat.mtimeMs > mostRecentTime) {
-        mostRecentTime = stat.mtimeMs;
-        mostRecent = file.replace(".jsonl", "");
-      }
-    }
-
-    if (mostRecent && Date.now() - mostRecentTime < 5 * 60 * 1000) {
-      return mostRecent;
-    }
-
-    const configFile = path.join(claudeDir, ".claude.json");
-    if (fs.existsSync(configFile)) {
-      try {
-        const config = JSON.parse(fs.readFileSync(configFile, "utf-8"));
-        if (config.projects?.[projectPath]?.lastSessionId) {
-          return config.projects[projectPath].lastSessionId;
-        }
-      } catch {
-        // Ignore config parse errors
-      }
-    }
-
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-async function getClaudeSessionId(sessionName: string): Promise<string | null> {
-  const envId = await getClaudeSessionIdFromEnv(sessionName);
-  if (envId) {
-    return envId;
-  }
-
-  const cwd = await getTmuxSessionCwd(sessionName);
-  if (cwd) {
-    return getClaudeSessionIdFromFiles(cwd);
-  }
-
-  return null;
-}
-
-async function getLastLine(sessionName: string): Promise<string> {
-  try {
-    const { stdout } = await execAsync(
-      `tmux capture-pane -t "${sessionName}" -p -S -5 2>/dev/null || echo ""`
-    );
-    const lines = stdout.trim().split("\n").filter(Boolean);
-    return lines.pop() || "";
-  } catch {
-    return "";
-  }
-}
-
-// UUID pattern for claude-deck managed sessions (derived from registry)
-const UUID_PATTERN = getManagedSessionPattern();
-
-// Track previous statuses to detect changes
-const previousStatuses = new Map<string, SessionStatus>();
-
-function getAgentTypeFromSessionName(sessionName: string): AgentType {
-  return getProviderIdFromSessionName(sessionName) || "claude";
-}
+import { getStatusSnapshot } from "@/lib/status-monitor";
 
 export async function GET() {
-  try {
-    const sessions = await getTmuxSessions();
-
-    // Get status for claude-deck managed sessions
-    const managedSessions = sessions.filter((s) => UUID_PATTERN.test(s));
-
-    // Use the new status detector
-    const statusMap: Record<string, SessionStatusResponse> = {};
-
-    const db = getDb();
-    const sessionsToUpdate: string[] = [];
-
-    // Process all sessions in parallel for speed
-    const sessionPromises = managedSessions.map(async (sessionName) => {
-      const [status, claudeSessionId, lastLine] = await Promise.all([
-        statusDetector.getStatus(sessionName),
-        getClaudeSessionId(sessionName),
-        getLastLine(sessionName),
-      ]);
-      const id = getSessionIdFromName(sessionName);
-      const agentType = getAgentTypeFromSessionName(sessionName);
-
-      return { sessionName, id, status, claudeSessionId, lastLine, agentType };
-    });
-
-    const results = await Promise.all(sessionPromises);
-
-    for (const {
-      sessionName,
-      id,
-      status,
-      claudeSessionId,
-      lastLine,
-      agentType,
-    } of results) {
-      // Track status changes - update DB when session becomes active
-      const prevStatus = previousStatuses.get(id);
-      if (status === "running" || status === "waiting") {
-        if (prevStatus !== status) {
-          sessionsToUpdate.push(id);
-        }
-      }
-      previousStatuses.set(id, status);
-
-      statusMap[id] = {
-        sessionName,
-        status,
-        lastLine,
-        claudeSessionId,
-        agentType,
-      };
-    }
-
-    // Batch update sessions and claude_session_id
-    for (const id of sessionsToUpdate) {
-      db.prepare(
-        "UPDATE sessions SET updated_at = datetime('now') WHERE id = ?"
-      ).run(id);
-    }
-
-    for (const { id, claudeSessionId } of results) {
-      if (claudeSessionId) {
-        db.prepare(
-          "UPDATE sessions SET claude_session_id = ? WHERE id = ? AND (claude_session_id IS NULL OR claude_session_id != ?)"
-        ).run(claudeSessionId, id, claudeSessionId);
-      }
-    }
-
-    // Cleanup old trackers
-    statusDetector.cleanup();
-
-    return NextResponse.json({ statuses: statusMap });
-  } catch (error) {
-    console.error("Error getting session statuses:", error);
-    return NextResponse.json({ statuses: {} });
-  }
+  return NextResponse.json({ statuses: getStatusSnapshot() });
 }

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 };
@@ -464,6 +455,7 @@ function HomeContent() {
         paneId={paneId}
         sessions={sessions}
         projects={projects}
+        sessionStatuses={sessionStatuses}
         onRegisterTerminal={registerTerminalRef}
         onMenuClick={isMobile ? () => setSidebarOpen(true) : undefined}
         onSelectSession={handleSelectSession}
@@ -473,6 +465,7 @@ function HomeContent() {
     [
       sessions,
       projects,
+      sessionStatuses,
       registerTerminalRef,
       isMobile,
       handleSelectSession,

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>