fix: remove debug logs and improve terminal exit behavior

MarkShawn2020 · claude · MarkShawn2020 · commit 7fe8ac5edf5a · 2025-12-31T17:51:02.000+07:00
- Remove debug logs from pty_manager.rs and TerminalPane.tsx - Keep sessions with commands open after PTY exit for scrollback visibility - Refactor workspace and panel components 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
diff --git a/src-tauri/src/pty_manager.rs b/src-tauri/src/pty_manager.rs
@@ -41,20 +41,12 @@ fn get_scrollback_path(id: &str) -> PathBuf {
 /// Load scrollback from disk
 fn load_scrollback_from_disk(id: &str) -> Option<VecDeque<u8>> {
     let path = get_scrollback_path(id);
-    println!("[DEBUG][pty_manager] load_scrollback_from_disk: id={}, path={:?}, exists={}", id, path, path.exists());
     if path.exists() {
         match fs::read(&path) {
-            Ok(data) => {
-                println!("[DEBUG][pty_manager] load_scrollback_from_disk: loaded {} bytes", data.len());
-                Some(VecDeque::from(data))
-            }
-            Err(e) => {
-                eprintln!("[DEBUG][pty_manager] load_scrollback_from_disk: failed to read: {}", e);
-                None
-            }
+            Ok(data) => Some(VecDeque::from(data)),
+            Err(_) => None,
         }
     } else {
-        println!("[DEBUG][pty_manager] load_scrollback_from_disk: file not found");
         None
     }
 }
@@ -66,15 +58,13 @@ fn save_scrollback_to_disk(id: &str, data: &VecDeque<u8>) -> Result<(), String>
 
     let path = get_scrollback_path(id);
     let bytes: Vec<u8> = data.iter().copied().collect();
-    println!("[DEBUG][pty_manager] save_scrollback_to_disk: id={}, path={:?}, bytes={}", id, path, bytes.len());
     fs::write(&path, &bytes).map_err(|e| format!("Failed to write scrollback: {}", e))?;
     Ok(())
 }
 
 /// Delete scrollback file
 fn delete_scrollback_from_disk(id: &str) {
     let path = get_scrollback_path(id);
-    println!("[DEBUG][pty_manager] delete_scrollback_from_disk: id={}, path={:?}", id, path);
     let _ = fs::remove_file(path);
 }
 
