@saadnvd1/agent-os 0.3.833 → 0.3.836

package/app/api/sessions/route.ts

@@ -10,6 +10,7 @@ import { ModelUnavailableError } from "@/lib/models/agent-binding";
 import { namesLine, waitBadges } from "@/lib/bus/waits/store";
 import { claimsSnapshot } from "@/lib/claims";
 import { isProjectRef } from "@/lib/tasks/project-ref";
+import { worktreeRemoved } from "@/lib/chat/worker/cwd";
 import { omitNulls } from "@/lib/sessions/omit-null";
 
 // The sidebar's Done shelf lists this many finished tasks; ?done=all lists
@@ -34,7 +35,12 @@ export async function GET(request?: NextRequest) {
     const sessions = rows.map((s) => {
       const b = badges.get(s.id);
       const overlap = claims.bySession.get(s.id);
-      const row = overlap ? { ...s, overlap } : s;
+      const gone = worktreeRemoved(s);
+      const row = {
+        ...s,
+        ...(overlap && { overlap }),
+        ...(gone && { worktree_removed: true }),
+      };
       return omitNulls(
         b
           ? {

package/app/globals.css

@@ -334,3 +334,17 @@ body {
 ::highlight(conv-search) {
   background-color: hsl(var(--find-match));
 }
+
+/* Toast close button inside the toast's right edge, not half outside the left. */
+[data-sonner-toaster]
+  [data-sonner-toast][data-styled="true"]
+  [data-close-button] {
+  left: auto;
+  right: 6px;
+  top: 50%;
+  margin-top: -10px;
+  transform: none;
+  background: transparent;
+  border-color: transparent;
+  color: hsl(var(--muted-foreground));
+}

package/components/Chat/ChatPanel.tsx

@@ -8,17 +8,24 @@ import {
   useRef,
   useState,
 } from "react";
-import { ArrowDown, Loader2 } from "lucide-react";
+import { ArrowDown, GitFork, Loader2 } from "lucide-react";
 import type { ClipboardEvent } from "react";
 import { useChat } from "@/data/chat/useChat";
 import { PausedBanner } from "./PausedBanner";
+import { WorktreeRemovedNotice } from "./WorktreeRemovedNotice";
 import { groupTimeline } from "@/lib/chat/group";
 import type { ChatItem } from "@/lib/chat/events";
 import { isFreshCommand, withFresh } from "@/lib/chat/commands";
 import { useExperiment } from "@/data/experiments";
 import { useStartForks } from "@/data/fork";
 import { toast } from "sonner";
-import { ForksStrip, forkLabel } from "./Forks";
+import {
+  leaveForkMode,
+  placeholderFor,
+  suggestionFor,
+  type ForkDraft,
+} from "./fork-draft";
+import { ForksStrip, forkLabel, startedToast } from "./Forks";
 import { ReplyingTo } from "./ReplyingTo";
 import { compactsFirst } from "@/lib/chat/pending";
 import { useFreshStart } from "@/data/sessions";
@@ -106,12 +113,11 @@ export function ChatPanel({
   const forksOn = useExperiment("forks");
   const startFork = useStartForks(sessionId);
   // Set while a selection is being forked; per session, like asIs below.
-  const [forkDraft, setForkDraft] = useState<{
-    sessionId: string;
-    quote: string;
-    own: boolean;
-  } | null>(null);
-  const fork = forksOn && forkDraft?.sessionId === sessionId ? forkDraft : null;
+  const [forkDraft, setForkDraft] = useState<ForkDraft | null>(null);
+  const draftHere = forkDraft?.sessionId === sessionId ? forkDraft : null;
+  const fork = forksOn && draftHere?.mode ? draftHere : null;
+  const quoteChip =
+    draftHere && !draftHere.mode && draftHere.quote ? draftHere : null;
   const {
     items,
     hasMore,
@@ -181,7 +187,7 @@ export function ChatPanel({
 
   // The suggestion the reader set aside (typed over it, or Esc) stays hidden.
   const [dismissed, setDismissed] = useState<string | null>(null);
-  const shownSuggestion = suggestion === dismissed ? null : suggestion;
+  const shownSuggestion = suggestionFor(suggestion, dismissed, !!fork);
   const dismissSuggestion = useCallback((s: string) => setDismissed(s), []);
   const history = useMemo(() => sentPrompts(items), [items]);
   const [insert, setInsert] = useState<{
@@ -190,15 +196,13 @@ export function ChatPanel({
     append?: boolean;
   }>();
 
-  // Leaving Fork mode keeps the selection as a normal quote in the draft.
+  // Leaving Fork mode keeps the selection as a quote chip and the typed text.
   const leaveFork = () => {
-    if (fork?.quote)
-      setInsert({
-        text: quoteMarkdown(fork.quote),
-        at: Date.now(),
-        append: true,
-      });
-    setForkDraft(null);
+    if (!fork) return;
+    setForkDraft(leaveForkMode(fork));
+    toast("Fork mode off · your text is kept", {
+      icon: <GitFork aria-hidden className="size-4" />,
+    });
   };
 
   // Esc sets the composer's ghost text aside, or else stops the turn
@@ -269,7 +273,7 @@ export function ChatPanel({
       focusComposer
     );
   const forkQuote = (text: string) => {
-    setForkDraft({ sessionId, quote: text, own: false });
+    setForkDraft({ sessionId, quote: text, own: false, mode: true });
     focusComposer();
   };
   const togglePlan = plan === null ? undefined : () => setPlan(!plan);
@@ -688,6 +692,7 @@ export function ChatPanel({
           onFork={forksOn ? forkQuote : undefined}
         />
         <PausedBanner sessionId={sessionId} />
+        <WorktreeRemovedNotice sessionId={sessionId} />
         <ForksStrip sessionId={sessionId} />
         <Queue
           queue={queue}
@@ -725,13 +730,7 @@ export function ChatPanel({
           insert={insert}
           running={running}
           disabled={!connected}
-          placeholder={
-            !connected
-              ? "Reconnecting…"
-              : fork
-                ? "What should the fork do?"
-                : `Message ${sessionName}`
-          }
+          placeholder={placeholderFor(connected, !!fork, sessionName)}
           fork={
             fork
               ? {
@@ -743,6 +742,14 @@ export function ChatPanel({
                 }
               : undefined
           }
+          quoteChip={
+            quoteChip
+              ? {
+                  text: quoteChip.quote,
+                  onDrop: () => setForkDraft(null),
+                }
+              : undefined
+          }
           onSend={(text, images, files) => {
             if (freshStart && isFreshCommand(text)) {
               startFresh.mutate(sessionId);
@@ -758,8 +765,8 @@ export function ChatPanel({
                   labels: [forkLabel(text, fork.quote)],
                 },
                 {
-                  onSuccess: () => {
-                    toast.success("Started fork");
+                  onSuccess: (res) => {
+                    toast.success(startedToast(res.children.map((c) => c.n)));
                     setForkDraft(null);
                   },
                   onError: (e) => {
@@ -771,14 +778,19 @@ export function ChatPanel({
               return;
             }
             toEnd();
-            const compact = composerCompacts(text, context, {
+            // A quote kept from Fork mode goes out ahead of what was typed.
+            const body = quoteChip
+              ? (quoteMarkdown(quoteChip.quote) + text).trim()
+              : text;
+            if (quoteChip) setForkDraft(null);
+            const compact = composerCompacts(body, context, {
               state,
               thresholdTokens: compactTokens,
               asIs,
             });
             setAsIs(false);
             send(
-              text,
+              body,
               images.length ? images : undefined,
               compact,
               files.length ? files : undefined

package/components/Chat/Forks.tsx

@@ -10,6 +10,7 @@ import {
   useStartForks,
   type ChildView,
 } from "@/data/fork";
+import { formatElapsed } from "@/lib/chat/elapsed";
 import { Button } from "@/components/ui/button";
 import { StatusPill } from "@/components/ui/status-pill";
 import { SessionAnchor } from "./SessionAnchor";
@@ -34,6 +35,9 @@ export const forkLabel = (typed: string, quote: string): string => {
   return line.length > 60 ? `${line.slice(0, 59)}…` : line;
 };
 
+export const startedToast = (ns: number[]): string =>
+  ns.length === 1 ? `Started fork ${ns[0]}` : `Started forks ${ns.join(", ")}`;
+
 // What a fork that ended with nothing to read says in place of a result.
 export const emptyNote = (c: ChildView) =>
   c.summary && c.summary !== "ended without a result"
@@ -49,13 +53,23 @@ export function useRunAgain(sessionId: string) {
       start.mutate(
         { instructions: [c.instruction], worktree: c.worktree },
         {
-          onSuccess: () => toast.success("Started fork"),
+          onSuccess: (res) =>
+            toast.success(startedToast(res.children.map((x) => x.n))),
           onError: (e) => toast.error(e.message),
         }
       ),
   };
 }
 
+// "2m 14s · reading sync/worker.ts": how long it has gone and its latest step.
+export const runningNote = (c: ChildView, now = Date.now()): string | null => {
+  const parts = [
+    c.startedAt ? formatElapsed(now - c.startedAt) : null,
+    c.activity,
+  ].filter(Boolean);
+  return parts.length ? parts.join(" · ") : null;
+};
+
 function Row({
   c,
   onStop,
@@ -72,6 +86,7 @@ function Row({
   const empty = c.outcome === "empty";
   const note =
     (empty ? emptyNote(c) : c.summary) ??
+    (c.state === "running" ? runningNote(c) : null) ??
     (c.asks
       ? `Asks: ${c.asks}`
       : c.state === "queued"

package/components/Chat/Messages.tsx

@@ -9,6 +9,7 @@ import {
   Check,
   ChevronRight,
   Download,
+  GitFork,
   Circle,
   CircleDot,
   Quote,
@@ -41,6 +42,7 @@ import {
 } from "@/components/Bookmarks/BookmarkButton";
 import { useOwnerName } from "@/data/client-config/queries";
 import { ownerVerb } from "@/lib/owner-label";
+import { FORK_NOTE_PREFIX } from "@/lib/fork/note";
 
 type Of<K extends ChatItem["kind"]> = Extract<ChatItem, { kind: K }>;
 
@@ -481,12 +483,24 @@ const NOTE_LABEL = {
   away: "Away",
 } as const;
 
+// Where forks were started: one quiet line, not a boxed note.
+function ForkMarker({ item }: { item: Of<"note"> }) {
+  return (
+    <div className="text-muted-foreground flex min-w-0 items-center gap-2 text-xs">
+      <GitFork aria-hidden className="size-3.5 shrink-0" />
+      <span className="truncate">{item.text}</span>
+      <i className="bg-border h-px w-3 shrink-0" />
+    </div>
+  );
+}
+
 export function NoteLine({ item }: { item: Of<"note"> }) {
   const name = useOwnerName();
   const label =
     item.tone === "escalation"
       ? ownerVerb(name, "decides", "decide")
       : NOTE_LABEL[item.tone];
+  if (item.id.startsWith(FORK_NOTE_PREFIX)) return <ForkMarker item={item} />;
   return (
     <div
       className={cn(

package/components/Chat/WorktreeRemovedNotice.tsx

@@ -0,0 +1,17 @@
+"use client";
+
+import { useSessionsQuery } from "@/data/sessions";
+import { Notice } from "@/components/ui/notice";
+
+// Above the composer once a finished task's worktree is removed: its chat
+// still answers from the project's checkout, but can't change anything.
+export function WorktreeRemovedNotice({ sessionId }: { sessionId: string }) {
+  const { data } = useSessionsQuery();
+  const session = data?.sessions.find((s) => s.id === sessionId);
+  if (!session?.worktree_removed) return null;
+  return (
+    <Notice className="mb-2">
+      Merged · worktree removed. Questions work; changes need a new task.
+    </Notice>
+  );
+}

package/components/Chat/composer/ComposerBody.tsx

@@ -32,7 +32,7 @@ import { offeredSuggestion } from "@/lib/chat/suggestion";
 import { historyStep } from "@/lib/chat/history";
 import { markdownParagraphs } from "@/lib/chat/quote";
 import { insertMarkdown } from "./insert";
-import { ForkHeader, type ForkComposer } from "./ForkHeader";
+import { ForkHeader, QuoteChip, type ForkComposer } from "./ForkHeader";
 import { useCoarsePointer } from "./useCoarsePointer";
 import { useMentions } from "./useMentions";
 import { Attachments } from "./Attachments";
@@ -56,6 +56,8 @@ export interface ComposerProps {
   // The send button's label, when Enter does something else than send.
   // Fork mode: the quote chip, pill and own-checkout choice.
   fork?: ForkComposer;
+  // After Fork mode: the selection stays as a chip on a normal reply.
+  quoteChip?: { text: string; onDrop: () => void };
   onSend: (text: string, images: ChatImage[], files: ChatFile[]) => void;
   // Where attached files are kept: the session's id, or "draft" before one exists.
   attachScope: string;
@@ -99,6 +101,7 @@ export function ComposerBody({
   disabled,
   placeholder,
   fork,
+  quoteChip,
   onSend,
   onStop,
   commands = [],
@@ -276,6 +279,7 @@ export function ComposerBody({
 
   const empty =
     !fork?.quote &&
+    !quoteChip &&
     !text.trim() &&
     !images.length &&
     !files.length &&
@@ -371,6 +375,11 @@ export function ComposerBody({
         )}
       >
         {fork && <ForkHeader fork={fork} />}
+        {quoteChip && (
+          <div className="mb-1.5">
+            <QuoteChip text={quoteChip.text} onDrop={quoteChip.onDrop} />
+          </div>
+        )}
         <Attachments
           images={images}
           files={files}

package/components/Chat/composer/ForkHeader.tsx

@@ -35,21 +35,32 @@ export function ForkHeader({ fork }: { fork: ForkComposer }) {
           ↵ start · Esc cancel
         </span>
       </div>
-      {fork.quote && (
-        <div className="bg-muted/60 text-muted-foreground flex items-start gap-2 rounded-lg py-1.5 pr-1 pl-2.5 text-sm">
-          <Quote aria-hidden className="mt-1 size-3.5 shrink-0" />
-          <p className="line-clamp-2 min-w-0 flex-1">{fork.quote}</p>
-          <button
-            type="button"
-            onMouseDown={(e) => e.preventDefault()}
-            onClick={fork.onDropQuote}
-            aria-label="Remove quote"
-            className="hover:text-foreground flex size-8 shrink-0 items-center justify-center"
-          >
-            <X aria-hidden className="size-4" />
-          </button>
-        </div>
-      )}
+      {fork.quote && <QuoteChip text={fork.quote} onDrop={fork.onDropQuote} />}
+    </div>
+  );
+}
+
+// The selection as a chip above the box; it goes out ahead of what's typed.
+export function QuoteChip({
+  text,
+  onDrop,
+}: {
+  text: string;
+  onDrop: () => void;
+}) {
+  return (
+    <div className="bg-muted/60 text-muted-foreground flex items-start gap-2 rounded-lg py-1.5 pr-1 pl-2.5 text-sm">
+      <Quote aria-hidden className="mt-1 size-3.5 shrink-0" />
+      <p className="line-clamp-2 min-w-0 flex-1">{text}</p>
+      <button
+        type="button"
+        onMouseDown={(e) => e.preventDefault()}
+        onClick={onDrop}
+        aria-label="Remove quote"
+        className="hover:text-foreground flex size-8 shrink-0 items-center justify-center"
+      >
+        <X aria-hidden className="size-4" />
+      </button>
     </div>
   );
 }

package/components/Chat/fork-draft.test.ts

@@ -0,0 +1,57 @@
+import { describe, expect, it } from "vitest";
+import {
+  FORK_PLACEHOLDER,
+  leaveForkMode,
+  placeholderFor,
+  suggestionFor,
+  type ForkDraft,
+} from "./fork-draft";
+import { forkLabel, runningNote, startedToast } from "./Forks";
+import { startedText } from "@/lib/fork/note";
+import type { ChildView } from "@/lib/fork/types";
+
+const draft: ForkDraft = {
+  sessionId: "s",
+  quote: "the text",
+  own: true,
+  mode: true,
+};
+
+describe("Fork mode composer", () => {
+  it("hides the parent's suggestion and uses the fork placeholder", () => {
+    expect(
+      suggestionFor("what does --rollback --to do", null, true)
+    ).toBeNull();
+    expect(suggestionFor("next", null, false)).toBe("next");
+    expect(suggestionFor("next", "next", false)).toBeNull();
+    expect(placeholderFor(true, true, "Work")).toBe(FORK_PLACEHOLDER);
+    expect(placeholderFor(true, false, "Work")).toBe("Message Work");
+    expect(placeholderFor(false, true, "Work")).toBe("Reconnecting…");
+  });
+
+  it("keeps the quote and drops only the Fork mode on leaving", () => {
+    expect(leaveForkMode(draft)).toEqual({ ...draft, mode: false });
+    expect(leaveForkMode({ ...draft, quote: "" })).toBeNull();
+  });
+});
+
+describe("fork copy", () => {
+  it("words the started marker and toast", () => {
+    expect(startedText([1], ["Check it"])).toBe("Fork 1 started · Check it");
+    expect(startedText([2, 3], ["a", "b"])).toBe("Forks 2, 3 started · a · b");
+    expect(startedToast([4])).toBe("Started fork 4");
+    expect(forkLabel("", "> q")).toBe("> q");
+  });
+
+  it("says how long a running fork has gone and what it's doing", () => {
+    const c = {
+      startedAt: 1_000,
+      activity: "Read sync/worker.ts",
+    } as ChildView;
+    expect(runningNote(c, 1_000 + 134_000)).toBe(
+      "2m 14s · Read sync/worker.ts"
+    );
+    expect(runningNote({ ...c, activity: null }, 6_000)).toBe("5s");
+    expect(runningNote({ ...c, startedAt: null, activity: null })).toBeNull();
+  });
+});

package/components/Chat/fork-draft.ts

@@ -0,0 +1,34 @@
+// A selection being forked, and what's left of it after leaving Fork mode.
+export interface ForkDraft {
+  sessionId: string;
+  quote: string;
+  own: boolean;
+  // Off after leaving Fork mode: the quote stays as a chip on a normal reply.
+  mode: boolean;
+}
+
+export const FORK_PLACEHOLDER = "What should the fork do?";
+
+// Esc or the pill's x: only the Fork pill goes; the quote chip stays when
+// there is one, and what was typed stays in the composer.
+export const leaveForkMode = (draft: ForkDraft): ForkDraft | null =>
+  draft.quote ? { ...draft, mode: false } : null;
+
+// The parent's guess has no place in Fork mode, which asks its own question.
+export const suggestionFor = (
+  suggestion: string | null,
+  dismissed: string | null,
+  inForkMode: boolean
+): string | null =>
+  inForkMode || suggestion === dismissed ? null : suggestion;
+
+export const placeholderFor = (
+  connected: boolean,
+  inForkMode: boolean,
+  sessionName: string
+): string =>
+  !connected
+    ? "Reconnecting…"
+    : inForkMode
+      ? FORK_PLACEHOLDER
+      : `Message ${sessionName}`;

package/content/whats-new.json

@@ -1953,6 +1953,22 @@
       "area": "AgentOS",
       "text": "Select text in a chat reply and tap Fork to hand it to a background copy of the session; its result comes back as a card.",
       "url": "https://github.com/saadnvd1/agent-os/pull/558"
+    },
+    {
+      "id": 560,
+      "date": "2026-11-02",
+      "kind": "fixed",
+      "area": "Chat",
+      "text": "You can ask follow-up questions in a task's chat after its work has merged, with a note that changes need a new task.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/560"
+    },
+    {
+      "id": 561,
+      "date": "2026-11-02",
+      "kind": "improved",
+      "area": "AgentOS",
+      "text": "Forking from a selection is tidier: the fork pill can be dismissed while keeping your quote and text, and started forks show a one-line marker and what they're doing.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/561"
     }
   ]
 }

package/lib/chat/socket.ts

@@ -32,6 +32,7 @@ import {
 import { setComposerModel } from "../models/session-model";
 import { stopChatTurn } from "./stop";
 import { clientSend } from "./client-send";
+import { startFailureMessage } from "./start-error";
 import { searchChat } from "./search";
 import { DEMO_CHAT_READS, handleDemoChat } from "./demo";
 import { titleChatFromMessage } from "../session-titles";
@@ -97,7 +98,7 @@ export function serveChatSocket(
   const fail = (err: unknown) => {
     console.error(`[chat ${sessionId}] message failed:`, err);
     if (!sessionExists(sessionId)) return gone();
-    reply(errorItem(err instanceof Error ? err.message : String(err)));
+    reply(errorItem(startFailureMessage(err)));
   };
 
   if (!sessionExists(sessionId)) return gone();
@@ -157,9 +158,12 @@ function onChatMessage(
           reply({
             type: "send_failed",
             id,
-            message: err instanceof Error ? err.message : String(err),
+            message: startFailureMessage(err),
           });
-        fail(err);
+        // A message with an id shows its failure on itself; the rest of the
+        // chat hears of it once, here.
+        if (id) console.error(`[chat ${sessionId}] send failed:`, err);
+        else fail(err);
       }
     );
     // "Session 4" is named after its first message.

package/lib/chat/start-error.ts

@@ -0,0 +1,13 @@
+// What a person reads when a chat's worker can't start. The raw error (a
+// socket ENOENT, usually) stays in the server log.
+export function startFailureMessage(error: unknown): string {
+  const raw = error instanceof Error ? error.message : String(error);
+  if (!/^The chat worker didn't start/.test(raw)) return raw;
+  const reason = /ENOENT|ECONNREFUSED/.test(raw)
+    ? "it stopped while starting"
+    : raw
+        .replace(/^The chat worker didn't start:?\s*/, "")
+        .split("\n")[0]
+        .slice(0, 120) || "it didn't answer";
+  return `Couldn't start the agent: ${reason}`;
+}

package/lib/chat/worker/cwd.ts

@@ -0,0 +1,77 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+import { getProject } from "../../projects";
+import type { Session } from "../../db";
+
+const expand = (p: string) => p.replace(/^~/, os.homedir());
+const isDir = (p: string) => {
+  try {
+    return fs.statSync(p).isDirectory();
+  } catch {
+    return false;
+  }
+};
+
+export const WORKTREE_REMOVED_NOTE =
+  "(This task's PR merged and its worktree was removed. You are now running in the project's main checkout: do not edit files or commit here. Questions are fine; if more changes are needed, say a follow-up task is required.)";
+
+// The project's own checkout, for a session whose folder is gone; null when
+// that is missing too or the session never had a project.
+function projectRoot(session: Session): string | null {
+  const project = session.project_id ? getProject(session.project_id) : null;
+  const root = project ? expand(project.working_directory) : null;
+  return root && isDir(root) ? root : null;
+}
+
+// Where a session's agent runs. A task's worktree is removed when it
+// merges, but its chat can still be asked a question: it runs in the
+// project's checkout instead.
+export function resolveChatCwd(session: Session): {
+  session: Session;
+  removedFrom: string | null;
+} {
+  const dir = expand(session.working_directory);
+  if (isDir(dir)) return { session, removedFrom: null };
+  const root = projectRoot(session);
+  if (!root) return { session, removedFrom: null };
+  return {
+    session: { ...session, working_directory: root },
+    removedFrom: dir,
+  };
+}
+
+// Claude finds a conversation under its folder's name in its config dir, so
+// a resume from a new folder needs the transcript copied there.
+export function carryClaudeTranscript(
+  from: string,
+  to: string,
+  claudeSessionId: string | null
+): void {
+  if (!claudeSessionId) return;
+  const base = path.join(
+    process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), ".claude"),
+    "projects"
+  );
+  const name = (d: string) => d.replace(/[^a-zA-Z0-9]/g, "-");
+  const src = path.join(base, name(from), `${claudeSessionId}.jsonl`);
+  const dest = path.join(base, name(to), `${claudeSessionId}.jsonl`);
+  try {
+    if (!fs.existsSync(src) || fs.existsSync(dest)) return;
+    fs.mkdirSync(path.dirname(dest), { recursive: true });
+    fs.copyFileSync(src, dest);
+  } catch (error) {
+    console.error(
+      "Couldn't carry the transcript to the project folder:",
+      error
+    );
+  }
+}
+
+// A finished task whose worktree is gone: the sidebar's cue for the notice.
+export function worktreeRemoved(session: Session): boolean {
+  if (!session.worktree_path || !session.task_status) return false;
+  if (session.task_status === "running") return false;
+  if (session.host_id && session.host_id !== "local") return false;
+  return !isDir(expand(session.worktree_path));
+}

package/lib/chat/worker/host.ts

@@ -8,6 +8,7 @@ import os from "os";
 import { db, type Session } from "../../db";
 import { agentEnv } from "../../agents/launch";
 import { forkBrief } from "../../fork/extras";
+import { WORKTREE_REMOVED_NOTE } from "./cwd";
 import { sessionRunningBrief } from "../../project-config/session";
 import { BUS_BRIEF } from "../../agents/brief";
 import { resolveModelForAgent } from "../../model-catalog";
@@ -196,7 +197,9 @@ export class ChatHost {
     private session: Session,
     private emit: (e: WorkerEvent) => void,
     // What a session's role adds: its brief and its own tools.
-    extras: RoleExtras = {}
+    extras: RoleExtras = {},
+    // Its worktree was removed: it runs in the project's checkout.
+    private worktreeGone = false
   ) {
     this.gate = new GuestGate((note) => {
       if (!this.busy()) return;
@@ -611,7 +614,13 @@ export class ChatHost {
     if (handOver) this.stopsUpTo = this.turnsStarted;
     if (now) this.nowPending++;
     this.stopping = null;
-    const note = this.refreshedNote ?? (this.restartedNote && RESTARTED_NOTE);
+    const note =
+      [
+        this.worktreeGone && WORKTREE_REMOVED_NOTE,
+        this.refreshedNote ?? (this.restartedNote && RESTARTED_NOTE),
+      ]
+        .filter(Boolean)
+        .join("\n") || null;
     const text = agentText(note ? `${note}\n\n${m.text}` : m.text, m.files);
     if (this.refreshedNote) {
       this.refreshedNote = null;

package/lib/chat/worker/main.ts

@@ -41,9 +41,17 @@ async function main(sessionId: string) {
     console.error(`No session ${sessionId}`);
     process.exit(1);
   }
-  const session = await (
+  const routed = await (
     await import("../../models/launch")
   ).routeOrchestrator(row);
+  const { resolveChatCwd, carryClaudeTranscript } = await import("./cwd");
+  const { session, removedFrom } = resolveChatCwd(routed);
+  if (removedFrom && session.agent_type === "claude")
+    carryClaudeTranscript(
+      removedFrom,
+      session.working_directory,
+      session.claude_session_id
+    );
 
   const clients = new Set<net.Socket>();
   const emit = (e: WorkerEvent) => {
@@ -60,7 +68,8 @@ async function main(sessionId: string) {
       emit(e);
       if (e.type === "state") armIdle();
     },
-    extras
+    extras,
+    !!removedFrom
   );
   function armIdle() {
     clearTimeout(idleTimer);

package/lib/db/types.ts

@@ -87,6 +87,8 @@ export interface Session {
   // Task priority (null reads as normal) and timed pause (lib/tasks/pause.ts):
   // pausing, paused or resuming, until when (null: until resumed).
   priority?: string | null;
+  // Set only by GET /api/sessions: a finished task whose worktree is gone.
+  worktree_removed?: boolean;
   pause_state?: "pausing" | "paused" | "resuming" | null;
   paused_until?: string | null;
   pause_id?: number | null;

package/lib/fork/note.ts

@@ -0,0 +1,6 @@
+/** The one line the parent's chat keeps where forks were started. */
+
+export const FORK_NOTE_PREFIX = "fork-";
+
+export const startedText = (ns: number[], labels: string[]): string =>
+  `${ns.length === 1 ? `Fork ${ns[0]}` : `Forks ${ns.join(", ")}`} started · ${labels.join(" · ")}`;

package/lib/fork/start.ts

@@ -18,6 +18,7 @@ import { getProject } from "../projects";
 import { limitOf, runningIn, startingIn } from "../tasks/queue-rows";
 import { currentLevel, loadEnabled } from "../load/monitor";
 import { childFirstMessage } from "./brief";
+import { FORK_NOTE_PREFIX, startedText } from "./note";
 import { ForkError, forkConversation } from "./conversation";
 import {
   childrenOf,
@@ -120,7 +121,7 @@ export function startFork(req: ForkRequest): ForkStarted {
     instruction,
     worktree,
   }));
-  const noteId = `fork-${groupId}`;
+  const noteId = `${FORK_NOTE_PREFIX}${groupId}`;
   insertGroup({
     id: groupId,
     parentId: parent.id,
@@ -136,7 +137,10 @@ export function startFork(req: ForkRequest): ForkStarted {
     kind: "note" as const,
     tone: "note" as const,
     createdAt: Date.now(),
-    text: `Forked ${children.length === 1 ? "1 copy" : `${children.length} copies`}: ${children.map((c) => c.label).join(" · ")}`,
+    text: startedText(
+      children.map((c) => numberOf(parent.id, c.childId)),
+      children.map((c) => c.label)
+    ),
   };
   saveItem(parent.id, item);
   emit(parent.id, { type: "item", item });

package/lib/fork/types.ts

@@ -71,6 +71,8 @@ export interface ChildView {
   delivered: boolean;
   // A question or approval it's waiting on.
   asks: string | null;
+  // What it is doing now (its latest tool), while it runs.
+  activity: string | null;
 }
 
 export interface GroupView {

package/lib/fork/view.ts

@@ -1,5 +1,6 @@
 /** What clients and `aos children` show, and the numbers behind them. */
 
+import { lastItems } from "../chat/store";
 import { childrenOf, getGroup } from "./ledger";
 import type { ChildRow, ChildView, GroupView } from "./types";
 
@@ -21,8 +22,16 @@ export const childView = (c: ChildRow): ChildView => ({
   settledAt: c.settled_at,
   delivered: c.delivered_at != null,
   asks: c.state === "needs_input" ? c.hold : null,
+  activity: null,
 });
 
+// The title of the latest tool a running child used, to say what it is doing.
+const activityOf = (c: ChildRow): string | null => {
+  if (c.state !== "running") return null;
+  const tool = lastItems(c.child_session_id, 1, "tool")[0];
+  return tool && tool.kind === "tool" ? tool.title : null;
+};
+
 export function childrenView(parentId: string): {
   children: ChildView[];
   groups: GroupView[];
@@ -45,7 +54,11 @@ export function childrenView(parentId: string): {
       });
   }
   return {
-    children: rows.map((c, i) => ({ ...childView(c), n: i + 1 })),
+    children: rows.map((c, i) => ({
+      ...childView(c),
+      n: i + 1,
+      activity: activityOf(c),
+    })),
     groups,
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.833",
+  "version": "0.3.836",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"