@saadnvd1/agent-os 0.3.819 → 0.3.821

package/app/api/client-config/route.test.ts

@@ -6,6 +6,8 @@ describe("GET /api/client-config", () => {
     const res = GET();
     expect(res.status).toBe(200);
     expect(res.headers.get("cache-control")).toBe("no-store");
-    expect((await res.json()).v).toBe(1);
+    const body = await res.json();
+    expect(body.v).toBe(1);
+    expect(body).toHaveProperty("ownerName");
   });
 });

package/app/api/owner/route.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vitest";
+import { GET, PUT } from "./route";
+
+const put = (body: unknown) =>
+  PUT(
+    new Request("http://localhost/api/owner", {
+      method: "PUT",
+      body: JSON.stringify(body),
+    })
+  );
+
+describe("/api/owner", () => {
+  it("sets, reads and clears the owner's name", async () => {
+    expect(await (await GET()).json()).toEqual({ name: null });
+    expect(await (await put({ name: " Alex " })).json()).toEqual({
+      name: "Alex",
+    });
+    expect(await (await GET()).json()).toEqual({ name: "Alex" });
+    expect(await (await put({ name: null })).json()).toEqual({ name: null });
+    expect(await (await GET()).json()).toEqual({ name: null });
+  });
+
+  it("refuses a name that isn't text", async () => {
+    expect((await put({ name: 5 })).status).toBe(400);
+    expect((await put({})).status).toBe(400);
+  });
+});

package/app/api/owner/route.ts

@@ -0,0 +1,17 @@
+import { NextResponse } from "next/server";
+import { ownerName, setOwnerName } from "@/lib/owner";
+
+// GET /api/owner - the name the owner gave, or null.
+export function GET() {
+  return NextResponse.json({ name: ownerName() });
+}
+
+// PUT /api/owner { name } - set it; blank or null clears it.
+export async function PUT(request: Request) {
+  const body = (await request.json().catch(() => null)) as {
+    name?: unknown;
+  } | null;
+  if (!body || (body.name !== null && typeof body.name !== "string"))
+    return NextResponse.json({ error: "name must be text" }, { status: 400 });
+  return NextResponse.json({ name: setOwnerName(body.name) });
+}

package/app/api/workspaces/[id]/orchestrator/rules/[ruleId]/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import type { PresenceProof } from "@/lib/security/presence-http";
 import { removeRule, updateRule } from "@/lib/orchestrator/rules";
-import { provenAsSaad } from "../presence";
+import { provenAsOwner } from "../presence";
 
 type RouteParams = { params: Promise<{ id: string; ruleId: string }> };
 
@@ -21,7 +21,7 @@ async function target(
       response: NextResponse.json({ error: "Bad rule id" }, { status: 400 }),
     };
   const body = (await request.json().catch(() => ({}))) as Body;
-  const refused = await provenAsSaad(request, id, body);
+  const refused = await provenAsOwner(request, id, body);
   if (refused) return { response: refused };
   return { workspaceId: id, ruleId: n, body };
 }

package/app/api/workspaces/[id]/orchestrator/rules/presence.ts

@@ -10,7 +10,7 @@ import { rulesPresence } from "@/lib/orchestrator/presence-binding";
 // A rule written here is Saad's, shown to the orchestrator as his word and
 // removable only by him: so it takes his passkey, not just a trusted place
 // (any process on this machine reaches the route).
