heyterm 0.1.2 → 0.1.3

package/dist/server/cli.js

@@ -1,9 +1,9 @@
 // src/server/cli.ts
-import { execFile as execFile5, spawn as spawn2 } from "node:child_process";
-import { readFile as readFile8 } from "node:fs/promises";
-import os8 from "node:os";
-import path19 from "node:path";
-import { promisify as promisify5 } from "node:util";
+import { execFile as execFile8, spawn as spawn2 } from "node:child_process";
+import { readFile as readFile11 } from "node:fs/promises";
+import os9 from "node:os";
+import path24 from "node:path";
+import { promisify as promisify6 } from "node:util";
 
 // src/server/agents/agent-adapters.ts
 var permissionHookSeconds = 595;
@@ -116,6 +116,10 @@ var HookCommands = class {
   static isHeyTerm(command) {
     return [forwardScriptName, ...olderScriptNames].some((name) => command.includes(name));
   }
+  // A hook of this copy of HeyTerm (its own forwarder), or one left by HeyTerm's old name.
+  static belongsTo(command, scriptPath) {
+    return command.includes(quoted(scriptPath)) || olderScriptNames.some((name) => command.includes(name));
+  }
 };
 function quoted(scriptPath) {
   if (/["$`%!\r\n]/.test(scriptPath)) throw new Error(`HeyTerm's data folder path cannot be used in a hook command: ${scriptPath}`);
@@ -307,10 +311,11 @@ var ExistingSessionConnector = class {
 };
 
 // src/server/main.ts
-import { execFile as execFile3 } from "node:child_process";
-import os6 from "node:os";
-import path17 from "node:path";
-import { promisify as promisify3 } from "node:util";
+import { execFile as execFile6 } from "node:child_process";
+import { readFile as readFile9 } from "node:fs/promises";
+import os7 from "node:os";
+import path22 from "node:path";
+import { promisify as promisify4 } from "node:util";
 
 // src/server/actions/action-executor.ts
 import { EventEmitter } from "node:events";
@@ -383,7 +388,13 @@ function stringField(record2, key) {
 var statesWaitingOnUser = ["needs_permission", "asked", "needs_trust", "done", "failed"];
 var SessionLifecycle = class _SessionLifecycle {
   static maximumActivityEntries = 200;
+  // Every event is also activity: it says when the session last did anything, clears a quiet
+  // notice, and tracks the shell command running, if any (see quiet-rules.ts).
   static apply(original, event, options = {}) {
+    const result = _SessionLifecycle.applyEvent(original, event, options);
+    return { ...result, lastActivityAt: event.receivedAt, quiet: void 0, runningCommand: runningCommandAfter(result, event) };
+  }
+  static applyEvent(original, event, options) {
     const session = original.blockedByTerminalDialog && event.name !== "Notification" ? { ...original, blockedByTerminalDialog: void 0 } : original;
     const payload = event.payload;
     switch (event.name) {
@@ -391,13 +402,13 @@ var SessionLifecycle = class _SessionLifecycle {
         return _SessionLifecycle.moveTo({ ...session, agentSessionId: stringField2(payload, "session_id") || session.agentSessionId, transcriptPath: stringField2(payload, "transcript_path") || session.transcriptPath }, "idle", event.receivedAt);
       case "UserPromptSubmit": {
         const prompt = stringField2(payload, "prompt");
-        const withPrompt = _SessionLifecycle.addActivity({ ...session, lastPrompt: prompt, pending: void 0 }, "prompt", prompt, event.receivedAt);
+        const withPrompt = _SessionLifecycle.addActivity({ ...session, lastPrompt: prompt, pending: void 0, filesChangedInLastTask: [] }, "prompt", prompt, event.receivedAt);
         return _SessionLifecycle.moveTo(withPrompt, "working", event.receivedAt);
       }
       case "PreToolUse":
         return _SessionLifecycle.applyToolStart(session, event);
       case "PostToolUse":
-        return _SessionLifecycle.applyToolEnd(session, event);
+        return _SessionLifecycle.applyToolEnd(_SessionLifecycle.withFileChanged(session, event), event);
       case "PermissionRequest":
         return _SessionLifecycle.applyPermissionRequest(session, event, options.requestId ?? `request-${event.receivedAt}`);
       case "Stop":
@@ -418,6 +429,10 @@ var SessionLifecycle = class _SessionLifecycle {
   static applyTrustDialog(session, now, trustSubject = "folder") {
     return _SessionLifecycle.moveTo({ ...session, trustSubject }, "needs_trust", now);
   }
+  // Claude Code was stopped mid-turn (no Stop hook is sent for that) and waits at its prompt.
+  static applyTurnStopped(session, now) {
+    return _SessionLifecycle.moveTo({ ...session, pending: void 0, blockedByTerminalDialog: void 0 }, "idle", now);
+  }
   static markSeen(session, now) {
     return { ...session, lastSeenAt: now, activitySinceSeen: [] };
   }
@@ -432,6 +447,13 @@ var SessionLifecycle = class _SessionLifecycle {
     if (withActivity.state === "working") return withActivity;
     return _SessionLifecycle.moveTo(withActivity, "working", event.receivedAt);
   }
+  // An edit that finished, so the file really changed (a denied one never gets here).
+  static withFileChanged(session, event) {
+    const change = describeToolUse(stringField2(event.payload, "tool_name"), recordField(event.payload, "tool_input"), session.projectPath);
+    if (change?.kind !== "file" || !change.text) return session;
+    const files = session.filesChangedInLastTask ?? [];
+    return files.includes(change.text) ? session : { ...session, filesChangedInLastTask: [...files, change.text] };
+  }
   static applyToolEnd(session, event) {
     if (!session.pending) return session;
     const toolName = stringField2(event.payload, "tool_name");
@@ -468,6 +490,13 @@ var SessionLifecycle = class _SessionLifecycle {
     return { ...session, activitySinceSeen: entries.slice(-_SessionLifecycle.maximumActivityEntries) };
   }
 };
+function runningCommandAfter(session, event) {
+  const toolName = stringField2(event.payload, "tool_name");
+  if (event.name === "PreToolUse" && toolName === "Bash") return { text: stringField2(recordField(event.payload, "tool_input"), "command"), since: event.receivedAt };
+  if (event.name === "PostToolUse" && toolName === "Bash") return void 0;
+  if (["UserPromptSubmit", "Stop", "StopFailure", "SessionEnd"].includes(event.name)) return void 0;
+  return session.runningCommand;
+}
 function describeToolUse(toolName, toolInput, projectPath) {
   if (toolName === "Bash") return { kind: "tool", text: stringField2(toolInput, "command") };
   if (["Edit", "Write", "MultiEdit", "NotebookEdit"].includes(toolName)) {
@@ -628,6 +657,54 @@ var UtteranceLimits = class {
   }
 };
 
+// src/server/actions/session-actions.ts
+import { execFile } from "node:child_process";
+import { readFile as readFile3 } from "node:fs/promises";
+import path5 from "node:path";
+import { promisify } from "node:util";
+
+// src/shared/change-summary.ts
+var filesNamedAtMost = 3;
+var ChangeSummary = class {
+  static describe(sessionName, files, lineCounts) {
+    if (files.length === 0) return { files, spoken: `${sessionName} has not changed any files in its last task.` };
+    const fileWord = files.length === 1 ? "file" : "files";
+    const opening = `${sessionName} changed ${files.length} ${fileWord} in its last task`;
+    if (files.length > filesNamedAtMost) return { files, spoken: `${opening}, most of them in ${mostCommonFolder(files)}.` };
+    const names = joinedAsList(files.map((file) => file.split("/").pop() ?? file));
+    return { files, spoken: `${opening}: ${names}.${lineSentence(files, lineCounts)}` };
+  }
+  static parseNumstat(output) {
+    const counts = /* @__PURE__ */ new Map();
+    for (const line of output.split("\n")) {
+      const [added, removed, file] = line.split("	");
+      if (!file) continue;
+      counts.set(file, { added: Number(added) || 0, removed: Number(removed) || 0 });
+    }
+    return counts;
+  }
+};
+function lineSentence(files, lineCounts) {
+  if (!lineCounts) return "";
+  const known = files.map((file) => lineCounts.get(file)).filter((counts) => counts !== void 0);
+  if (known.length === 0) return "";
+  const added = known.reduce((total, counts) => total + counts.added, 0);
+  const removed = known.reduce((total, counts) => total + counts.removed, 0);
+  return ` Since the last commit, ${added} ${added === 1 ? "line" : "lines"} added and ${removed} removed.`;
+}
+function mostCommonFolder(files) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const file of files) {
+    const folder = file.includes("/") ? file.slice(0, file.lastIndexOf("/")) : "the top folder";
+    counts.set(folder, (counts.get(folder) ?? 0) + 1);
+  }
+  return [...counts].sort((first, second) => second[1] - first[1])[0][0];
+}
+function joinedAsList(items) {
+  if (items.length <= 1) return items.join("");
+  return `${items.slice(0, -1).join(", ")} and ${items.at(-1)}`;
+}
+
 // src/shared/message-text.ts
 var longestSpokenSentence = 160;
 function firstSentence(message) {
@@ -726,6 +803,8 @@ var SessionActions = class {
         return this.trust(action.session);
       case "status":
         return this.status(action.session);
+      case "changes":
+        return { text: (await this.changes(action.session)).spoken, tone: "info", speak: true };
       default:
         return { text: "I did not catch what to do.", tone: "warning", speak: true };
     }
@@ -737,6 +816,36 @@ var SessionActions = class {
     if (result === "queued") return { text: `Queued for ${sessionName}; it reads it after its current step.`, tone: "info", speak: false };
     return { text: `${sessionName} did not take the message. Check its terminal.`, tone: "error", speak: true };
   }
+  // The files the session's own edits touched in its last task, with git's line counts where git has them.
+  async changes(sessionName) {
+    const session = this.registry.get(sessionName) ?? this.registry.recentlyClosedSessions().find((closed) => closed.name === sessionName);
+    if (!session) return { files: [], spoken: `There is no session called ${sessionName}.` };
+    const files = session.filesChangedInLastTask ?? [];
+    if (files.length === 0) return ChangeSummary.describe(sessionName, files, void 0);
+    const numstat = await runGit(session.projectPath, ["diff", "--numstat", "--relative", "HEAD", "--", ...files]);
+    if (numstat === void 0) return ChangeSummary.describe(sessionName, files, void 0);
+    const counts = ChangeSummary.parseNumstat(numstat);
+    for (const file of files) {
+      if (counts.has(file)) continue;
+      const text2 = await readFile3(path5.join(session.projectPath, file), "utf8").catch(() => void 0);
+      if (text2 !== void 0 && text2.length < 1e6) counts.set(file, { added: text2.split("\n").filter((line, index, lines) => line !== "" || index < lines.length - 1).length, removed: 0 });
+    }
+    return ChangeSummary.describe(sessionName, files, counts);
+  }
+  // Off the list, and its worktree with it when nothing in the worktree would be lost.
+  async forgetClosed(sessionName) {
+    const closed = this.registry.recentlyClosedSessions().find((session) => session.name === sessionName);
+    if (!closed || !this.registry.forgetClosed(sessionName)) return { text: `There is no closed session called ${sessionName}.`, tone: "warning", speak: false };
+    const removed = `Removed ${sessionName} from the list. Its conversation is still there to resume.`;
+    if (!closed.worktree) return { text: removed, tone: "info", speak: false };
+    const worktree = await this.launcher.removeWorktreeIfUnused(closed.worktree);
+    if (worktree === "kept_uncommitted") return { text: `${removed} Its worktree has uncommitted changes, so it stays at ${closed.worktree.worktreePath}.`, tone: "info", speak: false };
+    if (worktree === "kept_commits") return { text: `${removed} Its branch ${closed.worktree.branch} has commits of its own, so the worktree stays at ${closed.worktree.worktreePath}.`, tone: "info", speak: false };
+    return { text: `${removed} Its worktree is deleted; nothing in it was lost.`, tone: "info", speak: false };
+  }
+  rename(sessionName, newName) {
+    return this.launcher.rename(sessionName, newName);
+  }
   async close(sessionName) {
     await this.launcher.close(sessionName);
     await this.audit.record({ session: sessionName, decision: "closed", subject: sessionName, decidedBy: "voice or click" });
@@ -765,6 +874,11 @@ var SessionActions = class {
     }
     focus(session.name);
     const taskNote = action.task ? " It gets the task once it is ready." : "";
+    if (session.worktree) {
+      return { text: `Starting ${session.name} in a copy of the folder of its own, on a new branch, so it and the other session there cannot change each other's files. It starts from the last commit.${taskNote}`, tone: "success", speak: true };
+    }
+    const sharing = this.registry.list().find((other) => other.name !== session.name && other.projectPath === session.projectPath);
+    if (sharing) return { text: `Starting ${session.name}. It shares ${sharing.name}'s folder, which is not a git repository, so the two can change each other's files.${taskNote}`, tone: "warning", speak: true };
     return { text: `Starting ${session.name}.${taskNote}`, tone: "success", speak: false };
   }
   async resume(sessionName, focus) {
@@ -794,9 +908,16 @@ var SessionActions = class {
     return { text: `${digest.spoken}${prompt}`, tone: "info", speak: true };
   }
 };
+var execFileAsync = promisify(execFile);
+function runGit(folder, args) {
+  return execFileAsync("git", ["-C", folder, ...args], { timeout: 5e3 }).then(
+    ({ stdout }) => stdout,
+    () => void 0
+  );
+}
 
 // src/shared/attention.ts
-var kindOrder = ["permission", "question", "trust", "failed", "finished"];
+var kindOrder = ["permission", "question", "trust", "failed", "finished", "quiet"];
 var kindsSpokenInQuietMode = ["permission", "question"];
 var AttentionQueue = class {
   static build(sessions) {
@@ -813,6 +934,14 @@ var AnnouncementText = class {
     return `${capitalize(countWord(spoken.length))} sessions need you. ${spoken.map((item) => item.spoken).join(" ")}`;
   }
 };
+function quietItem(session, quiet) {
+  const base = { sessionName: session.name, since: quiet.since, kind: "quiet" };
+  if (quiet.kind === "long_command") {
+    const command = session.runningCommand?.text;
+    return { ...base, headline: `${session.name} has been running one command for 10 minutes${command ? `: ${command}` : ""}`, spoken: `${session.name} has been running one command for 10 minutes.` };
+  }
+  return { ...base, headline: `${session.name} has gone quiet: nothing from it for 5 minutes`, spoken: `${session.name} has gone quiet for 5 minutes. It may be stuck.` };
+}
 function attentionItemFor(session) {
   const base = { sessionName: session.name, since: session.stateSince };
   const pending = session.pending;
@@ -841,8 +970,13 @@ function attentionItemFor(session) {
     case "done": {
       if (session.lastSeenAt >= session.stateSince) return void 0;
       const lead = firstSentence(session.lastMessage ?? "");
-      return { ...base, kind: "finished", headline: lead ? `${session.name} finished: ${lead}` : `${session.name} finished`, spoken: `${session.name} is done.` };
+      const changedCount = session.filesChangedInLastTask?.length ?? 0;
+      const changed = changedCount > 0 ? `${changedCount} ${changedCount === 1 ? "file" : "files"}` : "";
+      const headline2 = `${session.name} finished${lead ? `: ${lead}` : ""}${changed ? `${lead ? "" : "."} Changed ${changed}.` : ""}`;
+      return { ...base, kind: "finished", headline: headline2, spoken: changed ? `${session.name} is done. It changed ${changed}.` : `${session.name} is done.` };
     }
+    case "working":
+      return session.quiet ? quietItem(session, session.quiet) : void 0;
     default:
       return void 0;
   }
@@ -916,6 +1050,22 @@ var RequestThread = class _RequestThread {
   }
 };
 
+// src/shared/session-names.ts
+var longestName = 40;
+var SessionNames = class {
+  static fromTyped(text2) {
+    return text2.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  }
+  // Why a session cannot take this name, or undefined when it can.
+  static renameProblem(newName, currentName, takenNames) {
+    if (!newName) return "Give it a name with a letter or a number.";
+    if (newName.length > longestName) return `Keep it to ${longestName} characters.`;
+    if (newName === currentName) return `It is already called ${newName}.`;
+    if (takenNames.includes(newName)) return `There is already a session called ${newName}.`;
+    return void 0;
+  }
+};
+
 // src/server/router/utterance-text.ts
 function wordSpans(text2) {
   return [...text2.matchAll(/[a-z0-9][a-z0-9'-]*/gi)].map((match) => ({
@@ -1131,6 +1281,7 @@ function denialReason(utterance) {
 var sessionCommands = [
   { pattern: /^(?:what's|what is|how's|how is) (.+?) (?:doing|up to)$/, build: (session) => ({ type: "status", session }) },
   { pattern: /^status (?:of|for) (.+)$/, build: (session) => ({ type: "status", session }) },
+  { pattern: /^what (?:did|has) (.+?) (?:change|changed|edit|edited)$/, build: (session) => ({ type: "changes", session }) },
   { pattern: /^(?:go to|show me|show|switch to|focus on|focus|look at|bring up|open) (.+)$/, build: (session) => ({ type: "focus", session }) },
   { pattern: /^(?:close|kill|end|shut down|quit|exit) (.+)$/, build: (session) => ({ type: "close", session, confirmed: false }) },
   { pattern: /^(?:stop|interrupt|pause|halt|hold) (.+)$/, build: (session) => ({ type: "interrupt", session }) },
@@ -1148,7 +1299,7 @@ var FastPathRouter = class {
     if (!phrase) return void 0;
     const spans = wordSpans(utterance);
     const sessionMatcher = new SpokenNameMatcher(context.sessions.map((session) => session.name));
-    return this.routeControlPhrase(phrase, context) ?? this.routeSpawn(utterance, spans, context) ?? this.routeSessionCommand(phrase, sessionMatcher, context) ?? this.routeTell(utterance, spans, sessionMatcher) ?? new HeadAnswerRouter().route(utterance, phrase, context, sessionMatcher) ?? this.routeAddressed(utterance, spans, sessionMatcher) ?? (this.options.sendUnaddressedWordsToFocusedSession ? this.routeToFocusedSession(utterance, phrase, context, sessionMatcher) : void 0);
+    return this.routeControlPhrase(phrase, context) ?? this.routeSpawn(utterance, spans, context) ?? this.routeRename(phrase, sessionMatcher, context) ?? this.routeSessionCommand(phrase, sessionMatcher, context) ?? this.routeTell(utterance, spans, sessionMatcher) ?? new HeadAnswerRouter().route(utterance, phrase, context, sessionMatcher) ?? this.routeAddressed(utterance, spans, sessionMatcher) ?? (this.options.sendUnaddressedWordsToFocusedSession ? this.routeToFocusedSession(utterance, phrase, context, sessionMatcher) : void 0);
   }
   routeControlPhrase(phrase, context) {
     if (context.hasPendingConfirmation) {
@@ -1189,6 +1340,15 @@ var FastPathRouter = class {
     }
     return void 0;
   }
+  // "rename synqed to synqed auth": an open session first, then a recently closed one.
+  routeRename(phrase, sessionMatcher, context) {
+    const match = /^rename (.+?) (?:to|as) (.+)$/.exec(phrase);
+    if (!match?.[1] || !match[2]) return void 0;
+    const spokenName = withoutNameFiller(match[1].split(" ")).join(" ");
+    const session = sessionMatcher.findBest(spokenName) ?? new SpokenNameMatcher(context.recentlyClosedNames ?? []).findBest(spokenName);
+    if (!session) return void 0;
+    return { type: "rename", session: session.name, newName: SessionNames.fromTyped(match[2]) };
+  }
   routeSessionCommand(phrase, sessionMatcher, context) {
     for (const command of sessionCommands) {
       const match = command.pattern.exec(phrase);
@@ -1295,11 +1455,10 @@ var ActionExecutor = class extends EventEmitter {
   mode = "speak";
   focusedSession;
   routing = false;
-  lastHeard;
   controls = new PendingControls(() => this.emit("changed"));
   assistant;
   controlState() {
-    return { ...this.controls.view(), mode: this.mode, focusedSession: this.focusedSession, routing: this.routing, lastHeard: this.lastHeard };
+    return { ...this.controls.view(), mode: this.mode, focusedSession: this.focusedSession, routing: this.routing };
   }
   setFocus(sessionName) {
     if (!this.registry.get(sessionName)) return;
@@ -1331,8 +1490,6 @@ var ActionExecutor = class extends EventEmitter {
       return;
     }
     const utterance = checked.utterance;
-    this.lastHeard = utterance;
-    this.emit("changed");
     const context = await this.routingContext(focusOverride);
     const action = this.fastPath.route(utterance, context);
     if (!action || !ConductorRouting.handledInstantly(action, { confirmationWaiting: this.controls.view().confirmation !== void 0 })) {
@@ -1369,6 +1526,12 @@ var ActionExecutor = class extends EventEmitter {
         return this.confirm();
       case "close":
         return this.close(action.session, action.confirmed);
+      case "forget_closed":
+        return this.tell(await this.sessionActions.forgetClosed(action.session));
+      case "rename": {
+        const result = this.rename(action.session, action.newName);
+        return this.tell({ text: result.text, tone: result.renamed ? "success" : "warning", speak: !result.renamed });
+      }
       case "choose":
         return this.choose(action.index);
       case "clarify":
@@ -1445,6 +1608,13 @@ var ActionExecutor = class extends EventEmitter {
     if (this.focusedSession === sessionName) this.focusedSession = void 0;
     this.tell(await this.sessionActions.close(sessionName));
   }
+  // Also the assistant's rename_session tool, which reads the result back.
+  rename(sessionName, newName) {
+    const problem = this.sessionActions.rename(sessionName, newName);
+    if (problem) return { renamed: false, text: problem };
+    if (this.focusedSession === sessionName) this.setFocus(newName);
+    return { renamed: true, text: `Renamed ${sessionName} to ${newName}.` };
+  }
   async confirm() {
     const confirmed = this.controls.takeConfirmation();
     if (!confirmed) return this.tell({ text: "Nothing is waiting for a confirm.", tone: "info", speak: true });
@@ -1531,11 +1701,11 @@ How to reply:
 - Never read a command, file path or code aloud. Say what it does: "push the HeyTerm fix to GitHub", not the git command.
 
 What you can do:
-- See every session in <situation>, read a session's screen and full last message (read_session), send it work (send_to_session), answer its multiple-choice questions (answer_question), approve or deny what it asks permission for, start, close, bring back or interrupt sessions, and bring one onto the screen (show_session).
-- Run shell commands yourself with Bash and read files, for quick look-ups: git status, what changed, test output, what is running, anything on this Mac.
+- See every session in <situation>, read a session's screen and full last message (read_session), send it work (send_to_session), answer its multiple-choice questions (answer_question), approve or deny what it asks permission for, start, close, bring back, interrupt or rename sessions (rename_session), say what one changed in its last task (session_changes, before you describe what a session did), and bring one onto the screen (show_session).
+- Anything Claude Code can do on this Mac, yourself: run any shell command, install tools, write and edit files and scripts, search and read the web (WebSearch, WebFetch), use the developer's MCP servers and skills, and look at the screen when asked about it (screencapture -x to a file in your scratchpad, then Read the image).
 
 How to decide:
-- Coding work in a project goes to that project's session. If the project has none, start one with the task. Sessions can start in any folder on this Mac, not only listed projects: pass its path. If it is unclear which session or folder the developer means, ask.
+- Coding work in a project goes to that project's session, so the developer can follow and approve it; if they ask you to do it yourself, do it. If the project has none, start one with the task. A second session in a folder another open session uses gets a git worktree and branch of its own (read_session shows it); when it finishes, say its work is on that branch for the developer to merge. Sessions can start in any folder on this Mac, not only listed projects: pass its path. If it is unclear which session or folder the developer means, ask.
 - Answer questions yourself when you can, by reading sessions or running a command.
 - Approve or deny only when the developer clearly said so. The agent asked, so their yes is enough, high risk or not; mention the risk when you tell them about it.
 - Never do anything destructive on your own initiative. When the developer asks for something, do it: if Claude Code's permission mode needs their OK, HeyTerm asks them out loud, so do not ask them yourself first.
@@ -1551,7 +1721,10 @@ var ConductorTurnText = class {
 The developer said: "${utterance}"`;
   }
   static forEvent(items, situation) {
-    const lines = items.map((item) => `- ${item.kind}: ${item.sessionName} (${item.headline.replaceAll("<", "\u2039")}). Plain line: ${item.spoken}`);
+    const lines = items.map((item) => {
+      const line = `- ${item.kind}: ${item.sessionName} (${item.headline.replaceAll("<", "\u2039")}). Plain line: ${item.spoken}`;
+      return item.kind === "finished" || item.kind === "failed" ? `${line}${outcomeDetail(situation.sessions.find((session) => session.name === item.sessionName))}` : line;
+    });
     return `${situationBlock(situation)}
 
 <event>
@@ -1560,6 +1733,14 @@ ${lines.join("\n")}
 Tell the developer.`;
   }
 };
+function outcomeDetail(session) {
+  if (!session) return "";
+  const reply2 = session.lastMessage ? `
+  Its whole reply: <session_text>${session.lastMessage.replaceAll("</session_text>", "")}</session_text>` : "";
+  const files = session.filesChangedInLastTask?.length ? `
+  Files it changed in this task: ${session.filesChangedInLastTask.join(", ")}` : "";
+  return `${reply2}${files}`;
+}
 function situationBlock(situation) {
   const sessions = situation.sessions.map(describeSessionForAssistant).join("\n") || "none";
   return [
@@ -1714,6 +1895,11 @@ var Assistant = class extends EventEmitter2 {
     this.record("error", message);
     if (this.announcementMode() !== "mute") this.emit("say", "Something went wrong on my side. It's on screen.");
   }
+  // Lines kept from before a restart; new ones number on from them.
+  restoreEntries(entries) {
+    this.entries = entries.slice(-keptEntries);
+    this.nextEntryId = Math.max(0, ...this.entries.map((entry) => entry.id)) + 1;
+  }
   record(kind, text2, request) {
     const entry = request ? { id: this.nextEntryId++, at: Date.now(), kind, text: text2, request } : { id: this.nextEntryId++, at: Date.now(), kind, text: text2 };
     this.entries = [...this.entries, entry].slice(-keptEntries);
@@ -1840,7 +2026,9 @@ var Conductor = class extends EventEmitter3 {
         pathToClaudeCodeExecutable: claudeExecutablePath(),
         // The user's own setup: their MCP servers, skills, CLAUDE.md and permission rules.
         settingSources: ["user"],
-        persistSession: false,
+        // Saved like any Claude Code conversation, so it can be resumed by id.
+        persistSession: true,
+        ...this.options.memory?.sessionId() ? { resume: this.options.memory.sessionId() } : {},
         tools: { type: "preset", preset: "claude_code" },
         mcpServers: { heyterm: this.options.tools },
         // The mode the developer's own Claude Code sessions run in (their plan's default), so the
@@ -1859,8 +2047,13 @@ var Conductor = class extends EventEmitter3 {
     void this.readSession(this.session);
   }
   async readSession(session) {
+    let started = false;
     try {
       for await (const message of session) {
+        if (message.type === "system" && message.subtype === "init") {
+          started = true;
+          this.options.memory?.rememberSession(message.session_id);
+        }
         if (this.session !== session) return;
         if (message.type === "assistant") {
           for (const block of message.message.content) {
@@ -1874,6 +2067,7 @@ var Conductor = class extends EventEmitter3 {
       }
     } catch {
     } finally {
+      if (!started) this.options.memory?.forgetSession();
       if (this.session === session) {
         this.session = void 0;
         this.finishTurn(void 0, new Error("The assistant stopped unexpectedly."));
@@ -1930,6 +2124,7 @@ function createConductorTools(dependencies) {
           const lastLines = screen.split("\n").filter((line) => line.trim()).slice(-screenLinesShown).join("\n");
           return [
             `State: ${session.state}. Project folder: ${session.projectPath}.`,
+            session.worktree ? `Works in its own git worktree on branch ${session.worktree.branch}, made from ${session.worktree.repoPath}.` : "",
             session.lastPrompt ? `Last task: <session_text>${session.lastPrompt}</session_text>` : "",
             session.lastMessage ? `Last message: <session_text>${session.lastMessage}</session_text>` : "",
             session.pending ? `Waiting on: <session_text>${JSON.stringify(session.pending.kind === "permission" ? { permission: session.pending.summary, risk: session.pending.risk } : { questions: session.pending.questions })}</session_text>` : "",
@@ -2014,6 +2209,16 @@ function createConductorTools(dependencies) {
         { name: z.string() },
         ({ name }) => withSession(name, async () => (await sessionActions.perform({ type: "trust", session: name }, () => void 0)).text)
       ),
+      tool("session_changes", "List the files a session changed in its last task, from its own edits, with line counts from git. Use it before saying what a session did.", { name: z.string() }, async ({ name }) => {
+        const summary = await sessionActions.changes(name);
+        return reply([summary.spoken, ...summary.files].join("\n"));
+      }),
+      tool(
+        "rename_session",
+        "Rename an open or recently closed session, so the developer can tell it apart. Works for sessions in their own terminal too.",
+        { name: z.string(), new_name: z.string() },
+        async ({ name, new_name }) => reply(executor.rename(name, SessionNames.fromTyped(new_name)).text)
+      ),
       tool(
         "show_session",
         "Bring a session onto the developer's screen.",
@@ -2058,9 +2263,19 @@ function createAssistant(dependencies) {
     workingDirectory: dependencies.workingDirectory,
     tools: createConductorTools(dependencies),
     beforeTool,
-    askDeveloper
+    askDeveloper,
+    ...dependencies.memory ? { memory: dependencies.memory } : {}
   });
   assistant = new Assistant(conductor, () => executor.situation(), () => executor.currentMode());
+  const memory = dependencies.memory;
+  if (memory) {
+    assistant.restoreEntries(memory.entries());
+    let saveTimer;
+    assistant.on("conversation", (entries) => {
+      clearTimeout(saveTimer);
+      saveTimer = setTimeout(() => memory.rememberEntries(entries), 500);
+    });
+  }
   return assistant;
 }
 function spokenToolUse(toolName) {
@@ -2072,14 +2287,60 @@ function spokenToolUse(toolName) {
   return `use ${toolName}`;
 }
 
+// src/server/conductor/assistant-memory.ts
+import { readFileSync, renameSync, writeFileSync } from "node:fs";
+import path6 from "node:path";
+var AssistantMemory = class {
+  filePath;
+  remembered;
+  constructor(dataDirectory2) {
+    this.filePath = path6.join(dataDirectory2, "assistant.json");
+    this.remembered = readRemembered(this.filePath);
+  }
+  sessionId() {
+    return this.remembered.sessionId;
+  }
+  entries() {
+    return this.remembered.entries ?? [];
+  }
+  rememberSession(sessionId) {
+    if (this.remembered.sessionId === sessionId) return;
+    this.write({ ...this.remembered, sessionId });
+  }
+  forgetSession() {
+    const { sessionId: _forgotten, ...rest } = this.remembered;
+    this.write(rest);
+  }
+  rememberEntries(entries) {
+    this.write({ ...this.remembered, entries });
+  }
+  write(remembered) {
+    this.remembered = remembered;
+    const temporaryPath = `${this.filePath}.tmp`;
+    try {
+      writeFileSync(temporaryPath, JSON.stringify(remembered), { mode: 384 });
+      renameSync(temporaryPath, this.filePath);
+    } catch {
+    }
+  }
+};
+function readRemembered(filePath) {
+  try {
+    const parsed = JSON.parse(readFileSync(filePath, "utf8"));
+    return typeof parsed === "object" && parsed !== null ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
 // src/server/config.ts
 import { existsSync } from "node:fs";
 import os2 from "node:os";
-import path7 from "node:path";
+import path9 from "node:path";
 
 // src/server/setup/data-folder.ts
 import { chmod as chmod2, mkdir as mkdir3, rename as rename2, stat } from "node:fs/promises";
-import path5 from "node:path";
+import path7 from "node:path";
 var DataFolder = class {
   // Readable by this user alone: it holds the token, the audit log and backups of Claude settings.
   static async ensurePrivate(folder) {
@@ -2087,8 +2348,8 @@ var DataFolder = class {
     if (process.platform !== "win32") await chmod2(folder, 448);
   }
   static async moveFromOldName(home) {
-    const oldFolder = path5.join(home, ".callsign");
-    const newFolder = path5.join(home, ".heyterm");
+    const oldFolder = path7.join(home, ".callsign");
+    const newFolder = path7.join(home, ".heyterm");
     if (!await isFolder(oldFolder) || await exists(newFolder)) return;
     await rename2(oldFolder, newFolder);
   }
@@ -2107,23 +2368,23 @@ async function exists(target) {
 }
 
 // src/server/setup/user-config.ts
-import { mkdir as mkdir4, readFile as readFile3, writeFile as writeFile3 } from "node:fs/promises";
-import path6 from "node:path";
+import { mkdir as mkdir4, readFile as readFile4, writeFile as writeFile3 } from "node:fs/promises";
+import path8 from "node:path";
 var UserConfig = class {
   filePath;
   constructor(dataDirectory2) {
-    this.filePath = path6.join(dataDirectory2, "config.json");
+    this.filePath = path8.join(dataDirectory2, "config.json");
   }
   async load() {
     try {
-      return JSON.parse(await readFile3(this.filePath, "utf8"));
+      return JSON.parse(await readFile4(this.filePath, "utf8"));
     } catch {
       return {};
     }
   }
   async update(change) {
     const next = { ...await this.load(), ...change };
-    await mkdir4(path6.dirname(this.filePath), { recursive: true });
+    await mkdir4(path8.dirname(this.filePath), { recursive: true });
     await writeFile3(this.filePath, `${JSON.stringify(next, null, 2)}
 `, { mode: 384 });
     return next;
@@ -2133,16 +2394,16 @@ var UserConfig = class {
 // src/server/config.ts
 var defaultProjectRoots = ["Documents/Projects", "Projects", "code", "dev", "src", "Developer"];
 function builtWebDirectory() {
-  const besideBundle = path7.resolve(import.meta.dirname, "../web");
-  return existsSync(path7.join(besideBundle, "index.html")) ? besideBundle : path7.resolve(import.meta.dirname, "../../dist/web");
+  const besideBundle = path9.resolve(import.meta.dirname, "../web");
+  return existsSync(path9.join(besideBundle, "index.html")) ? besideBundle : path9.resolve(import.meta.dirname, "../../dist/web");
 }
 async function loadConfig() {
   const home = os2.homedir();
   if (!process.env.HEYTERM_DATA_DIRECTORY) await DataFolder.moveFromOldName(home).catch(() => void 0);
-  const dataDirectory2 = process.env.HEYTERM_DATA_DIRECTORY ?? path7.join(home, ".heyterm");
+  const dataDirectory2 = process.env.HEYTERM_DATA_DIRECTORY ?? path9.join(home, ".heyterm");
   const saved = await new UserConfig(dataDirectory2).load();
-  const environmentRoots = process.env.HEYTERM_PROJECT_ROOTS?.split(path7.delimiter).filter(Boolean);
-  const projectRoots = environmentRoots ?? saved.projectRoots ?? defaultProjectRoots.map((root) => path7.join(home, root)).filter((root) => existsSync(root));
+  const environmentRoots = process.env.HEYTERM_PROJECT_ROOTS?.split(path9.delimiter).filter(Boolean);
+  const projectRoots = environmentRoots ?? saved.projectRoots ?? defaultProjectRoots.map((root) => path9.join(home, root)).filter((root) => existsSync(root));
   return {
     port: Number(process.env.HEYTERM_PORT ?? 4747),
     dataDirectory: dataDirectory2,
@@ -2154,6 +2415,18 @@ async function loadConfig() {
   };
 }
 
+// src/shared/page-build.ts
+var PageBuild = class {
+  static entryFromIndexHtml(html) {
+    return /<script[^>]*type="module"[^>]*src="\/assets\/([^"]+\.js)"/.exec(html)?.[1];
+  }
+  static verdict({ pageEntry, serverEntry, entryOnDisk }) {
+    if (!pageEntry || !serverEntry || pageEntry === serverEntry) return "same";
+    if (entryOnDisk && entryOnDisk !== serverEntry) return "restart_server";
+    return "reload_page";
+  }
+};
+
 // src/server/hooks/held-hook-requests.ts
 var holdMilliseconds = (permissionHookTimeoutSeconds - 10) * 1e3;
 var HeldHookRequests = class {
@@ -2183,6 +2456,9 @@ var HeldHookRequests = class {
       if (request.sessionName === sessionName && requestId !== exceptRequestId) this.finish(requestId, request, "");
     }
   }
+  renameSession(currentName, newName) {
+    for (const request of this.held.values()) if (request.sessionName === currentName) request.sessionName = newName;
+  }
   finish(requestId, request, body) {
     clearTimeout(request.timer);
     this.held.delete(requestId);
@@ -2191,9 +2467,9 @@ var HeldHookRequests = class {
 };
 
 // src/server/hooks/agent-hook-files.ts
-import { copyFile as copyFile2, mkdir as mkdir5, readFile as readFile4, rename as rename3, rm as rm2, stat as stat2, writeFile as writeFile4 } from "node:fs/promises";
+import { copyFile as copyFile2, mkdir as mkdir5, readFile as readFile5, rename as rename3, rm as rm2, stat as stat2, writeFile as writeFile4 } from "node:fs/promises";
 import os3 from "node:os";
-import path8 from "node:path";
+import path10 from "node:path";
 
 // src/server/hooks/global-agent-hooks.ts
 var grokEvents = ["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "Stop", "StopCancelled", "StopFailure", "Notification", "SessionEnd"];
@@ -2207,16 +2483,18 @@ var GlobalAgentHooks = class _GlobalAgentHooks {
     return { hooks };
   }
   static cursorWithHeyTerm(file, scriptPath) {
-    const cleaned = _GlobalAgentHooks.cursorWithoutHeyTerm(file);
+    const cleaned = _GlobalAgentHooks.cursorWithoutHeyTerm(file, scriptPath);
     const hooks = { ...cleaned.hooks ?? {} };
     for (const eventName of cursorEvents) hooks[eventName] = [...hooks[eventName] ?? [], { command: HookCommands.forAgent(scriptPath, eventName, "cursor"), timeout: hookTimeoutSeconds }];
     return { ...cleaned, version: cleaned.version ?? 1, hooks };
   }
-  static cursorWithoutHeyTerm(file) {
+  // With a forwarder path, only that copy's hooks go; without one, every copy's.
+  static cursorWithoutHeyTerm(file, scriptPath) {
     if (!file.hooks) return file;
+    const isOurs = (command) => scriptPath ? HookCommands.belongsTo(command, scriptPath) : HookCommands.isHeyTerm(command);
     const remaining = {};
     for (const [eventName, entries] of Object.entries(file.hooks)) {
-      const kept = entries.filter((entry) => !HookCommands.isHeyTerm(entry.command ?? ""));
+      const kept = entries.filter((entry) => !isOurs(entry.command ?? ""));
       if (kept.length > 0) remaining[eventName] = kept;
     }
     const { hooks: _removedHooks, ...rest } = file;
@@ -2227,8 +2505,8 @@ var GlobalAgentHooks = class _GlobalAgentHooks {
 // src/server/hooks/agent-hook-files.ts
 function agentHookPaths() {
   return {
-    grokPath: process.env.HEYTERM_GROK_HOOKS_PATH ?? path8.join(process.env.GROK_HOME ?? path8.join(os3.homedir(), ".grok"), "hooks", "heyterm.json"),
-    cursorPath: process.env.HEYTERM_CURSOR_HOOKS_PATH ?? path8.join(os3.homedir(), ".cursor", "hooks.json")
+    grokPath: process.env.HEYTERM_GROK_HOOKS_PATH ?? path10.join(process.env.GROK_HOME ?? path10.join(os3.homedir(), ".grok"), "hooks", "heyterm.json"),
+    cursorPath: process.env.HEYTERM_CURSOR_HOOKS_PATH ?? path10.join(os3.homedir(), ".cursor", "hooks.json")
   };
 }
 var AgentHookFiles = class {
@@ -2240,38 +2518,71 @@ var AgentHookFiles = class {
   scriptPath;
   backupDirectory;
   paths;
+  isInstalled = false;
   async install() {
-    if (await isFolder2(path8.dirname(path8.dirname(this.paths.grokPath)))) {
-      await mkdir5(path8.dirname(this.paths.grokPath), { recursive: true });
-      await writeAtomically(this.paths.grokPath, GlobalAgentHooks.grokHookFile(this.scriptPath));
+    this.isInstalled = true;
+    await this.installGrok();
+    await this.installCursor();
+  }
+  // While HeyTerm runs, something else may rewrite or delete these files (the agent itself, a second
+  // copy of HeyTerm stopping). Puts HeyTerm's hooks back if they are gone; true when it did.
+  async repairIfRemoved() {
+    if (!this.isInstalled) return false;
+    let repaired = false;
+    if (await this.grokIsInstalled() && !(await readFile5(this.paths.grokPath, "utf8").catch(() => "")).includes(this.marker("Stop", "grok"))) {
+      await this.installGrok();
+      repaired = true;
     }
-    if (await isFolder2(path8.dirname(this.paths.cursorPath))) {
+    if (await isFolder2(path10.dirname(this.paths.cursorPath))) {
       const current = await readJson(this.paths.cursorPath);
-      if (!current) return;
-      await this.backUp(this.paths.cursorPath);
-      await writeAtomically(this.paths.cursorPath, GlobalAgentHooks.cursorWithHeyTerm(current, this.scriptPath));
+      if (current && !JSON.stringify(current).includes(this.marker("stop", "cursor"))) {
+        await this.installCursor();
+        repaired = true;
+      }
     }
+    return repaired;
   }
   async remove() {
+    this.isInstalled = false;
     await rm2(this.paths.grokPath, { force: true });
     const current = await readJson(this.paths.cursorPath);
     if (!current || !current.hooks) return;
-    const cleaned = GlobalAgentHooks.cursorWithoutHeyTerm(current);
+    const cleaned = GlobalAgentHooks.cursorWithoutHeyTerm(current, this.scriptPath);
     if (JSON.stringify(cleaned) === JSON.stringify(current)) return;
     const holdsNothingElse = Object.keys(cleaned).every((key) => key === "version");
     if (holdsNothingElse) await rm2(this.paths.cursorPath, { force: true });
     else await writeAtomically(this.paths.cursorPath, cleaned);
   }
+  async installGrok() {
+    if (!await this.grokIsInstalled()) return;
+    await mkdir5(path10.dirname(this.paths.grokPath), { recursive: true });
+    await writeAtomically(this.paths.grokPath, GlobalAgentHooks.grokHookFile(this.scriptPath));
+  }
+  async installCursor() {
+    if (!await isFolder2(path10.dirname(this.paths.cursorPath))) return;
+    const current = await readJson(this.paths.cursorPath);
+    if (!current) return;
+    await this.backUp(this.paths.cursorPath);
+    await writeAtomically(this.paths.cursorPath, GlobalAgentHooks.cursorWithHeyTerm(current, this.scriptPath));
+  }
+  // ~/.grok/hooks/heyterm.json: the agent's folder is two levels up.
+  grokIsInstalled() {
+    return isFolder2(path10.dirname(path10.dirname(this.paths.grokPath)));
+  }
+  // One of HeyTerm's hook commands as it reads inside a JSON file, to tell whether its hooks are still there.
+  marker(eventName, agent) {
+    return JSON.stringify(HookCommands.forAgent(this.scriptPath, eventName, agent)).slice(1, -1);
+  }
   async backUp(filePath) {
     await mkdir5(this.backupDirectory, { recursive: true });
-    await copyFile2(filePath, path8.join(this.backupDirectory, `cursor-hooks-${(/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-")}.json`)).catch(() => void 0);
+    await copyFile2(filePath, path10.join(this.backupDirectory, `cursor-hooks-${(/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-")}.json`)).catch(() => void 0);
   }
 };
 async function isFolder2(folder) {
   return stat2(folder).then((info) => info.isDirectory(), () => false);
 }
 async function readJson(filePath) {
-  const text2 = await readFile4(filePath, "utf8").catch((error) => error.code === "ENOENT" ? "{}" : void 0);
+  const text2 = await readFile5(filePath, "utf8").catch((error) => error.code === "ENOENT" ? "{}" : void 0);
   if (text2 === void 0) return void 0;
   try {
     return JSON.parse(text2 || "{}");
@@ -2301,7 +2612,7 @@ var HeyTermHttpServer = class {
     this.hub = hub;
     this.terminals = terminals;
     this.tickets = tickets;
-    this.serveWeb = existsSync2(webDirectory) ? sirv(webDirectory, { single: true, setHeaders: cachingHeaders }) : void 0;
+    this.serveWeb = existsSync2(webDirectory) ? sirv(webDirectory, { dev: true, single: true, setHeaders: cachingHeaders }) : void 0;
     this.server.on("upgrade", (request, socket, head) => {
       if (!this.guard.isFromThisMac(request) || !this.guard.hasToken(request)) return socket.destroy();
       const url = new URL(request.url ?? "/", "http://127.0.0.1");
@@ -2449,13 +2760,14 @@ function readBody(request, largestBytes) {
 // src/server/http/event-hub.ts
 var snapshotThrottleMilliseconds = 50;
 var EventHub = class {
-  constructor(registry, executor, projects, setup, macVoice, assistant) {
+  constructor(registry, executor, projects, setup, macVoice, assistant, pageEntry) {
     this.registry = registry;
     this.executor = executor;
     this.projects = projects;
     this.setup = setup;
     this.macVoice = macVoice;
     this.assistant = assistant;
+    this.pageEntry = pageEntry;
     assistant.on("conversation", (entries) => this.broadcast({ type: "conversation", entries }));
     assistant.on("say", (text2) => this.broadcast({ type: "say", text: text2 }));
     registry.on("changed", () => this.scheduleSnapshot());
@@ -2471,6 +2783,7 @@ var EventHub = class {
   setup;
   macVoice;
   assistant;
+  pageEntry;
   sockets = /* @__PURE__ */ new Set();
   // How many HeyTerm pages are open, so closing the last one can close HeyTerm.
   onPageCountChange = () => void 0;
@@ -2545,10 +2858,22 @@ var EventHub = class {
     return {
       type: "snapshot",
       sessions: this.registry.list(),
-      recentlyClosed: this.registry.recentlyClosedSessions().map((session) => ({ name: session.name, projectName: session.projectName })),
+      recentlyClosed: this.registry.recentlyClosedSessions().map((session) => ({
+        name: session.name,
+        projectName: session.projectName,
+        agent: session.agent,
+        projectPath: session.projectPath,
+        ...session.origin ? { origin: session.origin } : {},
+        ...session.agentSessionId ? { agentSessionId: session.agentSessionId } : {},
+        ...session.faceSeed ? { faceSeed: session.faceSeed } : {},
+        ...session.worktree ? { worktree: session.worktree } : {},
+        createdAt: session.createdAt,
+        closedAt: session.stateSince
+      })),
       projects: this.projectNames,
       control: this.executor.controlState(),
-      serverTime: Date.now()
+      serverTime: Date.now(),
+      ...this.pageEntry ? { pageEntry: this.pageEntry } : {}
     };
   }
   scheduleSnapshot() {
@@ -2672,7 +2997,7 @@ function parseMessage(text2) {
 // src/server/projects/project-catalog.ts
 import { readdir, stat as stat3 } from "node:fs/promises";
 import os4 from "node:os";
-import path9 from "node:path";
+import path11 from "node:path";
 var deepestFolderLevel = 3;
 var skippedFolders = /* @__PURE__ */ new Set(["node_modules", "dist", "build", "vendor", "Pods", "DerivedData", "target"]);
 var refreshMilliseconds = 5 * 6e4;
@@ -2699,9 +3024,9 @@ var ProjectCatalog = class {
     const listed = (await this.list()).find((project) => project.name === nameOrPath);
     if (listed) return listed;
     if (!looksLikePath(nameOrPath)) return void 0;
-    const folder = path9.resolve(nameOrPath.replace(/^~(?=$|[\\/])/, os4.homedir()));
+    const folder = path11.resolve(nameOrPath.replace(/^~(?=$|[\\/])/, os4.homedir()));
     const isFolder4 = await stat3(folder).then((info) => info.isDirectory(), () => false);
-    return isFolder4 ? { name: path9.basename(folder).toLowerCase() || "root", path: folder } : void 0;
+    return isFolder4 ? { name: path11.basename(folder).toLowerCase() || "root", path: folder } : void 0;
   }
   async refresh() {
     const found = [];
@@ -2711,18 +3036,18 @@ var ProjectCatalog = class {
   }
 };
 function looksLikePath(text2) {
-  return text2.startsWith("~") || path9.isAbsolute(text2) || text2.includes("/") || text2.includes("\\");
+  return text2.startsWith("~") || path11.isAbsolute(text2) || text2.includes("/") || text2.includes("\\");
 }
 async function collectRepositories(folder, level, found) {
   const entries = await readdir(folder, { withFileTypes: true }).catch(() => []);
   if (entries.some((entry) => entry.name === ".git")) {
-    found.push({ name: path9.basename(folder), path: folder });
+    found.push({ name: path11.basename(folder), path: folder });
     return;
   }
   if (level >= deepestFolderLevel) return;
   for (const entry of entries) {
     if (entry.name.startsWith(".") || skippedFolders.has(entry.name)) continue;
-    const childPath = path9.join(folder, entry.name);
+    const childPath = path11.join(folder, entry.name);
     const isFolder4 = entry.isDirectory() || entry.isSymbolicLink() && await stat3(childPath).then((info) => info.isDirectory(), () => false);
     if (isFolder4) await collectRepositories(childPath, level + 1, found);
   }
@@ -2731,7 +3056,7 @@ function withUniqueNames(projects) {
   const seen = /* @__PURE__ */ new Set();
   return projects.map((project) => {
     const baseName = project.name.toLowerCase();
-    const name = seen.has(baseName) ? `${path9.basename(path9.dirname(project.path)).toLowerCase()}-${baseName}` : baseName;
+    const name = seen.has(baseName) ? `${path11.basename(path11.dirname(project.path)).toLowerCase()}-${baseName}` : baseName;
     seen.add(name);
     return { ...project, name };
   });
@@ -2739,14 +3064,14 @@ function withUniqueNames(projects) {
 
 // src/server/safety/audit-log.ts
 import { appendFile, mkdir as mkdir6 } from "node:fs/promises";
-import path10 from "node:path";
+import path12 from "node:path";
 var AuditLog = class {
   filePath;
   constructor(dataDirectory2) {
-    this.filePath = path10.join(dataDirectory2, "audit.jsonl");
+    this.filePath = path12.join(dataDirectory2, "audit.jsonl");
   }
   async record(entry) {
-    await mkdir6(path10.dirname(this.filePath), { recursive: true });
+    await mkdir6(path12.dirname(this.filePath), { recursive: true });
     await appendFile(this.filePath, `${JSON.stringify({ at: (/* @__PURE__ */ new Date()).toISOString(), ...entry })}
 `, { mode: 384 });
   }
@@ -2754,9 +3079,9 @@ var AuditLog = class {
 
 // src/server/sessions/session-launcher.ts
 import { randomUUID } from "node:crypto";
-import { execFile } from "node:child_process";
+import { execFile as execFile2 } from "node:child_process";
 import { access } from "node:fs/promises";
-import { promisify } from "node:util";
+import { promisify as promisify2 } from "node:util";
 
 // src/server/sessions/screen-reader.ts
 var trustOptionText = /Yes, I trust this folder|\bTrust (?:all )?and continue\b/;
@@ -2793,6 +3118,27 @@ var ScreenReader = class _ScreenReader {
   }
 };
 
+// src/server/sessions/worktree-plan.ts
+import path13 from "node:path";
+var WorktreePlan = class {
+  static needsOwnWorktree(projectPath, openSessions) {
+    return openSessions.some((session) => session.state !== "stopped" && foldersOverlap(session.projectPath, projectPath));
+  }
+  static branchName(sessionName, existingBranches) {
+    const base = `heyterm/${sessionName}`;
+    if (!existingBranches.includes(base)) return base;
+    for (let suffix = 2; ; suffix += 1) {
+      const candidate = `${base}-${suffix}`;
+      if (!existingBranches.includes(candidate)) return candidate;
+    }
+  }
+};
+function foldersOverlap(first, second) {
+  const a = path13.resolve(first);
+  const b = path13.resolve(second);
+  return a === b || a.startsWith(b + path13.sep) || b.startsWith(a + path13.sep);
+}
+
 // src/server/terminals/launch-command.ts
 var LaunchCommand = class {
   static forPlatform(program, args, platform = process.platform) {
@@ -2811,28 +3157,33 @@ function windowsQuote(value) {
 }
 
 // src/server/sessions/session-launcher.ts
-var execFileAsync = promisify(execFile);
+var execFileAsync2 = promisify2(execFile2);
 var promptConfirmationMilliseconds = 2500;
 var pasteSettleMilliseconds = 150;
 var AgentNotInstalledError = class extends Error {
 };
 var SessionLauncher = class {
-  constructor(host, registry, paths) {
+  constructor(host, registry, paths, worktrees) {
     this.host = host;
     this.registry = registry;
     this.paths = paths;
+    this.worktrees = worktrees;
     host.on("exit", (name) => this.registry.remove(name));
   }
   host;
   registry;
   paths;
+  worktrees;
   async start(projectPath, projectName, task, agent = "claude") {
     await this.ensureInstalled(agent);
     const name = this.uniqueName(projectName);
+    const sharesAFolder = WorktreePlan.needsOwnWorktree(projectPath, this.registry.list());
+    const made = sharesAFolder && this.worktrees ? await this.worktrees.create(projectPath, name) : void 0;
     const now = Date.now();
     const session = {
       name,
-      projectPath,
+      projectPath: made?.path ?? projectPath,
+      ...made ? { worktree: { repoPath: made.repoPath, worktreePath: made.worktreePath, branch: made.branch, baseCommit: made.baseCommit } } : {},
       projectName,
       agent,
       state: "starting",
@@ -2862,6 +3213,16 @@ var SessionLauncher = class {
     this.launch(session, adapter.resume(point, { ...this.launchContext(session.name), agentSessionId: launchId }));
     return session;
   }
+  // When a closed session leaves the list, its worktree goes too, unless that would lose work.
+  removeWorktreeIfUnused(worktree) {
+    return this.worktrees ? this.worktrees.removeIfUnused(worktree) : Promise.resolve("missing");
+  }
+  // Returns why the session could not take the name, or undefined once it has.
+  rename(currentName, newName) {
+    const problem = this.registry.rename(currentName, newName);
+    if (!problem) this.host.renameSession(currentName, newName);
+    return problem;
+  }
   async close(name) {
     this.host.killSession(name);
     this.registry.remove(name);
@@ -2897,19 +3258,16 @@ var SessionLauncher = class {
   async hasUncommittedChanges(name) {
     const session = this.registry.get(name);
     if (!session) return false;
-    const status = await execFileAsync("git", ["-C", session.projectPath, "status", "--porcelain"], { timeout: 5e3 }).then(
+    const status = await execFileAsync2("git", ["-C", session.projectPath, "status", "--porcelain"], { timeout: 5e3 }).then(
       ({ stdout }) => stdout.trim(),
       () => ""
     );
     return status.length > 0;
   }
-  // At start nothing is running yet: sessions saved last time are offered under "Recently closed",
-  // and outside sessions report again on their next event.
+  // HeyTerm's own sessions ended with it. Sessions in the user's terminal stay, names and all:
+  // ClaudeSessionWatcher closes the ones whose Claude has gone.
   restoreAfterStart() {
-    for (const session of this.registry.list()) {
-      if (session.origin === "external") this.registry.forget(session.name);
-      else this.registry.remove(session.name);
-    }
+    for (const session of this.registry.list()) if (session.origin !== "external") this.registry.remove(session.name);
   }
   // HeyTerm is stopping: every session ends and waits under "Recently closed" for next time.
   shutdown() {
@@ -2959,16 +3317,16 @@ var SessionLauncher = class {
   }
   uniqueName(projectName) {
     const base = projectName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "session";
-    if (!this.registry.get(base)) return base;
+    if (!this.registry.isNameInUse(base)) return base;
     for (let suffix = 2; ; suffix += 1) {
       const candidate = `${base}-${suffix}`;
-      if (!this.registry.get(candidate)) return candidate;
+      if (!this.registry.isNameInUse(candidate)) return candidate;
     }
   }
 };
 async function isOnPath(program) {
   const finder = process.platform === "win32" ? "where" : "which";
-  return execFileAsync(finder, [program], { timeout: 5e3 }).then(
+  return execFileAsync2(finder, [program], { timeout: 5e3 }).then(
     () => true,
     () => false
   );
@@ -2988,26 +3346,84 @@ function delay(milliseconds) {
 // src/server/sessions/session-registry.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { EventEmitter as EventEmitter4 } from "node:events";
-import path13 from "node:path";
+import path16 from "node:path";
 
 // src/server/sessions/agent-session-match.ts
-import path11 from "node:path";
+import path14 from "node:path";
 var AgentSessionMatch = class {
   static find(sessions, agent, agentSessionId, workingDirectory) {
     const ours = sessions.filter((session) => session.origin !== "external" && session.agent === agent);
     const known = ours.find((session) => session.agentSessionId === agentSessionId);
     if (known) return { session: known, claimsId: false };
-    const folder = path11.resolve(workingDirectory || "/");
-    const unclaimed = ours.filter((session) => !session.agentSessionId && path11.resolve(session.projectPath) === folder).sort((left, right) => right.createdAt - left.createdAt);
+    const folder = path14.resolve(workingDirectory || "/");
+    const unclaimed = ours.filter((session) => !session.agentSessionId && path14.resolve(session.projectPath) === folder).sort((left, right) => right.createdAt - left.createdAt);
     return unclaimed[0] ? { session: unclaimed[0], claimsId: true } : void 0;
   }
 };
 
+// src/server/sessions/claude-session-status.ts
+var statesInsideATurn = ["working", "needs_permission", "asked"];
+var statusesWithoutATurn = ["idle", "shell"];
+var ClaudeSessionStatus = class _ClaudeSessionStatus {
+  // The Stop hook can land just after the record turns idle; a real end of turn wins.
+  static settleMilliseconds = 3e3;
+  // A session that only just appeared may not have written its record yet.
+  static endGraceMilliseconds = 3e4;
+  static verdict(session, record2, processIsRunning, now) {
+    if (session.agent !== "claude" || !session.agentSessionId || session.state === "stopped") return void 0;
+    if (!record2 || !processIsRunning) {
+      if (session.origin !== "external") return void 0;
+      return now - session.stateSince >= _ClaudeSessionStatus.endGraceMilliseconds ? "ended" : void 0;
+    }
+    if (!statesInsideATurn.includes(session.state)) return void 0;
+    if (!record2.status || !statusesWithoutATurn.includes(record2.status)) return void 0;
+    const statusChangedAt = record2.statusUpdatedAt ?? 0;
+    if (statusChangedAt <= session.stateSince) return void 0;
+    return now - statusChangedAt >= _ClaudeSessionStatus.settleMilliseconds ? "turn_stopped" : void 0;
+  }
+  // A folder with no records means no Claude is running. Record files of which none can be read
+  // mean Claude Code changed how it writes them, which says nothing about the sessions.
+  static recordsCanBeTrusted(recordFileCount, readableRecordCount) {
+    return recordFileCount === 0 || readableRecordCount > 0;
+  }
+  static parseRecord(text2) {
+    let parsed;
+    try {
+      parsed = JSON.parse(text2);
+    } catch {
+      return void 0;
+    }
+    if (typeof parsed !== "object" || parsed === null) return void 0;
+    const fields = parsed;
+    if (typeof fields.pid !== "number" || typeof fields.sessionId !== "string" || !fields.sessionId) return void 0;
+    return {
+      pid: fields.pid,
+      sessionId: fields.sessionId,
+      ...typeof fields.status === "string" ? { status: fields.status } : {},
+      ...typeof fields.statusUpdatedAt === "number" ? { statusUpdatedAt: fields.statusUpdatedAt } : {}
+    };
+  }
+};
+
+// src/server/sessions/quiet-rules.ts
+var quietAfterMilliseconds = 5 * 6e4;
+var longCommandAfterMilliseconds = 10 * 6e4;
+var QuietRules = class {
+  static verdict(session, now) {
+    if (session.state !== "working" || session.quiet) return void 0;
+    if (session.runningCommand) {
+      return now - session.runningCommand.since >= longCommandAfterMilliseconds ? { kind: "long_command", since: session.runningCommand.since } : void 0;
+    }
+    const lastHeardAt = session.lastActivityAt ?? session.stateSince;
+    return now - lastHeardAt >= quietAfterMilliseconds ? { kind: "quiet", since: lastHeardAt } : void 0;
+  }
+};
+
 // src/server/sessions/external-session-naming.ts
-import path12 from "node:path";
+import path15 from "node:path";
 var ExternalSessionNaming = class {
   static nameFor(facts, takenNames) {
-    const base = slug(facts.sessionTitle ?? "") || slug(path12.basename(facts.workingDirectory)) || "session";
+    const base = slug(facts.sessionTitle ?? "") || slug(path15.basename(facts.workingDirectory)) || "session";
     if (!takenNames.includes(base)) return base;
     for (let suffix = 2; ; suffix += 1) {
       const candidate = `${base}-${suffix}`;
@@ -3125,12 +3541,20 @@ var SessionRegistry = class extends EventEmitter4 {
   sessions = /* @__PURE__ */ new Map();
   recentlyClosed = [];
   promptWaiters = /* @__PURE__ */ new Map();
+  turnChangeTracker;
+  // Launch name to current name, for renamed sessions HeyTerm started: their hooks keep the launch name.
+  launchNames = /* @__PURE__ */ new Map();
   dayKey = localDayKey(Date.now());
   changeTimer;
   saveTimer;
   restore(sessions, recentlyClosed) {
     for (const session of sessions) this.sessions.set(session.name, session);
-    this.recentlyClosed = recentlyClosed;
+    const takenNames = new Set(this.sessions.keys());
+    this.recentlyClosed = recentlyClosed.map((closed) => {
+      const name = takenNames.has(closed.name) ? freeNameLike(closed.name, takenNames) : closed.name;
+      takenNames.add(name);
+      return name === closed.name ? closed : { ...closed, name };
+    });
   }
   list() {
     return [...this.sessions.values()].sort((left, right) => left.createdAt - right.createdAt);
@@ -3150,10 +3574,23 @@ var SessionRegistry = class extends EventEmitter4 {
     if (!session) return;
     this.sessions.delete(name);
     this.heldRequests.letGoAllFor(name);
-    const closed = { ...session, state: "stopped", pending: void 0 };
+    for (const [launchName, renamedTo] of this.launchNames) if (renamedTo === name) this.launchNames.delete(launchName);
+    const closed = { ...session, state: "stopped", stateSince: Date.now(), pending: void 0 };
     this.recentlyClosed = [closed, ...this.recentlyClosed].slice(0, recentlyClosedLimit);
     this.announceChange();
   }
+  // Takes a closed session off the list. Its conversation stays with the agent, which can still resume it.
+  forgetClosed(name) {
+    const before = this.recentlyClosed.length;
+    this.recentlyClosed = this.recentlyClosed.filter((closed) => closed.name !== name);
+    if (this.recentlyClosed.length === before) return false;
+    this.announceChange();
+    return true;
+  }
+  // Without Claude Code's records nothing can say whether these are still running.
+  forgetExternalSessions() {
+    for (const session of this.list()) if (session.origin === "external") this.forget(session.name);
+  }
   // A session that left while HeyTerm was away; it is not worth a "recently closed" row.
   forget(name) {
     if (!this.sessions.delete(name)) return;
@@ -3167,19 +3604,61 @@ var SessionRegistry = class extends EventEmitter4 {
     this.set(updated);
     return updated;
   }
+  // Lets git say what a task changed, which edit hooks miss when a shell command does the editing.
+  useTurnChangeTracker(tracker) {
+    this.turnChangeTracker = tracker;
+  }
   // Returns what the hook script should print: a decision for a held request, otherwise nothing.
   async applyHookEvent(event) {
     this.resetWaitsOnNewDay(event.receivedAt);
-    const before = this.sessions.get(event.sessionName);
+    const sessionName = this.currentName(event.sessionName);
+    const before = this.sessions.get(sessionName);
     if (!before) return "";
+    if (event.name === "UserPromptSubmit") this.turnChangeTracker?.taskStarted(before);
+    const changedByTask = event.name === "Stop" && this.turnChangeTracker ? await this.turnChangeTracker.filesChangedByTask(before).catch(() => []) : [];
     const requestId = event.name === "PermissionRequest" ? randomUUID2() : void 0;
-    const after = SessionLifecycle.apply(before, event, { requestId });
+    const lifecycleResult = SessionLifecycle.apply(this.sessions.get(sessionName) ?? before, event, { requestId });
+    const after = changedByTask.length > 0 ? { ...lifecycleResult, filesChangedInLastTask: [.../* @__PURE__ */ new Set([...lifecycleResult.filesChangedInLastTask ?? [], ...changedByTask])] } : lifecycleResult;
     this.set(after);
     if (before.pending && before.pending.requestId !== after.pending?.requestId) {
-      this.heldRequests.letGoAllFor(event.sessionName, after.pending?.requestId);
+      this.heldRequests.letGoAllFor(sessionName, after.pending?.requestId);
+    }
+    if (event.name === "UserPromptSubmit") this.resolvePromptWaiters(sessionName);
+    return requestId ? this.heldRequests.hold(requestId, sessionName) : "";
+  }
+  // Renames an open or recently closed session; returns why it could not, or undefined.
+  rename(currentName, newName) {
+    const live = this.sessions.get(currentName);
+    const closedIndex = this.recentlyClosed.findIndex((closed) => closed.name === currentName);
+    if (!live && closedIndex === -1) return `There is no session called ${currentName}.`;
+    const ownLaunchNames = [...this.launchNames].filter(([, renamedTo]) => renamedTo === currentName).map(([launchName]) => launchName);
+    const otherLaunchNames = [...this.launchNames.keys()].filter((launchName) => !ownLaunchNames.includes(launchName));
+    const takenNames = [...this.sessions.keys(), ...this.recentlyClosed.map((closed) => closed.name), ...otherLaunchNames];
+    const problem = SessionNames.renameProblem(newName, currentName, takenNames);
+    if (problem) return problem;
+    if (live) {
+      this.sessions.delete(currentName);
+      this.sessions.set(newName, { ...live, name: newName, faceSeed: live.faceSeed ?? currentName });
+      this.launchNames.set(currentName, newName);
+      for (const [launchName, renamedTo] of this.launchNames) if (renamedTo === currentName) this.launchNames.set(launchName, newName);
+      this.heldRequests.renameSession(currentName, newName);
+      const waiters = this.promptWaiters.get(currentName);
+      if (waiters) {
+        this.promptWaiters.delete(currentName);
+        this.promptWaiters.set(newName, waiters);
+      }
+    } else {
+      this.recentlyClosed = this.recentlyClosed.map((closed, index) => index === closedIndex ? { ...closed, name: newName, faceSeed: closed.faceSeed ?? currentName } : closed);
     }
-    if (event.name === "UserPromptSubmit") this.resolvePromptWaiters(event.sessionName);
-    return requestId ? this.heldRequests.hold(requestId, event.sessionName) : "";
+    this.announceChange();
+    return void 0;
+  }
+  // Taken by an open or listed closed session, or kept for a renamed one whose hooks still use it.
+  isNameInUse(name) {
+    return this.sessions.has(name) || this.launchNames.has(name) || this.recentlyClosed.some((closed) => closed.name === name);
+  }
+  currentName(reportedName) {
+    return this.sessions.has(reportedName) ? reportedName : this.launchNames.get(reportedName) ?? reportedName;
   }
   // An event from Grok Build or Cursor, which run HeyTerm's hooks from a global file in every session.
   // Only the sessions HeyTerm started move; the reply is what the hook prints.
@@ -3193,6 +3672,26 @@ var SessionRegistry = class extends EventEmitter4 {
     const answer = await this.applyHookEvent({ name: event.name, sessionName: found.session.name, payload: event.payload, receivedAt });
     return answer || defaultReply;
   }
+  // Marks working sessions that have said nothing for long (quiet-rules.ts); each is told once.
+  noticeQuietSessions(now) {
+    for (const session of this.list()) {
+      const quiet = QuietRules.verdict(session, now);
+      if (quiet) this.update(session.name, (current) => ({ ...current, quiet }));
+    }
+  }
+  // Brings Claude sessions in line with Claude Code's own records: a stopped turn returns to idle,
+  // and a session from the user's terminal whose Claude has gone is closed.
+  reconcileClaudeSessions(records, processIsRunning, now) {
+    for (const session of this.list()) {
+      const record2 = session.agentSessionId ? records.get(session.agentSessionId) : void 0;
+      const verdict = ClaudeSessionStatus.verdict(session, record2, record2 ? processIsRunning(record2.pid) : false, now);
+      if (verdict === "turn_stopped") {
+        this.heldRequests.letGoAllFor(session.name);
+        this.update(session.name, (current) => SessionLifecycle.applyTurnStopped(current, now));
+      }
+      if (verdict === "ended") this.remove(session.name);
+    }
+  }
   // An event from a session the user started in their own terminal, known by its Claude session id.
   async applyExternalHookEvent(name, payload, receivedAt) {
     const agentSessionId = typeof payload.session_id === "string" ? payload.session_id : "";
@@ -3210,12 +3709,13 @@ var SessionRegistry = class extends EventEmitter4 {
   newExternalSession(agentSessionId, payload, now) {
     const workingDirectory = typeof payload.cwd === "string" ? payload.cwd : "";
     const sessionTitle = typeof payload.session_title === "string" ? payload.session_title : void 0;
-    const name = ExternalSessionNaming.nameFor({ sessionTitle, workingDirectory }, [...this.sessions.keys()]);
+    const takenNames = [...this.sessions.keys(), ...this.launchNames.keys(), ...this.recentlyClosed.map((closed) => closed.name)];
+    const name = ExternalSessionNaming.nameFor({ sessionTitle, workingDirectory }, takenNames);
     return {
       name,
       origin: "external",
       projectPath: workingDirectory,
-      projectName: path13.basename(workingDirectory) || name,
+      projectName: path16.basename(workingDirectory) || name,
       agent: "claude",
       state: "idle",
       stateSince: now,
@@ -3279,11 +3779,17 @@ var SessionRegistry = class extends EventEmitter4 {
 function localDayKey(time) {
   return new Date(time).toDateString();
 }
+function freeNameLike(name, takenNames) {
+  for (let suffix = 2; ; suffix += 1) {
+    const candidate = `${name}-${suffix}`;
+    if (!takenNames.has(candidate)) return candidate;
+  }
+}
 
 // src/server/sessions/state-store.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { mkdir as mkdir7, readFile as readFile5, rename as rename4, writeFile as writeFile5 } from "node:fs/promises";
-import path14 from "node:path";
+import { mkdir as mkdir7, readFile as readFile6, rename as rename4, writeFile as writeFile5 } from "node:fs/promises";
+import path17 from "node:path";
 function upgraded(saved) {
   const { claudeSessionId, ...session } = saved;
   return { ...session, agent: session.agent ?? "claude", agentSessionId: session.agentSessionId ?? claudeSessionId };
@@ -3291,10 +3797,10 @@ function upgraded(saved) {
 var StateStore = class {
   filePath;
   constructor(dataDirectory2) {
-    this.filePath = path14.join(dataDirectory2, "state.json");
+    this.filePath = path17.join(dataDirectory2, "state.json");
   }
   async load() {
-    const text2 = await readFile5(this.filePath, "utf8").catch(() => "");
+    const text2 = await readFile6(this.filePath, "utf8").catch(() => "");
     if (!text2) return { sessions: [], recentlyClosed: [] };
     try {
       const parsed = JSON.parse(text2);
@@ -3312,7 +3818,7 @@ var StateStore = class {
   }
   saving = Promise.resolve();
   async write(state) {
-    await mkdir7(path14.dirname(this.filePath), { recursive: true });
+    await mkdir7(path17.dirname(this.filePath), { recursive: true });
     const temporaryPath = `${this.filePath}.${process.pid}.${randomUUID3()}.tmp`;
     await writeFile5(temporaryPath, JSON.stringify(state), { mode: 384 });
     await rename4(temporaryPath, this.filePath);
@@ -3353,13 +3859,185 @@ var TrustDialogWatcher = class {
   }
 };
 
+// src/server/sessions/claude-session-watcher.ts
+import { readdir as readdir2, readFile as readFile7 } from "node:fs/promises";
+import os5 from "node:os";
+import path18 from "node:path";
+var pollMilliseconds2 = 2e3;
+function claudeSessionsDirectory() {
+  return process.env.HEYTERM_CLAUDE_SESSIONS_DIRECTORY ?? path18.join(process.env.CLAUDE_CONFIG_DIR ?? path18.join(os5.homedir(), ".claude"), "sessions");
+}
+var ClaudeSessionWatcher = class _ClaudeSessionWatcher {
+  constructor(registry) {
+    this.registry = registry;
+  }
+  registry;
+  timer;
+  polling = false;
+  hasPolled = false;
+  start() {
+    this.timer = setInterval(() => void this.poll(), pollMilliseconds2);
+  }
+  stop() {
+    clearInterval(this.timer);
+  }
+  async poll() {
+    if (this.polling) return;
+    this.polling = true;
+    try {
+      const records = await _ClaudeSessionWatcher.readRecords(claudeSessionsDirectory());
+      if (records) this.registry.reconcileClaudeSessions(records, _ClaudeSessionWatcher.processIsRunning, Date.now());
+      else if (!this.hasPolled) this.registry.forgetExternalSessions();
+      this.hasPolled = true;
+    } finally {
+      this.polling = false;
+    }
+  }
+  static async readRecords(directory) {
+    const names = await readdir2(directory).catch(() => void 0);
+    if (!names) return void 0;
+    const records = /* @__PURE__ */ new Map();
+    const recordFileNames = names.filter((name) => name.endsWith(".json"));
+    for (const name of recordFileNames) {
+      const text2 = await readFile7(path18.join(directory, name), "utf8").catch(() => "");
+      const record2 = ClaudeSessionStatus.parseRecord(text2);
+      if (record2) records.set(record2.sessionId, record2);
+    }
+    return ClaudeSessionStatus.recordsCanBeTrusted(recordFileNames.length, records.size) ? records : void 0;
+  }
+  // Signal 0 checks a process exists without touching it; EPERM means it exists under another user.
+  static processIsRunning(pid) {
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch (error) {
+      return error.code === "EPERM";
+    }
+  }
+};
+
+// src/server/sessions/turn-change-tracker.ts
+import { execFile as execFile3 } from "node:child_process";
+
+// src/server/sessions/turn-changes.ts
+var TurnChanges = class {
+  static between(before, after, committedDuringTask) {
+    const changed = /* @__PURE__ */ new Set();
+    for (const file of before.changedFiles.keys()) if (!after.changedFiles.has(file)) changed.add(file);
+    for (const [file, hash] of after.changedFiles) if (before.changedFiles.get(file) !== hash) changed.add(file);
+    for (const file of committedDuringTask) changed.add(file);
+    return [...changed];
+  }
+};
+
+// src/server/sessions/turn-change-tracker.ts
+var gitTimeoutMilliseconds = 2e3;
+var largestOutputBytes = 8 * 1024 * 1024;
+var TurnChangeTracker = class _TurnChangeTracker {
+  snapshotsAtTaskStart = /* @__PURE__ */ new Map();
+  taskStarted(session) {
+    this.snapshotsAtTaskStart.set(_TurnChangeTracker.key(session), _TurnChangeTracker.take(session.projectPath));
+  }
+  async filesChangedByTask(session) {
+    const key = _TurnChangeTracker.key(session);
+    const before = await this.snapshotsAtTaskStart.get(key);
+    this.snapshotsAtTaskStart.delete(key);
+    if (!before) return [];
+    const after = await _TurnChangeTracker.take(session.projectPath);
+    if (!after) return [];
+    const committed = before.head !== after.head ? (await git(session.projectPath, ["diff", "--name-only", "--relative", before.head, after.head]) ?? "").split("\n").filter(Boolean) : [];
+    return TurnChanges.between(before, after, committed);
+  }
+  // Stays the same when the session is renamed.
+  static key(session) {
+    return `${session.projectPath}|${session.createdAt}`;
+  }
+  static async take(folder) {
+    const prefix = await git(folder, ["rev-parse", "--show-prefix"]);
+    if (prefix === void 0) return void 0;
+    const head = (await git(folder, ["rev-parse", "HEAD"]) ?? "").trim() || "no commits yet";
+    const status = await git(folder, ["status", "--porcelain=v1", "-z", "--untracked-files=all", "--", "."]);
+    if (status === void 0) return void 0;
+    const entries = parseStatus(status, prefix.trim());
+    const present = entries.filter((entry) => !entry.deleted).map((entry) => entry.path);
+    const hashes = present.length > 0 ? (await git(folder, ["hash-object", "--stdin-paths"], present.join("\n")) ?? "").split("\n") : [];
+    const changedFiles = /* @__PURE__ */ new Map();
+    for (const entry of entries) changedFiles.set(entry.path, entry.deleted ? "deleted" : hashes[present.indexOf(entry.path)] ?? "unknown");
+    return { head, changedFiles };
+  }
+};
+function parseStatus(output, prefix) {
+  const records = output.split("\0");
+  const entries = [];
+  for (let index = 0; index < records.length; index += 1) {
+    const record2 = records[index];
+    if (record2.length < 4) continue;
+    const code = record2.slice(0, 2);
+    const fullPath = record2.slice(3);
+    if (code.includes("R") || code.includes("C")) index += 1;
+    if (!fullPath.startsWith(prefix)) continue;
+    entries.push({ path: fullPath.slice(prefix.length), deleted: code.includes("D") });
+  }
+  return entries;
+}
+function git(folder, args, input) {
+  return new Promise((resolve) => {
+    const child = execFile3("git", ["-C", folder, ...args], { timeout: gitTimeoutMilliseconds, maxBuffer: largestOutputBytes }, (error, stdout) => resolve(error ? void 0 : stdout));
+    if (input !== void 0) child.stdin?.end(input);
+  });
+}
+
+// src/server/sessions/session-worktrees.ts
+import { execFile as execFile4 } from "node:child_process";
+import { existsSync as existsSync3 } from "node:fs";
+import path19 from "node:path";
+var SessionWorktrees = class {
+  constructor(dataDirectory2) {
+    this.dataDirectory = dataDirectory2;
+  }
+  dataDirectory;
+  // A worktree for the session, with the folder it should work in, or undefined where git cannot make one.
+  async create(projectPath, sessionName) {
+    const repoPath = (await git2(projectPath, ["rev-parse", "--show-toplevel"]))?.trim();
+    const baseCommit = (await git2(projectPath, ["rev-parse", "HEAD"]))?.trim();
+    const prefix = (await git2(projectPath, ["rev-parse", "--show-prefix"]))?.trim() ?? "";
+    if (!repoPath || !baseCommit) return void 0;
+    const existingBranches = (await git2(repoPath, ["for-each-ref", "--format=%(refname:short)", "refs/heads/heyterm"]) ?? "").split("\n").filter(Boolean);
+    const branch = WorktreePlan.branchName(sessionName, existingBranches);
+    const worktreePath = freeFolder(path19.join(this.dataDirectory, "worktrees", `${path19.basename(repoPath)}-${sessionName}`));
+    if (await git2(repoPath, ["worktree", "add", "-q", "-b", branch, worktreePath, baseCommit]) === void 0) return void 0;
+    const sessionPath = prefix ? path19.join(worktreePath, prefix) : worktreePath;
+    return { repoPath, worktreePath, branch, baseCommit, path: sessionPath };
+  }
+  // Never deletes work: a worktree with uncommitted changes or commits of its own stays.
+  async removeIfUnused(worktree) {
+    if (!existsSync3(worktree.worktreePath)) {
+      await git2(worktree.repoPath, ["worktree", "prune"]);
+      return "missing";
+    }
+    if ((await git2(worktree.worktreePath, ["status", "--porcelain"]) ?? "x").trim()) return "kept_uncommitted";
+    const ownCommits = Number((await git2(worktree.worktreePath, ["rev-list", "--count", `${worktree.baseCommit}..HEAD`]) ?? "1").trim());
+    if (ownCommits > 0) return "kept_commits";
+    await git2(worktree.repoPath, ["worktree", "remove", worktree.worktreePath]);
+    await git2(worktree.repoPath, ["branch", "-D", worktree.branch]);
+    return "removed";
+  }
+};
+function freeFolder(wanted) {
+  if (!existsSync3(wanted)) return wanted;
+  for (let suffix = 2; ; suffix += 1) if (!existsSync3(`${wanted}-${suffix}`)) return `${wanted}-${suffix}`;
+}
+function git2(folder, args) {
+  return new Promise((resolve) => execFile4("git", ["-C", folder, ...args], { timeout: 15e3 }, (error, stdout) => resolve(error ? void 0 : stdout)));
+}
+
 // src/server/setup/setup-service.ts
-import { execFile as execFile2 } from "node:child_process";
+import { execFile as execFile5 } from "node:child_process";
 import { stat as stat4 } from "node:fs/promises";
-import os5 from "node:os";
-import path15 from "node:path";
-import { promisify as promisify2 } from "node:util";
-var execFileAsync2 = promisify2(execFile2);
+import os6 from "node:os";
+import path20 from "node:path";
+import { promisify as promisify3 } from "node:util";
+var execFileAsync3 = promisify3(execFile5);
 var testedClaudeVersion = "2.1.310";
 var SetupService = class {
   constructor(projects, userConfig, connector, routerModel) {
@@ -3421,7 +4099,7 @@ var SetupService = class {
   }
 };
 async function commandVersion(command, args, pattern) {
-  const output = await execFileAsync2(command, args, { timeout: 1e4, shell: process.platform === "win32" }).then(
+  const output = await execFileAsync3(command, args, { timeout: 1e4, shell: process.platform === "win32" }).then(
     ({ stdout }) => stdout,
     () => ""
   );
@@ -3437,21 +4115,21 @@ function compareVersions(left, right) {
   return 0;
 }
 function expandHome(folder) {
-  return folder === "~" || folder.startsWith("~/") ? path15.join(os5.homedir(), folder.slice(1)) : path15.resolve(folder);
+  return folder === "~" || folder.startsWith("~/") ? path20.join(os6.homedir(), folder.slice(1)) : path20.resolve(folder);
 }
 async function isFolder3(folder) {
   return stat4(folder).then((info) => info.isDirectory(), () => false);
 }
 
 // src/server/setup/input-log.ts
-import { appendFile as appendFile2, readFile as readFile6, writeFile as writeFile6 } from "node:fs/promises";
-import path16 from "node:path";
+import { appendFile as appendFile2, readFile as readFile8, writeFile as writeFile6 } from "node:fs/promises";
+import path21 from "node:path";
 var keptLines = 1e3;
 var InputLog = class {
   filePath;
   writing = Promise.resolve();
   constructor(dataDirectory2) {
-    this.filePath = path16.join(dataDirectory2, "input-log.jsonl");
+    this.filePath = path21.join(dataDirectory2, "input-log.jsonl");
   }
   record(records) {
     const safe = records.slice(0, 500).map((record2) => JSON.stringify(withoutText(record2))).join("\n");
@@ -3459,7 +4137,7 @@ var InputLog = class {
     this.writing = this.writing.then(async () => {
       await appendFile2(this.filePath, `${safe}
 `, { mode: 384 });
-      const lines = (await readFile6(this.filePath, "utf8")).split("\n").filter(Boolean);
+      const lines = (await readFile8(this.filePath, "utf8")).split("\n").filter(Boolean);
       if (lines.length > keptLines * 2) await writeFile6(this.filePath, `${lines.slice(-keptLines).join("\n")}
 `, { mode: 384 });
     }).catch(() => void 0);
@@ -3552,11 +4230,18 @@ var TerminalHost = class extends EventEmitter5 {
       for (const viewer of hosted.viewers) viewer.send(data);
     });
     child.onExit(() => {
-      if (this.terminals.get(session.name) !== hosted) return;
-      this.forget(session.name, hosted);
-      this.emit("exit", session.name);
+      const currentName = [...this.terminals].find(([, candidate]) => candidate === hosted)?.[0];
+      if (currentName === void 0) return;
+      this.forget(currentName, hosted);
+      this.emit("exit", currentName);
     });
   }
+  renameSession(currentName, newName) {
+    const hosted = this.terminals.get(currentName);
+    if (!hosted || this.terminals.has(newName)) return;
+    this.terminals.delete(currentName);
+    this.terminals.set(newName, hosted);
+  }
   killSession(name) {
     const hosted = this.terminals.get(name);
     if (!hosted) return;
@@ -3685,7 +4370,7 @@ var SpokenLineDeduplicator = class {
 };
 
 // src/server/main.ts
-var execFileAsync3 = promisify3(execFile3);
+var execFileAsync4 = promisify4(execFile6);
 var closedPageGraceMilliseconds = 15e3;
 async function startHeyTerm() {
   process.on("unhandledRejection", (reason) => console.error("HeyTerm caught an unexpected error:", reason instanceof Error ? reason.message : reason));
@@ -3694,8 +4379,12 @@ async function startHeyTerm() {
   const userConfig = new UserConfig(config.dataDirectory);
   const savedChoices = await userConfig.load();
   const hooks = await new HookInstaller(config.dataDirectory, config.port).install();
-  const agentHookFiles = new AgentHookFiles(hooks.forwardScriptPath, path17.join(config.dataDirectory, "backups"));
+  const agentHookFiles = new AgentHookFiles(hooks.forwardScriptPath, path22.join(config.dataDirectory, "backups"));
   await agentHookFiles.install().catch((error) => console.error(`Could not add HeyTerm's Grok and Cursor hooks: ${error.message}`));
+  const quietTimer = setInterval(() => registry.noticeQuietSessions(Date.now()), 3e4);
+  const hookRepairTimer = setInterval(() => {
+    agentHookFiles.repairIfRemoved().then((repaired) => repaired && console.log("Put HeyTerm's Grok and Cursor hooks back; something had removed them.")).catch(() => void 0);
+  }, 3e4);
   await stopSessionsFromOlderVersion(config.tmuxSocketName);
   const host = new TerminalHost();
   const heldRequests = new HeldHookRequests();
@@ -3703,26 +4392,30 @@ async function startHeyTerm() {
   const registry = new SessionRegistry(store, heldRequests);
   const saved = await store.load();
   registry.restore(saved.sessions, saved.recentlyClosed);
-  const launcher = new SessionLauncher(host, registry, { claudeSettingsPath: hooks.settingsPath, forwardScriptPath: hooks.forwardScriptPath });
+  registry.useTurnChangeTracker(new TurnChangeTracker());
+  const launcher = new SessionLauncher(host, registry, { claudeSettingsPath: hooks.settingsPath, forwardScriptPath: hooks.forwardScriptPath }, new SessionWorktrees(config.dataDirectory));
   launcher.restoreAfterStart();
   const trustWatcher = new TrustDialogWatcher(host, registry);
   trustWatcher.start();
+  const claudeSessionWatcher = new ClaudeSessionWatcher(registry);
+  claudeSessionWatcher.start();
   const projects = new ProjectCatalog(config.projectRoots);
   const audit = new AuditLog(config.dataDirectory);
   const decisions = new DecisionActions(registry, heldRequests, audit);
   const sessionActions = new SessionActions(registry, launcher, projects, audit);
   const executor = new ActionExecutor(registry, projects, new FastPathRouter({ sendUnaddressedWordsToFocusedSession: false }), decisions, sessionActions);
-  const assistant = createAssistant({ model: config.routerModel, workingDirectory: os6.homedir(), registry, launcher, projects, sessionActions, decisions, executor, audit });
+  const assistant = createAssistant({ model: config.routerModel, workingDirectory: os7.homedir(), memory: new AssistantMemory(config.dataDirectory), registry, launcher, projects, sessionActions, decisions, executor, audit });
   executor.attachAssistant(assistant);
   executor.on("feedback", (feedback) => assistant.recordOutcome(feedback.text));
   registry.on("changed", () => assistant.noteSessions(registry.list()));
   assistant.noteSessions(registry.list());
-  const connector = new ExistingSessionConnector(hooks.forwardScriptPath, path17.join(config.dataDirectory, "backups"));
+  const connector = new ExistingSessionConnector(hooks.forwardScriptPath, path22.join(config.dataDirectory, "backups"));
   const showOwnTerminalSessions = savedChoices.showOwnTerminalSessions ?? await connector.isConnected();
   if (savedChoices.showOwnTerminalSessions === void 0 && showOwnTerminalSessions) await userConfig.update({ showOwnTerminalSessions });
   if (showOwnTerminalSessions) await connector.connect().catch((error) => console.error(error.message));
   const setup = new SetupService(projects, userConfig, connector, config.routerModel);
-  const hub = new EventHub(registry, executor, projects, setup, new MacVoice(), assistant);
+  const pageEntry = PageBuild.entryFromIndexHtml(await readFile9(path22.join(config.webDirectory, "index.html"), "utf8").catch(() => ""));
+  const hub = new EventHub(registry, executor, projects, setup, new MacVoice(), assistant, pageEntry);
   hub.inputLog = new InputLog(config.dataDirectory);
   const guard = new RequestGuard(config.port, hooks.token, config.developmentOrigin);
   const tickets = new PairingTickets(hooks.token);
@@ -3735,7 +4428,10 @@ async function startHeyTerm() {
       console.log(`
 Stopping HeyTerm (${reason}).`);
       clearTimeout(closedPageTimer);
+      clearInterval(hookRepairTimer);
+      clearInterval(quietTimer);
       trustWatcher.stop();
+      claudeSessionWatcher.stop();
       assistant.close();
       launcher.shutdown();
       if ((await userConfig.load()).showOwnTerminalSessions) await connector.disconnect().catch(() => void 0);
@@ -3773,44 +4469,44 @@ Stopping HeyTerm (${reason}).`);
 }
 async function stopSessionsFromOlderVersion(tmuxSocketName) {
   if (process.platform === "win32") return;
-  await execFileAsync3("tmux", ["-L", tmuxSocketName, "kill-server"], { timeout: 5e3 }).catch(() => void 0);
+  await execFileAsync4("tmux", ["-L", tmuxSocketName, "kill-server"], { timeout: 5e3 }).catch(() => void 0);
 }
 
 // src/server/setup/trash.ts
-import { execFile as execFile4 } from "node:child_process";
+import { execFile as execFile7 } from "node:child_process";
 import { mkdir as mkdir8, rename as rename5, stat as stat5, writeFile as writeFile7 } from "node:fs/promises";
-import os7 from "node:os";
-import path18 from "node:path";
-import { promisify as promisify4 } from "node:util";
-var execFileAsync4 = promisify4(execFile4);
+import os8 from "node:os";
+import path23 from "node:path";
+import { promisify as promisify5 } from "node:util";
+var execFileAsync5 = promisify5(execFile7);
 async function moveToTrash(target) {
-  if (process.platform === "darwin") return moveIntoFolder(target, path18.join(os7.homedir(), ".Trash"));
+  if (process.platform === "darwin") return moveIntoFolder(target, path23.join(os8.homedir(), ".Trash"));
   if (process.platform === "win32") return moveToRecycleBin(target);
   return moveToFreedesktopTrash(target);
 }
 async function moveIntoFolder(target, trashFolder) {
-  await rename5(target, await freeName(trashFolder, path18.basename(target)));
+  await rename5(target, await freeName(trashFolder, path23.basename(target)));
 }
 async function moveToFreedesktopTrash(target) {
-  const trashHome = path18.join(process.env.XDG_DATA_HOME ?? path18.join(os7.homedir(), ".local", "share"), "Trash");
-  await mkdir8(path18.join(trashHome, "files"), { recursive: true });
-  await mkdir8(path18.join(trashHome, "info"), { recursive: true });
-  const destination = await freeName(path18.join(trashHome, "files"), path18.basename(target));
+  const trashHome = path23.join(process.env.XDG_DATA_HOME ?? path23.join(os8.homedir(), ".local", "share"), "Trash");
+  await mkdir8(path23.join(trashHome, "files"), { recursive: true });
+  await mkdir8(path23.join(trashHome, "info"), { recursive: true });
+  const destination = await freeName(path23.join(trashHome, "files"), path23.basename(target));
   const info = `[Trash Info]
 Path=${encodeURI(target)}
 DeletionDate=${(/* @__PURE__ */ new Date()).toISOString().slice(0, 19)}
 `;
-  await writeFile7(path18.join(trashHome, "info", `${path18.basename(destination)}.trashinfo`), info);
+  await writeFile7(path23.join(trashHome, "info", `${path23.basename(destination)}.trashinfo`), info);
   await rename5(target, destination);
 }
 async function moveToRecycleBin(target) {
   const quoted2 = target.replaceAll("'", "''");
   const script = `Add-Type -AssemblyName Microsoft.VisualBasic; [Microsoft.VisualBasic.FileIO.FileSystem]::DeleteDirectory('${quoted2}', 'OnlyErrorDialogs', 'SendToRecycleBin')`;
-  await execFileAsync4("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], { timeout: 3e4 });
+  await execFileAsync5("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], { timeout: 3e4 });
 }
 async function freeName(folder, name) {
-  let candidate = path18.join(folder, name);
-  for (let number = 2; await exists2(candidate); number += 1) candidate = path18.join(folder, `${name} ${number}`);
+  let candidate = path23.join(folder, name);
+  for (let number = 2; await exists2(candidate); number += 1) candidate = path23.join(folder, `${name} ${number}`);
   return candidate;
 }
 async function exists2(target) {
@@ -3821,7 +4517,7 @@ async function exists2(target) {
 }
 
 // src/server/setup/uninstaller.ts
-import { readFile as readFile7, rename as rename6, writeFile as writeFile8 } from "node:fs/promises";
+import { readFile as readFile10, rename as rename6, writeFile as writeFile8 } from "node:fs/promises";
 var Uninstaller = class {
   constructor(options) {
     this.options = options;
@@ -3840,7 +4536,7 @@ var Uninstaller = class {
     return report;
   }
   async removeHooks() {
-    const text2 = await readFile7(this.options.claudeSettingsPath, "utf8").catch(() => void 0);
+    const text2 = await readFile10(this.options.claudeSettingsPath, "utf8").catch(() => void 0);
     if (text2 === void 0) return false;
     let settings;
     try {
@@ -3858,7 +4554,7 @@ var Uninstaller = class {
 };
 
 // src/server/cli.ts
-var execFileAsync5 = promisify5(execFile5);
+var execFileAsync6 = promisify6(execFile8);
 var helpText = `HeyTerm: run your coding agents by voice.
 
 Usage:
@@ -3955,18 +4651,18 @@ function baseUrl() {
   return `http://127.0.0.1:${process.env.HEYTERM_PORT ?? 4747}`;
 }
 function dataDirectory() {
-  return process.env.HEYTERM_DATA_DIRECTORY ?? path19.join(os8.homedir(), ".heyterm");
+  return process.env.HEYTERM_DATA_DIRECTORY ?? path24.join(os9.homedir(), ".heyterm");
 }
 async function readToken() {
-  const folders = [dataDirectory(), path19.join(os8.homedir(), ".callsign")];
+  const folders = [dataDirectory(), path24.join(os9.homedir(), ".callsign")];
   for (const folder of folders) {
-    const token = (await readFile8(path19.join(folder, "token"), "utf8").catch(() => "")).trim();
+    const token = (await readFile11(path24.join(folder, "token"), "utf8").catch(() => "")).trim();
     if (token) return token;
   }
   return void 0;
 }
 async function versionOf(program) {
-  const output = await execFileAsync5(program, ["--version"], { timeout: 1e4, shell: process.platform === "win32" }).then(
+  const output = await execFileAsync6(program, ["--version"], { timeout: 1e4, shell: process.platform === "win32" }).then(
     ({ stdout }) => stdout,
     () => ""
   );