@saadnvd1/agent-os 0.3.524 → 0.3.528

package/lib/orchestrator/questions.ts

@@ -0,0 +1,120 @@
+/**
+ * Questions the orchestrator puts to Saad in chat. Marking one open pins it
+ * on his Needs-you strip until he answers it (the strip's Reply) or the
+ * orchestrator clears it. Unlike an ask it has no Approve or Decline: it is
+ * just words that need an answer. Dismissing an item from the strip only
+ * hides it, for asks and questions alike.
+ */
+
+import { db } from "../db";
+import type { QuestionView } from "./ask-view";
+import { workspaceTask } from "./targets";
+
+export const MAX_OPEN_QUESTIONS = 10;
+
+interface QuestionRow {
+  id: number;
+  text: string;
+  task: string | null;
+  task_name: string | null;
+  created_at: string;
+}
+
+export function openQuestions(workspaceId: string): QuestionView[] {
+  settleQuestions(workspaceId);
+  return (
+    db
+      .prepare(
+        `SELECT q.id, q.text, q.task, s.name AS task_name, q.created_at
+         FROM orchestrator_questions q LEFT JOIN sessions s ON s.id = q.task
+         WHERE q.workspace_id = ? AND q.status = 'open'
+         ORDER BY q.id DESC`
+      )
+      .all(workspaceId) as QuestionRow[]
+  ).map((r) => ({
+    id: r.id,
+    text: r.text,
+    task: r.task,
+    taskName: r.task_name,
+    createdAt: r.created_at,
+  }));
+}
+
+// A question about work that has finished no longer needs an answer.
+function settleQuestions(workspaceId: string): void {
+  db.prepare(
+    `UPDATE orchestrator_questions
+     SET status = 'cleared', resolved_by = 'orchestrator', resolved_at = datetime('now')
+     WHERE workspace_id = ? AND status = 'open' AND task IN (
+       SELECT id FROM sessions WHERE task_status IN ('merged', 'dropped', 'done'))`
+  ).run(workspaceId);
+}
+
+// The same words while open are the same question.
+export function askQuestion(
+  workspaceId: string,
+  text: string,
+  taskRef?: string
+): string {
+  const task = taskRef ? workspaceTask(workspaceId, taskRef).id : null;
+  const open = db
+    .prepare(
+      `SELECT id FROM orchestrator_questions
+       WHERE workspace_id = ? AND status = 'open' AND text = ?`
+    )
+    .get(workspaceId, text) as { id: number } | undefined;
+  if (open) return `Question ${open.id} is already open; left as it is.`;
+  const count = (
+    db
+      .prepare(
+        `SELECT COUNT(*) AS n FROM orchestrator_questions
+         WHERE workspace_id = ? AND status = 'open'`
+      )
+      .get(workspaceId) as { n: number }
+  ).n;
+  if (count >= MAX_OPEN_QUESTIONS)
+    return `Not opened: ${count} questions are already open. Clear the ones that no longer matter with resolve_question first.`;
+  const { lastInsertRowid } = db
+    .prepare(
+      `INSERT INTO orchestrator_questions (workspace_id, text, task) VALUES (?, ?, ?)`
+    )
+    .run(workspaceId, text, task);
+  return `Question ${lastInsertRowid} is open on Saad's Needs-you strip. Call resolve_question ${lastInsertRowid} once he has answered or it no longer matters.`;
+}
+
+export function resolveQuestion(
+  workspaceId: string,
+  id: number,
+  by: "saad" | "orchestrator"
+): boolean {
+  return (
+    db
+      .prepare(
+        `UPDATE orchestrator_questions
+         SET status = ?, resolved_by = ?, resolved_at = datetime('now')
+         WHERE id = ? AND workspace_id = ? AND status = 'open'`
+      )
+      .run(by === "saad" ? "answered" : "cleared", by, id, workspaceId)
+      .changes > 0
+  );
+}
+
+export function dismissItem(workspaceId: string, key: string): void {
+  db.prepare(
+    `INSERT OR IGNORE INTO needs_you_dismissed (workspace_id, key) VALUES (?, ?)`
+  ).run(workspaceId, key);
+}
+
+export function undismissItem(workspaceId: string, key: string): void {
+  db.prepare(
+    `DELETE FROM needs_you_dismissed WHERE workspace_id = ? AND key = ?`
+  ).run(workspaceId, key);
+}
+
+export function dismissedKeys(workspaceId: string): string[] {
+  return (
+    db
+      .prepare(`SELECT key FROM needs_you_dismissed WHERE workspace_id = ?`)
+      .all(workspaceId) as { key: string }[]
+  ).map((r) => r.key);
+}

