@saadnvd1/agent-os 0.3.839 → 0.3.848

package/components/Workspaces/WorkspaceSettings.tsx

@@ -1,31 +1,54 @@
 "use client";
 
+import { useContext, useState } from "react";
 import { settingsUiActions } from "@/stores/settingsUi";
-import { useUpdateWorkspace, useWorkspacesQuery } from "@/data/workspaces";
-import { RulesForm } from "./RulesForm";
-import { McpServersForm } from "./McpServersForm";
-import { HqFolderForm } from "./HqFolderForm";
-import { ProjectTiersForm } from "./ProjectTiersForm";
-import { WorkspaceModeForm } from "./WorkspaceModeForm";
-import { WorkspaceModelsForm } from "./WorkspaceModelsForm";
-import { AppWideLimits } from "@/components/Settings/AppWideLimits";
+import { useWorkspacesQuery } from "@/data/workspaces";
+import { useProjectsQuery } from "@/data/projects";
 import {
-  NumberSetting,
-  SwitchSetting,
-} from "@/components/Settings/settings-fields";
-import { SettingSection } from "@/components/Settings/SettingRow";
-import { SETTING_DEFAULTS } from "@/lib/settings/defaults";
+  matchesQuery,
+  SettingsQueryContext,
+} from "@/components/Settings/SettingRow";
+import { WorkspacePanel } from "./WorkspacePanel";
+import { WorkspacePicker } from "./WorkspacePicker";
+import { useSettingsWorkspace } from "./useSettingsWorkspace";
 