-export async function provenAsSaad(
+export async function provenAsOwner(
   request: NextRequest,
   workspaceId: string,
   proof: PresenceProof | undefined

package/app/api/workspaces/[id]/orchestrator/rules/route.ts

@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from "next/server";
 import type { PresenceProof } from "@/lib/security/presence-http";
 import { getWorkspace } from "@/lib/workspaces";
 import { addRule, listRules } from "@/lib/orchestrator/rules";
-import { provenAsSaad } from "./presence";
+import { provenAsOwner } from "./presence";
 
 type RouteParams = { params: Promise<{ id: string }> };
 
@@ -25,7 +25,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
   const { text } = body;
   if (typeof text !== "string")
     return NextResponse.json({ error: "text is required" }, { status: 400 });
-  const refused = await provenAsSaad(request, id, body);
+  const refused = await provenAsOwner(request, id, body);
   if (refused) return refused;
   try {
     return NextResponse.json({ rule: addRule(id, text, "saad") });

package/app/api/workspaces/[id]/orchestrator/tools/route.ts

@@ -5,6 +5,8 @@ import { TOKEN_HEADER } from "@/lib/orchestrator/tools";
 
 type RouteParams = { params: Promise<{ id: string }> };
 
+const LEGACY_ASK = "ask_saad";
+
 // The orchestrator chat's tools call here from its worker: plain text back.
 // Only that workspace's orchestrator worker holds the secret: other local
 // sessions are trusted by the network, not to act as the orchestrator.
@@ -12,7 +14,10 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
   const { id } = await params;
   if (!isOrchestratorToken(id, request.headers.get(TOKEN_HEADER)))
     return new NextResponse("Not the orchestrator", { status: 403 });
-  const { tool, args } = await request.json().catch(() => ({}));
+  const body = await request.json().catch(() => ({}));
+  const { args } = body;
+  // A worker started before the rename still calls ask_saad.
+  const tool = body.tool === LEGACY_ASK ? "ask_owner" : body.tool;
   if (!isToolName(tool))
     return NextResponse.json({ error: "Unknown tool" }, { status: 400 });
   try {

package/app/api/worktree-sweep/route.ts

@@ -10,6 +10,7 @@ import { requireLocalTrust } from "@/lib/security/route-guard";
 import { db, type Session } from "@/lib/db";
 import { orchestratorFullAccess } from "@/lib/orchestrator/full-access";
 import { sweepState } from "@/lib/worktree-sweep/state";
+import { owner } from "@/lib/owner";
 
 const body = z.union([
   z.object({
@@ -53,8 +54,7 @@ export async function PUT(request: NextRequest) {
         if (!s || !orchestratorFullAccess(s))
           return NextResponse.json(
             {
-              error:
-                "a session can't turn the full clean-up on: Saad does (Health, Clean-up, Turn on), or the orchestrator's sweep_arm tool when he has said to",
+              error: `a session can't turn the full clean-up on: ${owner()} does (Health, Clean-up, Turn on), or the orchestrator's sweep_arm tool when he has said to`,
             },
             { status: 403 }
           );

package/components/Chat/EventRow.tsx

@@ -18,6 +18,8 @@ import { cn } from "@/lib/utils";
 import { UserMessage } from "./Messages";
 import { openSessionLink as openSession } from "./session-link";
 import { useRowState } from "./rowState";
+import { useOwnerName } from "@/data/client-config/queries";
+import { ownerInUi } from "@/lib/owner-label";
 
 type UserItem = Extract<ChatItem, { kind: "user" }>;
 
@@ -158,6 +160,7 @@ export function EventRow({
   origin: ChatOrigin;
 }) {
   const { body, decided } = eventParts(item, origin);
+  const decidedLabel = `${ownerInUi(useOwnerName(), true)} decided`;
   const decision = origin.kind === "decision";
   return (
     <div className="flex flex-col gap-1">
@@ -167,7 +170,7 @@ export function EventRow({
           id={`${item.id}:${i}`}
           kind="decision"
           tone="decision"
-          head={<span className="truncate font-medium">Saad decided</span>}
+          head={<span className="truncate font-medium">{decidedLabel}</span>}
           body={d}
           at={item.createdAt}
         />
@@ -179,7 +182,7 @@ export function EventRow({
           tone={decision ? "decision" : undefined}
           head={
             decision ? (
-              <span className="truncate font-medium">Saad decided</span>
+              <span className="truncate font-medium">{decidedLabel}</span>
             ) : origin.kind === "guest" ? (
               <span className="truncate font-medium">
                 Suggested by {origin.label}

package/components/Chat/Messages.tsx

@@ -39,6 +39,8 @@ import {
   TurnBookmark,
   BookmarkPress,
 } from "@/components/Bookmarks/BookmarkButton";
+import { useOwnerName } from "@/data/client-config/queries";
+import { ownerVerb } from "@/lib/owner-label";
 
 type Of<K extends ChatItem["kind"]> = Extract<ChatItem, { kind: K }>;
 
@@ -473,13 +475,18 @@ export function CommandOutput({ item }: { item: Of<"command_output"> }) {
 const NOTE_LABEL = {
   note: "Note",
   brake: "Brake",
-  escalation: "Saad decides",
+  escalation: "",
   ask: "Ask",
   pause: "Pause",
   away: "Away",
 } as const;
 
 export function NoteLine({ item }: { item: Of<"note"> }) {
+  const name = useOwnerName();
+  const label =
+    item.tone === "escalation"
+      ? ownerVerb(name, "decides", "decide")
+      : NOTE_LABEL[item.tone];
   return (
     <div
       className={cn(
@@ -490,7 +497,7 @@ export function NoteLine({ item }: { item: Of<"note"> }) {
       )}
     >
       <span className="text-muted-foreground mr-2 font-mono text-[11px] tracking-wide uppercase">
-        {NOTE_LABEL[item.tone]}
+        {label}
       </span>
       {item.text}
     </div>

package/components/SessionList/statusDot.test.ts

@@ -35,7 +35,7 @@ describe("statusDot", () => {
     expect(d.title).toContain("Load 4.2 on 10 cores");
     expect(d.opensHealth).toBe(true);
   });
-  it("goes red when a health issue needs Saad", () => {
+  it("goes red when a health issue needs the owner", () => {
     const d = statusDot(load("green"), { open: 2, needsYou: 2 })!;
     expect(d.level).toBe("red");
     expect(d.label).toBe("Load normal · 2 health issues need you");

package/components/Settings/OwnerNameRow.tsx

@@ -0,0 +1,55 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { useClientConfig } from "@/data/client-config/queries";
+import { useSetOwnerName } from "@/data/owner/mutations";
+
+// The name AgentOS and the orchestrators use when they refer to you.
+export function OwnerNameRow() {
+  const saved = useClientConfig().data?.ownerName ?? "";
+  // null: show what is saved.
+  const [draft, setDraft] = useState<string | null>(null);
+  const value = draft ?? saved;
+  const save = useSetOwnerName();
+  return (
+    <form
+      className="bg-muted/40 flex flex-col gap-2 rounded-lg px-3 py-2.5 sm:flex-row sm:items-center"
+      onSubmit={(e) => {
+        e.preventDefault();
+        save.mutate(value.trim() || null, { onSuccess: () => setDraft(null) });
+      }}
+    >
+      <div className="min-w-0 flex-1">
+        <label htmlFor="owner-name" className="text-sm font-medium">
+          Your name
+        </label>
+        <p className="text-muted-foreground text-xs">
+          Used where AgentOS and your orchestrators refer to you. Orchestrators
+          pick it up when they next start.
+        </p>
+        {save.error && (
+          <p className="text-destructive text-xs">{save.error.message}</p>
+        )}
+      </div>
+      <Input
+        id="owner-name"
+        value={value}
+        maxLength={40}
+        placeholder="Not set"
+        onChange={(e) => setDraft(e.target.value)}
+        className="min-h-11 sm:min-h-8 sm:w-44"
+      />
+      <Button
+        type="submit"
+        size="sm"
+        variant="outline"
+        className="min-h-11 sm:min-h-8"
+        disabled={save.isPending || value.trim() === saved}
+      >
+        Save
+      </Button>
+    </form>
+  );
+}

package/components/Settings/SetupSection.tsx

@@ -4,6 +4,7 @@ import { Button } from "@/components/ui/button";
 import { HealthList } from "@/components/Welcome/HealthList";
 import { AgentList } from "@/components/Welcome/AgentList";
 import { ReachRow } from "@/components/Reach/ReachRow";
+import { OwnerNameRow } from "./OwnerNameRow";
 import { settingsUiActions } from "@/stores/settingsUi";
 import { welcomeUiActions } from "@/stores/welcomeUi";
 
@@ -11,6 +12,7 @@ import { welcomeUiActions } from "@/stores/welcomeUi";
 export function SetupSection() {
   return (
     <div className="flex flex-col gap-4">
+      <OwnerNameRow />
       <div className="bg-muted/40 flex items-center gap-3 rounded-lg px-3 py-2.5">
         <div className="min-w-0 flex-1">
           <p className="text-sm font-medium">First-run setup</p>

package/content/whats-new.json

@@ -1913,6 +1913,14 @@
       "area": "AgentOS",
       "text": "Files shared into the app are now checked against the same rules as chat attachments.",
       "url": "https://github.com/saadnvd1/agent-os/pull/549"
+    },
+    {
+      "id": 550,
+      "date": "2026-11-01",
+      "kind": "new",
+      "area": "AgentOS",
+      "text": "You can set your name in Settings, and AgentOS uses it in chats and notes instead of a fixed name.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/550"
     }
   ]
 }

package/data/client-config/queries.ts

@@ -16,3 +16,6 @@ export const clientConfigQuery = queryOptions({
 });
 
 export const useClientConfig = () => useQuery(clientConfigQuery);
+
+/** The owner's own name, or null until they set one (see lib/owner-label). */
+export const useOwnerName = () => useClientConfig().data?.ownerName ?? null;

package/data/owner/mutations.ts

@@ -0,0 +1,19 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { clientConfigKeys } from "@/data/client-config/queries";
+
+export function useSetOwnerName() {
+  const qc = useQueryClient();
+  return useMutation({
+    mutationFn: async (name: string | null) => {
+      const res = await fetch("/api/owner", {
+        method: "PUT",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ name }),
+      });
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error || "Couldn't save the name");
+      return data.name as string | null;
+    },
+    onSuccess: () => qc.invalidateQueries({ queryKey: clientConfigKeys.all }),
+  });
+}

package/lib/approvals/enable.ts

@@ -11,6 +11,7 @@ import {
   recordAutoApproval,
   setNoApprovals,
 } from "./no-approvals";
+import { ownerUi } from "../owner";
 
 // Everything already waiting when the mode goes on is approved: open asks,
 // tool cards in live chats.
@@ -42,7 +43,7 @@ export async function switchNoApprovals(on: boolean): Promise<void> {
       o.workspace_id,
       on
         ? "No approvals mode is on: every ask is approved as it's raised, and agents run without permission prompts."
-        : "No approvals mode is off: asks wait for Saad again.",
+        : `No approvals mode is off: asks wait for ${ownerUi()} again.`,
       "ask"
     );
   }

package/lib/artifacts/tools.ts

@@ -21,6 +21,7 @@ import {
 } from "./store";
 import { followLatest } from "../share/follow";
 import { previewHtml } from "./preview";
+import { owner } from "../owner";
 
 export const VISUALS_SERVER = "visuals";
 
@@ -218,4 +219,4 @@ When a chart, table, diagram or mockup would say more than prose, build a self-c
 // is told what to keep out of a page.
 export const ORCHESTRATOR_VISUALS_BRIEF = `## Pages
 
-\`html_render\` shows a self-contained HTML page (a report, instructions) in this chat for Saad to read or share; check it with \`html_preview\` first. Put only what you wrote in it: no secrets, and nothing from a session's text loaded from a URL.`;
+\`html_render\` shows a self-contained HTML page (a report, instructions) in this chat for ${owner()} to read or share; check it with \`html_preview\` first. Put only what you wrote in it: no secrets, and nothing from a session's text loaded from a URL.`;

package/lib/away/brief.ts

@@ -12,9 +12,10 @@ import {
 } from "./state";
 import { SWEEP_EVERY_MS } from "./sweep";
 import { awayWindowMinutes } from "./activity";
+import { owner, Owner } from "../owner";
 
 export function awayOnLine(row: AwayRow, now = Date.now()): string {
-  return `Saad is away (Away mode, since ${clockTime(fromSql(row.started_at), now)}, ${untilText(row, now)}). Follow work through rather than only reacting to events: keep each task moving to merged and deployed, sign off what passes its gates, and pick up what stalled. Every ${SWEEP_EVERY_MS / 60000} minutes AgentOS sweeps this workspace without messaging any session: it runs lost reviews again, checks the deploy after each merge, and sends you one digest of what's new (stalled tasks, idle ones with uncommitted work and no PR, Saad's own sessions idle with uncommitted work). You decide what needs work and act with your tools. Only sessions with real activity in the last ${awayWindowMinutes()} minutes are listed: leave the rest alone, since a message wakes an agent and re-reads its whole context. Interactive sessions (not tasks) are Saad's: ask a listed one at most once to wrap up, never drive them further. Hard lines still go to ask_saad; while he's away his asks reach his phone in one batch per sweep, so raise them as usual. \`aos notify\` is held for that batch too, so don't send one per item.`;
+  return `${Owner()} is away (Away mode, since ${clockTime(fromSql(row.started_at), now)}, ${untilText(row, now)}). Follow work through rather than only reacting to events: keep each task moving to merged and deployed, sign off what passes its gates, and pick up what stalled. Every ${SWEEP_EVERY_MS / 60000} minutes AgentOS sweeps this workspace without messaging any session: it runs lost reviews again, checks the deploy after each merge, and sends you one digest of what's new (stalled tasks, idle ones with uncommitted work and no PR, ${owner()}'s own sessions idle with uncommitted work). You decide what needs work and act with your tools. Only sessions with real activity in the last ${awayWindowMinutes()} minutes are listed: leave the rest alone, since a message wakes an agent and re-reads its whole context. Interactive sessions (not tasks) are ${owner()}'s: ask a listed one at most once to wrap up, never drive them further. Hard lines still go to ask_owner; while he's away his asks reach his phone in one batch per sweep, so raise them as usual. \`aos notify\` is held for that batch too, so don't send one per item.`;
 }
 
 // For the digest: the same line whenever Away is on, messaged or not, so an

package/lib/away/run.ts

@@ -56,6 +56,7 @@ import { checkDeploy } from "./deploy";
 import { buildAwayReport, phoneSummary, reportMarkdown } from "./report";
 import { awayOnLine } from "./brief";
 import { shutFinishedTaskSimulators } from "../simulator";
+import { owner, Owner, ownerUi } from "../owner";
 
 const PHONE_SOURCE = "away";
 const PHONE_LINES = 8;
@@ -116,7 +117,7 @@ function tellAway(
       ).run(away.id, workspaceId, orchestratorId, toldKey(workspaceId));
       addNote(
         workspaceId,
-        `Saad turned Away on, ${untilText(away, now)}.`,
+        `${ownerUi(true)} turned Away on, ${untilText(away, now)}.`,
         "away"
       );
     }
@@ -181,13 +182,13 @@ export function turnAwayOff(
   }
   const line =
     by === "expired"
-      ? "Away mode ran out: Saad may be back. Go back to reacting to events; don't drive interactive sessions."
-      : "Saad is back: Away mode is off. Go back to reacting to events.";
+      ? `Away mode ran out: ${owner()} may be back. Go back to reacting to events; don't drive interactive sessions.`
+      : `${Owner()} is back: Away mode is off. Go back to reacting to events.`;
   for (const workspaceId of reachedWorkspaces(ended.id)) {
     queueEvent(workspaceId, `away-back:${ended.id}`, null, line, now);
     addNote(
       workspaceId,
-      by === "expired" ? "Away ran out." : "Saad turned Away off.",
+      by === "expired" ? "Away ran out." : `${ownerUi(true)} turned Away off.`,
       "away"
     );
   }

package/lib/away/sweep.ts

@@ -21,6 +21,7 @@
 
 import { isFinished } from "../tasks/state";
 import type { SessionFacts } from "../orchestrator/facts";
+import { owner } from "../owner";
 
 export const SWEEP_EVERY_MS = 10 * 60 * 1000;
 export const STALL_MS = 30 * 60 * 1000;
@@ -199,7 +200,7 @@ function wrapupCandidate(f: SessionFacts, v: SweepView): Candidate | null {
     kind: "wrapup",
     sessionId: f.id,
     key,
-    line: `${f.name} (${f.id}): Saad's own session, idle ${minutes(v.now - turnOf(f, v))}m with uncommitted work.`,
+    line: `${f.name} (${f.id}): ${owner()}'s own session, idle ${minutes(v.now - turnOf(f, v))}m with uncommitted work.`,
   };
 }
 

package/lib/chat/runner.ts

@@ -86,6 +86,7 @@ import { DEMO_REFUSAL, demoMode } from "../security/demo";
 import { chatHold, chatRefusal } from "./hold";
 import { getHost } from "../hosts";
 import { hostLink } from "../hosts/remote-api";
+import { ownerUi } from "../owner";
 
 export {
   refreshCapabilities,
@@ -119,7 +120,7 @@ export async function carryOutPlan(
     {
       id: `user-carry-${planId}`,
       text: CARRY_OUT,
-      origin: { kind: "decision", label: "Saad" },
+      origin: { kind: "decision", label: ownerUi(true) },
       host: true,
     },
     timeoutMs

package/lib/chat/turns.ts

@@ -38,7 +38,7 @@ export const isQuestionTool = (item: ChatItem): boolean =>
   item.kind === "tool" && /(^|__)question$/.test(item.name);
 
 export const isAskTool = (item: ChatItem): boolean =>
-  item.kind === "tool" && /(^|__)ask_saad$/.test(item.name);
+  item.kind === "tool" && /(^|__)ask_(owner|saad)$/.test(item.name);
 
 // The assistant message a question was asked in (its turn's last words
 // before the call), else the call itself.

package/lib/config/client-config-types.ts

@@ -30,6 +30,8 @@ export interface ClientConfig {
   intake: IntakeLimits;
   attachments: AttachmentConfig;
   voice: VoiceLimits;
+  /** The owner's own name for text that refers to them; null until set. */
+  ownerName: string | null;
 }
 
 // What a chat accepts, served from lib/attachments/policy.ts. Sizes in bytes.

package/lib/config/client-config.ts

@@ -1,3 +1,4 @@
+import { ownerName } from "../owner";
 import { ATTACHMENT_LIMITS } from "../attachments/policy";
 import { ACCESS_LEVELS, DEFAULT_NEW_CHAT_ACCESS } from "../chat/access-levels";
 import { CHAT_ACCESS } from "../chat/events";
@@ -42,5 +43,6 @@ export function clientConfig(): ClientConfig {
     intake: INTAKE_LIMITS,
     attachments: ATTACHMENT_LIMITS,
     voice: VOICE_LIMITS,
+    ownerName: ownerName(),
   };
 }

package/lib/learning-cards/analyze.ts

@@ -24,6 +24,7 @@ import {
   type Pair,
   type SessionInput,
 } from "./types";
+import { owner } from "../owner";
 
 const ID = "learning-cards" as const;
 const LESSON_MAX = 200;
@@ -227,7 +228,7 @@ export async function analyzeSession(
           input.workspaceId,
           `learning-card:${card.id}`,
           sessionId,
-          `Learning card on "${input.name.replace(/\s+/g, " ")}", waiting on Saad's Needs-you strip: ${untrusted("learning card", cardTitle(card))}`
+          `Learning card on "${input.name.replace(/\s+/g, " ")}", waiting on ${owner()}'s Needs-you strip: ${untrusted("learning card", cardTitle(card))}`
         );
   } finally {
     inFlight.delete(sessionId);

package/lib/models/plan-step.ts

@@ -35,6 +35,7 @@ import {
   splitOf,
 } from "../plans/features";
 import { advancePlan, setPlan } from "../db/session-parts";
+import { Owner } from "../owner";
 
 export const PLAN_FILE = ".agentos/plan.md";
 
@@ -533,7 +534,7 @@ export async function recheckPlanning(
 export type ApprovedBy = "saad" | "orchestrator" | "no-approvals";
 
 const APPROVAL_TEXT: Record<ApprovedBy, string> = {
-  saad: "Saad approved the plan; implement it as planned.",
+  saad: `${Owner()} approved the plan; implement it as planned.`,
   orchestrator: "The orchestrator approved the plan; implement it as planned.",
   "no-approvals":
     "The plan was approved automatically (no-approvals mode); implement it as planned.",

package/lib/orchestrator/approval-carry.ts

@@ -11,6 +11,7 @@ import { addNote } from "./notes";
 import { comparePatches } from "./patch";
 import { fetchRefs } from "./repo";
 import type { Session } from "../db";
+import { Owner } from "../owner";
 
 const short = (sha: string) => sha.slice(0, 7);
 
@@ -41,7 +42,7 @@ export async function carryApproval(
   if (rebindApproval(approval.id, approval.sha, head, line))
     addNote(
       workspaceId,
-      `Saad's approval of ${work.name} at ${short(approval.sha)} carries to ${short(head)}: same patch, rebased onto ${base}.`
+      `${Owner()}'s approval of ${work.name} at ${short(approval.sha)} carries to ${short(head)}: same patch, rebased onto ${base}.`
     );
   const now = getAsk(workspaceId, approval.id);
   return { approval: now?.sha === head && !now.used_at ? now : null, note };

package/lib/orchestrator/armed.ts

@@ -31,6 +31,7 @@ import { workspaceTask } from "./targets";
 import { markStatusDirty } from "../status/dirty";
 import { setPr } from "../db/session-parts";
 import { noteAutoArmed } from "./fast-lane-state";
+import { owner } from "../owner";
 
 // Judged again at least this often, for what the fingerprint can't see.
 export const ARMED_RECHECK_MS = 5 * 60 * 1000;
@@ -94,7 +95,7 @@ export async function arm(workspaceId: string, ref: string): Promise<string> {
   const task = workspaceTask(workspaceId, ref);
   armTask(task);
   if (isFast(task)) return armedNow(workspaceId, task);
-  return `Armed ${task.name}: AgentOS merges its PR the moment every sign_off gate passes at its head, and tells you with one event. A gate failure also comes as one event; it stays armed for the fix, unless the failure goes to Saad. No need to call sign_off.`;
+  return `Armed ${task.name}: AgentOS merges its PR the moment every sign_off gate passes at its head, and tells you with one event. A gate failure also comes as one event; it stays armed for the fix, unless the failure goes to ${owner()}. No need to call sign_off.`;
 }
 
 // Arms a task, or says why it can't be: only a running task, in a
@@ -108,11 +109,11 @@ export function armTask(task: Session): void {
   const held = approved ? [] : holdingEscalations(task.id);
   if (held.length)
     throw new Error(
-      `${task.name} is with Saad (${held.map((h) => h.gate).join(", ")}); only he merges it`
+      `${task.name} is with ${owner()} (${held.map((h) => h.gate).join(", ")}); only he merges it`
     );
   if (w && !approved && openBySubject(w, workSubject(task.id)))
     throw new Error(
-      `${task.name} has an open ask with Saad; it merges on his answer`
+      `${task.name} has an open ask with ${owner()}; it merges on his answer`
     );
   if (task.peer_mirror)
     throw new Error(`${task.name} runs on a linked machine; arm it there`);
@@ -255,7 +256,7 @@ async function mergeOne(
     event(
       workspaceId,
       task,
-      `task ${task.name}: disarmed, it's with Saad (${held.join(", ")})`
+      `task ${task.name}: disarmed, it's with ${owner()} (${held.join(", ")})`
     );
     return;
   }
@@ -280,14 +281,14 @@ async function mergeOne(
   if (!stillArmed(workspaceId, task.id)) return;
   const counted = await deps.judge(workspaceId, task);
   if (counted.ok) return merge(workspaceId, task, counted, deps);
-  const toSaad = holdingEscalations(task.id).length > 0;
-  if (toSaad) setArmed(task.id, false);
+  const toOwner = holdingEscalations(task.id).length > 0;
+  if (toOwner) setArmed(task.id, false);
   else setPr(db, task.id, { merge_armed_seen: seen });
   event(
     workspaceId,
     task,
-    toSaad
-      ? `task ${task.name}: armed merge stopped and disarmed, it went to Saad.\n${counted.text}`
+    toOwner
+      ? `task ${task.name}: armed merge stopped and disarmed, it went to ${owner()}.\n${counted.text}`
       : `task ${task.name}: armed, not merged yet; it stays armed and merges once this is fixed.\n${counted.text}`
   );
 }

package/lib/orchestrator/ask-heads.ts

@@ -15,6 +15,7 @@ import type { SessionFacts } from "./facts";
 import { addNote } from "./notes";
 import { comparePatches } from "./patch";
 import { fetchRefs, repoOf } from "./repo";
+import { Owner } from "../owner";
 
 const short = (sha: string) => sha.slice(0, 7);
 
@@ -49,7 +50,7 @@ export async function followAskHeads(
       if (moveAskHead(ask.id, ask.sha, pr.head, line))
         addNote(
           workspaceId,
-          `Saad's ask on ${task.name} now names ${short(pr.head)} (${same ? "same patch" : "patch changed"}).`,
+          `${Owner()}'s ask on ${task.name} now names ${short(pr.head)} (${same ? "same patch" : "patch changed"}).`,
           "ask"
         );
     } catch (error) {