package/lib/orchestrator/serve.ts

@@ -23,6 +23,7 @@ import { addNote } from "./notes";
 import { addProject } from "./add-project";
 import { addRule, removeRule } from "./rules";
 import { askSaad } from "./ask-tool";
+import { askQuestion, resolveQuestion } from "./questions";
 import { listOrchestratorPeers, messageOrchestrator } from "./cross";
 import { PAUSED_REFUSAL } from "./pause";
 import { readSession } from "./read";
@@ -211,5 +212,15 @@ export async function runTool(
       return disarm(w, p(tool, raw).task);
     case "ask_saad":
       return askSaad(w, p(tool, raw));
+    case "question": {
+      const a = p(tool, raw);
+      return askQuestion(w, a.text, a.task);
+    }
+    case "resolve_question": {
+      const id = p(tool, raw).id;
+      return resolveQuestion(w, id, "orchestrator")
+        ? `Question ${id} cleared.`
+        : `No open question ${id}.`;
+    }
   }
 }

package/lib/orchestrator/tool-names.ts

@@ -29,6 +29,8 @@ export const TOOL_NAMES = {
   done: name("done"),
   add_project: name("add_project"),
   note: name("note"),
+  question: name("question"),
+  resolve_question: name("resolve_question"),
   rule_add: name("rule_add"),
   rule_remove: name("rule_remove"),
   review: name("review"),

package/lib/orchestrator/tool-schemas.ts

@@ -239,6 +239,18 @@ export const TOOL_SHAPES = {
       .describe("A new project's name (default: the folder's)"),
   },
   note: { text: z.string().trim().min(1).max(2000) },
+  question: {
+    text: z
+      .string()
+      .trim()
+      .min(1)
+      .max(300)
+      .describe("The question as you asked it in chat, one or two sentences"),
+    task: ref("The task it is about, when it names one").optional(),
+  },
+  resolve_question: {
+    id: z.number().int().positive().describe("The question's id"),
+  },
   rule_add: {
     text: z
       .string()

package/lib/orchestrator/tools.ts

@@ -101,6 +101,10 @@ const DESCRIPTIONS: Record<ToolName, string> = {
   arm: "Arm a task's PR to merge: AgentOS merges it, through the same gates as sign_off, the moment they all pass at its head, and tells you with one event. A gate failure comes as one event and it stays armed for the fix; one that goes to Saad disarms it. Survives restarts. Use it instead of calling sign_off until it passes.",
   disarm:
     "Disarm a task armed to merge: it merges only through sign_off again.",
+  question:
+    "Mark a question you asked Saad in chat as open: it stays pinned on his Needs-you strip until he answers or you clear it. Use it for anything you need from him that isn't an ask_saad item. The same text while open is the same question.",
+  resolve_question:
+    "Clear an open question once Saad has answered it in chat, or it no longer matters.",
   ask_saad:
     "Park an item on Saad'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.",
 };

package/lib/providers/registry.ts

@@ -15,6 +15,7 @@ export const PROVIDER_IDS = [
   "amp",
   "pi",
   "omp",
+  "copilot",
   "shell",
 ] as const;
 
@@ -57,6 +58,11 @@ export interface ProviderDefinition {
 // The model value that means "whatever the agent itself defaults to".
 export const AGENT_DEFAULT_MODEL = "default";
 
+// A model name handed to another agent's CLI as an argument: printable, no
+// leading dash (it would read as a flag), bounded.
+export const isAgentModelName = (v: unknown): v is string =>
+  typeof v === "string" && /^[A-Za-z0-9][A-Za-z0-9._:/@+-]{0,99}$/.test(v);
+
 /**
  * Provider Registry
  * All supported agent providers with their configurations
@@ -192,6 +198,19 @@ export const PROVIDERS: ProviderDefinition[] = [
     modelFlag: "--model",
     initialPromptFlag: "", // Positional argument
   },
+  {
+    id: "copilot",
+    name: "GitHub Copilot",
+    description: "GitHub's Copilot CLI",
+    cli: "copilot",
+    configDir: "~/.copilot",
+    autoApproveFlag: "--allow-all",
+    supportsResume: true,
+    supportsFork: false,
+    resumeArgs: (id) => [`--resume=${id}`],
+    modelFlag: "--model",
+    initialPromptFlag: "-i",
+  },
   {
     id: "shell",
     name: "Terminal",

package/lib/providers/resume-ids.ts

@@ -154,6 +154,35 @@ export function opencodeResumeId(cwd: string, now = Date.now()): string | null {
   }
 }
 
+// ~/.copilot/session-state/<id>/workspace.yaml, whose `cwd:` line names the
+// folder the conversation ran in.
+export function copilotResumeId(cwd: string, now = Date.now()): string | null {
+  const root = path.join(
+    process.env.COPILOT_HOME || path.join(os.homedir(), ".copilot"),
+    "session-state"
+  );
+  let ids: string[];
+  try {
+    ids = fs.readdirSync(root);
+  } catch {
+    return null;
+  }
+  let best: { id: string; mtimeMs: number } | null = null;
+  for (const id of ids) {
+    if (!/^[0-9a-f-]{36}$/.test(id)) continue;
+    const file = path.join(root, id, "workspace.yaml");
+    try {
+      const { mtimeMs } = fs.statSync(file);
+      if (!recent(mtimeMs, now) || (best && best.mtimeMs >= mtimeMs)) continue;
+      const folder = fs.readFileSync(file, "utf8").match(/^cwd: (.+)$/m)?.[1];
+      if (folder?.trim() === cwd) best = { id, mtimeMs };
+    } catch {
+      // Gone since the listing.
+    }
+  }
+  return best?.id ?? null;
+}
+
 const FINDERS: Partial<
   Record<ProviderId, (cwd: string, now?: number) => string | null>
 > = {
@@ -161,6 +190,7 @@ const FINDERS: Partial<
   codex: codexResumeId,
   pi: piResumeId,
   opencode: opencodeResumeId,
+  copilot: copilotResumeId,
 };
 
 export function findResumeId(agent: ProviderId, cwd: string): string | null {

package/lib/tasks/code-review.ts

@@ -19,15 +19,18 @@ const FENCE = /^ {0,3}(`{3,}|~{3,})/;
 // prose that quotes the footer ("the 'Generated with Claude Code' footer")
 // isn't one.
 export const ATTRIBUTION =
-  /^(?:co-authored-by:.*(?:claude|anthropic)|claude-session:|🤖 generated with)|(?:^|[^\p{L}\p{N}"'`])generated (?:with|by) \[?claude code/iu;
+  /^(?:co-authored-by:.*(?:claude|anthropic|copilot)|claude-session:|🤖 generated with)|(?:^|[^\p{L}\p{N}"'`])generated (?:with|by) \[?claude code/iu;
 export type AttributionKind =
   | "a Co-Authored-By trailer naming Claude"
+  | "a Co-Authored-By trailer naming GitHub Copilot"
   | "a Claude-Session link"
   | 'a "Generated with" AI footer';
 function attributionKind(line: string): AttributionKind | undefined {
   if (!ATTRIBUTION.test(line)) return;
   if (/^co-authored-by:/i.test(line))
-    return "a Co-Authored-By trailer naming Claude";
+    return /^co-authored-by:.*(?:claude|anthropic)/i.test(line)
+      ? "a Co-Authored-By trailer naming Claude"
+      : "a Co-Authored-By trailer naming GitHub Copilot";
   if (/^claude-session:/i.test(line)) return "a Claude-Session link";
   return 'a "Generated with" AI footer';
 }

package/lib/tasks/index.ts

@@ -28,7 +28,10 @@ import {
   isBranchName,
   slugify,
 } from "../git";
-import { getProvider } from "../providers";
+import { getProvider, type AgentType } from "../providers";
+import { agentLabel } from "../agent-options";
+import { supportsChat } from "../chat/capabilities";
+import { AGENT_DEFAULT_MODEL } from "../providers/registry";
 import { statusDetector } from "../status-detector";
 import { buildTaskBrief, type StackedOn } from "./brief";
 import {
@@ -140,6 +143,11 @@ export async function createTask(opts: {
   base?: { branch: string; tip: string; stack: StackedOn };
   // Cut from this branch instead of the default one.
   baseBranch?: string;
+  // The agent CLI that does the work (Claude Code unless a person picks
+  // another). Another agent runs as a chat on this machine, on its own
+  // default model unless `model` names one, without plan-first or role
+  // models: those are Claude Code's.
+  agent?: AgentType;
   // Called once the session row exists, before the agent launches.
   onCreated?: (sessionId: string) => void;
   // Run it on this machine (another one's own AgentOS); default: the project's.
@@ -201,6 +209,17 @@ async function startTask(
   if (!project || project.is_uncategorized) throw new Error("Pick a project");
   const hostId = opts.hostId ?? project.host_id;
   const view = opts.view ?? DEFAULT_START_VIEW;
+  const agent = opts.agent ?? "claude";
+  if (agent !== "claude") {
+    if (!supportsChat(agent))
+      throw new Error(`${agentLabel(agent)} can't run a task yet`);
+    if (view !== "chat")
+      throw new Error(`${agentLabel(agent)} runs a task as a chat`);
+    if (opts.plan || opts.planOnly)
+      throw new Error(`${agentLabel(agent)} doesn't plan first yet`);
+    if (isRemoteHost(hostId))
+      throw new Error(`${agentLabel(agent)} tasks run on this machine for now`);
+  }
   if (isRemoteHost(hostId)) {
     if (opts.planOnly)
       throw new Error("A plan-only task runs on this machine for now");
@@ -228,13 +247,16 @@ async function startTask(
     );
   if (opts.planOnly && view !== "chat")
     throw new Error("A plan-only task needs a chat, not a terminal");
-  const routing = taskRouting(
-    project.workspace_id,
-    view,
-    opts.model,
-    opts.plan,
-    opts.planOnly
-  );
+  const routing =
+    agent === "claude"
+      ? taskRouting(
+          project.workspace_id,
+          view,
+          opts.model,
+          opts.plan,
+          opts.planOnly
+        )
+      : otherAgentRouting(opts.model);
   const projectPath = expandHome(project.working_directory);
   const naming = await nameFor(prompt, projectPath, opts.name);
   const feature = `${slugify(naming.name.split(/\s+/).slice(0, 6).join(" "))}-${id.slice(0, 4)}`;
@@ -253,7 +275,7 @@ async function startTask(
     startPoint: opts.base?.tip,
   });
 
-  const provider = getProvider("claude");
+  const provider = getProvider(agent);
   const model = routing.first.model;
   const tmuxName = `${provider.id}-${id}`;
 
@@ -268,7 +290,7 @@ async function startTask(
       model,
       null,
       "sessions",
-      "claude",
+      agent,
       1,
       project.id,
       "local"
@@ -453,6 +475,19 @@ export async function listTasks(): Promise<TaskView[]> {
   );
 }
 
+// Another agent's task: its own model (or its default), never planned first.
+function otherAgentRouting(model: unknown) {
+  return {
+    override: null,
+    plan: false,
+    planOnly: false,
+    first: {
+      model: typeof model === "string" && model ? model : AGENT_DEFAULT_MODEL,
+      provider: { id: ANTHROPIC },
+    },
+  };
+}
+
 // The model a task starts on, and whether it plans first: only as a chat,
 // where the handoff can follow the end of its plan turn, and only when
 // planning and implementing are on different models. Both roles resolve

package/lib/tasks/queue.ts

@@ -12,6 +12,7 @@
  */
 
 import type { ModelOverride } from "../models/resolve";
+import type { AgentType } from "../providers";
 import { randomUUID } from "crypto";
 import { db, type Session } from "../db";
 import { getProject } from "../projects";
@@ -51,6 +52,7 @@ export interface QueueRow {
   plan_only: number | null;
   started_by: string | null;
   view: "chat" | "terminal" | null;
+  agent_type: string | null;
   base_branch: string | null;
   host_id: string | null;
   // A task (or queued task) it waits on, by id.
@@ -226,6 +228,7 @@ export interface QueueRequest {
   planOnly?: boolean;
   startedBy?: string | null;
   view?: "chat" | "terminal";
+  agent?: AgentType;
   baseBranch?: string;
   hostId?: string;
   // A task's id or name, or "any" for whichever running task finishes first.
@@ -279,9 +282,9 @@ export function queueIfNeeded(req: QueueRequest): QueuedTaskView | null {
   if (!req.prompt.trim()) throw new Error("Describe the task");
   const id = randomUUID();
   db.prepare(
-    `INSERT INTO task_queue (id, project_id, prompt, name, model, model_overrides, plan, plan_reason, plan_only, started_by, view, base_branch,
+    `INSERT INTO task_queue (id, project_id, prompt, name, model, model_overrides, plan, plan_reason, plan_only, started_by, view, agent_type, base_branch,
        host_id, after_task, after_any, origin_workspace_id, position)
-     VALUES (@id, @project_id, @prompt, @name, @model, @model_overrides, @plan, @plan_reason, @plan_only, @started_by, @view, @base_branch,
+     VALUES (@id, @project_id, @prompt, @name, @model, @model_overrides, @plan, @plan_reason, @plan_only, @started_by, @view, @agent_type, @base_branch,
        @host_id, @after_task, @after_any, @origin,
        (SELECT COALESCE(MAX(position), 0) + 1 FROM task_queue))`
   ).run({
@@ -299,6 +302,7 @@ export function queueIfNeeded(req: QueueRequest): QueuedTaskView | null {
     plan_only: req.planOnly ? 1 : null,
     started_by: req.startedBy ?? null,
     view: req.view ?? null,
+    agent_type: req.agent ?? null,
     base_branch: req.baseBranch || null,
     host_id: req.hostId || null,
     after_task: afterTask,
@@ -478,6 +482,7 @@ async function startRow(
     planOnly: !!r.plan_only,
     startedBy: r.started_by,
     view: r.view ?? undefined,
+    agent: (r.agent_type as AgentType | null) ?? undefined,
     baseBranch: r.base_branch ?? undefined,
     hostId: r.host_id ?? undefined,
     reclaim: true,

package/lib/welcome-url.ts

@@ -3,7 +3,12 @@
 
 export const WELCOME_PARAM = "welcome";
 
-export const WELCOME_STEPS = ["agents", "project", "finish"] as const;
+export const WELCOME_STEPS = [
+  "agents",
+  "project",
+  "devices",
+  "finish",
+] as const;
 
 export type WelcomeStep = (typeof WELCOME_STEPS)[number];
 

package/lib/worktree-hooks.ts

@@ -28,7 +28,7 @@ const git = (cwd: string, args: string[]) =>
 // same rule as lib/tasks/code-review.ts's ATTRIBUTION for PR bodies; a test
 // keeps the two agreeing.
 export const ATTRIBUTION_ERE =
-  "^[[:space:]]*(co-authored-by:.*(claude|anthropic)|claude-session:|🤖 generated with)|(^|[^[:alnum:]\"'`])generated (with|by) \\[?claude code";
+  "^[[:space:]]*(co-authored-by:.*(claude|anthropic|copilot)|claude-session:|🤖 generated with)|(^|[^[:alnum:]\"'`])generated (with|by) \\[?claude code";
 
 // The hooks husky installs; a project's own hook of any of these keeps
 // running. Not post-index-change or reference-transaction: those run on

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.524",
+  "version": "0.3.528",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"

package/scripts/setup.sh

@@ -29,7 +29,7 @@ echo "tmux: $(tmux -V)"
 
 # Check AI coding CLI
 AI_CLI_FOUND=""
-for cli in claude codex opencode kilo gemini aider cursor-agent amp pi omp; do
+for cli in claude codex opencode kilo gemini aider cursor-agent amp pi omp copilot; do
     if command -v "$cli" &> /dev/null; then
         AI_CLI_FOUND="$AI_CLI_FOUND $cli"
     fi

package/stores/needsYouFocus.ts

@@ -0,0 +1,13 @@
+import { proxy } from "valtio";
+
+// "Show this ask", raised by the Needs-you strip and handled by the asks list
+// above the chat, which opens itself and scrolls the card into view.
+export const needsYouFocus = proxy<{
+  ask: { id: number; at: number } | null;
+}>({ ask: null });
+
+export const needsYouFocusActions = {
+  ask: (id: number) => {
+    needsYouFocus.ask = { id, at: Date.now() };
+  },
+};

package/stores/welcomeUi.test.ts

@@ -0,0 +1,15 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import { welcomeUi, welcomeUiActions } from "./welcomeUi";
+
+describe("choosing a project in the welcome", () => {
+  beforeEach(() => {
+    welcomeUiActions.go("project");
+    welcomeUiActions.setProject(null);
+  });
+
+  it("remembers it and lands on the devices step, not the finish", () => {
+    welcomeUiActions.chooseProject("p1");
+    expect(welcomeUi.projectId).toBe("p1");
+    expect(welcomeUi.step).toBe("devices");
+  });
+});

package/stores/welcomeUi.ts

@@ -1,5 +1,5 @@
 import { proxy } from "valtio";
-import type { WelcomeStep } from "@/lib/welcome-url";
+import { WELCOME_STEPS, type WelcomeStep } from "@/lib/welcome-url";
 
 // The first-run welcome: whether it is on show, the step, and the project
 // the user made (or picked) to start in.
@@ -20,6 +20,11 @@ export const welcomeUiActions = {
   setProject: (projectId: string | null) => {
     welcomeUi.projectId = projectId;
   },
+  // A project picked or added: remember it and move to the step after "project".
+  chooseProject: (projectId: string) => {
+    welcomeUi.projectId = projectId;
+    welcomeUi.step = WELCOME_STEPS[WELCOME_STEPS.indexOf("project") + 1];
+  },
   close: () => {
     welcomeUi.open = false;
   },