@saadnvd1/agent-os 0.3.671 → 0.3.673

package/lib/orchestrator/signoff.ts

@@ -41,6 +41,8 @@ import {
   reviewSignature,
 } from "./loop-guard";
 import { addNote } from "./notes";
+import { isFast } from "../project-tier/getProjectTier";
+import { recordFastMerge } from "./fast-lane-state";
 import { latestApproval, refundApproval, spendApproval } from "./ask-approvals";
 import { workSubject } from "./asks";
 import { carryApproval } from "./approval-carry";
@@ -71,7 +73,7 @@ export function restackedOf(task: Session) {
 
 // `approval`: Saad approved this merge on his asks list, for this commit.
 export type Verdict =
-  | { ok: true; sha: string; pr: number; approval?: number }
+  | { ok: true; sha: string; pr: number; approval?: number; fast?: true }
   | { ok: false; wait: boolean; text: string };
 
 // Whether the task may merge now, and at which commit. Landing merges a
@@ -107,13 +109,15 @@ export async function judge(
   // A PR quick_pr opened (by the row AgentOS wrote, never the body): its
   // code review is the independent review of this head, and until that
   // passes it waits, before any gate is judged or counted.
-  const quick = isQuick(task)
-    ? quickCodeReview(
-        sha,
-        getCheck(task.id, sha, "review"),
-        restackedOf(task)?.to === sha
-      )
-    : null;
+  const fast = isFast(task);
+  const quick =
+    isQuick(task) && !fast
+      ? quickCodeReview(
+          sha,
+          getCheck(task.id, sha, "review"),
+          restackedOf(task)?.to === sha
+        )
+      : null;
   // Saad's approval of this head stands in for that review (gateVerdict).
   if (
     quick?.wait &&
@@ -157,7 +161,7 @@ export async function judge(
         return quick ? { refusal: gate.refusal, wait: null } : gate;
       })(),
     }),
-    opts
+    { ...opts, fast }
   );
 }
 
