@saadnvd1/agent-os 0.3.836 → 0.3.845

package/components/Workspaces/WorkspaceModeForm.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { SettingBlock } from "@/components/Settings/SettingRow";
 import { ModeChooser } from "@/components/Report/ModeChooser";
 import { useSetWorkspaceMode, useWorkspaceMode } from "@/data/reports";
 
@@ -9,14 +10,13 @@ export function WorkspaceModeForm({ workspaceId }: { workspaceId: string }) {
   const set = useSetWorkspaceMode(workspaceId);
   if (!mode) return null;
   return (
-    <div className="space-y-1.5">
-      <h4 className="text-sm font-medium">Operating mode</h4>
+    <SettingBlock id={`mode-${workspaceId}`} label="Operating mode">
       <ModeChooser
         mode={mode}
         onChange={(m) => set.mutate(m)}
         disabled={set.isPending}
         note="New tasks start in this mode; any task can change its own."
       />
-    </div>
+    </SettingBlock>
   );
 }

package/components/Workspaces/WorkspaceModelsForm.tsx

@@ -1,6 +1,8 @@
 "use client";
 
 import { useState } from "react";
+import { PickerSetting } from "@/components/Settings/PickerSetting";
+import { SettingBlock } from "@/components/Settings/SettingRow";
 import { ModelSelect } from "@/components/Models/ModelSelect";
 import {
   useModelsQuery,
@@ -26,46 +28,44 @@ export function WorkspaceModelsForm({ workspaceId }: { workspaceId: string }) {
   const set = Object.keys(roles).length;
 
   return (
-    <div className="space-y-2">
-      <button
-        type="button"
-        className="text-muted-foreground hover:text-foreground h-11 text-left text-xs md:h-auto"
-        onClick={() => setOpen((o) => !o)}
-        aria-expanded={open}
-      >
-        Models: {set ? `${set} set for this workspace` : "as Settings › Models"}{" "}
-        {open ? "▴" : "▾"}
-      </button>
-      {open && (
-        <ul className="space-y-2">
-          {WORKSPACE_ROLES.map((role) => (
-            <li key={role} className="space-y-1">
-              <label
-                htmlFor={`ws-${workspaceId}-${role}`}
-                className="text-muted-foreground block text-xs"
-              >
-                {ROLE_LABELS[role].label}
-              </label>
+    <>
+      <SettingBlock id={`models-${workspaceId}`} label="Models">
+        <button
+          type="button"
+          className="text-muted-foreground hover:text-foreground flex min-h-11 w-full items-center text-left text-xs md:min-h-0"
+          onClick={() => setOpen((o) => !o)}
+          aria-expanded={open}
+        >
+          {set ? `${set} set for this workspace` : "As Settings › Models"}{" "}
+          {open ? "▴" : "▾"}
+        </button>
+      </SettingBlock>
+      {open &&
+        WORKSPACE_ROLES.map((role) => (
+          <PickerSetting<string | null>
+            key={role}
+            id={`ws-${workspaceId}-${role}`}
+            label={ROLE_LABELS[role].label}
+            value={roles[role] ?? null}
+            defaultValue={null}
+            onSave={(ref) => {
+              const next = { ...roles };
+              if (ref) next[role] = ref;
+              else delete next[role];
+              return update.mutateAsync({ roles: next });
+            }}
+            render={({ value, commit }) => (
               <ModelSelect
                 id={`ws-${workspaceId}-${role}`}
-                value={roles[role] ?? null}
+                value={value}
                 effective={models.data?.effective}
                 inheritLabel={`As Settings (${models.data?.effective.roles[role] ?? "…"})`}
-                disabled={update.isPending || !models.data}
-                onChange={(ref) => {
-                  const next = { ...roles };
-                  if (ref) next[role] = ref;
-                  else delete next[role];
-                  update.mutate({ roles: next });
-                }}
+                disabled={!models.data}
+                onChange={commit}
               />
-            </li>
-          ))}
-        </ul>
-      )}
-      {update.isError && (
-        <p className="text-destructive text-xs">{update.error.message}</p>
-      )}
-    </div>
+            )}
+          />
+        ))}
+    </>
   );
 }

package/components/Workspaces/WorkspacePanel.tsx

@@ -0,0 +1,73 @@
+"use client";
+
+import { useUpdateWorkspace } from "@/data/workspaces";
+import type { Workspace } from "@/lib/db";
+import {
+  NumberSetting,
+  SwitchSetting,
+} from "@/components/Settings/settings-fields";
+import { SettingSection } from "@/components/Settings/SettingRow";
+import { SETTING_DEFAULTS } from "@/lib/settings/defaults";
+import { HqFolderForm } from "./HqFolderForm";
+import { McpServersForm } from "./McpServersForm";
+import { ProjectTiersForm } from "./ProjectTiersForm";
+import { RulesForm } from "./RulesForm";
+import { WorkspaceModeForm } from "./WorkspaceModeForm";
+import { WorkspaceModelsForm } from "./WorkspaceModelsForm";
+
+// One workspace's settings, in titled groups.
+export function WorkspacePanel({ workspace: w }: { workspace: Workspace }) {
+  const update = useUpdateWorkspace();
+  return (
+    <div aria-label={`${w.name} settings`} role="group">
+      <SettingSection
+        title="Limits & mode"
+        help="Tasks over the limit wait in Queued and start by themselves, in order, when a running one finishes."
+      >
+        <NumberSetting
+          id={`task-limit-${w.id}`}
+          label="Tasks at a time"
+          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 }}
+        />
+        <WorkspaceModeForm workspaceId={w.id} />
+      </SettingSection>
+      <SettingSection
+        title="Orchestrator"
+        help="What this workspace's orchestrator may do, which models it runs on, and where its session logs go."
+      >
+        <SwitchSetting
+          id={`full-access-${w.id}`}
+          label="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 })}
+        />
+        <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 })}
+        />
+        <WorkspaceModelsForm workspaceId={w.id} />
+        <HqFolderForm workspaceId={w.id} />
+      </SettingSection>
+      <RulesForm workspaceId={w.id} />
+      <McpServersForm workspace={w} />
+      <ProjectTiersForm workspaceId={w.id} />
+    </div>
+  );
+}

