@saadnvd1/agent-os 0.3.853 → 0.3.859

package/lib/orchestrator/mcp-servers.ts

@@ -14,7 +14,7 @@ import type { PermissionMode } from "@anthropic-ai/claude-agent-sdk";
 import os from "os";
 import path from "path";
 import { ORCHESTRATOR_PERMISSIONS } from "./tool-names";
-import { getOrchestrator } from "./home";
+import { listLeads } from "../leads/home";
 import { getWorkspace } from "../workspaces";
 import { retireChat } from "../chat/runner";
 
@@ -92,10 +92,11 @@ export function configuredMcpServers(): string[] {
   return [...names].sort((a, b) => a.localeCompare(b));
 }
 
-// A workspace's allowed servers changed: its orchestrator's worker ends at its
-// next turn boundary and the next one starts with the new permissions.
+// A workspace's allowed servers changed: its orchestrator's worker, and each
+// lead's, ends at its next turn boundary and the next one starts with the
+// new permissions.
 export async function applyMcpServers(workspaceId: string): Promise<void> {
-  const orchestrator = getOrchestrator(workspaceId);
-  if (orchestrator && getWorkspace(workspaceId))
-    await retireChat(orchestrator.id).catch(() => {});
+  if (!getWorkspace(workspaceId)) return;
+  for (const lead of listLeads(workspaceId))
+    await retireChat(lead.id).catch(() => {});
 }

package/lib/orchestrator/notes.ts

@@ -9,6 +9,10 @@ import { emit } from "../chat/registry";
 import { saveItem } from "../chat/store";
 import type { ChatItem } from "../chat/events";
 import { getOrchestrator } from "./home";
+import { actorIn } from "../leads/actor";
+import { getLead } from "../leads/home";
+import { leadKindOf } from "../leads/roles";
+import { TECH, type LeadKind } from "../leads/types";
 
 export type NoteKind =
   | "note"