-// Settings > Workspaces: each workspace's own settings.
+// What every workspace's page has, for the search box to find.
+const SHARED_ROWS =
+  "tasks at a time limit operating mode orchestrator full access wake ci failures reviews models hq folder session logs rules mcp servers projects production fast merge tier";
+
+// Settings > Workspaces: one workspace's settings at a time.
 export function WorkspaceSettings() {
   const { data: workspaces, isPending, isError, error } = useWorkspacesQuery();
-  const update = useUpdateWorkspace();
+  const { data: projects } = useProjectsQuery();
+  const query = useContext(SettingsQueryContext);
+  const { current, choose } = useSettingsWorkspace(workspaces ?? []);
+  // The search a hand-picked workspace overrides.
+  const [pinnedFor, setPinnedFor] = useState<string | null>(null);
+
+  // A search that matches only another workspace (its name, a project) shows
+  // that workspace; the shared rows are on every page, so they never move it.
+  const searchHit =
+    query.trim() &&
+    workspaces &&
+    current &&
+    pinnedFor !== query &&
+    !matchesQuery(query, SHARED_ROWS)
+      ? workspaces.find((w) =>
+          matchesQuery(
+            query,
+            w.name,
+            ...(projects ?? [])
+              .filter((p) => p.workspace_id === w.id)
+              .map((p) => p.name)
+          )
+        )
+      : undefined;
 
   if (isPending)
     return <div className="bg-muted/40 h-32 animate-pulse rounded-lg" />;
   if (isError)
     return <p className="text-destructive text-sm">{error.message}</p>;
-  if (!workspaces.length)
+  if (!workspaces.length || !current)
     return (
       <p className="text-muted-foreground text-sm">
         No workspaces yet. Make one from the workspace menu at the top of the
@@ -33,74 +56,23 @@ export function WorkspaceSettings() {
       </p>
     );
 
+  const shown = searchHit ?? current;
   return (
-    <div className="space-y-4">
-      <p className="text-muted-foreground text-sm">
-        Running task limit: tasks over it wait in the Queued list and start by
-        themselves, in order, when a running one finishes.
-      </p>
-      {workspaces.map((w) => (
-        <section
-          key={w.id}
-          aria-label={w.name}
-          className="bg-muted/40 space-y-3 rounded-lg px-3 py-3"
-        >
-          <h3 className="truncate text-sm font-medium">{w.name}</h3>
-          <SettingSection>
-            <NumberSetting
-              id={`task-limit-${w.id}`}
-              label="Tasks at a time"
-              help="Cap on tasks running at once. The rest wait in Queued and start in order."
-              value={w.max_running_tasks ?? 0}
-              defaultValue={0}
-              onSave={(n) =>
-                update.mutateAsync({
-                  id: w.id,
-                  maxRunningTasks: n === 0 ? null : n,
-                })
-              }
-              min={1}
-              integer
-              unit="at a time"
-              optional={{ off: 0, on: SETTING_DEFAULTS.taskLimitOn }}
-            />
-          </SettingSection>
-          <WorkspaceModeForm workspaceId={w.id} />
-          <RulesForm workspaceId={w.id} />
-          <WorkspaceModelsForm workspaceId={w.id} />
-          <McpServersForm workspace={w} />
-          <HqFolderForm workspaceId={w.id} />
-          <ProjectTiersForm workspaceId={w.id} />
-          <SettingSection>
-            <SwitchSetting
-              id={`wake-${w.id}`}
-              label="Wake tasks on CI failures and reviews"
-              help="A task's agent is messaged once when a check fails on its PR, and when someone reviews or comments."
-              checked={w.wake_tasks_on_pr}
-              onSave={(on) =>
-                update.mutateAsync({ id: w.id, wakeTasksOnPR: on })
-              }
-            />
-            <SwitchSetting
-              id={`full-access-${w.id}`}
-              label="Orchestrator full access"
-              help="Its shell and file writes aren't checked. Applies when its conversation next restarts."
-              checked={w.orch_full_access}
-              confirm="Let this orchestrator act without approval? It can push, commit, edit any repository or file on this machine, merge a PR directly, and edit .claude files. Off: the deny list, write limits and merge-only-through-the-gates apply."
-              confirmLabel="Turn on full access"
-              onSave={(on) =>
-                update.mutateAsync({ id: w.id, orchFullAccess: on })
-              }
-            />
-          </SettingSection>
-        </section>
-      ))}
-      <AppWideLimits />
+    <div>
+      <WorkspacePicker
+        workspaces={workspaces}
+        value={shown.id}
+        onChange={(id) => {
+          setPinnedFor(query);
+          choose(id);
+        }}
+      />
+      <WorkspacePanel key={shown.id} workspace={shown} />
       <p className="text-muted-foreground text-sm">
         Fresh starts and compaction are app-wide:{" "}
         <button
           type="button"
-          className="text-primary underline-offset-2 hover:underline"
+          className="text-primary -my-3 min-h-11 underline-offset-2 hover:underline"
           onClick={() => settingsUiActions.show("context")}
         >
           open Context

package/components/Workspaces/useSettingsWorkspace.ts

@@ -0,0 +1,47 @@
+"use client";
+
+import { useCallback, useSyncExternalStore } from "react";
+import type { Workspace } from "@/lib/db";
+import { useSelectedWorkspace } from "@/hooks/useSelectedWorkspace";
+
+const KEY = "agentOS-settings-workspace";
+
+const listeners = new Set<() => void>();
+
+function subscribe(fn: () => void) {
+  listeners.add(fn);
+  window.addEventListener("storage", fn);
+  return () => {
+    listeners.delete(fn);
+    window.removeEventListener("storage", fn);
+  };
+}
+
+function read(): string | null {
+  try {
+    return localStorage.getItem(KEY);
+  } catch {
+    return null;
+  }
+}
+
+// Which workspace Settings > Workspaces shows: the one picked here last,
+// else the sidebar's, else the first. A remembered one since deleted falls
+// through.
+export function useSettingsWorkspace(workspaces: Workspace[]) {
+  const { workspace: sidebar } = useSelectedWorkspace();
+  const picked = useSyncExternalStore(subscribe, read, () => null);
+  const choose = useCallback((id: string) => {
+    try {
+      localStorage.setItem(KEY, id);
+    } catch {
+      // Not remembered; the choice still holds for this visit.
+    }
+    listeners.forEach((fn) => fn());
+  }, []);
+  const current =
+    workspaces.find((w) => w.id === picked) ??
+    workspaces.find((w) => w.id === sidebar?.id) ??
+    workspaces[0];
+  return { current, choose };
+}

package/components/ui/switch.tsx

@@ -13,7 +13,7 @@ function Switch({
     <SwitchPrimitive.Root
       data-slot="switch"
       className={cn(
-        "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
+        "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-muted-foreground/35 data-[state=unchecked]:border-foreground/15 focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-muted-foreground/40 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
         className
       )}
       {...props}

package/content/whats-new.json

@@ -1985,6 +1985,46 @@
       "area": "Settings",
       "text": "More settings now save as you change them, and revoking a passkey or link asks inline instead of with a browser pop-up.",
       "url": "https://github.com/saadnvd1/agent-os/pull/563"
+    },
+    {
+      "id": 564,
+      "date": "2026-11-02",
+      "kind": "fixed",
+      "area": "Updates",
+      "text": "Updating AgentOS no longer rolls back a good update when the machine's automatic deploy restarts the server at the same moment.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/564"
+    },
+    {
+      "id": 565,
+      "date": "2026-11-02",
+      "kind": "improved",
+      "area": "Settings",
+      "text": "The Workspaces settings page now shows one workspace at a time, in clear groups, with rules you can read in full and edit in place.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/565"
+    },
+    {
+      "id": 568,
+      "date": "2026-11-02",
+      "kind": "fixed",
+      "area": "Sidebar",
+      "text": "Renaming a session for the first time no longer closes the name box before you can type.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/568"
+    },
+    {
+      "id": 569,
+      "date": "2026-11-02",
+      "kind": "fixed",
+      "area": "Chat",
+      "text": "Pressing Enter with a selection that ends on a reply's button row no longer quotes it.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/569"
+    },
+    {
+      "id": 570,
+      "date": "2026-11-02",
+      "kind": "improved",
+      "area": "Settings",
+      "text": "Settings is tidier: clearer switches, shorter lists, one Approvals page, and a General page for your name and alerts.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/570"
     }
   ]
 }

package/data/approvals/index.ts

@@ -1,11 +1,11 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import type { AuditRow } from "@/lib/approvals/no-approvals";
+import type { ApprovalLine } from "@/lib/approvals/describe";
 import { provePresence } from "../presence";
 import { usePollWhenOffline } from "../push/connection";
 
 export interface ApprovalsMode {
   on: boolean;
-  audit: AuditRow[];
+  audit: ApprovalLine[];
 }
 
 export const approvalsKeys = { all: ["approvals"] as const };

package/data/health/index.ts

@@ -91,10 +91,13 @@ export function useDeleteNote() {
   });
 }
 
