From 3d637e93b81cb4031b6cb11e12ffef84084db47a Mon Sep 17 00:00:00 2001
From: nonlooped <nonlooped@gmail.com>
Date: Fri, 31 Jul 2026 11:44:17 +0300
Subject: [PATCH 1/3] feat: expand integrated terminal with named tabs, shell
 profiles, and links

---
 apps/desktop/src/main/editors.ts              |  34 ++-
 apps/desktop/src/main/ipc.ts                  |  37 ++-
 apps/desktop/src/main/terminal.ts             | 146 +++++++--
 .../src/renderer/components/TerminalDock.tsx  | 280 +++++++++++++++---
 .../src/renderer/lib/terminalLinks.test.ts    |  36 +++
 .../desktop/src/renderer/lib/terminalLinks.ts |  72 +++++
 apps/desktop/src/shared/rpc-schema.ts         |  25 +-
 7 files changed, 554 insertions(+), 76 deletions(-)
 create mode 100644 apps/desktop/src/renderer/lib/terminalLinks.test.ts
 create mode 100644 apps/desktop/src/renderer/lib/terminalLinks.ts

diff --git a/apps/desktop/src/main/editors.ts b/apps/desktop/src/main/editors.ts
index d6c441f..74eeea6 100644
--- a/apps/desktop/src/main/editors.ts
+++ b/apps/desktop/src/main/editors.ts
@@ -7,12 +7,22 @@ import type { InstalledEditor } from "../shared/rpc-schema.ts";
 
 const execFileAsync = promisify(execFile);
 
+/** Editors whose CLI accepts a line to jump to. Anything else just opens the file. */
+type EditorFamily = "vscode" | "jetbrains";
+
 type EditorSpec = InstalledEditor & {
   executables: string[];
   paths: string[];
+  family?: EditorFamily;
 };
 
-type ScannedEditor = { editor: InstalledEditor; executable?: string };
+type ScannedEditor = { editor: InstalledEditor; executable?: string; family?: EditorFamily };
+
+function fileArgs(targetPath: string, family: EditorFamily | undefined, line: number | undefined): string[] {
+  if (line && family === "vscode") return ["-g", `${targetPath}:${line}`];
+  if (line && family === "jetbrains") return ["--line", String(line), targetPath];
+  return [targetPath];
+}
 
 const EXPLORER: InstalledEditor = { id: "explorer", name: "Explorer", icon: "explorer" };
 