@@ -178,8 +182,9 @@ export async function gateVerdict(
   workspaceId: string,
   work: GateWork,
   inputs: () => Promise<Omit<GateInput, "sha" | "ruleBreaks">>,
-  opts: { count?: boolean } = {}
+  opts: { count?: boolean; fast?: boolean } = {}
 ): Promise<Verdict> {
+  const fast = !!opts.fast;
   const no = (text: string, wait = false): Verdict => ({
     ok: false,
     wait,
@@ -216,7 +221,9 @@ export async function gateVerdict(
         : null;
     const refusal = i.codeReview.refusal ?? stack;
     if (refusal) return no(`${approved} ${refusal}`);
-    const ci = ciGate({ sha, ...i, repoCI: await repoCIFor(repo, work, i) });
+    const ci = fast
+      ? { state: "pass" as const }
+      : ciGate({ sha, ...i, repoCI: await repoCIFor(repo, work, i) });
     if (ci.state === "fail") return no(`${approved} ${ci.reason}`);
     if (ci.state === "wait") return no(`${approved} ${ci.reason}`, true);
     // "escalate" is a repository with no CI: Saad is who that goes to.
@@ -245,7 +252,7 @@ export async function gateVerdict(
   }
   // Here too, not only in the review: one reviewed in parts while approvals
   // were off goes to Saad once they're on.
-  if (mergeApprovalsOn()) {
+  if (mergeApprovalsOn() && !fast) {
     const size = (await fullDiff(repo, base, sha)).length;
     if (size > DIFF_CAP) {
       const why = `PR #${pr.number}'s diff at ${short(sha)} is ${size} characters, too big to review whole`;
@@ -255,8 +262,11 @@ export async function gateVerdict(
 
   const ruled = ruleBreaks(files, await addedLines(repo, base, sha));
   const live = await inputs();
-  const repoCI = await repoCIFor(repo, base, live);
-  const outcomes = evaluateGates({ sha, ruleBreaks: ruled, ...live, repoCI });
+  const repoCI = fast ? undefined : await repoCIFor(repo, base, live);
+  const outcomes = evaluateGates(
+    { sha, ruleBreaks: ruled, ...live, repoCI },
+    { fast }
+  );
   const head = `${work.name} (PR #${pr.number} at ${short(sha)}) can't merge:`;
   const toSaad = outcomes.find((o) => o.state === "escalate");
   if (toSaad)
@@ -266,9 +276,12 @@ export async function gateVerdict(
   const failed = outcomes.filter((o) => o.state === "fail");
   const waiting = outcomes.filter((o) => o.state === "wait");
   if (!failed.length && !waiting.length)
-    return { ok: true, sha, pr: pr.number };
+    return fast
+      ? { ok: true, sha, pr: pr.number, fast: true }
+      : { ok: true, sha, pr: pr.number };
   const lines: string[] = [];
-  if (opts.count === false)
+  // The fast lane has no loop guard: a failure is told, never counted.
+  if (opts.count === false || fast)
     lines.push(...failed.map((o) => `- ${o.gate} failed: ${o.reason}`));
   else {
     for (const o of outcomes)
@@ -346,11 +359,15 @@ export async function mergeJudged(
   await refundIfRefused(task.id, verdict.approval, async () => {
     method = await signOffTask(task.id, { head: verdict.sha, wait: opts.wait });
   });
+  if (verdict.fast)
+    recordFastMerge(task.id, workspaceId, verdict.pr, verdict.sha);
   addNote(
     workspaceId,
-    verdict.approval
-      ? `Merged ${task.name} (PR #${verdict.pr}, ${short(verdict.sha)}) on Saad's approval of that commit.`
-      : `Merged ${task.name} (PR #${verdict.pr}, ${short(verdict.sha)}): CI green, review passed, in scope.`
+    verdict.fast
+      ? `Merged ${task.name} (PR #${verdict.pr}, ${short(verdict.sha)}) on the fast lane: no CI wait or review.`
+      : verdict.approval
+        ? `Merged ${task.name} (PR #${verdict.pr}, ${short(verdict.sha)}) on Saad's approval of that commit.`
+        : `Merged ${task.name} (PR #${verdict.pr}, ${short(verdict.sha)}): CI green, review passed, in scope.`
   );
   return `Merged ${task.name}: PR #${verdict.pr} ${method ? MERGED_AS[method] : "merged"} at ${short(verdict.sha)}.`;
 }

package/lib/orchestrator/tool-names.ts

@@ -40,6 +40,7 @@ export const TOOL_NAMES = {
   archive: name("archive"),
   resurrect: name("resurrect"),
   add_project: name("add_project"),
+  project_tier: name("project_tier"),
   note: name("note"),
   question: name("question"),
   resolve_question: name("resolve_question"),

package/lib/orchestrator/tool-schemas.ts

@@ -5,6 +5,7 @@ import { z } from "zod";
 import { BRANCH_NAME } from "../git";
 import { RAISED_KINDS } from "./asks";
 import { MAX_RULE_CHARS } from "./rules";
+import { PROJECT_TIERS } from "../project-tier/types";
 import { PROJECT_NAME } from "../project-add/name";
 import { TASK_ROLES, type ModelRole } from "../models/roles";
 import { PRIORITIES } from "../tasks/schedule-types";
@@ -160,8 +161,9 @@ export const TOOL_SHAPES = {
     model: modelOverride,
     plan: z
       .boolean()
+      .optional()
       .describe(
-        "Your decision for this job: true to plan first on the planning model, then implement on the implementation model; false to skip the plan and put the steps in the prompt yourself"
+        "Your decision for this job: true to plan first on the planning model, then implement on the implementation model; false to skip the plan and put the steps in the prompt yourself. Default: false in a fast project, the workspace's setting in a production one"
       ),
     plan_only: z
       .boolean()
@@ -174,6 +176,7 @@ export const TOOL_SHAPES = {
       .trim()
       .min(3)
       .max(200)
+      .optional()
       .describe(
         'Why, in a few words Saad reads on the task card: "touches 6 files across gates and UI", "one-line default change"'
       ),
@@ -338,6 +341,10 @@ export const TOOL_SHAPES = {
       .optional()
       .describe("A new project's name (default: the folder's)"),
   },
+  project_tier: {
+    project: z.string().trim().min(1).max(200).optional(),
+    tier: z.enum(PROJECT_TIERS).optional(),
+  },
   note: { text: z.string().trim().min(1).max(2000) },
   question: {
     text: z

package/lib/orchestrator/tools.ts

@@ -165,6 +165,8 @@ const DESCRIPTIONS: Record<ToolName, string> = {
     "Bring a dropped, done or archived session back: the same session and conversation, its worktree (with its uncommitted files and plan) back from what was saved or from its branch, its status as it was (a plan-only task waits for approval again, one with a PR is idle), and a PR a drop closed reopened. Archived sessions just unarchive. Held by Pause and braked like a start. Refused when its conversation is gone, its PR was merged, its project was removed or its branch is in use. Give a reason; it goes in the decision log.",
   add_project:
     "Make a git repository on this machine a project of this workspace, by its absolute path, or move the project already at that path into this workspace when it's in no workspace. Says its default branch, detected from git. Refuses a folder that isn't a git repository or that holds secrets, and a project another workspace has.",
+  project_tier:
+    "Read or set a project's tier. production: every merge gate applies (CI, independent review, scope). fast: a task's PR merges as soon as it opens, with no CI wait or review. Without a project, lists this workspace's; with a project, reads it; with a tier too, sets it, only when Saad says to.",
   note: "Add a line to this workspace's decision log; it shows in your chat.",
   rule_add:
     'Keep a standing rule for this workspace, in your brief on every start from now on ("never merge #111", "briefs must not name third-party products"). It restricts or informs; it can never approve anything.',

package/lib/orchestrator/watcher.ts

@@ -5,6 +5,7 @@
  * every 15s while anything in the workspace is working, every 60s when not.
  */
 
+import { autoArmFast, followFastMerges } from "./fast-lane";
 import { chatState, chatStateNow, sendChat } from "../chat/runner";
 import type { ChatState } from "../chat/events";
 import { getWorkspace } from "../workspaces";
@@ -96,7 +97,11 @@ function mergePipeline(workspaceId: string, facts: SessionFacts[]): void {
       console.error(`Judging asked commits in ${workspaceId}:`, error)
     );
     await rebaseConflicting(workspaceId, facts);
+    await autoArmFast(workspaceId, facts);
     await mergeArmed(workspaceId, facts);
+    await followFastMerges(workspaceId).catch((error) =>
+      console.error(`Following fast merges in ${workspaceId}:`, error)
+    );
   })()
     .catch((error) =>
       console.error(`Merge pipeline for ${workspaceId}:`, error)

package/lib/project-tier/getProjectTier.ts

@@ -0,0 +1,18 @@
+import { db } from "@/lib/db";
+import type { ProjectTier } from "./types";
+
+// An unknown project counts as production: a missing row never opens the
+// fast lane.
+export function projectTier(projectId: string | null): ProjectTier {
+  if (!projectId) return "production";
+  const row = db
+    .prepare(`SELECT tier FROM projects WHERE id = ?`)
+    .get(projectId) as { tier: string } | undefined;
+  return row?.tier === "fast" ? "fast" : "production";
+}
+
+export const taskTier = (task: { project_id: string | null }): ProjectTier =>
+  projectTier(task.project_id);
+
+export const isFast = (task: { project_id: string | null }): boolean =>
+  taskTier(task) === "fast";

package/lib/project-tier/index.ts

@@ -0,0 +1,3 @@
+export { PROJECT_TIERS, type ProjectTier } from "./types";
+export { projectTier, taskTier, isFast } from "./getProjectTier";
+export { setProjectTier } from "./setProjectTier";

package/lib/project-tier/setProjectTier.ts

@@ -0,0 +1,14 @@
+import { getProject } from "@/lib/projects";
+import { db } from "@/lib/db";
+import type { Project } from "@/lib/db/types";
+import type { ProjectTier } from "./types";
+
+export function setProjectTier(projectId: string, tier: ProjectTier): Project {
+  const project = getProject(projectId);
+  if (!project || project.is_uncategorized)
+    throw new Error("Project not found or cannot be modified");
+  db.prepare(
+    `UPDATE projects SET tier = ?, updated_at = datetime('now') WHERE id = ?`
+  ).run(tier, projectId);
+  return getProject(projectId)!;
+}

package/lib/project-tier/types.ts

@@ -0,0 +1,3 @@
+export type { ProjectTier } from "@/lib/db/types";
+
+export const PROJECT_TIERS = ["production", "fast"] as const;

package/lib/sessions/launch.ts

@@ -10,7 +10,7 @@ import os from "os";
 import { randomUUID } from "crypto";
 import { db, queries, type Session } from "../db";
 import type { AgentType } from "../providers";
-import type { ChatAccess, ChatImage } from "../chat/events";
+import type { ChatAccess, ChatFile, ChatImage } from "../chat/events";
 import { resolveModelForAgent } from "../model-catalog";
 import { parseOverride, resolveRole, setSessionModel } from "../models/resolve";
 import { ANTHROPIC } from "../models/roles";
@@ -69,6 +69,7 @@ export interface LaunchInput {
   // The first message.
   prompt?: string | null;
   images?: ChatImage[];
+  files?: ChatFile[];
   name?: string | null;
   view?: "chat" | "terminal";
   parentSessionId?: string | null;
@@ -103,9 +104,14 @@ function firstMessage(projectPrompt: string | null | undefined, text: string) {
 }
 
 // Waits in the queue, so neither a restart nor a slow setup loses it.
-function queueFirst(sessionId: string, text: string, images?: ChatImage[]) {
+function queueFirst(
+  sessionId: string,
+  text: string,
+  images?: ChatImage[],
+  files?: ChatFile[]
+) {
   const id = `user-${Date.now()}-${randomUUID().slice(0, 5)}`;
-  enqueue(sessionId, { id, text, images });
+  enqueue(sessionId, { id, text, images, files });
   return id;
 }
 
@@ -201,8 +207,8 @@ async function launch(input: LaunchInput, id: string): Promise<Launched> {
   // A linked machine's AgentOS starts it there; it is mirrored here.
   const link = remote ? hostLink(runOn) : null;
   if (link) {
-    if (input.images?.length)
-      throw new Error(`Images can't be sent to ${link.hostName} yet`);
+    if (input.images?.length || input.files?.length)
+      throw new Error(`Images and files can't be sent to ${link.hostName} yet`);
     return startOnPeer(link, {
       id,
       project: scratch ? null : (project ?? null),
@@ -305,7 +311,7 @@ async function launch(input: LaunchInput, id: string): Promise<Launched> {
       : "";
   const chatFirst =
     view === "chat" && message
-      ? queueFirst(id, message, input.images)
+      ? queueFirst(id, message, input.images, input.files)
       : undefined;
 
   if (useWorktree) {

package/lib/start-options.ts

@@ -40,7 +40,14 @@ export async function startOptions(
     const opts = { workspaceId: project?.workspace_id ?? null };
     roles.plan = resolveRole("plan", opts, models).ref;
     roles.implement = resolveRole("implement", opts, models).ref;
-    planDefault = taskRouting(opts.workspaceId, "chat", undefined).plan;
+    planDefault = taskRouting(
+      opts.workspaceId,
+      "chat",
+      undefined,
+      undefined,
+      undefined,
+      project?.tier
+    ).plan;
   } catch (error) {
     planError = error instanceof Error ? error.message : String(error);
   }

package/lib/tasks/finish.ts

@@ -40,6 +40,7 @@ import { sessionEnded } from "../experiments/hooks";
 import { snapshotWorktree } from "../resurrect/snapshot";
 import { keepSessionFiles } from "../session-artifacts/collect";
 import { setPr, setTask } from "../db/session-parts";
+import { isFast } from "../project-tier/getProjectTier";
 
 export const sessionMergePolicy = (session: Session): MergePolicy =>
   mergePolicy(session.project_id ? getProject(session.project_id) : null);
@@ -167,7 +168,7 @@ export async function signOffTask(
     throw new Error(`${opts.base} isn't a base ${session.name} may merge into`);
   const judgedBase = opts.base ?? session.base_branch;
   const pr = await prFor(session, true);
-  const verdict = canSignOff(pr);
+  const verdict = canSignOff(pr, { ci: !isFast(session) });
   if (!verdict.ok) throw new Error(verdict.reason);
   if (pr!.base && pr!.base !== judgedBase)
     throw new Error(

package/lib/tasks/index.ts

@@ -15,7 +15,7 @@ import { effectiveModels } from "../models/config";
 import { ANTHROPIC } from "../models/roles";
 import { processTable, runsSomething } from "../process-table";
 import { randomUUID } from "crypto";
-import { db, queries, type Session } from "../db";
+import { db, queries, type ProjectTier, type Session } from "../db";
 import { getProject } from "../projects";
 import {
   createWorktree,
@@ -267,7 +267,8 @@ async function startTask(
         view,
         opts.model,
         opts.plan,
-        opts.planOnly
+        opts.planOnly,
+        project.tier
       ).plan;
     const session = await startRemoteTask(hostId, project, {
       id,
@@ -310,7 +311,8 @@ async function startTask(
           view,
           opts.model,
           opts.plan,
-          opts.planOnly
+          opts.planOnly,
+          project.tier
         )
       : otherAgentRouting(opts.model);
   const projectPath = expandHome(project.working_directory);
@@ -590,7 +592,9 @@ export function taskRouting(
   view: StartView,
   model: unknown,
   plan?: boolean,
-  planOnly?: boolean
+  planOnly?: boolean,
+  // A fast project skips the plan step unless the caller asks for it.
+  tier: ProjectTier = "production"
 ) {
   const override = parseOverride(model);
   const models = effectiveModels();
@@ -601,7 +605,8 @@ export function taskRouting(
   const planStep =
     view === "chat" &&
     (!!planOnly ||
-      ((plan ?? models.planStep) && planning.ref !== implement.ref));
+      ((plan ?? (tier === "fast" ? false : models.planStep)) &&
+        planning.ref !== implement.ref));
   return {
     override,
     plan: planStep,

package/lib/tasks/state.ts

@@ -97,13 +97,19 @@ export function needsHuman(state: TaskState): boolean {
   ].includes(state);
 }
 
-export function canSignOff(pr: TaskPR | null): {
+// `ci: false` (a fast project): checks that are failing or running don't
+// refuse the merge.
+export function canSignOff(
+  pr: TaskPR | null,
+  opts: { ci?: boolean } = {}
+): {
   ok: boolean;
   reason?: string;
 } {
   if (!pr) return { ok: false, reason: "No pull request yet" };
   if (pr.state !== "OPEN")
     return { ok: false, reason: `PR is ${pr.state.toLowerCase()}` };
+  if (opts.ci === false) return { ok: true };
   if (pr.checks === "fail")
     return { ok: false, reason: "CI checks are failing" };
   if (pr.checks === "pending")

package/package.json

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

package/components/Chat/composer/useImageDrop.ts

@@ -1,52 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import type { ChatImage } from "@/lib/chat/events";
-import { isImage } from "./paste";
-
-function readImage(file: File): Promise<ChatImage> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onload = () => {
-      const [meta, data] = String(reader.result).split(",");
-      resolve({ mediaType: meta.slice(5, meta.indexOf(";")), data });
-    };
-    reader.onerror = reject;
-    reader.readAsDataURL(file);
-  });
-}
-
-const carriesFiles = (e: React.DragEvent) =>
-  [...e.dataTransfer.types].includes("Files");
-
-// Images picked, pasted or dropped onto the composer, and the outline
-// shown while something is dragged over it.
-export function useImageDrop(onImages: (images: ChatImage[]) => void) {
-  const [dragging, setDragging] = useState(false);
-
-  const addFiles = async (picked: Iterable<File>) => {
-    const read = await Promise.all([...picked].filter(isImage).map(readImage));
-    if (read.length) onImages(read);
-  };
-
-  const dropProps = {
-    onDragOver: (e: React.DragEvent) => {
-      if (!carriesFiles(e)) return;
-      e.preventDefault();
-      e.dataTransfer.dropEffect = "copy";
-      setDragging(true);
-    },
-    onDragLeave: (e: React.DragEvent) => {
-      if (!e.currentTarget.contains(e.relatedTarget as Node | null))
-        setDragging(false);
-    },
-    onDrop: (e: React.DragEvent) => {
-      if (!carriesFiles(e)) return;
-      e.preventDefault();
-      setDragging(false);
-      void addFiles(e.dataTransfer.files);
-    },
-  };
-
-  return { dragging, dropProps, addFiles };
-}