+import type { HealthMeta } from "@/lib/health/config";
+
 export interface ConfigResponse {
   config: Record<string, number>;
   defaults: Record<string, number>;
   labels: Record<string, string>;
+  meta: Record<string, HealthMeta>;
 }
 
 export function useHealthConfig() {

package/hooks/useAutoSave.ts

@@ -2,6 +2,7 @@
 
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
+import { settingsUi } from "@/stores/settingsUi";
 
 export type SaveStatus = "idle" | "saving" | "saved" | "undo";
 
@@ -13,6 +14,9 @@ export interface AutoSave<T> {
   // rejected save drops the in-flight value, so this is the saved one again.
   value: T;
   status: SaveStatus;
+  // Why the last save was rejected; cleared by the next commit. Shown on the
+  // row while Settings is open (a toast would sit over the dialog).
+  error: string | null;
   // Commit a new value. `undoable` keeps the previous one for Undo (large or
   // destructive changes). Resolves false when the server rejected it.
   commit: (next: T, opts?: { undoable?: boolean }) => Promise<boolean>;
@@ -27,7 +31,7 @@ export function useAutoSave<T>({
   saved,
   save,
   equals = Object.is,
-  notify = (message) => toast.error(message),
+  notify,
 }: {
   saved: T;
   save: (next: T) => Promise<unknown>;
@@ -36,6 +40,7 @@ export function useAutoSave<T>({
 }): AutoSave<T> {
   const [pending, setPending] = useState<{ value: T } | null>(null);
   const [status, setStatus] = useState<SaveStatus>("idle");
+  const [error, setError] = useState<string | null>(null);
   const previous = useRef<{ value: T } | null>(null);
   const timer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
   const seq = useRef(0);
@@ -56,6 +61,7 @@ export function useAutoSave<T>({
       const mine = ++seq.current;
       clearTimeout(timer.current);
       setPending({ value: next });
+      setError(null);
       setStatus("saving");
       try {
         await latest.current.save(next);
@@ -64,9 +70,10 @@ export function useAutoSave<T>({
           setPending(null);
           setStatus("idle");
         }
-        latest.current.notify(
-          err instanceof Error ? err.message : "Couldn't save"
-        );
+        const message = err instanceof Error ? err.message : "Couldn't save";
+        if (latest.current.notify) latest.current.notify(message);
+        else if (settingsUi.open) setError(message);
+        else toast.error(message);
         return false;
       }
       if (mine !== seq.current) return true;
@@ -94,5 +101,11 @@ export function useAutoSave<T>({
     return run(back.value, false, latest.current.saved);
   }, [run]);
 
-  return { value: pending ? pending.value : saved, status, commit, undo };
+  return {
+    value: pending ? pending.value : saved,
+    status,
+    error,
+    commit,
+    undo,
+  };
 }

package/hooks/useSettingsUrl.ts

@@ -19,8 +19,7 @@ function fromAddress() {
  */
 export function useSettingsUrl() {
   useEffect(() => {
-    fromAddress();
-    const unsubscribe = subscribe(settingsUi, () => {
+    const toAddress = () => {
       const href = window.location.href;
       const next = hrefWithSettings(href, {
         open: settingsUi.open,
@@ -29,7 +28,11 @@ export function useSettingsUrl() {
       const url = new URL(href);
       if (next !== url.pathname + url.search + url.hash)
         window.history.replaceState(window.history.state, "", next);
-    });
+    };
+    fromAddress();
+    // An old link (?settings=setup) is rewritten to where it landed.
+    toAddress();
+    const unsubscribe = subscribe(settingsUi, toAddress);
     window.addEventListener("popstate", fromAddress);
     return () => {
       unsubscribe();

package/lib/approvals/describe.ts

@@ -0,0 +1,64 @@
+// What an auto-approval reads as to a person: a sentence, with the command
+// or other raw text behind a "details" toggle. The audit table keeps the raw
+// subject; this is only how it is shown.
+
+import type { AuditRow } from "./no-approvals";
+
+export interface ApprovalLine {
+  id: number;
+  at: string;
+  // The source in words ("an ask", "a chat").
+  where: string;
+  summary: string;
+  // Raw text (a shell command, a path) for the details toggle.
+  details: string | null;
+}
+
+const WHERE: Record<AuditRow["source"], string> = {
+  ask: "An ask",
+  brake: "A brake",
+  plan: "A plan",
+  chat: "A chat",
+  terminal: "A terminal",
+  "merge-approval": "A merge",
+  mode: "The mode",
+};
+
+const READ = new Set(["Read", "Glob", "Grep", "LS"]);
+const CHANGE = new Set(["Edit", "Write", "MultiEdit", "NotebookEdit"]);
+
+const SHELL_START = /^(bash|run|shell|execute|command)\b[:\s]/i;
+const SHELL_WORDS =
+  /(^|\s)(cd|ssh|scp|git|npm|npx|pnpm|rm|curl|sudo|cat|ls|sed|grep|kill|tmux|docker|kubectl|python3?|node)\s/;
+const SHELL_CHARS = /&&|\|\||[|;`]|\$\(|\s\/[\w.-]+\/|~\//;
+
+export const looksLikeCommand = (text: string) =>
+  SHELL_START.test(text) || SHELL_WORDS.test(text) || SHELL_CHARS.test(text);
+
+export function describeApproval(row: AuditRow): ApprovalLine {
+  const base = {
+    id: row.id,
+    at: row.at,
+    where: WHERE[row.source] ?? row.source,
+  };
+  const subject = row.subject.trim();
+  if (row.source === "terminal") {
+    const tool = subject.replace(/ in a terminal session$/, "");
+    const summary =
+      tool === "Bash"
+        ? "Ran a command"
+        : CHANGE.has(tool)
+          ? "Changed a file"
+          : READ.has(tool)
+            ? "Read files"
+            : `Used ${tool}`;
+    return { ...base, summary, details: null };
+  }
+  if (row.source === "chat" && looksLikeCommand(subject))
+    return {
+      ...base,
+      summary: "Ran a command",
+      details: subject.replace(SHELL_START, "").trim() || subject,
+    };
+  return { ...base, summary: subject, details: null };
+}

package/lib/away/deploy.ts

@@ -33,6 +33,14 @@ export const HEALTH_GRACE_MS = 3 * 60 * 1000;
 export const GAP_MARGIN_MS = 10 * 60 * 1000;
 const DEFAULT_GAP_S = 3600;
 
+type HealthAnswer = {
+  ok: boolean;
+  why?: string;
+  startedAt?: number;
+  // The commit the running server was built from, when it says.
+  build?: string;
+};
+
 export interface DeployDeps {
   // When the deploy last restarted the server, in ms; null when unknown.
   restartedAt: (file: string) => number | null;
@@ -43,9 +51,7 @@ export interface DeployDeps {
   contains: (repo: string, tip: string, sha: string) => Promise<boolean>;
   // startedAt, when the server says when it started (AgentOS's
   // /api/health does), so a deploy that never restarted it is caught.
-  health: (
-    url: string
-  ) => Promise<{ ok: boolean; why?: string; startedAt?: number }>;
+  health: (url: string) => Promise<HealthAnswer>;
   // When GitHub made the merge commit, in ms (0 when unknown): the time a
   // restart has to come after. Not when AgentOS noticed the merge, which
   // can be after a restart that already took it.
@@ -78,18 +84,25 @@ async function contains(
   return ancestor();
 }
 
-async function health(
-  url: string
-): Promise<{ ok: boolean; why?: string; startedAt?: number }> {
+async function health(url: string): Promise<HealthAnswer> {
   try {
     const res = await fetch(url, { signal: AbortSignal.timeout(5000) });
     if (!res.ok) return { ok: false, why: `HTTP ${res.status}` };
     const body = (await res.json().catch(() => null)) as {
       startedAt?: unknown;
+      build?: unknown;
     } | null;
     const startedAt =
       typeof body?.startedAt === "string" ? Date.parse(body.startedAt) : NaN;
-    return Number.isFinite(startedAt) ? { ok: true, startedAt } : { ok: true };
+    const build =
+      typeof body?.build === "string" && SHA.test(body.build)
+        ? body.build
+        : undefined;
+    return {
+      ok: true,
+      ...(Number.isFinite(startedAt) ? { startedAt } : {}),
+      ...(build ? { build } : {}),
+    };
   } catch (error) {
     return {
       ok: false,
@@ -161,6 +174,20 @@ async function judge(
     if (!config.health) return { state: "ok", detail: `${short} deployed` };
     const url = healthUrl(config.health);
     const answer = await deps.health(url);
+    // autodeploy's marker can name a build that isn't running (a rolled-back
+    // update); what the server says it runs decides.
+    if (
+      answer.ok &&
+      answer.build &&
+      !(await deps.contains(input.repo, answer.build, mergeSha))
+    ) {
+      if (input.now - deployed.at < HEALTH_GRACE_MS)
+        return { state: "pending" };
+      return {
+        state: "failed",
+        detail: `not deployed: the server is running ${answer.build.slice(0, 7)}, which doesn't have ${short}`,
+      };
+    }
     const merged =
       answer.ok && answer.startedAt !== undefined
         ? await deps.committedAt(input.repo, mergeSha)

package/lib/health/config.ts

@@ -30,25 +30,78 @@ export const HEALTH_DEFAULTS = {
 export type HealthKey = keyof typeof HEALTH_DEFAULTS;
 export type HealthConfig = Record<HealthKey, number>;
 
-export const HEALTH_LABELS: Record<HealthKey, string> = {
-  loadRedMinutes: "Machine load red for (minutes)",
-  queueHeldMinutes: "Queued task held for (minutes)",
-  bgQuietMinutes: "Background job quiet for (minutes)",
-  portWaitMinutes: "Waiting on a port someone else holds for (minutes)",
-  pieceDupOverlap: "Plan piece matches merged work (0 to 1 overlap)",
-  restartsMax: "Server restarts allowed per window",
-  restartsWindowMinutes: "Restart window (minutes)",
-  ciSlowFallbackMinutes: "CI pending, when no history yet (minutes)",
-  armedStuckMinutes: "PR armed without merging for (minutes)",
-  serverErrorsMin: "Server errors per 10 minutes, at least",
-  serverErrorsFactor: "Server errors, times the usual rate",
-  envBurstSessions: "Environment failure: sessions in the window to alert",
-  envBurstHours: "Environment failure window (hours)",
-  envQuietDays: "Environment failure back after quiet for (days)",
-  wakeUsageCeilingPct: "Stop waking watchers above usage (%)",
-  watchersOn: "Watchers on (1) or off (0)",
+export interface HealthMeta {
+  label: string;
+  unit?: string;
+  min: number;
+  max?: number;
+  integer?: boolean;
+  // A 1/0 value shown as a switch.
+  switch?: boolean;
+}
+
+// How each threshold reads in Settings: the server owns it, so a new
+// threshold needs no client change.
+export const HEALTH_META: Record<HealthKey, HealthMeta> = {
+  loadRedMinutes: { label: "Machine load red for", unit: "min", min: 1 },
+  queueHeldMinutes: { label: "Queued task held for", unit: "min", min: 1 },
+  bgQuietMinutes: { label: "Background job quiet for", unit: "min", min: 1 },
+  portWaitMinutes: {
+    label: "Waiting on a port someone else holds for",
+    unit: "min",
+    min: 1,
+  },
+  pieceDupOverlap: {
+    label: "Plan piece matches merged work",
+    min: 0,
+    max: 1,
+    integer: false,
+  },
+  restartsMax: { label: "Server restarts allowed per window", min: 1 },
+  restartsWindowMinutes: { label: "Restart window", unit: "min", min: 1 },
+  ciSlowFallbackMinutes: {
+    label: "CI pending, when no history yet",
+    unit: "min",
+    min: 1,
+  },
+  armedStuckMinutes: {
+    label: "PR armed without merging for",
+    unit: "min",
+    min: 1,
+  },
+  serverErrorsMin: {
+    label: "Server errors per 10 minutes, at least",
+    min: 1,
+  },
+  serverErrorsFactor: {
+    label: "Server errors, times the usual rate",
+    unit: "×",
+    min: 1,
+    integer: false,
+  },
+  envBurstSessions: {
+    label: "Environment failure: sessions in the window to alert",
+    min: 1,
+  },
+  envBurstHours: { label: "Environment failure window", unit: "hours", min: 1 },
+  envQuietDays: {
+    label: "Environment failure back after quiet for",
+    unit: "days",
+    min: 1,
+  },
+  wakeUsageCeilingPct: {
+    label: "Stop waking watchers above usage",
+    unit: "%",
+    min: 1,
+    max: 100,
+  },
+  watchersOn: { label: "Watchers", min: 0, max: 1, switch: true },
 };
 
+export const HEALTH_LABELS = Object.fromEntries(
+  Object.entries(HEALTH_META).map(([k, m]) => [k, m.label])
+) as Record<HealthKey, string>;
+
 const settingKey = (k: HealthKey) => `health.${k}`;
 
 export function healthConfig(