@@ -31,6 +41,7 @@ const editorSpecs: EditorSpec[] = [
     icon: "cursor",
     executables: ["Cursor.exe"],
     paths: under(local, "Programs", "Cursor", "Cursor.exe"),
+    family: "vscode",
   },
   {
     id: "vscode",
@@ -42,6 +53,7 @@ const editorSpecs: EditorSpec[] = [
       ...under(programFiles, "Microsoft VS Code", "Code.exe"),
       ...under(programFilesX86, "Microsoft VS Code", "Code.exe"),
     ],
+    family: "vscode",
   },
   {
     id: "antigravity",
@@ -52,6 +64,7 @@ const editorSpecs: EditorSpec[] = [
       ...under(local, "Programs", "Antigravity IDE", "Antigravity IDE.exe"),
       ...under(local, "Programs", "Antigravity", "Antigravity.exe"),
     ],
+    family: "vscode",
   },
   {
     id: "windsurf",
@@ -59,6 +72,7 @@ const editorSpecs: EditorSpec[] = [
     icon: "windsurf",
     executables: ["Windsurf.exe"],
     paths: under(local, "Programs", "Windsurf", "Windsurf.exe"),
+    family: "vscode",
   },
   {
     id: "vscode-insiders",
@@ -66,6 +80,7 @@ const editorSpecs: EditorSpec[] = [
     icon: "code",
     executables: ["Code - Insiders.exe"],
     paths: under(local, "Programs", "Microsoft VS Code Insiders", "Code - Insiders.exe"),
+    family: "vscode",
   },
   {
     id: "vscodium",
@@ -76,6 +91,7 @@ const editorSpecs: EditorSpec[] = [
       ...under(local, "Programs", "VSCodium", "VSCodium.exe"),
       ...under(programFiles, "VSCodium", "VSCodium.exe"),
     ],
+    family: "vscode",
   },
   {
     id: "zed",
@@ -178,7 +194,7 @@ function scanJetBrainsDirectory(
   if (!existsSync(directory)) return;
   for (const [id, name, filename] of jetBrainsEditors) {
     const executable = join(directory, "bin", filename);
-    if (existsSync(executable) && !found.has(id)) found.set(id, { editor: { id, name, icon: "code" }, executable });
+    if (existsSync(executable) && !found.has(id)) found.set(id, { editor: { id, name, icon: "code" }, executable, family: "jetbrains" });
   }
   if (depth === 0 || jetBrainsEditors.every(([id]) => found.has(id))) return;
   let children;
@@ -206,8 +222,8 @@ async function scanEditors(): Promise<Map<string, ScannedEditor>> {
   for (const spec of editorSpecs) {
     const executable = spec.paths.find(existsSync);
     if (executable) {
-      const { executables: _executables, paths: _paths, ...editor } = spec;
-      found.set(spec.id, { editor, executable });
+      const { executables: _executables, paths: _paths, family, ...editor } = spec;
+      found.set(spec.id, { editor, executable, family });
     }
   }
   try {
@@ -221,14 +237,14 @@ async function scanEditors(): Promise<Map<string, ScannedEditor>> {
       if (found.has(spec.id)) continue;
       const executable = spec.executables.map((name) => registered.get(name.toLowerCase())).find(Boolean);
       if (executable) {
-        const { executables: _executables, paths: _paths, ...editor } = spec;
-        found.set(spec.id, { editor, executable });
+        const { executables: _executables, paths: _paths, family, ...editor } = spec;
+        found.set(spec.id, { editor, executable, family });
       }
     }
     for (const [id, name, filename] of jetBrainsEditors) {
       if (found.has(id)) continue;
       const executable = registered.get(filename.toLowerCase());
-      if (executable) found.set(id, { editor: { id, name, icon: "code" }, executable });
+      if (executable) found.set(id, { editor: { id, name, icon: "code" }, executable, family: "jetbrains" });
     }
   } catch {
     // ignore
@@ -284,7 +300,7 @@ export async function openProjectIn(projectDir: string, editorId: string): Promi
   });
 }
 
-export async function openFileIn(projectDir: string, file: string, editorId: string): Promise<void> {
+export async function openFileIn(projectDir: string, file: string, editorId: string, line?: number): Promise<void> {
   const targetPath = resolve(projectDir, file);
   const relativePath = relative(projectDir, targetPath);
   if (isAbsolute(relativePath) || relativePath === ".." || relativePath.startsWith(`..${sep}`)) {
@@ -298,7 +314,7 @@ export async function openFileIn(projectDir: string, file: string, editorId: str
   if (!target?.executable) throw new Error("That editor is no longer installed.");
   const executable = target.executable;
   await new Promise<void>((resolveSpawn, reject) => {
-    const child = spawn(executable, [targetPath], {
+    const child = spawn(executable, fileArgs(targetPath, target.family, line), {
       detached: true,
       stdio: "ignore",
       windowsHide: true,
diff --git a/apps/desktop/src/main/ipc.ts b/apps/desktop/src/main/ipc.ts
index 2898140..257bbdc 100644
--- a/apps/desktop/src/main/ipc.ts
+++ b/apps/desktop/src/main/ipc.ts
@@ -22,9 +22,12 @@ import {
   closeTerminal,
   closeProjectTerminals,
   createTerminal,
+  listShellProfiles,
   listTerminals,
   liveTerminalProjects,
+  renameTerminal,
   resizeTerminal,
+  restartTerminal,
   stopAllTerminals,
   terminalSnapshot,
   writeTerminal,
@@ -283,7 +286,7 @@ function toSessionState(data: RpcSessionState): RpcSessionState {
 
 const THINKING_LEVELS = new Set<ThinkingLevel>(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 const openProjectInParamsSchema = z.object({ projectDir: z.string().min(1), editorId: z.string().min(1) });
-const openFileInParamsSchema = openProjectInParamsSchema.extend({ file: z.string().min(1) });
+const openFileInParamsSchema = openProjectInParamsSchema.extend({ file: z.string().min(1), line: z.number().int().positive().optional() });
 const saveImageParamsSchema = z.object({
   data: z.string().min(1).max(64 * 1024 * 1024),
   mimeType: z.enum(["image/png", "image/jpeg", "image/gif", "image/webp"]),
@@ -343,6 +346,11 @@ const tuiApplyParamsSchema = tuiCompleteParamsSchema.extend({
   prefix: z.string().max(200),
 });
 const terminalIdParamsSchema = projectDirParamsSchema.extend({ terminalId: z.string().min(1) });
+const terminalCreateParamsSchema = projectDirParamsSchema.extend({
+  shellId: z.string().optional(),
+  name: z.string().optional(),
+});
+const terminalRenameParamsSchema = terminalIdParamsSchema.extend({ name: z.string().min(1).max(64) });
 const terminalResizeParamsSchema = terminalIdParamsSchema.extend({
   cols: z.number().int().min(2).max(1000),
   rows: z.number().int().min(1).max(1000),
@@ -775,8 +783,8 @@ const handlers: HandlerMap = {
   },
   openFileIn: async (params) => {
     try {
-      const { projectDir, file, editorId } = openFileInParamsSchema.parse(params);
-      await openFileIn(projectDir, file, editorId);
+      const { projectDir, file, editorId, line } = openFileInParamsSchema.parse(params);
+      await openFileIn(projectDir, file, editorId, line);
       return { ok: true };
     } catch (err) {
       return { ok: false, error: errorMessage(err) };
@@ -905,6 +913,8 @@ const handlers: HandlerMap = {
       terminals: [
         createTerminal(
           projectDir,
+          undefined,
+          undefined,
           (payload) => push("terminalData", payload),
           (payload) => push("terminalExit", payload),
         ),
@@ -912,10 +922,29 @@ const handlers: HandlerMap = {
     };
   },
   terminalCreate: (params) => {
-    const { projectDir } = projectDirParamsSchema.parse(params);
+    const { projectDir, shellId, name } = terminalCreateParamsSchema.parse(params);
     return {
       terminal: createTerminal(
         projectDir,
+        shellId,
+        name,
+        (payload) => push("terminalData", payload),
+        (payload) => push("terminalExit", payload),
+      ),
+    };
+  },
+  terminalListShells: () => ({ shells: listShellProfiles() }),
+  terminalRename: (params) => {
+    const { projectDir, terminalId, name } = terminalRenameParamsSchema.parse(params);
+    renameTerminal(projectDir, terminalId, name);
+    return { ok: true };
+  },
+  terminalRestart: (params) => {
+    const { projectDir, terminalId } = terminalIdParamsSchema.parse(params);
+    return {
+      terminal: restartTerminal(
+        projectDir,
+        terminalId,
         (payload) => push("terminalData", payload),
         (payload) => push("terminalExit", payload),
       ),
diff --git a/apps/desktop/src/main/terminal.ts b/apps/desktop/src/main/terminal.ts
index b311523..0913f88 100644
--- a/apps/desktop/src/main/terminal.ts
+++ b/apps/desktop/src/main/terminal.ts
@@ -3,7 +3,7 @@ import { existsSync } from "node:fs";
 import { delimiter, join } from "node:path";
 import type { IPty } from "node-pty";
 import { spawn } from "node-pty";
-import type { TerminalSession } from "../shared/rpc-schema.ts";
+import type { ShellProfile, TerminalSession } from "../shared/rpc-schema.ts";
 
 const MAX_BUFFER_SIZE = 2 * 1024 * 1024;
 
@@ -16,14 +16,55 @@ type ManagedTerminal = TerminalSession & {
 
 const terminals = new Map<string, ManagedTerminal>();
 
-function resolveShell(): string {
+/**
+ * Shells NativePi knows how to look for. Detection is PATH-first with a few
+ * well-known install locations as a fallback, the same shape `editors.ts`
+ * uses for applications — adding a shell for another platform is one entry
+ * here, not a new branch.
+ */
+const SHELL_CANDIDATES: { id: string; name: string; executable: string; paths: string[]; args: string[] }[] = [
+  { id: "pwsh", name: "PowerShell 7", executable: "pwsh.exe", paths: [], args: ["-NoLogo"] },
+  { id: "powershell", name: "Windows PowerShell", executable: "powershell.exe", paths: [], args: ["-NoLogo"] },
+  { id: "cmd", name: "Command Prompt", executable: "cmd.exe", paths: [], args: [] },
+  {
+    id: "gitbash",
+    name: "Git Bash",
+    executable: "bash.exe",
+    paths: [
+      join(process.env["ProgramFiles"] ?? "", "Git", "bin", "bash.exe"),
+      join(process.env["ProgramFiles(x86)"] ?? "", "Git", "bin", "bash.exe"),
+    ],
+    args: ["--login", "-i"],
+  },
+  { id: "wsl", name: "WSL", executable: "wsl.exe", paths: [], args: [] },
+];
+
+function findOnPath(executable: string): string | undefined {
   const path = process.env["PATH"] ?? "";
   for (const dir of path.split(delimiter)) {
     if (!dir) continue;
-    const candidate = join(dir, "pwsh.exe");
+    const candidate = join(dir, executable);
     if (existsSync(candidate)) return candidate;
   }
-  return "powershell.exe";
+  return undefined;
+}
+
+function resolveCandidate(candidate: { executable: string; paths: string[] }): string | undefined {
+  return findOnPath(candidate.executable) ?? candidate.paths.find(existsSync);
+}
+
+export function listShellProfiles(): ShellProfile[] {
+  return SHELL_CANDIDATES.filter((candidate) => resolveCandidate(candidate) !== undefined).map(
+    ({ id, name }) => ({ id, name }),
+  );
+}
+
+function resolveShell(shellId: string | undefined): { id: string; path: string; args: string[] } {
+  const candidate = SHELL_CANDIDATES.find((entry) => entry.id === shellId);
+  const resolved = candidate ? resolveCandidate(candidate) : undefined;
+  if (candidate && resolved) return { id: candidate.id, path: resolved, args: candidate.args };
+  const path = findOnPath("pwsh.exe") ?? "powershell.exe";
+  return { id: "pwsh", path, args: ["-NoLogo"] };
 }
 
 function shellEnv(): Record<string, string> {
@@ -44,6 +85,8 @@ function publicSession(terminal: ManagedTerminal): TerminalSession {
   return {
     id: terminal.id,
     projectDir: terminal.projectDir,
+    name: terminal.name,
+    shellId: terminal.shellId,
     exited: terminal.exited,
     exitCode: terminal.exitCode,
   };
@@ -60,31 +103,36 @@ export function liveTerminalProjects(): string[] {
   return [...terminals.values()].filter((terminal) => !terminal.exited).map((terminal) => terminal.projectDir);
 }
 
-export function createTerminal(
-  projectDir: string,
-  onData: (payload: { projectDir: string; terminalId: string; data: string; sequence: number }) => void,
-  onExit: (payload: { projectDir: string; terminalId: string; exitCode: number }) => void,
-): TerminalSession {
-  const id = randomUUID();
-  const pty = spawn(resolveShell(), ["-NoLogo"], {
+function nextTerminalName(projectDir: string): string {
+  const used = new Set(
+    [...terminals.values()].filter((terminal) => terminal.projectDir === projectDir).map((terminal) => terminal.name),
+  );
+  let index = 1;
+  while (used.has(`Terminal ${index}`)) index += 1;
+  return `Terminal ${index}`;
+}
+
+function spawnPty(projectDir: string, shellId: string | undefined): { pty: IPty; resolvedShellId: string } {
+  const shell = resolveShell(shellId);
+  const pty = spawn(shell.path, shell.args, {
     name: "xterm-256color",
     cols: 100,
     rows: 24,
     cwd: projectDir,
     env: shellEnv(),
   });
-  const terminal: ManagedTerminal = {
-    id,
-    projectDir,
-    process: pty,
-    output: [],
-    outputSize: 0,
-    sequence: 0,
-    exited: false,
-  };
-  terminals.set(id, terminal);
+  return { pty, resolvedShellId: shell.id };
+}
 
-  pty.onData((data) => {
+function attachHandlers(
+  id: string,
+  projectDir: string,
+  onData: (payload: { projectDir: string; terminalId: string; data: string; sequence: number }) => void,
+  onExit: (payload: { projectDir: string; terminalId: string; exitCode: number }) => void,
+): void {
+  const terminal = terminals.get(id);
+  if (!terminal) return;
+  terminal.process.onData((data) => {
     const current = terminals.get(id);
     if (!current) return;
     current.output.push(data);
@@ -96,14 +144,66 @@ export function createTerminal(
     onData({ projectDir, terminalId: id, data, sequence: current.sequence });
   });
 
-  pty.onExit(({ exitCode }) => {
+  terminal.process.onExit(({ exitCode }) => {
     const current = terminals.get(id);
     if (!current) return;
     current.exited = true;
     current.exitCode = exitCode;
     onExit({ projectDir, terminalId: id, exitCode });
   });
+}
+
+export function createTerminal(
+  projectDir: string,
+  shellId: string | undefined,
+  name: string | undefined,
+  onData: (payload: { projectDir: string; terminalId: string; data: string; sequence: number }) => void,
+  onExit: (payload: { projectDir: string; terminalId: string; exitCode: number }) => void,
+): TerminalSession {
+  const id = randomUUID();
+  const { pty, resolvedShellId } = spawnPty(projectDir, shellId);
+  const terminal: ManagedTerminal = {
+    id,
+    projectDir,
+    name: name?.trim() || nextTerminalName(projectDir),
+    shellId: resolvedShellId,
+    process: pty,
+    output: [],
+    outputSize: 0,
+    sequence: 0,
+    exited: false,
+  };
+  terminals.set(id, terminal);
+  attachHandlers(id, projectDir, onData, onExit);
+  return publicSession(terminal);
+}
+
+export function renameTerminal(projectDir: string, terminalId: string, name: string): void {
+  const terminal = terminals.get(terminalId);
+  if (!terminal || terminal.projectDir !== projectDir) return;
+  const trimmed = name.trim();
+  if (trimmed) terminal.name = trimmed;
+}
 
+/** Kills the running shell and starts a fresh one under the same id, name, and profile. */
+export function restartTerminal(
+  projectDir: string,
+  terminalId: string,
+  onData: (payload: { projectDir: string; terminalId: string; data: string; sequence: number }) => void,
+  onExit: (payload: { projectDir: string; terminalId: string; exitCode: number }) => void,
+): TerminalSession {
+  const terminal = terminals.get(terminalId);
+  if (!terminal || terminal.projectDir !== projectDir) throw new Error("Terminal not found");
+  if (!terminal.exited) terminal.process.kill();
+  const { pty, resolvedShellId } = spawnPty(projectDir, terminal.shellId);
+  terminal.process = pty;
+  terminal.shellId = resolvedShellId;
+  terminal.output = [];
+  terminal.outputSize = 0;
+  terminal.sequence = 0;
+  terminal.exited = false;
+  terminal.exitCode = undefined;
+  attachHandlers(terminalId, projectDir, onData, onExit);
   return publicSession(terminal);
 }
 
diff --git a/apps/desktop/src/renderer/components/TerminalDock.tsx b/apps/desktop/src/renderer/components/TerminalDock.tsx
index 8239d29..f588c23 100644
--- a/apps/desktop/src/renderer/components/TerminalDock.tsx
+++ b/apps/desktop/src/renderer/components/TerminalDock.tsx
@@ -1,13 +1,19 @@
 import { useEffect, useRef, useState } from "react";
 import { FitAddon } from "@xterm/addon-fit";
 import { Terminal } from "@xterm/xterm";
+import { CaretDownIcon } from "@phosphor-icons/react/CaretDown";
+import { CheckIcon } from "@phosphor-icons/react/Check";
 import { SplitHorizontalIcon } from "@phosphor-icons/react/SplitHorizontal";
 import { TerminalWindowIcon } from "@phosphor-icons/react/TerminalWindow";
 import { TrashIcon } from "@phosphor-icons/react/Trash";
 import { XIcon } from "@phosphor-icons/react/X";
-import type { TerminalSession } from "../../shared/rpc-schema.ts";
+import { toast } from "sonner";
+import type { ShellProfile, TerminalSession } from "../../shared/rpc-schema.ts";
+import { findTerminalLinks } from "../lib/terminalLinks.ts";
 import { useAppStore } from "../lib/store.ts";
 import { Button } from "@/components/ui/button.tsx";
+import { Input } from "@/components/ui/input.tsx";
+import { Menu, MenuItem, MenuPopup, MenuTrigger } from "@/components/ui/menu.tsx";
 import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "@/components/ui/resizable.tsx";
 import { rpc } from "@/lib/rpc.ts";
 import {
@@ -26,8 +32,11 @@ export default function TerminalDock({
   onMinimize: () => void;
 }) {
   const [terminals, setTerminals] = useState<TerminalSession[]>([]);
+  const [shells, setShells] = useState<ShellProfile[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [closing, setClosing] = useState(false);
+  const preferredShellId = useAppStore((s) => s.preferences.preferredShellId);
+  const setPreference = useAppStore((s) => s.setPreference);
 
   useEffect(() => {
     let cancelled = false;
@@ -39,6 +48,12 @@ export default function TerminalDock({
         if (!cancelled) setError(reason instanceof Error ? reason.message : String(reason));
       },
     );
+    void rpc.request.terminalListShells({}).then(
+      ({ shells: next }) => {
+        if (!cancelled) setShells(next);
+      },
+      () => {},
+    );
     const offExit = rpc.events.on("terminalExit", ({ projectDir: exitedProject, terminalId, exitCode }) => {
       if (exitedProject !== projectDir) return;
       setTerminals((current) =>
@@ -53,15 +68,41 @@ export default function TerminalDock({
     };
   }, [projectDir]);
 
-  async function addSplit() {
+  async function addSplit(shellId?: string, name?: string) {
     try {
-      const { terminal } = await rpc.request.terminalCreate({ projectDir });
+      const { terminal } = await rpc.request.terminalCreate({ projectDir, shellId, name });
       setTerminals((current) => [...current, terminal]);
     } catch (reason) {
       setError(reason instanceof Error ? reason.message : String(reason));
     }
   }
 
+  async function duplicateSplit(session: TerminalSession) {
+    await addSplit(session.shellId, `${session.name} copy`);
+  }
+
+  async function restartSplit(terminalId: string) {
+    try {
+      const { terminal } = await rpc.request.terminalRestart({ projectDir, terminalId });
+      setTerminals((current) => current.map((session) => (session.id === terminalId ? terminal : session)));
+    } catch (reason) {
+      toast.error(reason instanceof Error ? reason.message : String(reason));
+    }
+  }
+
+  async function renameSplit(terminalId: string, name: string) {
+    const trimmed = name.trim();
+    if (!trimmed) return;
+    setTerminals((current) =>
+      current.map((session) => (session.id === terminalId ? { ...session, name: trimmed } : session)),
+    );
+    try {
+      await rpc.request.terminalRename({ projectDir, terminalId, name: trimmed });
+    } catch (reason) {
+      toast.error(reason instanceof Error ? reason.message : String(reason));
+    }
+  }
+
   async function closeSplit(terminalId: string) {
     if (closing) return;
     setClosing(true);
@@ -100,15 +141,12 @@ export default function TerminalDock({
         <ContextMenuTrigger render={<header className="flex min-h-8 shrink-0 items-center gap-2 border-b bg-sidebar/40 px-2" />}>
         <TerminalWindowIcon aria-hidden="true" className="shrink-0 text-muted-foreground" />
         <span className="flex-1 text-xs font-medium">Terminal</span>
-        <Button
-          variant="ghost"
-          size="icon-xs"
-          onClick={() => void addSplit()}
-          title="Split terminal"
-          aria-label="Split terminal"
-        >
-          <SplitHorizontalIcon />
-        </Button>
+        <ShellSplitButton
+          shells={shells}
+          preferredShellId={preferredShellId}
+          onChoose={(shellId) => setPreference("preferredShellId", shellId)}
+          onSplit={(shellId) => void addSplit(shellId)}
+        />
         <Button
           variant="ghost"
           size="icon-xs"
@@ -123,16 +161,16 @@ export default function TerminalDock({
           <XIcon />
         </Button>
         </ContextMenuTrigger>
-        <TerminalChromeMenu addSplit={addSplit} closeAll={closeAll} closing={closing} />
+        <TerminalChromeMenu addSplit={() => void addSplit(preferredShellId || undefined)} closeAll={closeAll} closing={closing} />
       </ContextMenu>
 
       {error ? (
         <div role="alert" className="flex min-h-0 flex-1 items-center justify-center px-4 text-sm text-destructive">
-          Could not start PowerShell: {error}
+          Could not start a shell: {error}
         </div>
       ) : terminals.length === 0 ? (
         <div className="flex min-h-0 flex-1 items-center justify-center text-xs text-muted-foreground" role="status">
-          Starting PowerShell…
+          Starting a shell…
         </div>
       ) : (
         <ResizablePanelGroup orientation="horizontal">
@@ -143,13 +181,13 @@ export default function TerminalDock({
               projectDir={projectDir}
               defaultSize={`${100 / terminals.length}%`}
               showHandle={index > 0}
-              // A single terminal needs no chrome: the dock header already names it
-              // and can close it. Splits do, or an individual split cannot be closed.
-              showChrome={terminals.length > 1}
               closing={closing}
               onClose={() => void closeSplit(terminal.id)}
-              onSplit={addSplit}
+              onSplit={() => void addSplit(preferredShellId || undefined)}
               onCloseAll={closeAll}
+              onDuplicate={() => void duplicateSplit(terminal)}
+              onRestart={() => void restartSplit(terminal.id)}
+              onRename={(name) => void renameSplit(terminal.id, name)}
             />
           ))}
         </ResizablePanelGroup>
@@ -158,62 +196,184 @@ export default function TerminalDock({
   );
 }
 
+function ShellSplitButton({
+  shells,
+  preferredShellId,
+  onChoose,
+  onSplit,
+}: {
+  shells: ShellProfile[];
+  preferredShellId: string;
+  onChoose: (shellId: string) => void;
+  onSplit: (shellId?: string) => void;
+}) {
+  if (shells.length === 0) {
+    return (
+      <Button variant="ghost" size="icon-xs" onClick={() => onSplit()} title="Split terminal" aria-label="Split terminal">
+        <SplitHorizontalIcon />
+      </Button>
+    );
+  }
+  const selected = shells.find((shell) => shell.id === preferredShellId);
+  return (
+    <div className="flex items-center">
+      <Button
+        variant="ghost"
+        size="icon-xs"
+        onClick={() => onSplit(preferredShellId || undefined)}
+        title={selected ? `Split terminal (${selected.name})` : "Split terminal"}
+        aria-label="Split terminal"
+      >
+        <SplitHorizontalIcon />
+      </Button>
+      <Menu>
+        <MenuTrigger
+          render={<Button variant="ghost" size="icon-xs" className="px-0" />}
+          title="Choose a shell"
+          aria-label="Choose a shell"
+        >
+          <CaretDownIcon />
+        </MenuTrigger>
+        <MenuPopup align="end" className="min-w-44">
+          {shells.map((shell) => (
+            <MenuItem
+              key={shell.id}
+              role="menuitemradio"
+              aria-checked={shell.id === preferredShellId}
+              onClick={() => onChoose(shell.id)}
+              className="text-sm"
+            >
+              <span className="min-w-0 flex-1 truncate">{shell.name}</span>
+              {shell.id === preferredShellId ? <CheckIcon className="ml-auto" aria-hidden /> : null}
+            </MenuItem>
+          ))}
+        </MenuPopup>
+      </Menu>
+    </div>
+  );
+}
+
 function TerminalSplit({
   session,
   projectDir,
   defaultSize,
   showHandle,
-  showChrome,
   closing,
   onClose,
   onSplit,
   onCloseAll,
+  onDuplicate,
+  onRestart,
+  onRename,
 }: {
   session: TerminalSession;
   projectDir: string;
   defaultSize: string;
   showHandle: boolean;
-  showChrome: boolean;
   closing: boolean;
   onClose: () => void;
-  onSplit: () => Promise<void>;
+  onSplit: () => void;
   onCloseAll: () => Promise<void>;
+  onDuplicate: () => void;
+  onRestart: () => void;
+  onRename: (name: string) => void;
 }) {
+  const [editingName, setEditingName] = useState(false);
+
   return (
     <>
       {showHandle ? <ResizableHandle className="hover:bg-ring focus-visible:bg-ring" /> : null}
       <ResizablePanel id={session.id} defaultSize={defaultSize}>
         <div className="flex h-full min-h-0 flex-col">
-          {showChrome ? (
-            <ContextMenu>
-              <ContextMenuTrigger render={<div className="flex min-h-7 shrink-0 items-center justify-end border-b px-2" />}>
+          <ContextMenu>
+            <ContextMenuTrigger render={<div className="flex min-h-7 shrink-0 items-center gap-1.5 border-b px-2" />}>
+              <StatusDot session={session} />
+              {editingName ? (
+                <Input
+                  autoFocus
+                  defaultValue={session.name}
+                  className="h-5 flex-1 px-1 text-xs"
+                  onBlur={(event) => {
+                    onRename(event.currentTarget.value);
+                    setEditingName(false);
+                  }}
+                  onKeyDown={(event) => {
+                    if (event.key === "Enter") event.currentTarget.blur();
+                    if (event.key === "Escape") setEditingName(false);
+                  }}
+                />
+              ) : (
+                <button
+                  type="button"
+                  className="min-w-0 flex-1 truncate text-left text-xs font-medium"
+                  onDoubleClick={() => setEditingName(true)}
+                  title={session.exited ? `${session.name} — exited (code ${session.exitCode ?? "unknown"})` : session.name}
+                >
+                  {session.name}
+                </button>
+              )}
               <Button variant="ghost" size="icon-xs" onClick={onClose} disabled={closing} title="Close terminal" aria-label="Close terminal">
                 <XIcon />
               </Button>
-              </ContextMenuTrigger>
-              <TerminalChromeMenu addSplit={onSplit} close={onClose} closeAll={onCloseAll} closing={closing} />
-            </ContextMenu>
-          ) : null}
-          <TerminalSurface session={session} projectDir={projectDir} onSplit={onSplit} onClose={onClose} onCloseAll={onCloseAll} closing={closing} />
+            </ContextMenuTrigger>
+            <TerminalChromeMenu
+              addSplit={onSplit}
+              close={onClose}
+              closeAll={onCloseAll}
+              closing={closing}
+              onDuplicate={onDuplicate}
+              onRestart={onRestart}
+              onRename={() => setEditingName(true)}
+            />
+          </ContextMenu>
+          <TerminalSurface
+            session={session}
+            projectDir={projectDir}
+            onSplit={onSplit}
+            onClose={onClose}
+            onCloseAll={onCloseAll}
+            onDuplicate={onDuplicate}
+            onRestart={onRestart}
+            closing={closing}
+          />
         </div>
       </ResizablePanel>
     </>
   );
 }
 
+function StatusDot({ session }: { session: TerminalSession }) {
+  if (!session.exited) {
+    return <span className="size-1.5 shrink-0 rounded-full bg-emerald-500" aria-hidden="true" />;
+  }
+  const failed = (session.exitCode ?? 0) !== 0;
+  return (
+    <span
+      className={`size-1.5 shrink-0 rounded-full ${failed ? "bg-destructive" : "bg-muted-foreground"}`}
+      role="status"
+      aria-label={`Exited with code ${session.exitCode ?? "unknown"}`}
+      title={`Exited (code ${session.exitCode ?? "unknown"})`}
+    />
+  );
+}
+
 function TerminalSurface({
   session,
   projectDir,
   onSplit,
   onClose,
   onCloseAll,
+  onDuplicate,
+  onRestart,
   closing,
 }: {
   session: TerminalSession;
   projectDir: string;
-  onSplit: () => Promise<void>;
+  onSplit: () => void;
   onClose: () => void;
   onCloseAll: () => Promise<void>;
+  onDuplicate: () => void;
+  onRestart: () => void;
   closing: boolean;
 }) {
   const containerRef = useRef<HTMLDivElement>(null);
@@ -222,6 +382,7 @@ function TerminalSurface({
   const fontSize = useAppStore((s) => s.preferences.terminalFontSize);
   const scrollback = useAppStore((s) => s.preferences.terminalScrollback);
   const cursorBlink = useAppStore((s) => s.preferences.terminalCursorBlink);
+  const preferredEditorId = useAppStore((s) => s.preferences.preferredEditorId);
 
   useEffect(() => {
     const container = containerRef.current;
@@ -262,6 +423,36 @@ function TerminalSurface({
     terminal.loadAddon(fit);
     terminal.open(container);
 
+    const linkProvider = terminal.registerLinkProvider({
+      provideLinks(bufferLineNumber, callback) {
+        const line = terminal.buffer.active.getLine(bufferLineNumber - 1);
+        if (!line) return callback(undefined);
+        const text = line.translateToString(true);
+        const found = findTerminalLinks(text);
+        if (found.length === 0) return callback(undefined);
+        callback(
+          found.map((match) => ({
+            text: text.slice(match.start, match.end),
+            range: {
+              start: { x: match.start + 1, y: bufferLineNumber },
+              end: { x: match.end, y: bufferLineNumber },
+            },
+            activate: () => {
+              if (match.kind === "url") {
+                void rpc.request.openExternal({ url: match.url });
+                return;
+              }
+              void rpc.request
+                .openFileIn({ projectDir, file: match.file, editorId: preferredEditorId, line: match.line })
+                .then((result) => {
+                  if (!result.ok) toast.error(result.error ?? `Could not open ${match.file}.`);
+                });
+            },
+          })),
+        );
+      },
+    });
+
     let disposed = false;
     let snapshotSequence = -1;
     let live = false;
@@ -273,7 +464,7 @@ function TerminalSurface({
     });
     const offExit = rpc.events.on("terminalExit", (payload) => {
       if (payload.projectDir !== projectDir || payload.terminalId !== session.id) return;
-      terminal.write(`\r\n[PowerShell exited with code ${payload.exitCode}]\r\n`);
+      terminal.write(`\r\n[Process exited with code ${payload.exitCode}]\r\n`);
     });
     const input = terminal.onData((data) => {
       void rpc.request.terminalWrite({ projectDir, terminalId: session.id, data });
@@ -288,7 +479,7 @@ function TerminalSurface({
           if (item.sequence > snapshotSequence) terminal.write(item.data);
         }
         live = true;
-        if (session.exited) terminal.write(`\r\n[PowerShell exited with code ${session.exitCode ?? "unknown"}]\r\n`);
+        if (session.exited) terminal.write(`\r\n[Process exited with code ${session.exitCode ?? "unknown"}]\r\n`);
       },
       () => {},
     );
@@ -317,6 +508,7 @@ function TerminalSurface({
       cancelAnimationFrame(frame);
       observer.disconnect();
       input.dispose();
+      linkProvider.dispose();
       offData();
       offExit();
       terminal.dispose();
@@ -325,8 +517,9 @@ function TerminalSurface({
     // A preference change rebuilds the surface rather than mutating the live
     // terminal's options. The pty and its output live in the main process, and
     // the snapshot above restores the scrollback, so a rebuild is invisible —
-    // the same path a project switch already takes.
-  }, [projectDir, session, fontSize, scrollback, cursorBlink]);
+    // the same path a project switch already takes. A restart bumps `session`
+    // (a new object from the main process) for the same reason.
+  }, [projectDir, session, fontSize, scrollback, cursorBlink, preferredEditorId]);
 
   return (
     <ContextMenu>
@@ -352,7 +545,9 @@ function TerminalSurface({
           Clear terminal
         </ContextMenuItem>
         <ContextMenuSeparator />
-        <ContextMenuItem onClick={() => void onSplit()}>Split terminal</ContextMenuItem>
+        <ContextMenuItem onClick={onSplit}>Split terminal</ContextMenuItem>
+        <ContextMenuItem onClick={onDuplicate}>Duplicate terminal</ContextMenuItem>
+        <ContextMenuItem onClick={onRestart}>Restart terminal</ContextMenuItem>
         <ContextMenuItem disabled={closing} onClick={onClose}>Close this terminal</ContextMenuItem>
         <ContextMenuItem disabled={closing} onClick={() => void onCloseAll()}>Kill all terminals</ContextMenuItem>
       </ContextMenuContent>
@@ -365,15 +560,24 @@ function TerminalChromeMenu({
   close,
   closeAll,
   closing,
+  onDuplicate,
+  onRestart,
+  onRename,
 }: {
-  addSplit: () => Promise<void>;
+  addSplit: () => void;
   close?: () => void;
   closeAll: () => Promise<void>;
   closing: boolean;
+  onDuplicate?: () => void;
+  onRestart?: () => void;
+  onRename?: () => void;
 }) {
   return (
     <ContextMenuContent className="w-48">
-      <ContextMenuItem onClick={() => void addSplit()}>Split terminal</ContextMenuItem>
+      <ContextMenuItem onClick={addSplit}>Split terminal</ContextMenuItem>
+      {onRename ? <ContextMenuItem onClick={onRename}>Rename</ContextMenuItem> : null}
+      {onDuplicate ? <ContextMenuItem onClick={onDuplicate}>Duplicate terminal</ContextMenuItem> : null}
+      {onRestart ? <ContextMenuItem onClick={onRestart}>Restart terminal</ContextMenuItem> : null}
       {close ? <ContextMenuItem disabled={closing} onClick={close}>Close this terminal</ContextMenuItem> : null}
       <ContextMenuItem disabled={closing} onClick={() => void closeAll()}>Kill all terminals</ContextMenuItem>
     </ContextMenuContent>
diff --git a/apps/desktop/src/renderer/lib/terminalLinks.test.ts b/apps/desktop/src/renderer/lib/terminalLinks.test.ts
new file mode 100644
index 0000000..6dc46f5
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/terminalLinks.test.ts
@@ -0,0 +1,36 @@
+import { expect, test } from "bun:test";
+import { findTerminalLinks } from "./terminalLinks.ts";
+
+test("links a path with a line and column", () => {
+  const [match] = findTerminalLinks("  at src/main.ts:42:5");
+
+  expect(match).toEqual({ start: 5, end: 21, kind: "file", file: "src/main.ts", line: 42, column: 5 });
+});
+
+test("links a bare code filename without a path separator", () => {
+  const [match] = findTerminalLinks("error in App.tsx:10");
+
+  expect(match?.kind).toBe("file");
+});
+
+test("does not link an ordinary host:port that is not a file", () => {
+  expect(findTerminalLinks("connecting to example.com:8080")).toEqual([]);
+});
+
+test("links a localhost URL and does not also link its port as a file", () => {
+  const matches = findTerminalLinks("Server running at http://localhost:3000/app");
+
+  expect(matches).toEqual([
+    { start: 18, end: 43, kind: "url", url: "http://localhost:3000/app" },
+  ]);
+});
+
+test("links 127.0.0.1 the same as localhost", () => {
+  const [match] = findTerminalLinks("http://127.0.0.1:8080");
+
+  expect(match).toEqual({ start: 0, end: 21, kind: "url", url: "http://127.0.0.1:8080" });
+});
+
+test("ignores a non-localhost URL", () => {
+  expect(findTerminalLinks("https://example.com")).toEqual([]);
+});
diff --git a/apps/desktop/src/renderer/lib/terminalLinks.ts b/apps/desktop/src/renderer/lib/terminalLinks.ts
new file mode 100644
index 0000000..3c85577
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/terminalLinks.ts
@@ -0,0 +1,72 @@
+/**
+ * Recognizes two kinds of clickable spans in a line of terminal output:
+ * `path/to/file.ts:12` (optionally `:12:5`) and `http(s)://localhost[:port]/...`.
+ *
+ * Kept separate from the xterm link provider that calls it so the matching
+ * logic is a plain, testable function over strings.
+ */
+
+const CODE_EXTENSIONS = new Set([
+  "ts", "tsx", "js", "jsx", "mjs", "cjs", "mts", "cts", "py", "go", "rs", "rb", "java",
+  "c", "cc", "cpp", "h", "hpp", "cs", "php", "swift", "kt", "kts", "json", "yaml", "yml",
+  "toml", "md", "mdx", "txt", "log", "css", "scss", "less", "html", "htm", "sh", "bash",
+  "ps1", "psm1", "sql", "xml", "vue", "svelte",
+]);
+
+const FILE_LINE_RE = /((?:[A-Za-z]:)?(?:[\w.-]+[\\/])*[\w.-]+\.[A-Za-z0-9]+):(\d+)(?::(\d+))?/g;
+const LOCALHOST_RE = /https?:\/\/(?:localhost|127\.0\.0\.1|\[::1\])(?::\d+)?(?:\/[^\s"'<>)\]]*)?/g;
+
+export interface FileLinkMatch {
+  start: number;
+  end: number;
+  kind: "file";
+  file: string;
+  line: number;
+  column?: number;
+}
+
+export interface UrlLinkMatch {
+  start: number;
+  end: number;
+  kind: "url";
+  url: string;
+}
+
+export type TerminalLinkMatch = FileLinkMatch | UrlLinkMatch;
+
+export function findTerminalLinks(text: string): TerminalLinkMatch[] {
+  const matches: TerminalLinkMatch[] = [];
+  const urlRanges: [number, number][] = [];
+
+  LOCALHOST_RE.lastIndex = 0;
+  let urlMatch: RegExpExecArray | null;
+  while ((urlMatch = LOCALHOST_RE.exec(text))) {
+    const start = urlMatch.index;
+    const end = start + urlMatch[0].length;
+    urlRanges.push([start, end]);
+    matches.push({ start, end, kind: "url", url: urlMatch[0] });
+  }
+
+  FILE_LINE_RE.lastIndex = 0;
+  let fileMatch: RegExpExecArray | null;
+  while ((fileMatch = FILE_LINE_RE.exec(text))) {
+    const [full, file = "", lineStr = "", colStr] = fileMatch;
+    const start = fileMatch.index;
+    const end = start + full.length;
+    // A URL's port already matched above; don't double-link the digits inside it.
+    if (urlRanges.some(([urlStart, urlEnd]) => start < urlEnd && end > urlStart)) continue;
+    const hasSeparator = /[\\/]/.test(file);
+    const extension = file.slice(file.lastIndexOf(".") + 1).toLowerCase();
+    if (!hasSeparator && !CODE_EXTENSIONS.has(extension)) continue;
+    matches.push({
+      start,
+      end,
+      kind: "file",
+      file,
+      line: Number(lineStr),
+      column: colStr ? Number(colStr) : undefined,
+    });
+  }
+
+  return matches.sort((a, b) => a.start - b.start);
+}
diff --git a/apps/desktop/src/shared/rpc-schema.ts b/apps/desktop/src/shared/rpc-schema.ts
index 821d238..24f8f92 100644
--- a/apps/desktop/src/shared/rpc-schema.ts
+++ b/apps/desktop/src/shared/rpc-schema.ts
@@ -83,10 +83,18 @@ export interface PendingWork {
 export interface TerminalSession {
   id: string;
   projectDir: string;
+  name: string;
+  shellId: string;
   exited: boolean;
   exitCode?: number;
 }
 
+/** A shell executable NativePi found on this machine, offered as a profile when opening a terminal. */
+export interface ShellProfile {
+  id: string;
+  name: string;
+}
+
 export interface AuthProviderInfo {
   id: string;
   name: string;
@@ -221,6 +229,7 @@ export const preferencesSchema = z.object({
   terminalScrollback: clamped(5000, 500, 100000),
   terminalCursorBlink: z.boolean().catch(true),
   preferredEditorId: z.string().min(1).catch("explorer"),
+  preferredShellId: z.string().catch(""),
 });
 
 export type Preferences = z.infer<typeof preferencesSchema>;
@@ -399,7 +408,7 @@ export type HostRequests = {
     response: { ok: boolean; error?: string };
   };
   openFileIn: {
-    params: { projectDir: string; file: string; editorId: string };
+    params: { projectDir: string; file: string; editorId: string; line?: number };
     response: { ok: boolean; error?: string };
   };
   versions: { params: Record<string, never>; response: { pi: string; app: string } };
@@ -435,7 +444,19 @@ export type HostRequests = {
   };
 
   terminalEnsure: { params: { projectDir: string }; response: { terminals: TerminalSession[] } };
-  terminalCreate: { params: { projectDir: string }; response: { terminal: TerminalSession } };
+  terminalCreate: {
+    params: { projectDir: string; shellId?: string; name?: string };
+    response: { terminal: TerminalSession };
+  };
+  terminalListShells: { params: Record<string, never>; response: { shells: ShellProfile[] } };
+  terminalRename: {
+    params: { projectDir: string; terminalId: string; name: string };
+    response: { ok: boolean };
+  };
+  terminalRestart: {
+    params: { projectDir: string; terminalId: string };
+    response: { terminal: TerminalSession };
+  };
   terminalSnapshot: {
     params: { projectDir: string; terminalId: string };
     response: { output: string; sequence: number };

From 746e82e63a85bcc0e953751432540f6751650e0f Mon Sep 17 00:00:00 2001
From: nonlooped <nonlooped@gmail.com>
Date: Fri, 31 Jul 2026 13:12:48 +0300
Subject: [PATCH 2/3] fix: address terminal audit issues

---
 apps/desktop/src/main/editors.ts                      |  8 ++++----
 apps/desktop/src/main/ipc.ts                          | 10 +++++-----
 apps/desktop/src/main/terminal.ts                     |  9 +++++----
 apps/desktop/src/renderer/components/TerminalDock.tsx | 10 +++++-----
 apps/desktop/src/renderer/lib/terminalLinks.ts        |  2 +-
 apps/desktop/src/shared/rpc-schema.ts                 |  4 ++--
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/apps/desktop/src/main/editors.ts b/apps/desktop/src/main/editors.ts
index 74eeea6..68f8455 100644
--- a/apps/desktop/src/main/editors.ts
+++ b/apps/desktop/src/main/editors.ts
@@ -18,8 +18,8 @@ type EditorSpec = InstalledEditor & {
 
 type ScannedEditor = { editor: InstalledEditor; executable?: string; family?: EditorFamily };
 
-function fileArgs(targetPath: string, family: EditorFamily | undefined, line: number | undefined): string[] {
-  if (line && family === "vscode") return ["-g", `${targetPath}:${line}`];
+function fileArgs(targetPath: string, family: EditorFamily | undefined, line: number | undefined, column?: number): string[] {
+  if (line && family === "vscode") return ["-g", `${targetPath}:${line}${column ? `:${column}` : ""}`];
   if (line && family === "jetbrains") return ["--line", String(line), targetPath];
   return [targetPath];
 }
@@ -300,7 +300,7 @@ export async function openProjectIn(projectDir: string, editorId: string): Promi
   });
 }
 
-export async function openFileIn(projectDir: string, file: string, editorId: string, line?: number): Promise<void> {
+export async function openFileIn(projectDir: string, file: string, editorId: string, line?: number, column?: number): Promise<void> {
   const targetPath = resolve(projectDir, file);
   const relativePath = relative(projectDir, targetPath);
   if (isAbsolute(relativePath) || relativePath === ".." || relativePath.startsWith(`..${sep}`)) {
@@ -314,7 +314,7 @@ export async function openFileIn(projectDir: string, file: string, editorId: str
   if (!target?.executable) throw new Error("That editor is no longer installed.");
   const executable = target.executable;
   await new Promise<void>((resolveSpawn, reject) => {
-    const child = spawn(executable, fileArgs(targetPath, target.family, line), {
+    const child = spawn(executable, fileArgs(targetPath, target.family, line, column), {
       detached: true,
       stdio: "ignore",
       windowsHide: true,
diff --git a/apps/desktop/src/main/ipc.ts b/apps/desktop/src/main/ipc.ts
index 257bbdc..7e1d4a1 100644
--- a/apps/desktop/src/main/ipc.ts
+++ b/apps/desktop/src/main/ipc.ts
@@ -286,7 +286,7 @@ function toSessionState(data: RpcSessionState): RpcSessionState {
 
 const THINKING_LEVELS = new Set<ThinkingLevel>(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 const openProjectInParamsSchema = z.object({ projectDir: z.string().min(1), editorId: z.string().min(1) });
-const openFileInParamsSchema = openProjectInParamsSchema.extend({ file: z.string().min(1), line: z.number().int().positive().optional() });
+const openFileInParamsSchema = openProjectInParamsSchema.extend({ file: z.string().min(1), line: z.number().int().positive().optional(), column: z.number().int().positive().optional() });
 const saveImageParamsSchema = z.object({
   data: z.string().min(1).max(64 * 1024 * 1024),
   mimeType: z.enum(["image/png", "image/jpeg", "image/gif", "image/webp"]),
@@ -783,8 +783,8 @@ const handlers: HandlerMap = {
   },
   openFileIn: async (params) => {
     try {
-      const { projectDir, file, editorId, line } = openFileInParamsSchema.parse(params);
-      await openFileIn(projectDir, file, editorId, line);
+      const { projectDir, file, editorId, line, column } = openFileInParamsSchema.parse(params);
+      await openFileIn(projectDir, file, editorId, line, column);
       return { ok: true };
     } catch (err) {
       return { ok: false, error: errorMessage(err) };
@@ -906,14 +906,14 @@ const handlers: HandlerMap = {
   },
 
   terminalEnsure: (params) => {
-    const { projectDir } = projectDirParamsSchema.parse(params);
+    const { projectDir, shellId } = projectDirParamsSchema.extend({ shellId: z.string().optional() }).parse(params);
     const existing = listTerminals(projectDir);
     if (existing.length > 0) return { terminals: existing };
     return {
       terminals: [
         createTerminal(
           projectDir,
-          undefined,
+          shellId,
           undefined,
           (payload) => push("terminalData", payload),
           (payload) => push("terminalExit", payload),
diff --git a/apps/desktop/src/main/terminal.ts b/apps/desktop/src/main/terminal.ts
index 0913f88..2bb728d 100644
--- a/apps/desktop/src/main/terminal.ts
+++ b/apps/desktop/src/main/terminal.ts
@@ -132,9 +132,10 @@ function attachHandlers(
 ): void {
   const terminal = terminals.get(id);
   if (!terminal) return;
-  terminal.process.onData((data) => {
+  const process = terminal.process;
+  process.onData((data) => {
     const current = terminals.get(id);
-    if (!current) return;
+    if (!current || current.process !== process) return;
     current.output.push(data);
     current.outputSize += data.length;
     while (current.outputSize > MAX_BUFFER_SIZE && current.output.length > 1) {
@@ -144,9 +145,9 @@ function attachHandlers(
     onData({ projectDir, terminalId: id, data, sequence: current.sequence });
   });
 
-  terminal.process.onExit(({ exitCode }) => {
+  process.onExit(({ exitCode }) => {
     const current = terminals.get(id);
-    if (!current) return;
+    if (!current || current.process !== process) return;
     current.exited = true;
     current.exitCode = exitCode;
     onExit({ projectDir, terminalId: id, exitCode });
diff --git a/apps/desktop/src/renderer/components/TerminalDock.tsx b/apps/desktop/src/renderer/components/TerminalDock.tsx
index f588c23..cead2c7 100644
--- a/apps/desktop/src/renderer/components/TerminalDock.tsx
+++ b/apps/desktop/src/renderer/components/TerminalDock.tsx
@@ -40,7 +40,7 @@ export default function TerminalDock({
 
   useEffect(() => {
     let cancelled = false;
-    void rpc.request.terminalEnsure({ projectDir }).then(
+    void rpc.request.terminalEnsure({ projectDir, shellId: preferredShellId || undefined }).then(
       ({ terminals: next }) => {
         if (!cancelled) setTerminals(next);
       },
@@ -66,7 +66,7 @@ export default function TerminalDock({
       cancelled = true;
       offExit();
     };
-  }, [projectDir]);
+  }, [projectDir, preferredShellId]);
 
   async function addSplit(shellId?: string, name?: string) {
     try {
@@ -306,7 +306,7 @@ function TerminalSplit({
                 <button
                   type="button"
                   className="min-w-0 flex-1 truncate text-left text-xs font-medium"
-                  onDoubleClick={() => setEditingName(true)}
+                  onClick={() => setEditingName(true)}
                   title={session.exited ? `${session.name} — exited (code ${session.exitCode ?? "unknown"})` : session.name}
                 >
                   {session.name}
@@ -344,7 +344,7 @@ function TerminalSplit({
 
 function StatusDot({ session }: { session: TerminalSession }) {
   if (!session.exited) {
-    return <span className="size-1.5 shrink-0 rounded-full bg-emerald-500" aria-hidden="true" />;
+    return <span className="size-1.5 shrink-0 rounded-full bg-success" aria-hidden="true" />;
   }
   const failed = (session.exitCode ?? 0) !== 0;
   return (
@@ -443,7 +443,7 @@ function TerminalSurface({
                 return;
               }
               void rpc.request
-                .openFileIn({ projectDir, file: match.file, editorId: preferredEditorId, line: match.line })
+                .openFileIn({ projectDir, file: match.file, editorId: preferredEditorId, line: match.line, column: match.column })
                 .then((result) => {
                   if (!result.ok) toast.error(result.error ?? `Could not open ${match.file}.`);
                 });
diff --git a/apps/desktop/src/renderer/lib/terminalLinks.ts b/apps/desktop/src/renderer/lib/terminalLinks.ts
index 3c85577..5732255 100644
--- a/apps/desktop/src/renderer/lib/terminalLinks.ts
+++ b/apps/desktop/src/renderer/lib/terminalLinks.ts
@@ -13,7 +13,7 @@ const CODE_EXTENSIONS = new Set([
   "ps1", "psm1", "sql", "xml", "vue", "svelte",
 ]);
 
-const FILE_LINE_RE = /((?:[A-Za-z]:)?(?:[\w.-]+[\\/])*[\w.-]+\.[A-Za-z0-9]+):(\d+)(?::(\d+))?/g;
+const FILE_LINE_RE = /((?:(?:[A-Za-z]:)?[\\/]|\/)?(?:[\w .-]+[\\/])*[\w .-]+\.[A-Za-z0-9]+):(\d+)(?::(\d+))?/g;
 const LOCALHOST_RE = /https?:\/\/(?:localhost|127\.0\.0\.1|\[::1\])(?::\d+)?(?:\/[^\s"'<>)\]]*)?/g;
 
 export interface FileLinkMatch {
diff --git a/apps/desktop/src/shared/rpc-schema.ts b/apps/desktop/src/shared/rpc-schema.ts
index 24f8f92..e7c5705 100644
--- a/apps/desktop/src/shared/rpc-schema.ts
+++ b/apps/desktop/src/shared/rpc-schema.ts
@@ -408,7 +408,7 @@ export type HostRequests = {
     response: { ok: boolean; error?: string };
   };
   openFileIn: {
-    params: { projectDir: string; file: string; editorId: string; line?: number };
+    params: { projectDir: string; file: string; editorId: string; line?: number; column?: number };
     response: { ok: boolean; error?: string };
   };
   versions: { params: Record<string, never>; response: { pi: string; app: string } };
@@ -443,7 +443,7 @@ export type HostRequests = {
     response: { ok: boolean; path?: string; canceled?: boolean; error?: string };
   };
 
-  terminalEnsure: { params: { projectDir: string }; response: { terminals: TerminalSession[] } };
+  terminalEnsure: { params: { projectDir: string; shellId?: string }; response: { terminals: TerminalSession[] } };
   terminalCreate: {
     params: { projectDir: string; shellId?: string; name?: string };
     response: { terminal: TerminalSession };

From d5a272539b241f011664c4daca3fe3f3d0df7bc8 Mon Sep 17 00:00:00 2001
From: nonlooped <nonlooped@gmail.com>
Date: Fri, 31 Jul 2026 13:26:15 +0300
Subject: [PATCH 3/3] fix(desktop): synchronize terminal state

---
 apps/desktop/src/main/ipc.ts                  | 16 +++----
 apps/desktop/src/preload/index.ts             |  1 +
 .../src/renderer/components/TerminalDock.tsx  | 45 +++++++++++++++++--
 apps/desktop/src/renderer/lib/rpc.ts          |  1 +
 .../desktop/src/renderer/lib/terminalLinks.ts | 12 ++---
 apps/desktop/src/shared/rpc-schema.ts         |  1 +
 6 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/apps/desktop/src/main/ipc.ts b/apps/desktop/src/main/ipc.ts
index 7e1d4a1..c920e58 100644
--- a/apps/desktop/src/main/ipc.ts
+++ b/apps/desktop/src/main/ipc.ts
@@ -941,14 +941,14 @@ const handlers: HandlerMap = {
   },
   terminalRestart: (params) => {
     const { projectDir, terminalId } = terminalIdParamsSchema.parse(params);
-    return {
-      terminal: restartTerminal(
-        projectDir,
-        terminalId,
-        (payload) => push("terminalData", payload),
-        (payload) => push("terminalExit", payload),
-      ),
-    };
+    const terminal = restartTerminal(
+      projectDir,
+      terminalId,
+      (payload) => push("terminalData", payload),
+      (payload) => push("terminalExit", payload),
+    );
+    push("terminalRestart", { projectDir, terminal });
+    return { terminal };
   },
   terminalSnapshot: (params) => {
     const { projectDir, terminalId } = terminalIdParamsSchema.parse(params);
diff --git a/apps/desktop/src/preload/index.ts b/apps/desktop/src/preload/index.ts
index dd1e66c..682ae86 100644
--- a/apps/desktop/src/preload/index.ts
+++ b/apps/desktop/src/preload/index.ts
@@ -37,6 +37,7 @@ const allowedEvents: Record<HostEventName, true> = {
   quitRequested: true,
   terminalData: true,
   terminalExit: true,
+  terminalRestart: true,
   tuiFrame: true,
 };
 
diff --git a/apps/desktop/src/renderer/components/TerminalDock.tsx b/apps/desktop/src/renderer/components/TerminalDock.tsx
index cead2c7..9e8788e 100644
--- a/apps/desktop/src/renderer/components/TerminalDock.tsx
+++ b/apps/desktop/src/renderer/components/TerminalDock.tsx
@@ -24,6 +24,29 @@ import {
   ContextMenuTrigger,
 } from "@/components/ui/context-menu.tsx";
 
+function columnForTextOffset(line: { length: number; getCell(index: number): { getChars(): string; getWidth(): number } | undefined }, offset: number) {
+  let textOffset = 0;
+  for (let index = 0; index < line.length; index += 1) {
+    const cell = line.getCell(index);
+    const chars = cell?.getChars() ?? "";
+    if (!chars) continue;
+    if (textOffset >= offset) return index + 1;
+    textOffset += chars.length;
+    if (textOffset >= offset) return index + cell!.getWidth();
+  }
+  return line.length;
+}
+
+function updateWorkingDirectory(cwdRef: { current: string }, controlRef: { current: string }, data: string) {
+  const control = `${controlRef.current}${data}`;
+  for (const match of control.matchAll(/\x1b]7;file:\/\/[^/]*([^\x07\x1b]*)(?:\x07|\x1b\\)/g)) {
+    try {
+      cwdRef.current = decodeURIComponent(match[1]).replace(/^\/([A-Za-z]:)/, "$1");
+    } catch {}
+  }
+  controlRef.current = control.slice(-4096);
+}
+
 export default function TerminalDock({
   projectDir,
   onMinimize,
@@ -62,9 +85,14 @@ export default function TerminalDock({
         ),
       );
     });
+    const offRestart = rpc.events.on("terminalRestart", ({ projectDir: restartedProject, terminal }) => {
+      if (restartedProject !== projectDir) return;
+      setTerminals((current) => current.map((session) => (session.id === terminal.id ? terminal : session)));
+    });
     return () => {
       cancelled = true;
       offExit();
+      offRestart();
     };
   }, [projectDir, preferredShellId]);
 
@@ -378,6 +406,8 @@ function TerminalSurface({
 }) {
   const containerRef = useRef<HTMLDivElement>(null);
   const terminalRef = useRef<Terminal | null>(null);
+  const cwdRef = useRef(projectDir);
+  const controlRef = useRef("");
   const [selection, setSelection] = useState("");
   const fontSize = useAppStore((s) => s.preferences.terminalFontSize);
   const scrollback = useAppStore((s) => s.preferences.terminalScrollback);
@@ -387,6 +417,8 @@ function TerminalSurface({
   useEffect(() => {
     const container = containerRef.current;
     if (!container) return;
+    cwdRef.current = projectDir;
+    controlRef.current = "";
 
     const styles = getComputedStyle(document.documentElement);
     const terminal = new Terminal({
@@ -434,8 +466,8 @@ function TerminalSurface({
           found.map((match) => ({
             text: text.slice(match.start, match.end),
             range: {
-              start: { x: match.start + 1, y: bufferLineNumber },
-              end: { x: match.end, y: bufferLineNumber },
+              start: { x: columnForTextOffset(line, match.start), y: bufferLineNumber },
+              end: { x: columnForTextOffset(line, match.end), y: bufferLineNumber },
             },
             activate: () => {
               if (match.kind === "url") {
@@ -443,7 +475,7 @@ function TerminalSurface({
                 return;
               }
               void rpc.request
-                .openFileIn({ projectDir, file: match.file, editorId: preferredEditorId, line: match.line, column: match.column })
+                .openFileIn({ projectDir: cwdRef.current, file: match.file, editorId: preferredEditorId, line: match.line, column: match.column })
                 .then((result) => {
                   if (!result.ok) toast.error(result.error ?? `Could not open ${match.file}.`);
                 });
@@ -459,6 +491,7 @@ function TerminalSurface({
     const pending: { data: string; sequence: number }[] = [];
     const offData = rpc.events.on("terminalData", (payload) => {
       if (payload.projectDir !== projectDir || payload.terminalId !== session.id) return;
+      updateWorkingDirectory(cwdRef, controlRef, payload.data);
       if (live) terminal.write(payload.data);
       else pending.push(payload);
     });
@@ -474,9 +507,13 @@ function TerminalSurface({
       ({ output, sequence }) => {
         if (disposed) return;
         snapshotSequence = sequence;
+        updateWorkingDirectory(cwdRef, controlRef, output);
         terminal.write(output);
         for (const item of pending) {
-          if (item.sequence > snapshotSequence) terminal.write(item.data);
+          if (item.sequence > snapshotSequence) {
+            updateWorkingDirectory(cwdRef, controlRef, item.data);
+            terminal.write(item.data);
+          }
         }
         live = true;
         if (session.exited) terminal.write(`\r\n[Process exited with code ${session.exitCode ?? "unknown"}]\r\n`);
diff --git a/apps/desktop/src/renderer/lib/rpc.ts b/apps/desktop/src/renderer/lib/rpc.ts
index 4a6e299..b5b5ddf 100644
--- a/apps/desktop/src/renderer/lib/rpc.ts
+++ b/apps/desktop/src/renderer/lib/rpc.ts
@@ -98,6 +98,7 @@ const allowedEvents: Record<HostEventName, true> = {
   quitRequested: true,
   terminalData: true,
   terminalExit: true,
+  terminalRestart: true,
   tuiFrame: true,
 };
 
diff --git a/apps/desktop/src/renderer/lib/terminalLinks.ts b/apps/desktop/src/renderer/lib/terminalLinks.ts
index 5732255..f6668fa 100644
--- a/apps/desktop/src/renderer/lib/terminalLinks.ts
+++ b/apps/desktop/src/renderer/lib/terminalLinks.ts
@@ -51,18 +51,20 @@ export function findTerminalLinks(text: string): TerminalLinkMatch[] {
   let fileMatch: RegExpExecArray | null;
   while ((fileMatch = FILE_LINE_RE.exec(text))) {
     const [full, file = "", lineStr = "", colStr] = fileMatch;
-    const start = fileMatch.index;
-    const end = start + full.length;
+    const stackPrefix = file.match(/^\s*at\s+/)?.[0] ?? "";
+    const linkedFile = file.slice(stackPrefix.length);
+    const start = fileMatch.index + stackPrefix.length;
+    const end = fileMatch.index + full.length;
     // A URL's port already matched above; don't double-link the digits inside it.
     if (urlRanges.some(([urlStart, urlEnd]) => start < urlEnd && end > urlStart)) continue;
-    const hasSeparator = /[\\/]/.test(file);
-    const extension = file.slice(file.lastIndexOf(".") + 1).toLowerCase();
+    const hasSeparator = /[\\/]/.test(linkedFile);
+    const extension = linkedFile.slice(linkedFile.lastIndexOf(".") + 1).toLowerCase();
     if (!hasSeparator && !CODE_EXTENSIONS.has(extension)) continue;
     matches.push({
       start,
       end,
       kind: "file",
-      file,
+      file: linkedFile,
       line: Number(lineStr),
       column: colStr ? Number(colStr) : undefined,
     });
diff --git a/apps/desktop/src/shared/rpc-schema.ts b/apps/desktop/src/shared/rpc-schema.ts
index e7c5705..ce146d8 100644
--- a/apps/desktop/src/shared/rpc-schema.ts
+++ b/apps/desktop/src/shared/rpc-schema.ts
@@ -564,6 +564,7 @@ export type HostEvents = {
   quitRequested: { work: PendingWork };
   terminalData: { projectDir: string; terminalId: string; data: string; sequence: number };
   terminalExit: { projectDir: string; terminalId: string; exitCode: number };
+  terminalRestart: { projectDir: string; terminal: TerminalSession };
   /** A pi-tui surface opening, drawing, closing, or reporting extension UI state. */
   tuiFrame: { projectDir: string; frame: TuiHostFrame };
 };