@saadnvd1/agent-os 0.3.736 → 0.3.738

package/components/Draft/Chip.tsx

@@ -90,10 +90,17 @@ export function ChipItem({
   );
 }
 
-export function ChipHeading({ children }: { children: React.ReactNode }) {
+export function ChipHeading({
+  children,
+  first,
+}: {
+  children: React.ReactNode;
+  // The top of the menu: nothing above it to separate from.
+  first?: boolean;
+}) {
   return (
     <>
-      <DropdownMenuSeparator />
+      {!first && <DropdownMenuSeparator />}
       <DropdownMenuLabel className="text-muted-foreground text-[11px] font-medium">
         {children}
       </DropdownMenuLabel>

package/components/Draft/DraftChips.tsx

@@ -2,7 +2,6 @@
 
 import { useEffect } from "react";
 import {
-  Bot,
   Cpu,
   Eye,
   FolderGit2,
@@ -15,14 +14,13 @@ import {
 import type { Host } from "@/lib/db";
 import type { Project } from "@/lib/db";
 import { draftHostGone, newDraft, type Draft } from "@/lib/drafts";
-import { AGENT_OPTIONS, agentLabel } from "@/lib/agent-options";
-import { resolveModelForAgent } from "@/lib/model-catalog";
 import type { GitCheck } from "@/data/git/queries";
-import { useAgentStatusQuery } from "@/data/agents";
 import { useProjectMachinesQuery } from "@/data/projects";
 import { modelChoices, useModelsQuery } from "@/data/models";
-import type { AgentProbe } from "@/lib/agents/probe";
+import { useBrowserMachine } from "@/data/machines";
+import { machineLabel } from "@/lib/machines/label";
 import { RoleChips } from "./RoleChips";
+import { AgentModelChip } from "./AgentModelChip";
 import { ChipHeading, ChipItem, ChipMenu, ChipToggle } from "./Chip";
 import {
   DEFAULT_PRIORITY,
@@ -31,14 +29,6 @@ import {
   PRIORITY_LABEL,
 } from "@/lib/tasks/schedule-types";
 
-// What stands between an agent and its first prompt, if anything.
-export function agentBlocker(probe?: AgentProbe): string | null {
-  if (!probe) return null;
-  if (!probe.installed) return "Not installed";
-  if (probe.auth === "needs-login") return "Needs sign-in";
-  return null;
-}
-
 const BRANCHES_SHOWN = 20;
 
 // A draft's choices, above its composer: where it runs and how.
@@ -58,6 +48,7 @@ export function DraftChips({
   git: GitCheck | undefined;
   onChange: (patch: Partial<Draft>) => void;
 }) {
+  const browser = useBrowserMachine();
   const real = projects.filter((p) => !p.is_uncategorized);
   const project = real.find((p) => p.id === draft.projectId) ?? null;
   const projectHere = !!project && (project.host_id || "local") === "local";
@@ -70,10 +61,6 @@ export function DraftChips({
       : hosts;
   const host = hosts.find((h) => h.id === draft.hostId);
   const local = draft.hostId === "local";
-  // Which agents are installed and signed in, on this machine: a draft for
-  // another machine shows them all.
-  const { data: localProbes } = useAgentStatusQuery();
-  const probes = local ? localProbes : undefined;
   const base = draft.baseBranch ?? git?.defaultBranch ?? "main";
   const { data: models } = useModelsQuery(draft.openPr);
   // A project elsewhere runs where it lives; a scratch chat, a task or a
@@ -147,7 +134,7 @@ export function DraftChips({
         <ChipMenu
           icon={Monitor}
           name="Machine"
-          label={host?.name ?? draft.hostId}
+          label={host ? machineLabel(host) : draft.hostId}
           disabled={!canMove}
           title={canMove ? undefined : "Runs where the project lives"}
         >
@@ -164,31 +151,14 @@ export function DraftChips({
                 })
               }
             >
-              {h.name}
+              {machineLabel(h, browser.hostId)}
             </ChipItem>
           ))}
         </ChipMenu>
       )}
 
       {!draft.openPr && !draft.agentRole && (
-        <ChipMenu icon={Bot} name="Agent" label={agentLabel(draft.agentType)}>
-          {AGENT_OPTIONS.map((o) => (
-            <ChipItem
-              key={o.value}
-              checked={o.value === draft.agentType}
-              disabled={probes?.[o.value] ? !probes[o.value].installed : false}
-              hint={agentBlocker(probes?.[o.value]) ?? undefined}
-              onSelect={() =>
-                onChange({
-                  agentType: o.value,
-                  model: resolveModelForAgent(o.value, draft.model),
-                })
-              }
-            >
-              {o.label}
-            </ChipItem>
-          ))}
-        </ChipMenu>
+        <AgentModelChip draft={draft} onChange={onChange} />
       )}
 
       {!draft.openPr && local && (
@@ -314,14 +284,6 @@ export function DraftChips({
           onChange={(terminal) => onChange({ terminal })}
         />
       )}
-      {!draft.openPr && agentBlocker(probes?.[draft.agentType]) && (
-        <p className="w-full text-xs text-amber-600 dark:text-amber-400">
-          {agentBlocker(probes?.[draft.agentType])}
-          {probes?.[draft.agentType]?.hint
-            ? `: ${probes[draft.agentType].hint}`
-            : ""}
-        </p>
-      )}
     </div>
   );
 }

package/components/Draft/DraftPanel.tsx

@@ -27,6 +27,7 @@ import { useStartAnalystBeside } from "@/components/Analyst/pair";
 import { DraftChips } from "./DraftChips";
 import { DraftHeading } from "./DraftHeading";
 import { ModelUnavailableDialog } from "./ModelUnavailableDialog";
+import { useMachineCatalog } from "@/data/machines";
 import { draftModels } from "./draftModels";
 
 // A new session before its first send: choices on top, a composer below.
@@ -57,6 +58,8 @@ export function DraftPanel({
     draft?.projectId ?? null,
     discovers
   );
+  // On another machine the models are the ones it reports, not this one's.
+  const there = useMachineCatalog(draft?.hostId ?? "local");
   const launch = useLaunchSession();
   const startAnalyst = useStartAnalystBeside();
   const { workspace } = useSelectedWorkspace();
@@ -253,7 +256,13 @@ export function DraftPanel({
           }
           onSend={(text, images, files) => void send(text, images, files)}
           onStop={() => {}}
-          models={draftModels(draft.agentType, found)}
+          models={
+            (draft.hostId !== "local" &&
+              there.data?.catalog?.agents.find(
+                (a) => a.agent === draft.agentType
+              )?.models) ||
+            draftModels(draft.agentType, found)
+          }
           model={draft.model}
           onSetModel={(model) => draftsActions.update(draft.id, { model })}
           access={draft.openPr ? undefined : draft.access}

package/components/Hosts/AccountMachines.tsx

@@ -55,7 +55,9 @@ function MachineRow({
       </div>
       {linked ? (
         <span className="text-xs font-medium text-emerald-600 dark:text-emerald-400">
-          Linked
+          {machine.linkedVia === "tailscale"
+            ? "Linked over Tailscale"
+            : "Linked"}
         </span>
       ) : machine.linkState === "suspended" ? (
         <span

package/components/Hosts/HostRow.tsx

@@ -11,15 +11,20 @@ import {
   PlugZap,
   Loader2,
   Link2,
+  MapPin,
+  Pencil,
   Unlink,
 } from "lucide-react";
 import { Notice } from "@/components/ui/notice";
 import type { Host } from "@/lib/db";
 import { useDeleteHost, useLinkHost, useTestHost } from "@/data/hosts";
+import { useBrowserMachine } from "@/data/machines";
+import { machineDetail, machineLabel } from "@/lib/machines/label";
 import { useUnlinkPeer } from "@/data/peers";
 import { NEEDS_PRO, UPGRADE_URL } from "@/lib/peer/reasons";
 import { cn } from "@/lib/utils";
 import { PeerActivitySheet } from "./PeerActivitySheet";
+import { RenameHost } from "./RenameHost";
 
 function connectLine(host: Host): string {
   if (host.peer_state === "active")
@@ -67,6 +72,9 @@ export function HostRow({ host }: { host: Host }) {
   const unlink = useUnlinkPeer();
   const [activity, setActivity] = useState(false);
   const [confirmUnlink, setConfirmUnlink] = useState(false);
+  const [renaming, setRenaming] = useState(false);
+  const browser = useBrowserMachine();
+  const here = browser.hostId === host.id;
   const isLocal = host.id === "local";
   const viaConnect = host.kind === "connect";
   const pinned =
@@ -80,17 +88,58 @@ export function HostRow({ host }: { host: Host }) {
       <div className="flex items-center gap-3">
         <Icon className="text-muted-foreground h-4 w-4 shrink-0" />
         <div className="min-w-0 flex-1">
-          <p className="truncate text-sm font-medium">{host.name}</p>
+          <p className="truncate text-sm font-medium">
+            {machineLabel(host, browser.hostId)}
+          </p>
           <p className="text-muted-foreground truncate text-xs">
             {isLocal
-              ? "Where agent-os is running"
-              : viaConnect
-                ? connectLine(host)
-                : host.linked
-                  ? `${host.ssh_target} · tasks run on its AgentOS`
-                  : host.ssh_target}
+              ? [machineDetail(host), "serves this dashboard"]
+                  .filter(Boolean)
+                  .join(" · ")
+              : [
+                  machineDetail(host),
+                  viaConnect
+                    ? connectLine(host)
+                    : host.linked
+                      ? `${host.ssh_target} · tasks run on its AgentOS`
+                      : host.ssh_target,
+                ]
+                  .filter(Boolean)
+                  .join(" · ")}
           </p>
         </div>
+        <Button
+          variant="ghost"
+          size="icon-sm"
+          className="h-11 w-11 sm:h-8 sm:w-8"
+          onClick={() => setRenaming(true)}
+          disabled={renaming}
+          aria-label={`Rename ${host.name}`}
+          title="Give it a name of your own"
+        >
+          <Pencil className="h-4 w-4" />
+        </Button>
+        <Button
+          variant="ghost"
+          size="icon-sm"
+          className={cn("h-11 w-11 sm:h-8 sm:w-8", here && "text-primary")}
+          aria-pressed={here}
+          onClick={() => browser.set(here ? null : host.id)}
+          aria-label={
+            here
+              ? `This browser is not on ${host.name}`
+              : `This browser is on ${host.name}`
+          }
+          title={
+            here
+              ? browser.detected
+                ? "Detected from the connection. Tap to say otherwise"
+                : "You said you're here. Tap to undo"
+              : "Say this is the machine you're using now"
+          }
+        >
+          <MapPin className="h-4 w-4" />
+        </Button>
         {!isLocal && (
           <>
             {!viaConnect && (
@@ -171,6 +220,7 @@ export function HostRow({ host }: { host: Host }) {
           </>
         )}
       </div>
+      {renaming && <RenameHost host={host} onDone={() => setRenaming(false)} />}
       {result && (
         <p
           className={cn(

package/components/Hosts/RenameHost.tsx

@@ -0,0 +1,59 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import type { Host } from "@/lib/db";
+import { useRenameHost } from "@/data/hosts";
+
+/** A name of the person's own for a machine, shown on every screen. */
+export function RenameHost({
+  host,
+  onDone,
+}: {
+  host: Host;
+  onDone: () => void;
+}) {
+  const rename = useRenameHost();
+  const [name, setName] = useState(host.name);
+  const save = () =>
+    rename.mutate({ id: host.id, name }, { onSuccess: onDone });
+  return (
+    <form
+      className="mt-2 flex flex-wrap items-center gap-2"
+      onSubmit={(e) => {
+        e.preventDefault();
+        save();
+      }}
+    >
+      <Input
+        value={name}
+        onChange={(e) => setName(e.target.value)}
+        aria-label={`Name for ${host.name}`}
+        maxLength={60}
+        autoFocus
+        className="h-11 min-w-0 flex-1 sm:h-9"
+      />
+      <Button
+        type="submit"
+        className="min-h-11 sm:min-h-9"
+        disabled={rename.isPending || !name.trim()}
+      >
+        Save
+      </Button>
+      <Button
+        type="button"
+        variant="ghost"
+        className="min-h-11 sm:min-h-9"
+        onClick={onDone}
+      >
+        Cancel
+      </Button>
+      {rename.error && (
+        <p className="text-destructive w-full text-xs">
+          {rename.error.message}
+        </p>
+      )}
+    </form>
+  );
+}

package/components/SessionList/MachineSwitcher.tsx

@@ -0,0 +1,67 @@
+"use client";
+
+import { useEffect } from "react";
+import { useSnapshot } from "valtio";
+import { Check, ChevronDown, Monitor } from "lucide-react";
+import * as DM from "@/components/ui/dropdown-menu";
+import { useHostsQuery } from "@/data/hosts";
+import { useBrowserMachine } from "@/data/machines";
+import { machineLabel } from "@/lib/machines/label";
+import { machinesUi, machinesUiActions } from "@/stores/machines";
+import { cn } from "@/lib/utils";
+
+// A quick way between the machines linked here: narrows the sidebar to one
+// machine's sessions and starts new chats there. Hidden until one is linked.
+export function MachineSwitcher() {
+  const { data: hosts = [], isSuccess } = useHostsQuery();
+  const { scopeHostId } = useSnapshot(machinesUi);
+  const browser = useBrowserMachine();
+  const machines = hosts.filter((h) => h.id === "local" || h.linked);
+  const current = machines.find((h) => h.id === scopeHostId) ?? null;
+
+  // A machine that was unlinked since goes back to all of them.
+  useEffect(() => {
+    if (isSuccess && scopeHostId && !current) machinesUiActions.setScope(null);
+  }, [isSuccess, scopeHostId, current]);
+
+  if (machines.length < 2) return null;
+  return (
+    <DM.DropdownMenu>
+      <DM.DropdownMenuTrigger asChild>
+        <button
+          type="button"
+          aria-label={`Machine: ${current ? machineLabel(current) : "All machines"}`}
+          className={cn(
+            "border-border/70 text-muted-foreground hover:text-foreground hover:bg-foreground/[0.04] flex h-11 max-w-full min-w-0 items-center gap-1.5 rounded-lg border px-2.5 text-xs md:h-8",
+            current && "border-primary/40 bg-primary/10 text-primary"
+          )}
+        >
+          <Monitor className="h-3.5 w-3.5 shrink-0" />
+          <span className="truncate">
+            {current ? machineLabel(current) : "All machines"}
+          </span>
+          <ChevronDown className="h-3 w-3 shrink-0" />
+        </button>
+      </DM.DropdownMenuTrigger>
+      <DM.DropdownMenuContent align="start" className="max-w-80">
+        <DM.DropdownMenuLabel className="text-muted-foreground text-xs font-normal">
+          Machine
+        </DM.DropdownMenuLabel>
+        {[null, ...machines].map((h) => (
+          <DM.DropdownMenuItem
+            key={h?.id ?? "all"}
+            className="min-h-11 md:min-h-8"
+            onClick={() => machinesUiActions.setScope(h?.id ?? null)}
+          >
+            <span className="flex-1 truncate">
+              {h ? machineLabel(h, browser.hostId) : "All machines"}
+            </span>
+            {(current?.id ?? null) === (h?.id ?? null) && (
+              <Check className="text-primary h-3.5 w-3.5" />
+            )}
+          </DM.DropdownMenuItem>
+        ))}
+      </DM.DropdownMenuContent>
+    </DM.DropdownMenu>
+  );
+}

package/components/SessionList/SidebarHeader.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { MachineSwitcher } from "./MachineSwitcher";
 import {
   Archive,
   Star,
@@ -189,6 +190,9 @@ export function SidebarHeader(props: SidebarHeaderProps) {
           ]}
         />
       </div>
+      <div className="w-full empty:hidden">
+        <MachineSwitcher />
+      </div>
     </div>
   );
 }

package/components/SessionList/useSidebarData.ts

@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useMemo } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 import { useSnapshot } from "valtio";
 import type { Session } from "@/lib/db";
 import type { SessionGroup } from "@/lib/sidebar/shelves";
@@ -11,7 +11,11 @@ import {
   projectsInWorkspace,
 } from "@/lib/sidebar/shelves";
 import type { TaskState } from "@/lib/tasks/state";
-import { machineGroups, onMachineOnly } from "@/lib/sidebar/machines";
+import {
+  inMachineScope,
+  machineGroups,
+  onMachineOnly,
+} from "@/lib/sidebar/machines";
 import { orchestratorsToStart } from "@/lib/sidebar/orchestrator-row";
 import { useSessionsQuery } from "@/data/sessions";
 import { useLinkedHostNames } from "@/data/hosts";
@@ -23,6 +27,7 @@ import { useSelectedWorkspace } from "@/hooks/useSelectedWorkspace";
 import { useOrchestratorsQuery } from "@/data/orchestrators";
 import { useClock } from "@/hooks/useMinuteTick";
 import { sidebarUi } from "@/stores/sidebarUi";
+import { machinesUi, machinesUiActions } from "@/stores/machines";
 import type { SessionStatus } from "./SessionList.types";
 
 // One empty list for queries still loading, so memos below hold.
@@ -35,6 +40,10 @@ export function useSidebarData(
   sessionStatuses: Record<string, SessionStatus> | undefined
 ) {
   const ui = useSnapshot(sidebarUi);
+  const scope = useSnapshot(machinesUi).scopeHostId;
+  useEffect(() => {
+    machinesUiActions.hydrate();
+  }, []);
   // Wakes and 3-day settles are read from the clock.
   const now = useClock();
 
@@ -98,6 +107,7 @@ export function useSidebarData(
       sessions: sessions.filter(
         (s) =>
           !onMachineOnly(s, linked) &&
+          inMachineScope(s, scope) &&
           inWorkspace(
             s,
             (id) => byId.get(id)?.workspace_id,
@@ -122,7 +132,14 @@ export function useSidebarData(
       machines:
         project || ui.orchestratorId
           ? []
-          : machineGroups({ ...common, sessions }, linked),
+          : machineGroups(
+              { ...common, sessions },
+              scope
+                ? Object.fromEntries(
+                    Object.entries(linked).filter(([id]) => id === scope)
+                  )
+                : linked
+            ),
     };
   }, [
     now,
@@ -138,6 +155,7 @@ export function useSidebarData(
     project,
     ui.query,
     ui.orchestratorId,
+    scope,
   ]);
 
   // Per workspace, how many of its project sessions are working: the

package/data/hosts/queries.ts

@@ -61,6 +61,23 @@ export function useDeleteHost() {
   });
 }
 
+/** Rename a machine; "local" renames this one. */
+export function useRenameHost() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({ id, name }: { id: string; name: string }) =>
+      json<{ name: string }>(
+        await fetch(`/api/hosts/${encodeURIComponent(id)}`, {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ name }),
+        })
+      ),
+    // The name is on the claims, the sidebar and the chips too.
+    onSuccess: () => queryClient.invalidateQueries(),
+  });
+}
+
 export interface HostTestResult {
   ok: boolean;
   hostname?: string;

package/data/machines/index.ts

@@ -0,0 +1,54 @@
+import { useEffect } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { useSnapshot } from "valtio";
+import { machinesUi, machinesUiActions } from "@/stores/machines";
+import type { HostCatalogResponse } from "@/lib/machines/types";
+import type { BrowserMachine } from "@/lib/machines/browser";
+import { machineKeys } from "./keys";
+
+/** The agents and models a machine reports, for the new-session form. */
+export function useMachineCatalog(hostId: string) {
+  return useQuery({
+    queryKey: machineKeys.agents(hostId),
+    queryFn: async () => {
+      const res = await fetch(
+        `/api/hosts/${encodeURIComponent(hostId)}/agents`
+      );
+      const data = await res.json().catch(() => ({}));
+      if (!res.ok) throw new Error(data.error || "Couldn't list its agents");
+      return data as HostCatalogResponse;
+    },
+    staleTime: 60_000,
+    retry: false,
+  });
+}
+
+/**
+ * The machine this browser is on: what the person set, else what the server
+ * could tell from the connection, else unknown.
+ */
+export function useBrowserMachine(): {
+  hostId: string | null;
+  detected: BrowserMachine["how"];
+  set: (hostId: string | null) => void;
+} {
+  const snap = useSnapshot(machinesUi);
+  useEffect(() => {
+    machinesUiActions.hydrate();
+  }, []);
+  const { data } = useQuery({
+    queryKey: machineKeys.browser(),
+    queryFn: async () => {
+      const res = await fetch("/api/machine/browser");
+      if (!res.ok) throw new Error("Couldn't tell");
+      return (await res.json()) as BrowserMachine;
+    },
+    staleTime: Infinity,
+    retry: false,
+  });
+  return {
+    hostId: snap.browserHostId ?? data?.hostId ?? null,
+    detected: data?.how ?? null,
+    set: machinesUiActions.setBrowserHost,
+  };
+}

package/data/machines/keys.ts

@@ -0,0 +1,5 @@
+export const machineKeys = {
+  all: ["machines"] as const,
+  agents: (hostId: string) => [...machineKeys.all, "agents", hostId] as const,
+  browser: () => [...machineKeys.all, "browser"] as const,
+};

package/hooks/useDraftRequests.ts

@@ -1,5 +1,6 @@
 "use client";
 
+import { machinesUi } from "@/stores/machines";
 import { useEffect, useRef } from "react";
 import { subscribe } from "valtio";
 import { FolderGit2 } from "lucide-react";
@@ -64,7 +65,11 @@ export function useDraftRequests(options: Options) {
           ? { agentType: s.agent_type, model: s.model, access: s.chat_access }
           : {};
       const project = projects.find((p) => p.id === projectId) ?? null;
-      const draft = makeDraft(uuid(), project, carry, { openPr, workspaceId });
+      const draft = makeDraft(uuid(), project, carry, {
+        openPr,
+        workspaceId,
+        hostId: openPr ? null : machinesUi.scopeHostId,
+      });
       draftsActions.put(draft);
       show(draft.id);
     };

package/lib/chat/drivers/pi-mapper.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "crypto";
 import type { DriverEvent, UsageTotals } from "../events";
 import { toolDiff, toolTitle } from "../tools";
 import { TurnItems, type ToolStart } from "./turn-items";
-import { logTurnEnd, turnOutcome } from "./turn-outcome";
+import { logTurnEnd, needsSummary, turnOutcome } from "./turn-outcome";
 
 type P = Record<string, unknown>;
 const str = (v: unknown) => (typeof v === "string" ? v : "");
@@ -53,6 +53,7 @@ export class PiMapper {
   private error = "";
   // The last answer's text, its tool calls and who gave it, for the notice
   // when a turn ends without doing anything.
+  private toolsRun = 0;
   private last = { text: "", calls: 0, provider: "", model: "", api: "" };
   totals: UsageTotals = {
     costUsd: 0,
@@ -74,6 +75,8 @@ export class PiMapper {
   map(e: P): void {
     switch (e.type) {
       case "agent_start":
+        // A nudged run continues the same turn, so its tools still count.
+        if (!this.items.inTurn) this.toolsRun = 0;
         this.stopReason = this.error = "";
         this.last = { text: "", calls: 0, provider: "", model: "", api: "" };
         return this.items.startTurn();
@@ -85,6 +88,7 @@ export class PiMapper {
       case "message_end":
         return this.ended(e.message as P);
       case "tool_execution_start":
+        this.toolsRun++;
         return this.items.tool(
           str(e.toolCallId),
           piTool(str(e.toolName), e.args)
@@ -168,6 +172,18 @@ export class PiMapper {
     };
   }
 
+  // The run ran tools and ended without saying what they found.
+  needsSummary(): boolean {
+    return needsSummary({
+      toolsRun: this.toolsRun,
+      text: this.last.text,
+      toolCalls: this.last.calls,
+      finishReason: this.stopReason,
+      error: this.error || undefined,
+      aborted: this.aborted,
+    });
+  }
+
   // The run is over: Pi has nothing left to do for it.
   endTurn(): void {
     if (!this.items.inTurn) return;