@saadnvd1/agent-os 0.3.468 → 0.3.471

package/components/Projects/AddProject/FolderForm.tsx

@@ -2,18 +2,52 @@
 
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
-import { useInitProject } from "@/data/projects";
+import {
+  ProjectExistsError,
+  useInitProject,
+  type ExistingProject,
+} from "@/data/projects";
+import { useWorkspacesQuery } from "@/data/workspaces";
 import { FolderBrowser } from "./FolderBrowser";
 
 export function FolderForm({
   hostId,
+  workspaceId,
   onDone,
 }: {
   hostId: string;
+  workspaceId: string | null;
   onDone: (projectId: string) => void;
 }) {
   const [path, setPath] = useState("~");
   const init = useInitProject();
+  const [existing, setExisting] = useState<ExistingProject | null>(null);
+  const add = (moveExisting = false) =>
+    init.mutate(
+      { hostId, path, workspaceId, moveExisting },
+      {
+        onSuccess: (p) => onDone(p.id),
+        onError: (e) =>
+          e instanceof ProjectExistsError && setExisting(e.existing),
+      }
+    );
+
+  if (existing)
+    return (
+      <AlreadyAProject
+        existing={existing}
+        workspaceId={workspaceId}
+        pending={init.isPending}
+        error={init.error instanceof ProjectExistsError ? null : init.error}
+        onMove={() => add(true)}
+        onOpen={() => onDone(existing.id)}
+        onBack={() => {
+          setExisting(null);
+          init.reset();
+        }}
+      />
+    );
+
   return (
     <div className="space-y-3">
       <FolderBrowser hostId={hostId} path={path} onNavigate={setPath} />
@@ -23,12 +57,72 @@ export function FolderForm({
       <Button
         className="h-11 w-full md:h-9"
         disabled={init.isPending}
-        onClick={() =>
-          init.mutate({ hostId, path }, { onSuccess: (p) => onDone(p.id) })
-        }
+        onClick={() => add()}
       >
         {init.isPending ? "Adding…" : "Use this folder"}
       </Button>
     </div>
   );
 }
+
+// The folder is a project already: move it into the workspace this adds
+// to, or just start in it.
+function AlreadyAProject({
+  existing,
+  workspaceId,
+  pending,
+  error,
+  onMove,
+  onOpen,
+  onBack,
+}: {
+  existing: ExistingProject;
+  workspaceId: string | null;
+  pending: boolean;
+  error: Error | null;
+  onMove: () => void;
+  onOpen: () => void;
+  onBack: () => void;
+}) {
+  const { data: workspaces = [] } = useWorkspacesQuery();
+  const nameOf = (id: string | null) =>
+    workspaces.find((w) => w.id === id)?.name ?? null;
+  const from = nameOf(existing.workspaceId);
+  const to = nameOf(workspaceId);
+  const canMove = !!to && existing.workspaceId !== workspaceId;
+  return (
+    <div className="space-y-3">
+      <p className="text-sm">
+        <span className="font-medium">{existing.name}</span> is already a
+        project, {from ? `in ${from}` : "in no workspace"}.
+      </p>
+      {error && <p className="text-destructive text-sm">{error.message}</p>}
+      <div className="flex flex-col gap-2 sm:flex-row">
+        {canMove && (
+          <Button
+            className="h-11 flex-1 md:h-9"
+            disabled={pending}
+            onClick={onMove}
+          >
+            {pending ? "Moving…" : `Move it to ${to}`}
+          </Button>
+        )}
+        <Button
+          variant={canMove ? "outline" : "default"}
+          className="h-11 flex-1 md:h-9"
+          disabled={pending}
+          onClick={onOpen}
+        >
+          Start a session in it
+        </Button>
+      </div>
+      <button
+        type="button"
+        onClick={onBack}
+        className="text-primary min-h-11 px-1 text-sm md:min-h-8"
+      >
+        Pick another folder
+      </button>
+    </div>
+  );
+}

package/components/Projects/AddProject/NameForm.tsx

@@ -10,9 +10,11 @@ import { ParentPicker } from "./ParentPicker";
 // a separate, explicit click.
 export function NameForm({
   hostId,
+  workspaceId,
   onDone,
 }: {
   hostId: string;
+  workspaceId: string | null;
   onDone: (projectId: string) => void;
 }) {
   const [name, setName] = useState("");
@@ -67,7 +69,7 @@ export function NameForm({
       className="space-y-3"
       onSubmit={(e) => {
         e.preventDefault();
-        init.mutate({ hostId, parent, name: name.trim() });
+        init.mutate({ hostId, parent, name: name.trim(), workspaceId });
       }}
     >
       <Input

package/components/Projects/AddProject/WorkspacePick.tsx

@@ -0,0 +1,56 @@
+"use client";
+
+import { LayoutGrid } from "lucide-react";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { useWorkspacesQuery } from "@/data/workspaces";
+
+const NONE = "none";
+
+// "Adds to Internal Tools", changeable to another workspace or none.
+export function WorkspacePick({
+  workspaceId,
+  onChange,
+}: {
+  workspaceId: string | null;
+  onChange: (workspaceId: string | null) => void;
+}) {
+  const { data: workspaces = [] } = useWorkspacesQuery();
+  if (workspaces.length === 0) return null;
+  // One deleted since the dialog opened reads as none.
+  const value = workspaces.some((w) => w.id === workspaceId)
+    ? (workspaceId as string)
+    : NONE;
+  return (
+    <div className="flex items-center gap-2 text-sm">
+      <LayoutGrid className="text-muted-foreground h-3.5 w-3.5 shrink-0" />
+      <span className="text-muted-foreground shrink-0">Adds to</span>
+      <Select
+        value={value}
+        onValueChange={(v) => onChange(v === NONE ? null : v)}
+      >
+        <SelectTrigger
+          aria-label="Workspace"
+          className="h-11 min-w-0 flex-1 md:h-9"
+        >
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value={NONE} className="min-h-11 md:min-h-0">
+            No workspace
+          </SelectItem>
+          {workspaces.map((w) => (
+            <SelectItem key={w.id} value={w.id} className="min-h-11 md:min-h-0">
+              {w.name}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    </div>
+  );
+}

package/components/Projects/AddProject/useAddExistingProject.ts

@@ -0,0 +1,58 @@
+"use client";
+
+import { FolderGit2, FolderPlus } from "lucide-react";
+import { toast } from "sonner";
+import type { Workspace } from "@/lib/db";
+import { useProjectsQuery } from "@/data/projects";
+import {
+  useMoveProjectToWorkspace,
+  useWorkspacesQuery,
+} from "@/data/workspaces";
+import { paletteActions } from "@/stores/palette";
+import { useAddProject } from "./useAddProject";
+
+// "Add existing project…": a searchable pick of the projects not in this
+// workspace, under the workspace each is in now; picking one moves it in.
+// A new one is the first choice.
+export function useAddExistingProject() {
+  const { data: projects = [] } = useProjectsQuery();
+  const { data: workspaces = [] } = useWorkspacesQuery();
+  const move = useMoveProjectToWorkspace();
+  const addProject = useAddProject();
+  return (workspace: Workspace) => {
+    const nameOf = (id: string | null) =>
+      workspaces.find((w) => w.id === id)?.name ?? "No workspace";
+    const others = projects
+      .filter((p) => !p.is_uncategorized && p.workspace_id !== workspace.id)
+      .sort(
+        (a, b) =>
+          nameOf(a.workspace_id).localeCompare(nameOf(b.workspace_id)) ||
+          a.name.localeCompare(b.name)
+      );
+    paletteActions.pick(`Add a project to ${workspace.name}…`, [
+      {
+        id: "add-existing.new",
+        title: "New project (folder, clone or name)…",
+        group: "",
+        icon: FolderPlus,
+        run: addProject,
+      },
+      ...others.map((p) => ({
+        id: `add-existing.${p.id}`,
+        title: p.name,
+        group: nameOf(p.workspace_id),
+        keywords: [p.working_directory],
+        icon: FolderGit2,
+        run: () =>
+          move.mutate(
+            { projectId: p.id, workspaceId: workspace.id },
+            {
+              onSuccess: () =>
+                toast.success(`${p.name} moved to ${workspace.name}`),
+              onError: (e) => toast.error(e.message),
+            }
+          ),
+      })),
+    ]);
+  };
+}

package/components/SessionList/WorkspaceSwitcher.tsx

@@ -7,6 +7,7 @@ import {
   ChevronDown,
   CircleCheck,
   Clock,
+  FolderPlus,
   Gauge,
   LayoutGrid,
   Pencil,
@@ -29,6 +30,7 @@ import { archivedUiActions, cleanupUiActions } from "@/stores/archivedUi";
 import { orchestratorOpenActions } from "@/stores/orchestratorOpen";
 import { sidebarUiActions } from "@/stores/sidebarUi";
 import { schedulesUiActions } from "@/stores/schedulesUi";
+import { useAddExistingProject } from "@/components/Projects/AddProject/useAddExistingProject";
 
 const icon = "mr-2 h-3.5 w-3.5";
 
@@ -44,6 +46,7 @@ export function WorkspaceSwitcher({
   const create = useCreateWorkspace();
   const update = useUpdateWorkspace();
   const remove = useDeleteWorkspace();
+  const addExisting = useAddExistingProject();
   const [dialog, setDialog] = useState<"new" | "rename" | null>(null);
   const name = current?.name ?? "All workspaces";
 
@@ -94,6 +97,13 @@ export function WorkspaceSwitcher({
           {current && (
             <>
               <DM.DropdownMenuSeparator />
+              <DM.DropdownMenuItem
+                onClick={() => addExisting(current)}
+                className="min-h-11 md:min-h-0"
+              >
+                <FolderPlus className={icon} />
+                Add existing project…
+              </DM.DropdownMenuItem>
               <DM.DropdownMenuItem
                 onClick={() => orchestratorOpenActions.request(current.id)}
               >

package/components/Usage/UsageDialog.tsx

@@ -41,8 +41,8 @@ export function UsageDialog() {
         <DialogHeader>
           <DialogTitle>Usage</DialogTitle>
           <DialogDescription>
-            The account&apos;s limits, and what chat sessions on this machine
-            cost.
+            The account&apos;s limits, and what chat sessions and gate reviews
+            on this machine cost.
           </DialogDescription>
         </DialogHeader>
 
@@ -124,6 +124,35 @@ export function UsageDialog() {
             </>
           )}
         </section>
+
+        {data?.reviews && data.reviews.total.turns > 0 && (
+          <section className="space-y-3">
+            <h3 className="text-sm font-medium">Gate reviews</h3>
+            <div className="flex items-baseline gap-2">
+              <span className="text-2xl font-semibold tabular-nums">
+                {formatUsd(data.reviews.total.costUsd)}
+              </span>
+              <span className="text-muted-foreground text-xs">
+                estimate · {data.reviews.total.turns} runs ·{" "}
+                {data.reviews.total.tokens.toLocaleString()} tokens
+              </span>
+            </div>
+            <SpendList
+              title="By PR"
+              rows={data.reviews.sessions.map((s) => ({
+                key: s.id,
+                label: s.name,
+                ...s,
+              }))}
+              total={data.reviews.total}
+              limit={10}
+            />
+            <p className="text-muted-foreground text-[11px]">
+              Each run of the orchestrator&apos;s independent reviewer and scope
+              check, from its own result. Not part of chat spend.
+            </p>
+          </section>
+        )}
       </DialogContent>
     </Dialog>
   );

package/components/Workspaces/FreshStartForm.tsx

@@ -19,7 +19,7 @@ export function FreshStartForm() {
     return <p className="text-destructive text-sm">{error.message}</p>;
   return (
     <Form
-      key={`${data.orchestratorTokens}:${data.taskTokens}:${data.staleCompactTokens}`}
+      key={`${data.orchestratorTokens}:${data.taskTokens}:${data.compactTokens}`}
       saved={data}
     />
   );
@@ -29,13 +29,13 @@ function Form({ saved }: { saved: RefreshSettings }) {
   const update = useUpdateFreshStart();
   const orchestrator = useThreshold(saved.orchestratorTokens, 200);
   const task = useThreshold(saved.taskTokens, 200);
-  const stale = useThreshold(saved.staleCompactTokens, 150);
-  const error = orchestrator.error ?? task.error ?? stale.error;
+  const compact = useThreshold(saved.compactTokens, 150);
+  const error = orchestrator.error ?? task.error ?? compact.error;
   const dirty =
     !error &&
     (orchestrator.tokens !== saved.orchestratorTokens ||
       task.tokens !== saved.taskTokens ||
-      stale.tokens !== saved.staleCompactTokens);
+      compact.tokens !== saved.compactTokens);
 
   return (
     <form
@@ -46,7 +46,7 @@ function Form({ saved }: { saved: RefreshSettings }) {
           {
             orchestratorTokens: orchestrator.tokens,
             taskTokens: task.tokens,
-            staleCompactTokens: stale.tokens,
+            compactTokens: compact.tokens,
           },
           {
             onSuccess: () => toast.success("Context settings saved"),
@@ -65,17 +65,17 @@ function Form({ saved }: { saved: RefreshSettings }) {
       </p>
       <ThresholdRow label="Orchestrators" field={orchestrator} />
       <ThresholdRow label="Tasks" field={task} />
-      <h3 className="pt-2 text-sm font-medium">Compact idle chats</h3>
+      <h3 className="pt-2 text-sm font-medium">Compact</h3>
       <p className="text-muted-foreground text-sm">
-        A message to a chat idle past its prompt cache re-reads the whole
-        conversation at full price. Above this size, messages from the
-        orchestrator, events and schedules compact it first; the composer offers
-        to.
+        Chats and tasks compact when their context passes this size: Claude Code
+        does it itself, and between turns AgentOS compacts a chat over it, or
+        idle past its prompt cache, before the next message. The composer offers
+        to first. Orchestrators start fresh instead.
       </p>
       <ThresholdRow
-        label="Idle chats"
-        field={stale}
-        switchLabel="Compact idle chats before a message"
+        label="Chats and tasks"
+        field={compact}
+        switchLabel="Compact chats and tasks at this size"
       />
       {error && <p className="text-destructive text-xs">{error}</p>}
       <div className="flex justify-end">

package/data/projects/add.ts

@@ -2,8 +2,26 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { CloneJob, FolderListing } from "@/lib/project-add";
 import { projectKeys } from "./keys";
 
+export interface ExistingProject {
+  id: string;
+  name: string;
+  workspaceId: string | null;
+}
+
+// A folder that's already a project: the add form offers to move it.
+export class ProjectExistsError extends Error {
+  constructor(
+    message: string,
+    readonly existing: ExistingProject
+  ) {
+    super(message);
+  }
+}
+
 async function json<T>(res: Response): Promise<T> {
   const data = await res.json();
+  if (res.status === 409 && data.existing)
+    throw new ProjectExistsError(data.error, data.existing);
   if (!res.ok) throw new Error(data.error || "Request failed");
   return data;
 }
@@ -28,13 +46,14 @@ export function useFolderListing(hostId: string, path: string) {
   });
 }
 
-// A project from a folder ({ path }) or a new one from a name.
+// A project from a folder ({ path }) or a new one from a name, in a
+// workspace when given. moveExisting moves the project already at { path }.
 export function useInitProject() {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async (
-      input: { hostId: string } & (
-        | { path: string }
+      input: { hostId: string; workspaceId: string | null } & (
+        | { path: string; moveExisting?: boolean }
         | { parent: string; name: string }
       )
     ) =>
@@ -54,6 +73,7 @@ export function useStartClone() {
       hostId: string;
       parent: string;
       url: string;
+      workspaceId: string | null;
     }) =>
       (await json<{ job: CloneJob }>(await post("/api/projects/clone", input)))
         .job,

package/data/usage/index.ts

@@ -9,6 +9,8 @@ export const usageKeys = {
 
 export interface UsageResponse {
   report: UsageReport;
+  // The orchestrator's reviewer and scope check runs, by PR.
+  reviews: UsageReport;
   windows: UsageWindows;
 }
 

package/lib/agents/launch.ts

@@ -9,6 +9,7 @@ import { runInBackground } from "../async-operations";
 import { trustPromptKeys } from "../tasks/state";
 import { BUS_BRIEF } from "./brief";
 import { selfUrl } from "./self-env";
+import { autoCompactEnv } from "../chat/refresh";
 import { CLAUDE_STATUS_SETTINGS_FLAG } from "../program-status/claude-flag";
 import {
   sessionProjectEnv,
@@ -35,6 +36,7 @@ export function ensureBusBrief(): void {
 export function agentEnv(sessionId: string): Record<string, string> {
   return {
     ...sessionProjectEnv(sessionId),
+    ...autoCompactEnv(sessionId),
     AGENTOS_SESSION_ID: sessionId,
     AGENTOS_URL: selfUrl(),
     PATH: `${AOS_BIN_DIR}:${process.env.PATH ?? ""}`,

package/lib/chat/driver.ts

@@ -35,8 +35,16 @@ export interface ChatStartOptions {
   // A fixed permission mode in place of the access setting, which then
   // can't be changed for this conversation.
   permissionMode?: PermissionMode;
+  // Checked before every tool call, whatever the permissions say: why it's
+  // refused, or null to let it go on to them.
+  toolGuard?: ToolGuard;
 }
 
+export type ToolGuard = (
+  tool: string,
+  input: Record<string, unknown>
+) => Promise<string | null>;
+
 // One live conversation with an agent. Messages sent while a turn runs are
 // queued by the provider and folded into the conversation.
 export interface UndoResult extends UndoPreview {

package/lib/chat/drivers/claude-approvals.ts

@@ -2,6 +2,7 @@ import fs from "fs";
 import type {
   CanUseTool,
   HookCallback,
+  HookCallbackMatcher,
   PermissionMode,
   PermissionResult,
 } from "@anthropic-ai/claude-agent-sdk";
@@ -13,6 +14,7 @@ import type {
   DriverEvent,
 } from "../events";
 import { toolDiff, toolTitle } from "../tools";
+import type { ToolGuard } from "../driver";
 
 type Approval = Extract<ChatItem, { kind: "approval" }>;
 
@@ -235,3 +237,41 @@ export class Approvals {
     p.resolve(result);
   }
 }
+
+// A role's guard as a PreToolUse hook: a refusal denies the call before any
+// permission rule could allow it, and a guard that fails refuses too.
+export function guardHook(guard: ToolGuard): HookCallback {
+  return async (input) => {
+    if (input.hook_event_name !== "PreToolUse") return {};
+    const reason = await guard(
+      input.tool_name,
+      (input.tool_input ?? {}) as Record<string, unknown>
+    ).catch((e: Error) => `Couldn't check this call: ${e.message}`);
+    if (reason === null) return {};
+    return {
+      hookSpecificOutput: {
+        hookEventName: "PreToolUse",
+        permissionDecision: "deny",
+        permissionDecisionReason: reason,
+      },
+    };
+  };
+}
+
+// What runs before each tool call: questions and plans become cards, and a
+// role's guard (an orchestrator's, on where it writes) sees every call.
+export function preToolUseHooks(
+  approvals: Approvals,
+  guard?: ToolGuard
+): HookCallbackMatcher[] {
+  return [
+    {
+      matcher: "AskUserQuestion",
+      hooks: [approvals.askQuestions],
+      // The reader may take a while to answer.
+      timeout: 24 * 60 * 60,
+    },
+    { matcher: "ExitPlanMode", hooks: [approvals.proposePlan] },
+    ...(guard ? [{ hooks: [guardHook(guard)] }] : []),
+  ];
+}

package/lib/chat/drivers/claude.ts

@@ -8,7 +8,12 @@ import {
 import type { ChatDriver, ChatConversation } from "../driver";
 import type { DriverEvent, FileSuggestion, McpServerView } from "../events";
 import { InputQueue } from "../queue";
-import { Approvals, isPlanFile, sdkMode } from "./claude-approvals";
+import {
+  Approvals,
+  isPlanFile,
+  preToolUseHooks,
+  sdkMode,
+} from "./claude-approvals";
 import { toChatContext, usageTotals } from "../context";
 import { cacheTtlMs } from "../stale";
 import { ClaudeMapper, toCommand, type ClaudeMessage } from "./claude-mapper";
@@ -186,15 +191,7 @@ export const claudeDriver: ChatDriver = {
         allowedTools: options.allowedTools,
         disallowedTools: options.disallowedTools,
         hooks: {
-          PreToolUse: [
-            {
-              matcher: "AskUserQuestion",
-              hooks: [approvals.askQuestions],
-              // The reader may take a while to answer.
-              timeout: 24 * 60 * 60,
-            },
-            { matcher: "ExitPlanMode", hooks: [approvals.proposePlan] },
-          ],
+          PreToolUse: preToolUseHooks(approvals, options.toolGuard),
         },
         settings: { attribution: NO_ATTRIBUTION },
         enableFileCheckpointing: true,