@saadnvd1/agent-os 0.3.828 → 0.3.836

package/README.md

@@ -68,6 +68,8 @@ It ends by offering `agent-os setup`. If another device can't reach the machine
 
 Then open AgentOS, add a project from ⌘K, and press ⌥N. The [install guide](docs/guides/install.md) covers Windows (WSL2), the supported agents, first run and the `agent-os` commands. To use it from your phone, see the [phone guide](docs/guides/phone.md).
 
+AgentOS keeps itself up to date: once a release is two hours old and nothing has been working for 10 minutes, it installs it, and puts the previous version back if the new one doesn't come up healthy. Turn it off or change the idle time in **Settings → Updates**, or pin it with `AGENTOS_AUTO_UPDATE=off` and `AGENTOS_AUTO_UPDATE_IDLE_MIN`. Details are in [Automatic updates](docs/guides/install.md#automatic-updates).
+
 ## Connect
 
 AgentOS Connect is live. It gives your machine a private address at runagentos.com, so your phone reaches it from any network with nothing to open on your router and no VPN.

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/app/layout.tsx

@@ -97,6 +97,9 @@ export default function RootLayout({
         </SerwistProvider>
         <Toaster
           position="top-center"
+          // Below the header, not over its title.
+          offset={{ top: 56 }}
+          mobileOffset={{ top: 64 }}
           closeButton
           toastOptions={{
             className: "!bg-card !border-border !text-foreground !shadow-lg",

package/components/Chat/ChatPanel.tsx

@@ -8,20 +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 {
-  isForkCommand,
-  isFreshCommand,
-  withFork,
-  withFresh,
-} from "@/lib/chat/commands";
+import { isFreshCommand, withFresh } from "@/lib/chat/commands";
 import { useExperiment } from "@/data/experiments";
-import { ForkDialog, ForksStrip } from "./Forks";
+import { useStartForks } from "@/data/fork";
+import { toast } from "sonner";
+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";
@@ -107,8 +111,13 @@ export function ChatPanel({
     append?: boolean;
   }>();
   const forksOn = useExperiment("forks");
-  const [forkOpen, setForkOpen] = useState(false);
-  const withForkIf = (c: typeof commands) => (forksOn ? withFork(c) : c);
+  const startFork = useStartForks(sessionId);
+  // Set while a selection is being forked; per session, like asIs below.
+  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,
@@ -178,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<{
@@ -187,12 +196,31 @@ export function ChatPanel({
     append?: boolean;
   }>();
 
+  // Leaving Fork mode keeps the selection as a quote chip and the typed text.
+  const leaveFork = () => {
+    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
   // (lib/chat/escape), from anywhere in this panel.
   const rootRef = useRef<HTMLDivElement>(null);
-  const escape = useRef({ running, interrupt, suggestion });
+  const escape = useRef({
+    running,
+    interrupt,
+    suggestion,
+    leaveFork: null as (() => void) | null,
+  });
   useEffect(() => {
-    escape.current = { running, interrupt, suggestion };
+    escape.current = {
+      running,
+      interrupt,
+      suggestion,
+      leaveFork: fork ? leaveFork : null,
+    };
   });
   useEffect(() => {
     const onKey = (e: KeyboardEvent) => {
@@ -203,6 +231,17 @@ export function ChatPanel({
       const overlay = !!document.querySelector(OVERLAY_SELECTOR);
       const ghost = !!root.querySelector(GHOST_SELECTOR);
       const composer = (e.target as Element).closest?.(".chat-composer");
+      // Fork mode ends first; the typed text stays as a normal draft.
+      if (
+        e.key === "Escape" &&
+        escape.current.leaveFork &&
+        composer &&
+        !overlay
+      ) {
+        e.preventDefault();
+        escape.current.leaveFork();
+        return;
+      }
       const action = escapeAction(
         e,
         escape.current.running,
@@ -233,6 +272,10 @@ export function ChatPanel({
         setInsert({ text: quoteMarkdown(t), at: Date.now(), append: true }),
       focusComposer
     );
+  const forkQuote = (text: string) => {
+    setForkDraft({ sessionId, quote: text, own: false, mode: true });
+    focusComposer();
+  };
   const togglePlan = plan === null ? undefined : () => setPlan(!plan);
   const sendText = (text: string) => {
     toEnd();
@@ -643,8 +686,13 @@ export function ChatPanel({
           onStop={stopTask}
           onLoadOutput={loadTaskOutput}
         />
-        <QuoteButton rootRef={scrollRef} onQuote={quote} />
+        <QuoteButton
+          rootRef={scrollRef}
+          onQuote={quote}
+          onFork={forksOn ? forkQuote : undefined}
+        />
         <PausedBanner sessionId={sessionId} />
+        <WorktreeRemovedNotice sessionId={sessionId} />
         <ForksStrip sessionId={sessionId} />
         <Queue
           queue={queue}
@@ -682,25 +730,67 @@ export function ChatPanel({
           insert={insert}
           running={running}
           disabled={!connected}
-          placeholder={connected ? `Message ${sessionName}` : "Reconnecting…"}
+          placeholder={placeholderFor(connected, !!fork, sessionName)}
+          fork={
+            fork
+              ? {
+                  quote: fork.quote,
+                  own: fork.own,
+                  onOwn: () => setForkDraft({ ...fork, own: !fork.own }),
+                  onLeave: leaveFork,
+                  onDropQuote: () => setForkDraft({ ...fork, quote: "" }),
+                }
+              : undefined
+          }
+          quoteChip={
+            quoteChip
+              ? {
+                  text: quoteChip.quote,
+                  onDrop: () => setForkDraft(null),
+                }
+              : undefined
+          }
           onSend={(text, images, files) => {
             if (freshStart && isFreshCommand(text)) {
               startFresh.mutate(sessionId);
               return;
             }
-            if (forksOn && isForkCommand(text)) {
-              setForkOpen(true);
+            if (fork) {
+              startFork.mutate(
+                {
+                  instructions: [(quoteMarkdown(fork.quote) + text).trim()],
+                  worktree: fork.own,
+                  // The result comes back by itself, as a card, without a message from the reader.
+                  delivery: "wake",
+                  labels: [forkLabel(text, fork.quote)],
+                },
+                {
+                  onSuccess: (res) => {
+                    toast.success(startedToast(res.children.map((c) => c.n)));
+                    setForkDraft(null);
+                  },
+                  onError: (e) => {
+                    toast.error(e.message);
+                    setInsert({ text, at: Date.now() });
+                  },
+                }
+              );
               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
@@ -711,7 +801,7 @@ export function ChatPanel({
             }
           }}
           onStop={interrupt}
-          commands={withForkIf(freshStart ? withFresh(commands) : commands)}
+          commands={freshStart ? withFresh(commands) : commands}
           onRefreshCommands={refreshCommands}
           refreshingCommands={refreshingCommands}
           models={models}
@@ -731,13 +821,6 @@ export function ChatPanel({
           focusKey={active ? sessionId : null}
         />
       </div>
-      {forksOn && (
-        <ForkDialog
-          sessionId={sessionId}
-          open={forkOpen}
-          onOpenChange={setForkOpen}
-        />
-      )}
       {undoPreview && (
         <UndoDialog
           preview={undoPreview.preview}

package/components/Chat/EventRow.tsx

@@ -13,6 +13,7 @@ import {
 } from "lucide-react";
 import type { ChatItem, ChatOrigin, ChatOriginKind } from "@/lib/chat/events";
 import { eventParts, originOf } from "@/lib/chat/origin";
+import { ForkResults } from "./ForkResults";
 import { SessionAnchor } from "./SessionAnchor";
 import { cn } from "@/lib/utils";
 import { UserMessage } from "./Messages";
@@ -155,13 +156,24 @@ function Row({
 export function EventRow({
   item,
   origin,
+  onQuote,
 }: {
   item: UserItem;
   origin: ChatOrigin;
+  onQuote?: (text: string) => void;
 }) {
   const { body, decided } = eventParts(item, origin);
   const decidedLabel = `${ownerInUi(useOwnerName(), true)} decided`;
   const decision = origin.kind === "decision";
+  if (origin.forks)
+    return (
+      <ForkResults
+        parent={origin.forks.parent}
+        ids={origin.forks.ids}
+        fallback={body}
+        onQuote={onQuote}
+      />
+    );
   return (
     <div className="flex flex-col gap-1">
       {decided.map((d, i) => (
@@ -207,11 +219,13 @@ export function EventRow({
 export function UserTurn({
   item,
   onUndo,
+  onQuote,
 }: {
   item: UserItem;
   onUndo?: () => void;
+  onQuote?: (text: string) => void;
 }) {
   const origin = originOf(item);
-  if (origin) return <EventRow item={item} origin={origin} />;
+  if (origin) return <EventRow item={item} origin={origin} onQuote={onQuote} />;
   return <UserMessage item={item} onUndo={onUndo} />;
 }

package/components/Chat/ForkResults.tsx

@@ -0,0 +1,109 @@
+"use client";
+
+import { GitFork, Quote, RotateCcw } from "lucide-react";
+import { useForkChildren, type ChildView } from "@/data/fork";
+import { Button } from "@/components/ui/button";
+import { StatusPill } from "@/components/ui/status-pill";
+import { SessionAnchor } from "./SessionAnchor";
+import { emptyNote, stateLabel, useRunAgain } from "./Forks";
+
+const took = (c: ChildView) => {
+  if (!c.startedAt || !c.settledAt) return null;
+  const s = Math.max(1, Math.round((c.settledAt - c.startedAt) / 1000));
+  return s < 60
+    ? `${s}s`
+    : `${Math.floor(s / 60)}m ${String(s % 60).padStart(2, "0")}s`;
+};
+
+function Card({
+  c,
+  onQuote,
+  again,
+}: {
+  c: ChildView;
+  onQuote?: (text: string) => void;
+  again: ReturnType<typeof useRunAgain>;
+}) {
+  const { text, tone } = stateLabel(c);
+  const empty = c.outcome === "empty";
+  const body = empty ? emptyNote(c) : (c.excerpt ?? c.summary ?? "");
+  return (
+    <section
+      aria-label={`Fork ${c.n} result`}
+      className="bg-card popover-surface space-y-2 rounded-2xl p-3"
+    >
+      <div className="flex items-center gap-2">
+        <GitFork aria-hidden className="text-muted-foreground size-4" />
+        <span className="text-muted-foreground font-mono text-[11px] tracking-wider uppercase">
+          Fork {c.n}
+        </span>
+        <StatusPill tone={tone}>{text}</StatusPill>
+        <span className="text-muted-foreground ml-auto text-xs">{took(c)}</span>
+      </div>
+      <p className="text-sm font-medium">{c.label.replace(/^\d+\.\s*/, "")}</p>
+      <p
+        className={
+          empty
+            ? "text-sm text-amber-600 dark:text-amber-400"
+            : "text-muted-foreground line-clamp-6 text-sm whitespace-pre-wrap"
+        }
+      >
+        {body}
+      </p>
+      <div className="flex flex-wrap gap-2">
+        <Button asChild size="sm" className="min-h-11">
+          <SessionAnchor sessionId={c.id}>Open fork</SessionAnchor>
+        </Button>
+        {empty ? (
+          <Button
+            size="sm"
+            variant="secondary"
+            className="min-h-11"
+            disabled={again.pending}
+            onClick={() => again.run(c)}
+          >
+            <RotateCcw aria-hidden className="size-4" /> Run again
+          </Button>
+        ) : (
+          onQuote &&
+          body && (
+            <Button
+              size="sm"
+              variant="secondary"
+              className="min-h-11"
+              onClick={() => onQuote(c.excerpt ?? c.summary ?? "")}
+            >
+              <Quote aria-hidden className="size-4" /> Quote
+            </Button>
+          )
+        )}
+      </div>
+    </section>
+  );
+}
+
+// A delivery of fork results, as one card per fork in the parent's chat.
+export function ForkResults({
+  parent,
+  ids,
+  onQuote,
+  fallback,
+}: {
+  parent: string;
+  ids: string[];
+  fallback: string;
+  onQuote?: (text: string) => void;
+}) {
+  const { data } = useForkChildren(parent, true);
+  const again = useRunAgain(parent);
+  const cards = (data?.children ?? []).filter((c) => ids.includes(c.id));
+  if (!cards.length)
+    return <p className="text-muted-foreground text-xs">{fallback}</p>;
+  return (
+    <div className="flex flex-col gap-2">
+      {cards.map((c) => (
+        <Card key={c.id} c={c} onQuote={onQuote} again={again} />
+      ))}
+    </div>
+  );
+}

package/components/Chat/Forks.tsx

@@ -1,28 +1,18 @@
 "use client";
 
 import { useState } from "react";
-import { GitFork, Plus, Square } from "lucide-react";
+import { GitFork, Square } from "lucide-react";
 import { toast } from "sonner";
 import { useExperiment } from "@/data/experiments";
-import { useClientConfig } from "@/data/client-config/queries";
 import {
   useCancelForks,
   useForkChildren,
   useStartForks,
   type ChildView,
 } from "@/data/fork";
+import { formatElapsed } from "@/lib/chat/elapsed";
 import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
 import { StatusPill } from "@/components/ui/status-pill";
-import { Switch } from "@/components/ui/switch";
-import { Textarea } from "@/components/ui/textarea";
 import { SessionAnchor } from "./SessionAnchor";
 
 type Tone = "amber" | "muted" | "green" | "primary" | "red";
@@ -34,22 +24,69 @@ export function stateLabel(c: ChildView): { text: string; tone: Tone } {
   if (c.state === "needs_input") return { text: "Needs you", tone: "amber" };
   if (c.outcome === "failed") return { text: "Failed", tone: "red" };
   if (c.outcome === "cancelled") return { text: "Stopped", tone: "muted" };
+  if (c.outcome === "empty") return { text: "No result", tone: "amber" };
   return { text: "Done", tone: "green" };
 }
 
+// The strip's name for a fork: what was asked, else what was quoted, so a
+// quote-first instruction isn't labelled with its "> ".
+export const forkLabel = (typed: string, quote: string): string => {
+  const line = (typed.trim() || quote.trim()).split("\n")[0].trim();
+  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"
+    ? `Ended with “${c.summary}”, not an answer`
+    : "Ended without a result";
+
+// Starts the same instruction again, for a fork that came back with nothing.
+export function useRunAgain(sessionId: string) {
+  const start = useStartForks(sessionId);
+  return {
+    pending: start.isPending,
+    run: (c: ChildView) =>
+      start.mutate(
+        { instructions: [c.instruction], worktree: c.worktree },
+        {
+          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,
   stopping,
+  again,
 }: {
   c: ChildView;
+  again: ReturnType<typeof useRunAgain>;
   onStop: () => void;
   stopping: boolean;
 }) {
   const { text, tone } = stateLabel(c);
   const open = c.state !== "settled";
+  const empty = c.outcome === "empty";
   const note =
-    c.summary ??
+    (empty ? emptyNote(c) : c.summary) ??
+    (c.state === "running" ? runningNote(c) : null) ??
     (c.asks
       ? `Asks: ${c.asks}`
       : c.state === "queued"
@@ -65,7 +102,13 @@ function Row({
           {c.n}. {c.label.replace(/^\d+\.\s*/, "")}
         </p>
         {note && (
-          <p className="text-muted-foreground truncate text-xs">
+          <p
+            className={
+              empty
+                ? "truncate text-xs text-amber-600 dark:text-amber-400"
+                : "text-muted-foreground truncate text-xs"
+            }
+          >
             {note}
             {c.resultKind === "implicit" && c.outcome === "ok"
               ? " · ended without reporting"
@@ -73,6 +116,16 @@ function Row({
           </p>
         )}
       </div>
+      {empty && (
+        <button
+          type="button"
+          disabled={again.pending}
+          onClick={() => again.run(c)}
+          className="text-primary flex min-h-11 shrink-0 items-center px-2 text-sm"
+        >
+          Run again
+        </button>
+      )}
       <SessionAnchor
         sessionId={c.id}
         className="text-primary flex min-h-11 shrink-0 items-center px-2 text-sm"
@@ -100,6 +153,7 @@ export function ForksStrip({ sessionId }: { sessionId: string }) {
   const on = useExperiment("forks");
   const { data } = useForkChildren(sessionId, on);
   const cancel = useCancelForks(sessionId);
+  const again = useRunAgain(sessionId);
   const [collapsed, setCollapsed] = useState(false);
   if (!on || !data) return null;
   if (data.asChild) return <ForkOfBanner info={data.asChild} />;
@@ -150,6 +204,7 @@ export function ForksStrip({ sessionId }: { sessionId: string }) {
               key={c.id}
               c={c}
               stopping={cancel.isPending}
+              again={again}
               onStop={() => stop(String(c.n))}
             />
           ))}
@@ -187,92 +242,3 @@ function ForkOfBanner({
     </section>
   );
 }
-
-// "/fork": instructions for N copies of this session.
-export function ForkDialog({
-  sessionId,
-  open,
-  onOpenChange,
-}: {
-  sessionId: string;
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-}) {
-  const start = useStartForks(sessionId);
-  const max = useClientConfig().data?.forks?.maxPerFork ?? 8;
-  const [texts, setTexts] = useState<string[]>([""]);
-  const [worktree, setWorktree] = useState(false);
-  const filled = texts.map((t) => t.trim()).filter(Boolean);
-  const submit = () =>
-    start.mutate(
-      { instructions: filled, worktree },
-      {
-        onSuccess: (r) => {
-          toast.success(
-            `Started ${r.children.length} ${r.children.length === 1 ? "fork" : "forks"}`
-          );
-          setTexts([""]);
-          setWorktree(false);
-          onOpenChange(false);
-        },
-        onError: (e) => toast.error(e.message),
-      }
-    );
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-h-[90dvh] overflow-y-auto sm:max-w-lg">
-        <DialogHeader>
-          <DialogTitle>Fork this session</DialogTitle>
-          <DialogDescription>
-            Each copy knows what this session knows and works in the background.
-            You keep going; results are added to your next message.
-          </DialogDescription>
-        </DialogHeader>
-        <div className="space-y-2">
-          {texts.map((t, i) => (
-            <Textarea
-              key={i}
-              value={t}
-              rows={2}
-              aria-label={`Fork ${i + 1}`}
-              placeholder={`What should fork ${i + 1} do?`}
-              onChange={(e) =>
-                setTexts(texts.map((x, j) => (j === i ? e.target.value : x)))
-              }
-            />
-          ))}
-          {texts.length < max && (
-            <Button
-              type="button"
-              variant="ghost"
-              size="sm"
-              className="min-h-11"
-              onClick={() => setTexts([...texts, ""])}
-            >
-              <Plus aria-hidden className="size-4" /> Another
-            </Button>
-          )}
-          <label className="flex min-h-11 items-center justify-between gap-3 text-sm">
-            <span>
-              Own checkout
-              <span className="text-muted-foreground block text-xs">
-                For forks that edit code. Off: they read this checkout and leave
-                it alone.
-              </span>
-            </span>
-            <Switch checked={worktree} onCheckedChange={setWorktree} />
-          </label>
-        </div>
-        <DialogFooter>
-          <Button
-            className="min-h-11"
-            disabled={!filled.length || start.isPending}
-            onClick={submit}
-          >
-            {filled.length > 1 ? `Start ${filled.length} forks` : "Start fork"}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-}