@@ -32,16 +36,23 @@ const NOTE_CAP = 2000;
 export function addNote(
   workspaceId: string,
   text: string,
-  kind: NoteKind = "note"
+  kind: NoteKind = "note",
+  // Whose log it goes in: the lead calling, else the one named, else Tech.
+  lead?: LeadKind
 ): NoteRow {
   const body = text.trim().slice(0, NOTE_CAP);
   if (!body) throw new Error("The note is empty");
+  const actor = actorIn(workspaceId);
+  const leadKind = lead ?? (actor && leadKindOf(actor)) ?? TECH;
   const { lastInsertRowid } = db
     .prepare(
-      `INSERT INTO orchestrator_notes (workspace_id, kind, text) VALUES (?, ?, ?)`
+      `INSERT INTO orchestrator_notes (workspace_id, kind, text, lead_kind) VALUES (?, ?, ?, ?)`
     )
-    .run(workspaceId, kind, body);
-  const orchestrator = getOrchestrator(workspaceId);
+    .run(workspaceId, kind, body, leadKind);
+  const orchestrator =
+    leadKind === TECH
+      ? getOrchestrator(workspaceId)
+      : getLead(workspaceId, leadKind);
   if (orchestrator) {
     const item: ChatItem = {
       id: `note-${lastInsertRowid}-${randomUUID().slice(0, 5)}`,

package/lib/orchestrator/overview.ts

@@ -4,6 +4,7 @@
  * counts come from the live session statuses on the client.
  */
 
+import { sqlNoRole } from "../leads/roles";
 import { demoMode } from "../security/demo";
 import { db } from "../db";
 import { listWorkspaces } from "../workspaces";
@@ -26,7 +27,7 @@ function inReview(workspaceId: string): number {
     db
       .prepare(
         `SELECT COUNT(*) AS n FROM session_rows s JOIN projects p ON p.id = s.project_id
-         WHERE p.workspace_id = ? AND s.role IS NULL
+         WHERE p.workspace_id = ? AND ${sqlNoRole("s.role")}
            AND s.task_status = 'running' AND s.pr_status = 'open'`
       )
       .get(workspaceId) as { n: number }
@@ -58,6 +59,7 @@ export function orchestratorOverview(): OrchestratorOverview[] {
           // A demo answers without a passkey (its orchestrator never runs).
           presence: !demoMode() && PRESENCE_KINDS.includes(a.kind),
           createdAt: a.created_at,
+          leadKind: a.lead_kind,
         };
       }),
       questions: openQuestions(w.id),

package/lib/orchestrator/recipe-tools.ts

@@ -8,6 +8,7 @@
 import { formatRunTime } from "../schedules/cron";
 import { workspaceProject } from "./targets";
 import { getOrchestrator } from "./home";
+import { actorIn } from "../leads/actor";
 import { untrusted } from "./untrusted";
 import {
   AlreadyRunning,
@@ -85,7 +86,7 @@ export async function runRecipe(
   note?: string
 ): Promise<string> {
   const recipe = findRecipe(w, name);
-  const orchestrator = getOrchestrator(w);
+  const orchestrator = actorIn(w) ?? getOrchestrator(w);
   try {
     const { run, queued } = await startRun(recipe.id, {
       trigger: "tool",

package/lib/orchestrator/reminders.ts

@@ -6,6 +6,7 @@
  * an orchestrator made can be cancelled here: Saad's are his to change.
  */
 
+import { isTechRole } from "../leads/roles";
 import {
   archiveSchedule,
   createSchedule,
@@ -25,7 +26,7 @@ const line = (s: Schedule) =>
   `${s.id.slice(0, 8)}  ${s.name}: ${formatRunTime(s.run_at ?? 0, s.timezone)} (${relativeTime(s.run_at ?? 0)})`;
 
 const madeByOrchestrator = (s: Schedule) =>
-  getSessionRow(s.created_by_session_id ?? "")?.role === "orchestrator";
+  isTechRole(getSessionRow(s.created_by_session_id ?? "")?.role);
 
 export function remindMe(
   w: string,

package/lib/orchestrator/tools.ts

@@ -19,7 +19,7 @@ import { TOOL_SHAPES, TOOLS, type ToolName } from "./tool-schemas";
 type CallToolResult = Awaited<ReturnType<Parameters<typeof tool>[3]>>;
 
 export type ToolCaller = (
-  tool: ToolName,
+  tool: string,
   args: object,
   signal?: AbortSignal
 ) => Promise<string>;
@@ -203,21 +203,38 @@ const DESCRIPTIONS: Record<ToolName, string> = {
     "Park an item on the owner's asks list (a decision, or anything crossing a hard line) and carry on; it never waits. One open ask per title. His answer reaches you as an event. To ask whether to merge a PR the gates refuse, give task and sha (its head): his approval lets sign_off merge it once, at that commit, without a review (an AI-attributed body or failing CI still refuses).",
 };
 
+// A tool beyond the orchestrator's own (a lead's, lib/leads/tools.ts).
+export interface ExtraTool {
+  name: string;
+  description: string;
+  shape: z.ZodRawShape;
+}
+
+// The tools a standing session gets: by default exactly the orchestrator's.
 export function orchestratorTools(
-  call: ToolCaller
+  call: ToolCaller,
+  names: readonly ToolName[] = TOOLS,
+  extra: readonly ExtraTool[] = []
 ): McpSdkServerConfigWithInstance {
+  const signal = (e: unknown) => (e as { signal?: AbortSignal })?.signal;
   return createSdkMcpServer({
     name: ORCHESTRATOR_SERVER,
     version: "1.0.0",
-    tools: TOOLS.map((name) =>
-      tool(
-        name,
-        DESCRIPTIONS[name],
-        TOOL_SHAPES[name],
-        (args: object, extra: unknown) =>
-          answer(call(name, args, (extra as { signal?: AbortSignal })?.signal))
-      )
-    ),
+    tools: [
+      ...names.map((name) =>
+        tool(
+          name,
+          DESCRIPTIONS[name],
+          TOOL_SHAPES[name],
+          (args: object, e: unknown) => answer(call(name, args, signal(e)))
+        )
+      ),
+      ...extra.map((t) =>
+        tool(t.name, t.description, t.shape, (args: object, e: unknown) =>
+          answer(call(t.name, args, signal(e)))
+        )
+      ),
+    ],
   });
 }
 
@@ -225,9 +242,22 @@ export function orchestratorTools(
 // arguments and permissions. A worker after a deploy tells the agent its
 // tools changed only when this did.
 export function orchestratorToolsDigest(
-  permissions: object = ORCHESTRATOR_PERMISSIONS
+  permissions: object = ORCHESTRATOR_PERMISSIONS,
+  names?: readonly ToolName[],
+  extra: readonly ExtraTool[] = []
 ): string {
-  return toolsDigest(DESCRIPTIONS, TOOL_SHAPES, permissions);
+  if (!names && !extra.length)
+    return toolsDigest(DESCRIPTIONS, TOOL_SHAPES, permissions);
+  const kept = names ?? TOOLS;
+  const pick = <T>(m: Record<string, T>, x: (t: ExtraTool) => T) => ({
+    ...Object.fromEntries(kept.map((n) => [n, m[n]])),
+    ...Object.fromEntries(extra.map((t) => [t.name, x(t)])),
+  });
+  return toolsDigest(
+    pick(DESCRIPTIONS, (t) => t.description),
+    pick<z.ZodRawShape>(TOOL_SHAPES, (t) => t.shape),
+    permissions
+  );
 }
 
 export function toolsDigest(

package/lib/orchestrator/worker.ts

@@ -1,7 +1,6 @@
 import type { Session } from "../db";
 import { agentEnv } from "../agents/launch";
 import { loadOrchestratorBrief } from "./brief";
-import { orchestratorToken } from "./home";
 import { ORCHESTRATOR_SERVER } from "./tool-names";
 import { orchestratorPermissions } from "./mcp-servers";
 import { getWorkspace } from "../workspaces";
@@ -9,37 +8,70 @@ import {
   httpToolCaller,
   orchestratorTools,
   orchestratorToolsDigest,
+  type ExtraTool,
 } from "./tools";
 import type { RoleExtras } from "../chat/worker/extras";
 import { refreshSettings } from "../chat/refresh";
 import { orchestratorFullAccess } from "./full-access";
 import { orchestratorToolRefusal } from "./write-guard";
+import { hasLeads } from "../leads/settings";
+import { profileFor, type Profile } from "../leads/profiles";
+import { standingToken } from "../leads/home";
+import { LEAD_TOOL_DESCRIPTIONS, LEAD_TOOL_SHAPES } from "../leads/tools";
+import { loadLeadBrief, techLeadAdditions } from "../leads/brief";
 
-// What an orchestrator's chat worker starts with on top of any chat: its
-// brief, its tools, permissions fixed by its role, and the guard on where
-// it may write.
+const leadTools = (p: Profile): ExtraTool[] =>
+  p.leadTools.map((name) => ({
+    name,
+    description: LEAD_TOOL_DESCRIPTIONS[name],
+    shape: LEAD_TOOL_SHAPES[name],
+  }));
+
+// What an orchestrator's or a lead's chat worker starts with on top of any
+// chat: its brief, the tools its profile gives it (lib/leads/profiles),
+// permissions fixed by its role, and the guard on where it may write. The
+// orchestrator of a workspace without leads gets exactly what it always had.
 export async function orchestratorExtras(
   session: Session
 ): Promise<RoleExtras> {
+  const workspaceId = session.workspace_id ?? "";
+  const leads = hasLeads(workspaceId);
+  const profile = profileFor(session, leads);
+  if (!profile) throw new Error("This session has no tool profile yet");
+  const tech = profile.kind === "tech";
+  const extra = leadTools(profile);
   const baseUrl = agentEnv(session.id).AGENTOS_URL;
-  const permissions = orchestratorPermissions(
-    getWorkspace(session.workspace_id ?? "")?.orch_mcp_servers ?? [],
+  const base = orchestratorPermissions(
+    getWorkspace(workspaceId)?.orch_mcp_servers ?? [],
     orchestratorFullAccess(session)
   );
+  const permissions = extra.length
+    ? {
+        ...base,
+        allowedTools: [
+          ...base.allowedTools,
+          ...extra.map((t) => `mcp__${ORCHESTRATOR_SERVER}__${t.name}`),
+        ],
+      }
+    : base;
+  const names = tech ? undefined : profile.tools;
   return {
-    systemAppend: await loadOrchestratorBrief(session),
+    systemAppend: tech
+      ? await loadOrchestratorBrief(
+          session,
+          leads ? techLeadAdditions(session) : undefined
+        )
+      : await loadLeadBrief(session, profile),
     mcpServers: {
       [ORCHESTRATOR_SERVER]: orchestratorTools(
-        httpToolCaller(
-          baseUrl,
-          session.workspace_id ?? "",
-          orchestratorToken(session.workspace_id ?? "")
-        )
+        httpToolCaller(baseUrl, workspaceId, standingToken(session.id)),
+        profile.tools,
+        extra
       ),
     },
     ...permissions,
     toolGuard: (tool, input) => orchestratorToolRefusal(session, tool, input),
-    toolsDigest: orchestratorToolsDigest(permissions),
+    toolsDigest: orchestratorToolsDigest(permissions, names, extra),
     refresh: {
       atTokens: refreshSettings().orchestratorTokens,
       role: "orchestrator",

package/lib/orchestrator/write-guard.ts

@@ -24,7 +24,7 @@ import type { ToolGuardResult } from "../chat/driver";
 import { git, GitError } from "../git-exec";
 import { isOrchestratorSecretPath as isSecretPath } from "../secret-paths";
 import { WORKTREES_DIR } from "../worktrees";
-import { orchestratorDir } from "./home";
+import { standingDir } from "../leads/home";
 import { LIMITS_FILE } from "./usage";
 import { quickWorktrees } from "./quick-store";
 import { shellRefusal, shellWarning, type ShellContext } from "./shell-guard";
@@ -297,7 +297,7 @@ export async function orchestratorWriteBounds(
       ...(process.env.XDG_CONFIG_HOME ? [process.env.XDG_CONFIG_HOME] : []),
       ...(process.env.PATH ?? "").split(":").filter((d) => d.startsWith("/")),
     ],
-    ownDir: orchestratorDir(session.workspace_id ?? ""),
+    ownDir: standingDir(session),
     memory: [...new Set([cwd, await physicalPath(cwd)])].map((c) =>
       path.join(os.homedir(), ".claude", "projects", mangleCwd(c), "memory")
     ),

package/lib/projects.ts

@@ -5,6 +5,7 @@
  * Sessions inherit settings from their parent project.
  */
 
+import { sqlNoRole } from "./leads/roles";
 import fs from "fs";
 import path from "path";
 import { exec } from "child_process";
@@ -282,7 +283,7 @@ export function deleteProject(id: string): boolean {
   // Its sessions go to Uncategorized, staying in the project's workspace.
   db.prepare(
     `UPDATE sessions SET project_id = 'uncategorized', updated_at = datetime('now'),
-       workspace_id = CASE WHEN role IS NULL THEN ? ELSE workspace_id END
+       workspace_id = CASE WHEN ${sqlNoRole()} THEN ? ELSE workspace_id END
      WHERE project_id = ?`
   ).run(project.workspace_id ?? null, id);
 
@@ -328,7 +329,7 @@ export function moveSessionToProject(
     // A project's session follows the project; one left in none keeps the
     // workspace it was in.
     db.prepare(
-      `UPDATE sessions SET workspace_id = ? WHERE id = ? AND role IS NULL`
+      `UPDATE sessions SET workspace_id = ? WHERE id = ? AND ${sqlNoRole()}`
     ).run(
       to && !to.is_uncategorized
         ? null

package/lib/resurrect/find.ts

@@ -1,5 +1,6 @@
 /** Sessions that ended (dropped, done, archived) and can be asked for back. */
 
+import { sqlNoRole } from "../leads/roles";
 import { db } from "../db";
 import { resolveRef } from "../bus/resolve";
 
@@ -40,7 +41,7 @@ function kindOf(r: Row): EndedKind {
 
 function rows(scope: EndedScope, limit: number, kind?: EndedKind): Row[] {
   const where = [
-    "s.role IS NULL",
+    sqlNoRole("s.role"),
     "s.peer_mirror = 0",
     "s.held_by_device IS NULL",
   ];

package/lib/resurrect/index.ts

@@ -9,6 +9,7 @@
  * started: a chat resumes on its next message, so a restore costs no tokens.
  */
 
+import { isStandingRole, roleLabel } from "../leads/roles";
 import fs from "fs";
 import path from "path";
 import { db, queries, type Session } from "../db";
@@ -103,8 +104,8 @@ export async function resurrectSession(
 ): Promise<ResurrectOutcome> {
   const s = row(id);
   if (!s) throw new Error("Session not found");
-  if (s.role === "orchestrator")
-    throw new Error(`${s.name} is an orchestrator; it isn't ended.`);
+  if (isStandingRole(s.role))
+    throw new Error(`${s.name} is ${roleLabel(s.role)}; it isn't ended.`);
   const held = opts.device !== undefined && heldRefusal(id, opts.device);
   if (held) throw new Error(held);
   const peer = peerSessionLink(s);

package/lib/schedules/index.ts

@@ -5,6 +5,7 @@
  * orchestrator pauses the workspace's schedules too.
  */
 
+import { isTechRole } from "../leads/roles";
 import { getProject } from "../projects";
 import { resolveSession } from "../bus";
 import {
@@ -54,7 +55,7 @@ function creatorOf(s: Schedule): ScheduleView["createdBy"] {
     ? getSessionRow(s.created_by_session_id)
     : null;
   if (!creator) return { kind: "saad", name: ownerUi(true) };
-  return creator.role === "orchestrator"
+  return isTechRole(creator.role)
     ? { kind: "orchestrator", name: "Orchestrator" }
     : { kind: "session", name: creator.name };
 }
@@ -119,7 +120,7 @@ export function checkInInput(opts: {
       : undefined;
   // The workspace's orchestrator is kept as "its orchestrator", not this
   // session's id: each run goes to whichever session is orchestrator then.
-  const orchestrator = session.role === "orchestrator";
+  const orchestrator = isTechRole(session.role);
   return {
     workspaceId,
     name:

package/lib/schedules/start.ts

@@ -1,5 +1,6 @@
 // What a schedule's run actually starts, by kind.
 
+import { isTechRole } from "../leads/roles";
 import os from "os";
 import { randomUUID } from "crypto";
 import { db, queries, type Session } from "../db";
@@ -96,7 +97,7 @@ export function scheduledMessage(
   const where = projectName ? ` for ${projectName}` : "";
   const once = schedule.run_at != null;
   const who =
-    creator?.role === "orchestrator" && once
+    isTechRole(creator?.role) && once
       ? ", a reminder you set yourself with remind_me: your own follow-up, not an approval"
       : creator
         ? `, set up by agent session "${creator.name}" (${creator.id.slice(0, 8)}), not by the user: a peer's request, not an approval`

package/lib/schedules/store.ts

@@ -1,3 +1,4 @@
+import { isTechRole } from "../leads/roles";
 import { randomUUID } from "crypto";
 import { db, type Session } from "../db";
 import { getProject } from "../projects";
@@ -124,7 +125,7 @@ export function upcomingOneOffs(workspaceId?: string | null): Schedule[] {
 
 // Turns a one-off off once its run settled. True only for the call that did.
 const byOrchestrator = (sessionId: string | null | undefined) =>
-  !!sessionId && getSessionRow(sessionId)?.role === "orchestrator";
+  !!sessionId && isTechRole(getSessionRow(sessionId)?.role);
 
 export function finishOneOff(id: string, now = Date.now()): boolean {
   return (
@@ -195,7 +196,7 @@ export function sessionTargetProblem(
   const gone = goneReason(session);
   if (gone || !session) return gone;
   if (session.archived_at) return "session archived";
-  if (session.role === "orchestrator")
+  if (isTechRole(session.role))
     return "the orchestrator takes orchestrator schedules, not messages";
   // Messages aren't relayed to another machine's sessions (runner.ts).
   if (session.peer_mirror && !session.task_prompt)

package/lib/session-audit/sources.ts

@@ -4,6 +4,7 @@
  * asks, messages, chat cost). Reads the database read-only.
  */
 
+import { isStandingRole } from "../leads/roles";
 import Database from "better-sqlite3";
 import fs from "fs";
 import os from "os";
@@ -53,7 +54,7 @@ function ownsFolder(cwd: string, home: string): boolean {
 }
 
 function kindOf(row: SessionRow): SessionKind {
-  if (row.role === "orchestrator") return "orchestrator";
+  if (isStandingRole(row.role)) return "orchestrator";
   if (row.task_prompt) return "task";
   return row.view === "chat" ? "chat" : "terminal";
 }
@@ -307,9 +308,9 @@ export function loadSignals(
   let fromOrchestrator = 0;
   let toTasks = 0;
   for (const m of msgs) {
-    if (m.from_role === "orchestrator") fromOrchestrator++;
+    if (isStandingRole(m.from_role)) fromOrchestrator++;
     if (m.to_task) toTasks++;
-    if (m.from_role !== "orchestrator") continue;
+    if (!isStandingRole(m.from_role)) continue;
     const text = normalizeError(m.body).slice(0, 90);
     const t = texts.get(text) ?? { count: 0, sessions: new Set<string>() };
     t.count++;

package/lib/session-groups/workspace.ts

@@ -1,3 +1,4 @@
+import { isStandingRole } from "../leads/roles";
 import { getDb } from "@/lib/db";
 
 // The workspace a session belongs to: its project's, else the one kept on the
@@ -16,6 +17,6 @@ export function sessionWorkspaceId(
     | { role: string | null; own: string | null; byProject: string | null }
     | undefined;
   if (!row) return undefined;
-  if (row.role === "orchestrator") return row.own;
+  if (isStandingRole(row.role)) return row.own;
   return row.byProject ?? row.own;
 }

package/lib/sessions/launch.ts

@@ -3,6 +3,7 @@
  * then (for a worktree) the setup in the background, then the first message.
  */
 
+import { sqlStanding } from "../leads/roles";
 import { fileInGroup } from "../session-groups/assignSessions";
 import { agentosHome } from "../agentos-home";
 import type { StartVia } from "../tasks/starter";
@@ -203,7 +204,7 @@ function homeWorkspace(input: LaunchInput): string | null {
   if (!input.startedBy) return null;
   const by = db
     .prepare(
-      `SELECT workspace_id FROM sessions WHERE id = ? AND role = 'orchestrator'`
+      `SELECT workspace_id FROM sessions WHERE id = ? AND ${sqlStanding()}`
     )
     .get(input.startedBy) as { workspace_id: string | null } | undefined;
   return by?.workspace_id ?? null;

package/lib/sidebar/machines.ts

@@ -1,6 +1,7 @@
 // A linked machine's sessions are sessions here. One whose folder maps to
 // a project here sits with that project's sessions; the rest are listed
 // under their machine ("devbox · 3"), with the same rows. Client-safe.
+import { isStandingRole } from "../leads/roles";
 import type { Session } from "@/lib/db/types";
 import { buildShelves, type ShelfInput, type SidebarRow } from "./shelves";
 
@@ -20,7 +21,7 @@ export function onMachineOnly(
     !!session.host_id &&
     !!linked[session.host_id] &&
     !session.project_id &&
-    !session.role
+    !isStandingRole(session.role)
   );
 }
 

package/lib/sidebar/row-actions.ts

@@ -1,3 +1,4 @@
+import { isStandingRole } from "../leads/roles";
 import type { Session } from "@/lib/db/types";
 import { isOverTask, isRestorableTask } from "@/lib/tasks/restorable";
 import type { TaskState } from "@/lib/tasks/state";
@@ -15,7 +16,7 @@ export function finishActions(
   plain: boolean,
   derived?: TaskState
 ): FinishAction[] {
-  if (session.role === "orchestrator") return [];
+  if (isStandingRole(session.role)) return [];
   if (plain) return ["archive"];
   if (isRestorableTask(session.task_status)) return ["restore", "archive"];
   // The PR can merge before the status catches up.

package/lib/sidebar/row-badge.ts

@@ -1,6 +1,7 @@
 // The plan badge a row shows: writing its plan, or a plan
 // waiting for approval. A need or a stall says more and wins; finished,
 // snoozed and quick-change rows show none. Client-safe.
+import { isStandingRole } from "../leads/roles";
 import { NEED_LABEL, type SidebarRow } from "./shelves";
 
 export type RowKindBadge = {
@@ -18,7 +19,8 @@ export function rowKindBadge(
 ): RowKindBadge | null {
   const s = row.session;
   if (row.need || row.status?.stalled) return null;
-  if (row.settled || row.wakesAt || s.quick_of || s.role) return null;
+  if (row.settled || row.wakesAt || s.quick_of || isStandingRole(s.role))
+    return null;
   if (s.task_status && s.task_status !== "running") return null;
   if (row.task === "plan-ready" || s.plan_phase === "awaiting")
     return {

package/lib/sidebar/row-menu.ts

@@ -1,3 +1,4 @@
+import { isStandingRole, isTechRole } from "../leads/roles";
 import type { Session } from "@/lib/db/types";
 import type { SidebarRow } from "./shelves";
 import { finishActions } from "./row-actions";
@@ -112,8 +113,10 @@ export function rowMenu(input: RowMenuInput): RowMenuPlan {
     };
   }
 
-  const orchestrator = s.role === "orchestrator";
-  const agentRow = !s.role;
+  const standing = isStandingRole(s.role);
+  // The orchestrator takes its own schedule kind, not check-ins.
+  const orchestrator = isTechRole(s.role);
+  const agentRow = !standing;
   const live = !remote;
 
   sections.push(["rename", s.pinned ? "unpin" : "pin", "select"]);
@@ -134,7 +137,7 @@ export function rowMenu(input: RowMenuInput): RowMenuPlan {
     ...group("restart", [
       s.agent_type === "claude" && agentRow && live && "fork",
       agentRow && live && "fresh-start",
-      (orchestrator || !!s.has_brief) &&
+      (standing || !!s.has_brief) &&
         s.view === "chat" &&
         !s.archived_at &&
         live &&

package/lib/sidebar/shelves.ts

@@ -1,6 +1,7 @@
 // The sidebar's one flat list, sorted onto shelves: the workspace's pinned
 // orchestrator, Pinned, the user's groups, Needs you, Working, In review,
 // Ongoing, Snoozed, then Done. Client-safe: no database.
+import { isStandingRole } from "../leads/roles";
 import type { Session } from "@/lib/db/types";
 import { fromSqliteTime } from "@/lib/session-meta";
 import type { PrStage } from "@/lib/tasks/pr-stage";
@@ -384,7 +385,7 @@ export function buildShelves(input: ShelfInput): Shelves {
     // Named on a row outside its group (Pinned, Done); inside, the header says it.
     if (mine) row.groupName = mine.group.name;
     if (pinned && current) shelves.orchestrators.push(row);
-    else if (pinned && role !== "orchestrator") shelves.pinned.push(row);
+    else if (pinned && !isStandingRole(role)) shelves.pinned.push(row);
     else {
       const shelf = statusShelf(row, now);
       // Membership beats status. Only finished work goes on to Done (it keeps
@@ -468,8 +469,7 @@ export function inWorkspace(
   workspaceId: string | null
 ): boolean {
   if (!workspaceId) return true;
-  if (session.role === "orchestrator")
-    return session.workspace_id === workspaceId;
+  if (isStandingRole(session.role)) return session.workspace_id === workspaceId;
   const byProject = session.project_id ? workspaceOf(session.project_id) : null;
   return (byProject ?? session.workspace_id) === workspaceId;
 }

package/lib/status/collect.ts

@@ -2,6 +2,7 @@
 // program's own reports (OSC 7501) or, failing that, their screen; chats
 // from their live conversation. Shared by GET /api/sessions/status and the
 // pushed /ws/status stream.
+import { isStandingRole } from "../leads/roles";
 import { controlManager } from "../tmux/control";
 import { managedPanes } from "./managed";
 import { findResumeId } from "../providers/resume-ids";
@@ -38,7 +39,7 @@ import type { SessionNeed } from "../sidebar/shelves";
 import type { PrStage } from "../tasks/pr-stage";
 import { addPrStages } from "./pr-stages";
 import type { Compacting } from "../chat/events";
-import { openAskCount } from "../orchestrator/asks";
+import { standingAskCount } from "../orchestrator/asks";
 import { lastUserTask } from "../chat/store";
 import { hostExecFile, isRemoteHost } from "../hosts";
 import { linkedHostIds } from "../hosts/remote-api";
@@ -478,10 +479,10 @@ async function collect(full = false): Promise<StatusSnapshot> {
   )) {
     const state = chatState(session.id);
     const background = chatActivity(session.id)?.background;
-    const orchestrator = session.role === "orchestrator";
+    const orchestrator = isStandingRole(session.role);
     // What the database says; the rest below moves with time or the process.
     const base = chatMemo(pass, session.id, orchestrator, state ?? "", () => {
-      const asks = orchestrator ? openAskCount(session.workspace_id) : 0;
+      const asks = orchestrator ? standingAskCount(session) : 0;
       return {
         asks,
         waiting: needsYou(session, state),