Auto-prompt workspace rename for unnamed workspaces

apps/desktop/src/lib/trpc/routers/workspaces/procedures/create.ts

@@ -384,6 +384,7 @@ export const createCreateProcedures = () => {
 						type: "worktree",
 						branch,
 						name: input.name ?? branch,
+						isUnnamed: !input.name,
 						tabOrder: maxTabOrder + 1,
 					})
 					.returning()
@@ -591,6 +592,7 @@ export const createCreateProcedures = () => {
 						type: "worktree",
 						branch: worktree.branch,
 						name: input.name ?? worktree.branch,
+						isUnnamed: !input.name,
 						tabOrder: maxTabOrder + 1,
 					})
 					.returning()

apps/desktop/src/lib/trpc/routers/workspaces/procedures/query.ts

@@ -173,6 +173,7 @@ export const createQueryProcedures = () => {
 						updatedAt: number;
 						lastOpenedAt: number;
 						isUnread: boolean;
+						isUnnamed: boolean;
 					}>;
 				}
 			>();
@@ -215,6 +216,7 @@ export const createQueryProcedures = () => {
 						type: workspace.type as "worktree" | "branch",
 						worktreePath,
 						isUnread: workspace.isUnread ?? false,
+						isUnnamed: workspace.isUnnamed ?? false,
 					});
 				}
 			}

apps/desktop/src/lib/trpc/routers/workspaces/procedures/status.ts

@@ -63,6 +63,7 @@ export const createStatusProcedures = () => {
 					id: z.string(),
 					patch: z.object({
 						name: z.string().optional(),
+						preserveUnnamedStatus: z.boolean().optional(),
 					}),
 				}),
 			)
@@ -75,7 +76,11 @@ export const createStatusProcedures = () => {
 				}
 
 				touchWorkspace(input.id, {
-					...(input.patch.name !== undefined && { name: input.patch.name }),
+					...(input.patch.name !== undefined && {
+						name: input.patch.name,
+						// Only mark as named if not preserving unnamed status
+						...(input.patch.preserveUnnamedStatus ? {} : { isUnnamed: false }),
+					}),
 				});
 
 				return { success: true };

apps/desktop/src/lib/trpc/routers/workspaces/utils/db-helpers.ts

@@ -220,6 +220,7 @@ export function touchWorkspace(
 	workspaceId: string,
 	additionalFields?: Partial<{
 		isUnread: boolean;
+		isUnnamed: boolean;
 		branch: string;
 		name: string;
 	}>,

apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx

@@ -29,11 +29,40 @@ import type {
 } from "./types";
 import { shellEscapePaths } from "./utils";
 
+const stripLeadingEmoji = (text: string) =>
+	text.trim().replace(/^[\p{Emoji}\p{Symbol}]\s*/u, "");
+
 export const Terminal = ({ paneId, tabId, workspaceId }: TerminalProps) => {
 	const pane = useTabsStore((s) => s.panes[paneId]);
 	const paneInitialCommands = pane?.initialCommands;
 	const paneInitialCwd = pane?.initialCwd;
 	const clearPaneInitialData = useTabsStore((s) => s.clearPaneInitialData);
+
+	const { data: workspaceData } = electronTrpc.workspaces.get.useQuery(
+		{ id: workspaceId },
+		{ staleTime: 30_000 },
+	);
+	const isUnnamedRef = useRef(false);
+	isUnnamedRef.current = workspaceData?.isUnnamed ?? false;
+
+	const utils = electronTrpc.useUtils();
+	const updateWorkspace = electronTrpc.workspaces.update.useMutation({
+		onSuccess: () => {
+			utils.workspaces.getAllGrouped.invalidate();
+			utils.workspaces.get.invalidate({ id: workspaceId });
+		},
+	});
+
+	const renameUnnamedWorkspaceRef = useRef<(title: string) => void>(() => {});
+	renameUnnamedWorkspaceRef.current = (title: string) => {
+		const cleanedTitle = stripLeadingEmoji(title);
+		if (isUnnamedRef.current && cleanedTitle) {
+			updateWorkspace.mutate({
+				id: workspaceId,
+				patch: { name: cleanedTitle, preserveUnnamedStatus: true },
+			});
+		}
+	};
 	const terminalRef = useRef<HTMLDivElement>(null);
 	const xtermRef = useRef<XTerm | null>(null);
 	const fitAddonRef = useRef<FitAddon | null>(null);
@@ -260,6 +289,7 @@ export const Terminal = ({ paneId, tabId, workspaceId }: TerminalProps) => {
 		isAlternateScreenRef,
 		isBracketedPasteRef,
 		debouncedSetTabAutoTitleRef,
+		renameUnnamedWorkspaceRef,
 		handleTerminalFocusRef,
 		registerClearCallbackRef,
 		unregisterClearCallbackRef,

apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalLifecycle.ts

@@ -122,6 +122,7 @@ export interface UseTerminalLifecycleOptions {
 	isAlternateScreenRef: MutableRefObject<boolean>;
 	isBracketedPasteRef: MutableRefObject<boolean>;
 	debouncedSetTabAutoTitleRef: MutableRefObject<DebouncedTitleSetter>;
+	renameUnnamedWorkspaceRef: MutableRefObject<(title: string) => void>;
 	handleTerminalFocusRef: MutableRefObject<() => void>;
 	registerClearCallbackRef: MutableRefObject<RegisterCallback>;
 	unregisterClearCallbackRef: MutableRefObject<UnregisterCallback>;
@@ -173,6 +174,7 @@ export function useTerminalLifecycle({
 	isAlternateScreenRef,
 	isBracketedPasteRef,
 	debouncedSetTabAutoTitleRef,
+	renameUnnamedWorkspaceRef,
 	handleTerminalFocusRef,
 	registerClearCallbackRef,
 	unregisterClearCallbackRef,
@@ -466,6 +468,7 @@ export function useTerminalLifecycle({
 		const titleDisposable = xterm.onTitleChange((title) => {
 			if (title) {
 				debouncedSetTabAutoTitleRef.current(tabIdRef.current, title);
+				renameUnnamedWorkspaceRef.current(title);
 			}
 		});
 

packages/local-db/drizzle/0017_add_is_unnamed_to_workspaces.sql

@@ -0,0 +1 @@
+ALTER TABLE `workspaces` ADD `is_unnamed` integer DEFAULT false;