package/components/Workspaces/WorkspacePicker.tsx

@@ -0,0 +1,44 @@
+"use client";
+
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import type { Workspace } from "@/lib/db";
+
+// Which workspace's settings the page shows.
+export function WorkspacePicker({
+  workspaces,
+  value,
+  onChange,
+}: {
+  workspaces: Workspace[];
+  value: string;
+  onChange: (id: string) => void;
+}) {
+  return (
+    <div className="mb-4 flex items-center gap-3">
+      <label htmlFor="settings-workspace" className="text-sm font-medium">
+        Workspace
+      </label>
+      <Select value={value} onValueChange={onChange}>
+        <SelectTrigger
+          id="settings-workspace"
+          className="h-11 min-w-0 flex-1 text-base sm:max-w-xs md:h-9 md:text-sm"
+        >
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          {workspaces.map((w) => (
+            <SelectItem key={w.id} value={w.id}>
+              {w.name}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    </div>
+  );
+}

package/components/Workspaces/WorkspaceSettings.test.ts

@@ -0,0 +1,153 @@
+import "@/components/Chat/composer/test-dom";
+import { act, createElement } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+for (const key of Object.getOwnPropertyNames(window))
+  if (
+    /^(HTML|SVG|Event|CustomEvent|FocusEvent|DocumentFragment|Node|Element|Mutation)/.test(
+      key
+    ) &&
+    !(key in globalThis)
+  )
+    Object.defineProperty(globalThis, key, {
+      value: (window as unknown as Record<string, unknown>)[key],
+      configurable: true,
+      writable: true,
+    });
+(
+  globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+
+const ws = (id: string, name: string, limit: number | null) => ({
+  id,
+  name,
+  max_running_tasks: limit,
+  orch_full_access: false,
+  wake_tasks_on_pr: true,
+  orch_mcp_servers: [],
+});
+const state = vi.hoisted(() => ({
+  workspaces: [] as unknown[],
+  projects: [] as unknown[],
+  sidebar: null as unknown,
+  update: vi.fn(),
+}));
+vi.mock("sonner", () => ({ toast: { error: vi.fn() } }));
+vi.mock("@/data/workspaces", () => ({
+  useWorkspacesQuery: () => ({ isPending: false, data: state.workspaces }),
+  useUpdateWorkspace: () => ({ mutateAsync: state.update }),
+}));
+vi.mock("@/data/projects", () => ({
+  useProjectsQuery: () => ({ data: state.projects }),
+}));
+vi.mock("@/hooks/useSelectedWorkspace", () => ({
+  useSelectedWorkspace: () => ({ workspace: state.sidebar }),
+}));
+vi.mock("@/components/Settings/AppWideLimits", () => ({
+  AppWideLimits: () => null,
+}));
+for (const name of [
+  "RulesForm",
+  "McpServersForm",
+  "HqFolderForm",
+  "ProjectTiersForm",
+  "WorkspaceModeForm",
+  "WorkspaceModelsForm",
+])
+  vi.doMock(`./${name}`, () => ({
+    [name]: () => null,
+  }));
+
+const { WorkspaceSettings } = await import("./WorkspaceSettings");
+const { SettingsQueryContext } =
+  await import("@/components/Settings/SettingRow");
+
+let root: Root;
+let host: HTMLDivElement;
+beforeEach(() => {
+  localStorage.clear();
+  state.update.mockReset().mockResolvedValue(undefined);
+  state.workspaces = [ws("w1", "Alpha", null), ws("w2", "Beta", 2)];
+  state.projects = [
+    { id: "p1", name: "beta-api", workspace_id: "w2", is_uncategorized: false },
+  ];
+  state.sidebar = null;
+  host = document.createElement("div");
+  document.body.appendChild(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+});
+
+const render = (query = "") =>
+  act(async () =>
+    root.render(
+      createElement(
+        SettingsQueryContext.Provider,
+        { value: query },
+        createElement(WorkspaceSettings)
+      )
+    )
+  );
+const picker = () => host.querySelector<HTMLElement>("#settings-workspace")!;
+const titles = () => [...host.querySelectorAll("h3")].map((h) => h.textContent);
+const limit = () =>
+  host.querySelector<HTMLInputElement>("#task-limit-w1, #task-limit-w2")!;
+
+describe("WorkspaceSettings", () => {
+  it("shows one workspace at a time, in titled groups", async () => {
+    await render();
+    expect(host.querySelectorAll('[role="group"]')).toHaveLength(1);
+    expect(picker().textContent).toBe("Alpha");
+    expect(titles()).toEqual(
+      expect.arrayContaining(["Limits & mode", "Orchestrator"])
+    );
+    expect(host.textContent).not.toContain("Running task limit:");
+  });
+
+  it("preselects the sidebar's workspace", async () => {
+    state.sidebar = state.workspaces[1];
+    await render();
+    expect(picker().textContent).toBe("Beta");
+  });
+
+  it("remembers the choice", async () => {
+    localStorage.setItem("agentOS-settings-workspace", "w2");
+    await render();
+    expect(picker().textContent).toBe("Beta");
+  });
+
+  it("greys the number while the limit is off, keeping its value", async () => {
+    await render();
+    expect(limit().id).toBe("task-limit-w1");
+    expect(limit().disabled).toBe(true);
+    expect(limit().value).toBe("3");
+    expect(host.textContent).not.toContain("Default");
+  });
+
+  it("enables the number when a limit is set, and hints the default", async () => {
+    localStorage.setItem("agentOS-settings-workspace", "w2");
+    await render();
+    expect(limit().disabled).toBe(false);
+    expect(limit().value).toBe("2");
+    expect(host.textContent).toContain("Default: off");
+    expect(
+      [...host.querySelectorAll("button")].some(
+        (b) => b.textContent === "Reset"
+      )
+    ).toBe(true);
+  });
+
+  it("a search matching only another workspace's project switches to it", async () => {
+    await render("beta-api");
+    expect(picker().textContent).toBe("Beta");
+  });
+
+  it("a search matching rows on every page stays on the current workspace", async () => {
+    await render("mcp");
+    expect(picker().textContent).toBe("Alpha");
+  });
+});

package/components/Workspaces/WorkspaceSettings.tsx

@@ -1,28 +1,55 @@
 "use client";
 
-import { SettingToggle } from "@/components/Settings/SettingToggle";
-import { useUpdateWorkspace, useWorkspacesQuery } from "@/data/workspaces";
-import { TaskLimitForm } from "./TaskLimitForm";
-import { RulesForm } from "./RulesForm";
-import { FreshStartForm } from "./FreshStartForm";
-import { McpServersForm } from "./McpServersForm";
-import { HqFolderForm } from "./HqFolderForm";
-import { ProjectTiersForm } from "./ProjectTiersForm";
-import { StallForm } from "./StallForm";
-import { WorkspaceModeForm } from "./WorkspaceModeForm";
-import { WorkspaceModelsForm } from "./WorkspaceModelsForm";
-import { AwayWindowForm } from "@/components/Away/AwayWindowForm";
+import { useContext, useState } from "react";
+import { settingsUiActions } from "@/stores/settingsUi";
+import { useWorkspacesQuery } from "@/data/workspaces";
+import { useProjectsQuery } from "@/data/projects";
+import { AppWideLimits } from "@/components/Settings/AppWideLimits";
+import {
+  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
@@ -30,46 +57,30 @@ export function WorkspaceSettings() {
       </p>
     );
 
+  const shown = searchHit ?? current;
   return (
-    <div className="space-y-4">
+    <div>
+      <WorkspacePicker
+        workspaces={workspaces}
+        value={shown.id}
+        onChange={(id) => {
+          setPinnedFor(query);
+          choose(id);
+        }}
+      />
+      <WorkspacePanel key={shown.id} workspace={shown} />
+      <AppWideLimits />
       <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"
+        Fresh starts and compaction are app-wide:{" "}
+        <button
+          type="button"
+          className="text-primary -my-3 min-h-11 underline-offset-2 hover:underline"
+          onClick={() => settingsUiActions.show("context")}
         >
-          <h3 className="truncate text-sm font-medium">{w.name}</h3>
-          <TaskLimitForm
-            key={`${w.id}:${w.max_running_tasks ?? "off"}`}
-            workspace={w}
-          />
-          <WorkspaceModeForm workspaceId={w.id} />
-          <RulesForm workspaceId={w.id} />
-          <WorkspaceModelsForm workspaceId={w.id} />
-          <McpServersForm workspace={w} />
-          <HqFolderForm workspaceId={w.id} />
-          <ProjectTiersForm workspaceId={w.id} />
-          <SettingToggle
-            title="Wake tasks on CI failures and reviews"
-            detail="A task's agent is messaged once when a check fails on its PR's head, with the log's tail, and when someone reviews or comments on it."
-            checked={w.wake_tasks_on_pr}
-            onChange={(on) => update.mutate({ id: w.id, wakeTasksOnPR: on })}
-          />
-          <SettingToggle
-            title="Orchestrator full access"
-            detail="Its shell and file writes aren't checked: it can push, commit, edit any repository or file on this machine, and merge a PR directly, and edit .claude files (skills, settings, hooks). Applies when its conversation next restarts. Off: the deny list, write limits, quick-change cap and merge-only-through-the-gates apply."
-            checked={w.orch_full_access}
-            onChange={(on) => update.mutate({ id: w.id, orchFullAccess: on })}
-          />
-        </section>
-      ))}
-      <FreshStartForm />
-      <StallForm />
-      <AwayWindowForm />
+          open Context
+        </button>
+        .
+      </p>
     </div>
   );
 }

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/content/whats-new.json

@@ -1969,6 +1969,46 @@
       "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"
+    },
+    {
+      "id": 562,
+      "date": "2026-11-02",
+      "kind": "improved",
+      "area": "Settings",
+      "text": "Settings now save as you change them, with a clear \"Saved\" note, undo and reset, and Context settings have their own page.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/562"
+    },
+    {
+      "id": 563,
+      "date": "2026-11-02",
+      "kind": "improved",
+      "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"
     }
   ]
 }

package/data/fresh-start/index.ts

@@ -24,7 +24,7 @@ export function useUpdateFreshStart() {
     mutationFn: async (settings: Partial<RefreshSettings>) =>
       json<RefreshSettings>(
         await fetch("/api/fresh-start", {
-          method: "PUT",
+          method: "PATCH",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(settings),
         })

package/data/workspaces/index.ts

@@ -87,6 +87,9 @@ export function useUpdateWorkspace() {
       ...updates
     }) => {
       await queryClient.cancelQueries({ queryKey: workspaceKeys.list() });
+      const previous = queryClient.getQueryData<Workspace[]>(
+        workspaceKeys.list()
+      );
       queryClient.setQueryData<Workspace[]>(workspaceKeys.list(), (prev) =>
         prev?.map((w) =>
           w.id === id
@@ -109,6 +112,12 @@ export function useUpdateWorkspace() {
             : w
         )
       );
+      return { previous };
+    },
+    // A rejected change rolls back to what the server holds.
+    onError: (_err, _vars, context) => {
+      if (context?.previous)
+        queryClient.setQueryData(workspaceKeys.list(), context.previous);
     },
     onSettled: () =>
       queryClient.invalidateQueries({ queryKey: workspaceKeys.all }),