@@ -211,11 +201,9 @@ pub fn create_session(
 
     // Initialize scrollback buffer - load from disk if exists (for app restart recovery)
     {
-        println!("[DEBUG][pty_manager] create_session: loading scrollback for id={}", id);
         let mut scrollback = PTY_SCROLLBACK.lock().map_err(|e| e.to_string())?;
         let buffer = load_scrollback_from_disk(&id)
             .unwrap_or_else(|| VecDeque::with_capacity(SCROLLBACK_MAX_BYTES));
-        println!("[DEBUG][pty_manager] create_session: scrollback buffer size={}", buffer.len());
         scrollback.insert(id.clone(), buffer);
     }
     // Initialize last save timestamp
diff --git a/src/components/GlobalHeader/VerticalFeatureTabs.tsx b/src/components/GlobalHeader/VerticalFeatureTabs.tsx
@@ -699,106 +699,114 @@ function ProjectSessionsGroup({
   };
 
   const handleResumeSession = async (session: Session) => {
-    if (!workspace) return;
+    // Use functional update to avoid race conditions with stale closure values
+    let savedWorkspace: WorkspaceData | null = null;
 
-    // Select this project first
-    navigate({ type: "workspace", projectId: project.id, mode: "features" });
+    setWorkspace((currentWorkspace) => {
+      if (!currentWorkspace) return currentWorkspace;
 
-    // Find or create a feature to add the session terminal
-    const targetFeature = project.features.find((f) => !f.archived);
+      // Find current project from latest state
+      const currentProject = currentWorkspace.projects.find((p) => p.id === project.id);
+      if (!currentProject) return currentWorkspace;
 
-    // If no active feature, just navigate to the project
-    if (!targetFeature) {
-      const newWorkspace: WorkspaceData = {
-        ...workspace,
-        active_project_id: project.id,
-      };
-      setWorkspace(newWorkspace);
-      await invoke("workspace_save", { data: newWorkspace });
-      return;
-    }
+      // Find or create a feature to add the session terminal
+      const targetFeature = currentProject.features.find((f) => !f.archived);
 
-    // Create a new terminal session with cc --resume command
-    const panelId = targetFeature.panels[0]?.id;
-    const title = session.summary || "CC Session";
-    const command = `cc --resume "${session.id}"`;
-
-    if (!panelId) {
-      // No panel exists, create one with the resume command
-      const newPanelId = crypto.randomUUID();
-      const ptySessionId = crypto.randomUUID();
-      const ptyId = crypto.randomUUID();
-
-      const newPanel = {
-        id: newPanelId,
-        sessions: [{ id: ptySessionId, pty_id: ptyId, title, command }],
-        active_session_id: ptySessionId,
-        is_shared: false,
-        cwd: project.path,
-      };
+      // If no active feature, just set active project
+      if (!targetFeature) {
+        savedWorkspace = {
+          ...currentWorkspace,
+          active_project_id: project.id,
+        };
+        return savedWorkspace;
+      }
 
-      const newProjects = workspace.projects.map((p) => {
-        if (p.id !== project.id) return p;
-        return {
-          ...p,
-          features: p.features.map((f) => {
-            if (f.id !== targetFeature!.id) return f;
-            return {
-              ...f,
-              panels: [...f.panels, newPanel],
-              layout: { type: "panel" as const, panelId: newPanelId },
-            };
-          }),
-          active_feature_id: targetFeature!.id,
-          view_mode: "features" as const,
+      // Create a new terminal session with claude --resume command
+      const panelId = targetFeature.panels[0]?.id;
+      const title = session.summary || "Untitled";
+      const command = `claude --resume "${session.id}"`;
+
+      if (!panelId) {
+        // No panel exists, create one with the resume command
+        const newPanelId = crypto.randomUUID();
+        const ptySessionId = crypto.randomUUID();
+        const ptyId = crypto.randomUUID();
+
+        const newPanel = {
+          id: newPanelId,
+          sessions: [{ id: ptySessionId, pty_id: ptyId, title, command }],
+          active_session_id: ptySessionId,
+          is_shared: false,
+          cwd: project.path,
         };
-      });
 
-      const newWorkspace: WorkspaceData = {
-        ...workspace,
-        projects: newProjects,
-        active_project_id: project.id,
-      };
-      setWorkspace(newWorkspace);
-      await invoke("workspace_save", { data: newWorkspace });
-    } else {
-      // Add a new session tab to the first panel
-      const ptySessionId = crypto.randomUUID();
-      const ptyId = crypto.randomUUID();
-
-      const newProjects = workspace.projects.map((p) => {
-        if (p.id !== project.id) return p;
-        return {
-          ...p,
-          features: p.features.map((f) => {
-            if (f.id !== targetFeature!.id) return f;
-            return {
-              ...f,
-              panels: f.panels.map((panel) => {
-                if (panel.id !== panelId) return panel;
-                return {
-                  ...panel,
-                  sessions: [
-                    ...(panel.sessions || []),
-                    { id: ptySessionId, pty_id: ptyId, title, command },
-                  ],
-                  active_session_id: ptySessionId,
-                };
-              }),
-            };
-          }),
-          active_feature_id: targetFeature!.id,
-          view_mode: "features" as const,
+        const newProjects = currentWorkspace.projects.map((p) => {
+          if (p.id !== project.id) return p;
+          return {
+            ...p,
+            features: p.features.map((f) => {
+              if (f.id !== targetFeature.id) return f;
+              return {
+                ...f,
+                panels: [...f.panels, newPanel],
+                layout: { type: "panel" as const, panelId: newPanelId },
+              };
+            }),
+            active_feature_id: targetFeature.id,
+            view_mode: "features" as const,
+          };
+        });
+
+        savedWorkspace = {
+          ...currentWorkspace,
+          projects: newProjects,
+          active_project_id: project.id,
         };
-      });
+        return savedWorkspace;
+      } else {
+        // Add a new session tab to the first panel
+        const ptySessionId = crypto.randomUUID();
+        const ptyId = crypto.randomUUID();
+
+        const newProjects = currentWorkspace.projects.map((p) => {
+          if (p.id !== project.id) return p;
+          return {
+            ...p,
+            features: p.features.map((f) => {
+              if (f.id !== targetFeature.id) return f;
+              return {
+                ...f,
+                panels: f.panels.map((panel) => {
+                  if (panel.id !== panelId) return panel;
+                  return {
+                    ...panel,
+                    sessions: [
+                      ...(panel.sessions || []),
+                      { id: ptySessionId, pty_id: ptyId, title, command },
+                    ],
+                    active_session_id: ptySessionId,
+                  };
+                }),
+              };
+            }),
+            active_feature_id: targetFeature.id,
+            view_mode: "features" as const,
+          };
+        });
 
-      const newWorkspace: WorkspaceData = {
-        ...workspace,
-        projects: newProjects,
-        active_project_id: project.id,
-      };
-      setWorkspace(newWorkspace);
-      await invoke("workspace_save", { data: newWorkspace });
+        savedWorkspace = {
+          ...currentWorkspace,
+          projects: newProjects,
+          active_project_id: project.id,
+        };
+        return savedWorkspace;
+      }
+    });
+
+    // Save after state update - use the captured workspace from functional update
+    if (savedWorkspace) {
+      await invoke("workspace_save", { data: savedWorkspace });
+      navigate({ type: "workspace", projectId: project.id, mode: "features" });
     }
   };
 
diff --git a/src/components/PanelGrid/PanelGrid.tsx b/src/components/PanelGrid/PanelGrid.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from "react";
 import { Allotment } from "allotment";
 import "allotment/dist/style.css";
-import { ChevronLeftIcon, ChevronRightIcon, DrawingPinFilledIcon } from "@radix-ui/react-icons";
+import { ChevronLeftIcon, ChevronRightIcon, DrawingPinFilledIcon, PlusIcon } from "@radix-ui/react-icons";
 import { SessionPanel } from "./SessionPanel";
 import type { LayoutNode } from "../../views/Workspace/types";
 
@@ -164,12 +164,6 @@ export function PanelGrid({
     }
   }, [controlledOnPanelFocus, controlledActivePanelId]);
 
-  // Auto-create terminal when empty
-  useEffect(() => {
-    if (panels.length === 0 && onInitialPanelCreate) {
-      onInitialPanelCreate();
-    }
-  }, [panels.length, onInitialPanelCreate]);
 
   // Auto-select first panel if current active is gone
   useEffect(() => {
@@ -179,7 +173,22 @@ export function PanelGrid({
   }, [panels, activePanelId]);
 
   if (panels.length === 0) {
-    return null;
+    return (
+      <div className="h-full w-full flex items-center justify-center bg-canvas">
+        <div className="text-center">
+          <p className="text-muted-foreground mb-4">No terminals open</p>
+          {onInitialPanelCreate && (
+            <button
+              onClick={onInitialPanelCreate}
+              className="inline-flex items-center gap-2 px-4 py-2 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 transition-colors"
+            >
+              <PlusIcon className="w-4 h-4" />
+              New Terminal
+            </button>
+          )}
+        </div>
+      </div>
+    );
   }
 
   // Use tree layout if available
diff --git a/src/components/PanelGrid/SessionPanel.tsx b/src/components/PanelGrid/SessionPanel.tsx
@@ -112,12 +112,17 @@ export const SessionPanel = memo(function SessionPanel({
 }: SessionPanelProps) {
   const handleTitleChange = useCallback(
     (sessionId: string) => (title: string) => {
+      // Only update title if current title is "Untitled" (preserve user-set titles like session summary)
+      // Also skip if session not found yet (React hasn't finished updating props)
+      const session = panel.sessions.find((s) => s.id === sessionId);
+      if (!session || session.title !== "Untitled") return;
+
       // Strip ANSI escape sequences and control characters from terminal title
       // eslint-disable-next-line no-control-regex
       const cleanTitle = title.replace(/\x1b\[[0-9;]*[a-zA-Z]|\x1b\][^\x07]*\x07|[\x00-\x1f]/g, '').trim();
       if (cleanTitle) onSessionTitleChange(sessionId, cleanTitle);
     },
-    [onSessionTitleChange]
+    [onSessionTitleChange, panel.sessions]
   );
 
   return (
diff --git a/src/components/Terminal/TerminalPane.tsx b/src/components/Terminal/TerminalPane.tsx
diff --git a/src/views/Workspace/WorkspaceView.tsx b/src/views/Workspace/WorkspaceView.tsx
