@saadnvd1/agent-os 0.3.533 → 0.3.534

package/components/Tasks/PlanReview.tsx

@@ -0,0 +1,253 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
+import { Markdown } from "@/components/Chat/Markdown";
+import { useApprovePlan, useDropTask, usePlanEdits } from "@/data/tasks";
+import type { PlanPieceView } from "@/lib/tasks/loop-types";
+import type { TaskView } from "@/lib/tasks";
+import { cn } from "@/lib/utils";
+
+const CIRCLED = ["①", "②", "③", "④", "⑤", "⑥"];
+const REASON: Record<string, string> = {
+  a: "spans repositories",
+  b: "must be live before the other can merge",
+  c: "needs you mid-way",
+  d: "must be revertible on its own",
+};
+
+function Piece({
+  p,
+  edits,
+  busy,
+  onEdit,
+}: {
+  p: PlanPieceView;
+  edits: { merge: number[]; drop: number[] };
+  busy: boolean;
+  onEdit: (merge: number[], drop: number[]) => void;
+}) {
+  const mark = CIRCLED[p.position - 1];
+  const off = p.edit !== null;
+  const without = (list: number[]) => list.filter((n) => n !== p.position);
+  return (
+    <li className={cn("space-y-1 px-3 py-2.5", off && "opacity-60")}>
+      <div className="flex items-baseline gap-2">
+        <span className="min-w-0 flex-1 truncate text-sm font-medium">
+          {mark} {p.name}
+        </span>
+        <span className="text-muted-foreground shrink-0 text-xs">
+          {p.project}
+        </span>
+      </div>
+      <p className="text-muted-foreground text-xs">{p.slice.split("\n")[0]}</p>
+      {p.afterPosition && (
+        <p className="text-xs">
+          after {CIRCLED[p.afterPosition - 1]} is {p.afterKind}
+        </p>
+      )}
+      {p.reasons.length > 0 && (
+        <p className="text-xs">
+          {p.reasons.map((r) => `(${r}) ${REASON[r]}`).join("; ")}
+        </p>
+      )}
+      {p.owns.length > 0 && (
+        <p className="text-muted-foreground text-xs">
+          owns: {p.owns.join(", ")}
+        </p>
+      )}
+      {p.position > 1 && (
+        <div className="flex flex-wrap items-center gap-2 pt-1">
+          {off ? (
+            <>
+              <span className="bg-foreground/10 rounded-full px-2 py-0.5 text-[11px]">
+                {p.edit === "merge"
+                  ? `Merged into ${CIRCLED[p.position - 2]}`
+                  : "Dropped"}
+              </span>
+              <Button
+                size="sm"
+                variant="ghost"
+                className="h-11 md:h-8"
+                disabled={busy}
+                onClick={() =>
+                  onEdit(without(edits.merge), without(edits.drop))
+                }
+              >
+                Undo
+              </Button>
+            </>
+          ) : (
+            <>
+              <Button
+                size="sm"
+                variant="outline"
+                className="h-11 md:h-8"
+                disabled={busy || p.forced}
+                title={
+                  p.forced ? "Split because it spans repositories" : undefined
+                }
+                onClick={() => onEdit([...edits.merge, p.position], edits.drop)}
+              >
+                Merge into {CIRCLED[p.position - 2]}
+              </Button>
+              <Button
+                size="sm"
+                variant="ghost"
+                className="h-11 md:h-8"
+                disabled={busy}
+                onClick={() => onEdit(edits.merge, [...edits.drop, p.position])}
+              >
+                Drop
+              </Button>
+            </>
+          )}
+        </div>
+      )}
+    </li>
+  );
+}
+
+// A plan waiting for a decision: how it splits, the plan itself, and
+// Reject, Approve with a note, Approve.
+export function PlanReview({ task }: { task: TaskView }) {
+  const approve = useApprovePlan();
+  const drop = useDropTask();
+  const planEdits = usePlanEdits();
+  const [showPlan, setShowPlan] = useState(false);
+  const [noting, setNoting] = useState(false);
+  const [note, setNote] = useState("");
+  const [rejecting, setRejecting] = useState(false);
+  const pieces = task.plan?.pieces;
+  const edits = {
+    merge:
+      pieces?.pieces.filter((p) => p.edit === "merge").map((p) => p.position) ??
+      [],
+    drop:
+      pieces?.pieces.filter((p) => p.edit === "drop").map((p) => p.position) ??
+      [],
+  };
+  const error =
+    approve.error?.message || drop.error?.message || planEdits.error?.message;
+  return (
+    <div className="space-y-3">
+      {pieces && pieces.pieces.length > 1 ? (
+        <div className="space-y-1">
+          <p className="label-mono text-muted-foreground">
+            Pieces ({pieces.pieces.length})
+          </p>
+          <ul className="divide-border/60 border-border/60 divide-y rounded-lg border">
+            {pieces.pieces.map((p) => (
+              <Piece
+                key={p.position}
+                p={p}
+                edits={edits}
+                busy={planEdits.isPending}
+                onEdit={(merge, dropped) =>
+                  planEdits.mutate({ id: task.id, merge, drop: dropped })
+                }
+              />
+            ))}
+          </ul>
+        </div>
+      ) : (
+        <p className="text-muted-foreground text-xs">1 piece</p>
+      )}
+      {pieces?.folded.map((f) => (
+        <p key={f.name} className="text-xs text-amber-700 dark:text-amber-300">
+          &quot;{f.name}&quot; folded into {CIRCLED[f.into - 1]}: {f.why}
+        </p>
+      ))}
+      {pieces?.warnings.map((w) => (
+        <p key={w} className="text-xs text-amber-700 dark:text-amber-300">
+          {w}
+        </p>
+      ))}
+      <button
+        type="button"
+        aria-expanded={showPlan}
+        className="text-primary min-h-11 text-xs font-medium md:min-h-8"
+        onClick={() => setShowPlan((v) => !v)}
+      >
+        {showPlan ? "Hide the plan" : "Show the plan"}
+      </button>
+      {showPlan && (
+        <div className="bg-foreground/[0.04] max-h-80 overflow-y-auto rounded-lg p-3 text-sm">
+          {task.plan?.text ? (
+            <Markdown text={task.plan.text} />
+          ) : (
+            <p className="text-muted-foreground text-xs">
+              No plan file was written.
+            </p>
+          )}
+          {task.plan?.truncated && (
+            <p className="text-muted-foreground mt-2 font-mono text-[11px]">
+              Shortened; the whole plan is {task.plan.path} in the worktree.
+            </p>
+          )}
+        </div>
+      )}
+      {noting && (
+        <div className="space-y-2">
+          <Textarea
+            rows={3}
+            value={note}
+            placeholder="A change to the plan (recorded as a scope change)"
+            onChange={(e) => setNote(e.target.value)}
+          />
+          <Button
+            size="sm"
+            className="h-11 md:h-8"
+            disabled={approve.isPending || !note.trim()}
+            onClick={() =>
+              approve.mutate({ id: task.id, message: note.trim() })
+            }
+          >
+            Approve with this note
+          </Button>
+        </div>
+      )}
+      <div className="flex flex-wrap gap-2">
+        {rejecting ? (
+          <Button
+            size="sm"
+            variant="destructive"
+            className="h-11 md:h-8"
+            disabled={drop.isPending}
+            onClick={() => drop.mutate(task.id)}
+          >
+            Drop this plan
+          </Button>
+        ) : (
+          <Button
+            size="sm"
+            variant="ghost"
+            className="h-11 md:h-8"
+            onClick={() => setRejecting(true)}
+          >
+            Reject
+          </Button>
+        )}
+        <Button
+          size="sm"
+          variant="outline"
+          className="h-11 md:h-8"
+          aria-expanded={noting}
+          onClick={() => setNoting((v) => !v)}
+        >
+          Approve with note…
+        </Button>
+        <Button
+          size="sm"
+          className="h-11 md:h-8"
+          disabled={approve.isPending}
+          onClick={() => approve.mutate({ id: task.id })}
+        >
+          {approve.isPending ? "Approving..." : "Approve"}
+        </Button>
+      </div>
+      {error && <p className="text-destructive text-xs">{error}</p>}
+    </div>
+  );
+}

package/components/Tasks/TaskRow.tsx

@@ -2,6 +2,7 @@
 
 import { useState } from "react";
 import {
+  ChefHat,
   ExternalLink,
   GitMerge,
   KanbanSquare,
@@ -10,17 +11,13 @@ import {
 import { Button } from "@/components/ui/button";
 import type { TaskView } from "@/lib/tasks";
 import { isFinished } from "@/lib/tasks/state";
-import {
-  useApprovePlan,
-  useArmTask,
-  useDropTask,
-  useSignOffTask,
-} from "@/data/tasks";
-import { Markdown } from "@/components/Chat/Markdown";
+import { useArmTask, useDropTask, useSignOffTask } from "@/data/tasks";
 import { tmuxAttachActions } from "@/stores/tmuxAttach";
 import { tasksUiActions } from "@/stores/tasksUi";
+import { recipesUiActions } from "@/stores/recipesUi";
 import { cn } from "@/lib/utils";
 import { SimulatorIndicator } from "@/components/Simulator";
+import { PlanReview } from "./PlanReview";
 import { MoveTaskButton } from "./MoveTaskButton";
 import { ResumeOnModel } from "./ResumeOnModel";
 import { TASK_STATE as STATE } from "./task-state-labels";
@@ -30,8 +27,6 @@ export function TaskRow({ task }: { task: TaskView }) {
   const signOff = useSignOffTask();
   const drop = useDropTask();
   const arm = useArmTask();
-  const approve = useApprovePlan();
-  const [showPlan, setShowPlan] = useState(false);
   const [confirmDrop, setConfirmDrop] = useState(false);
   const [moveError, setMoveError] = useState<string | null>(null);
   const live = !isFinished(task.state);
@@ -39,7 +34,6 @@ export function TaskRow({ task }: { task: TaskView }) {
     signOff.error?.message ||
     drop.error?.message ||
     arm.error?.message ||
-    approve.error?.message ||
     moveError ||
     task.hostError;
   const settingUp = live && task.setup?.status === "running";
@@ -159,26 +153,6 @@ export function TaskRow({ task }: { task: TaskView }) {
               {task.armed ? "Armed" : "Arm merge"}
             </Button>
           )}
-          {task.state === "plan-ready" && (
-            <>
-              <Button
-                size="sm"
-                variant="outline"
-                aria-expanded={showPlan}
-                onClick={() => setShowPlan((v) => !v)}
-              >
-                {showPlan ? "Hide plan" : "View plan"}
-              </Button>
-              <Button
-                size="sm"
-                className="h-11 md:h-8"
-                disabled={approve.isPending}
-                onClick={() => approve.mutate({ id: task.id })}
-              >
-                {approve.isPending ? "Approving..." : "Approve"}
-              </Button>
-            </>
-          )}
           {task.state === "review" && (
             <Button
               size="sm"
@@ -190,20 +164,21 @@ export function TaskRow({ task }: { task: TaskView }) {
           )}
         </div>
       )}
-      {live && task.state === "plan-ready" && showPlan && (
-        <div className="bg-foreground/[0.04] max-h-80 overflow-y-auto rounded-lg p-3 text-sm">
-          {task.plan?.text ? (
-            <Markdown text={task.plan.text} />
-          ) : (
-            <p className="text-muted-foreground text-xs">
-              No plan file was written.
-            </p>
-          )}
-          {task.plan?.truncated && (
-            <p className="text-muted-foreground mt-2 font-mono text-[11px]">
-              Shortened; the whole plan is {task.plan.path} in the worktree.
-            </p>
-          )}
+      {live && task.state === "plan-ready" && <PlanReview task={task} />}
+      {!live && !task.hostId && (
+        <div>
+          <Button
+            size="sm"
+            variant="ghost"
+            className="text-muted-foreground h-11 md:h-8"
+            onClick={() => {
+              recipesUiActions.saveSessionAs(task.id);
+              tasksUiActions.setPanelOpen(false);
+            }}
+          >
+            <ChefHat className="h-3.5 w-3.5" />
+            Save as recipe
+          </Button>
         </div>
       )}
       {error && <p className="text-destructive text-xs">{error}</p>}

package/components/Tasks/TasksDialog.tsx

@@ -16,6 +16,7 @@ import { newDraft } from "@/stores/drafts";
 import { TaskRow } from "./TaskRow";
 import { BoardTodoSection } from "@/components/LumifyHub";
 import { StacksSection } from "@/components/Stacks";
+import { FeaturesSection } from "@/components/Features";
 
 export function TasksDialog() {
   const { panelOpen } = useSnapshot(tasksUi);
@@ -57,6 +58,7 @@ export function TasksDialog() {
             <TaskRow key={t.id} task={t} />
           ))}
         </div>
+        <FeaturesSection />
         <StacksSection />
         <BoardTodoSection />
         {done.length > 0 && (

package/data/features/index.ts

@@ -0,0 +1,40 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import type { FeatureView } from "@/lib/plans/view";
+import { usePollWhenOffline } from "../push/connection";
+
+export const featureKeys = {
+  all: ["features"] as const,
+  list: (workspaceId: string | null) =>
+    [...featureKeys.all, "list", workspaceId ?? "all"] as const,
+};
+
+export function useFeaturesQuery(workspaceId: string | null = null) {
+  return useQuery({
+    queryKey: featureKeys.list(workspaceId),
+    queryFn: async () => {
+      const res = await fetch(
+        `/api/features${workspaceId ? `?workspace=${workspaceId}` : ""}`
+      );
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error || "Request failed");
+      return data.features as FeatureView[];
+    },
+    // Pushed when features or their pieces change.
+    refetchInterval: usePollWhenOffline(20000),
+  });
+}
+
+export function useReleasePiece() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (id: number) => {
+      const res = await fetch(`/api/features/pieces/${id}/release`, {
+        method: "POST",
+      });
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error || "Request failed");
+    },
+    onSettled: () =>
+      queryClient.invalidateQueries({ queryKey: featureKeys.all }),
+  });
+}

package/data/push/topics.ts

@@ -12,6 +12,8 @@ import { orchestratorKeys } from "../orchestrators";
 import { ruleKeys } from "../orchestrators/rules";
 import { workspaceKeys } from "../workspaces";
 import { scheduleKeys } from "../schedules";
+import { recipeKeys } from "../recipes";
+import { featureKeys } from "../features";
 import { archivedKeys } from "../done";
 import { awayKeys } from "../away";
 
@@ -54,6 +56,12 @@ function keysFor(topic: string): QueryKey[] {
     case "schedules":
     case "schedule_runs":
       return [scheduleKeys.all];
+    case "recipes":
+    case "recipe_runs":
+      return [recipeKeys.all];
+    case "features":
+    case "feature_pieces":
+      return [featureKeys.all, taskKeys.all, sessionKeys.all];
     case "orchestrator_asks":
     case "orchestrator_questions":
     case "needs_you_dismissed":

package/data/recipes/index.ts

@@ -0,0 +1,129 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import type { RecipeInput, RecipeRun, RecipeView } from "@/lib/recipes/types";
+import type { RecipeDraft } from "@/lib/recipes/draft";
+import type { TimerInput } from "@/lib/recipes/timer";
+import { sessionKeys } from "../sessions/keys";
+import { taskKeys } from "../tasks";
+import { usePollWhenOffline } from "../push/connection";
+
+export const recipeKeys = {
+  all: ["recipes"] as const,
+  list: (workspaceId: string | null) =>
+    [...recipeKeys.all, "list", workspaceId ?? "all"] as const,
+  detail: (id: string) => [...recipeKeys.all, "detail", id] as const,
+  preview: (id: string, note: string) =>
+    [...recipeKeys.all, "preview", id, note] as const,
+};
+
+async function call<T>(
+  url: string,
+  method = "GET",
+  body?: unknown
+): Promise<T> {
+  const res = await fetch(url, {
+    method,
+    headers:
+      body === undefined ? undefined : { "Content-Type": "application/json" },
+    body: body === undefined ? undefined : JSON.stringify(body),
+  });
+  const data = await res.json();
+  if (!res.ok) throw new Error(data.error || "Request failed");
+  return data;
+}
+
+export function useRecipesQuery(workspaceId: string | null, enabled = true) {
+  return useQuery({
+    queryKey: recipeKeys.list(workspaceId),
+    queryFn: async () =>
+      (
+        await call<{ recipes: RecipeView[] }>(
+          `/api/recipes${workspaceId ? `?workspace=${workspaceId}` : ""}`
+        )
+      ).recipes,
+    enabled,
+    // Pushed when recipes or their runs change.
+    refetchInterval: usePollWhenOffline(15000),
+  });
+}
+
+export function useRecipeQuery(id: string | null) {
+  return useQuery({
+    queryKey: recipeKeys.detail(id ?? ""),
+    queryFn: () =>
+      call<{ recipe: RecipeView; runs: RecipeRun[] }>(`/api/recipes/${id}`),
+    enabled: !!id,
+    refetchInterval: usePollWhenOffline(10000),
+  });
+}
+
+// What a run started now would send, for the Run sheet.
+export function usePreviewQuery(id: string, note: string, enabled: boolean) {
+  return useQuery({
+    queryKey: recipeKeys.preview(id, note),
+    queryFn: () =>
+      call<{ prompt: string }>(
+        `/api/recipes/${id}/preview${note ? `?note=${encodeURIComponent(note)}` : ""}`
+      ),
+    enabled,
+  });
+}
+
+function useRecipeMutation<V, R>(fn: (v: V) => Promise<R>) {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: fn,
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: recipeKeys.all });
+      queryClient.invalidateQueries({ queryKey: taskKeys.all });
+      queryClient.invalidateQueries({ queryKey: sessionKeys.all });
+    },
+  });
+}
+
+export type RecipeFormInput = RecipeInput & { timer?: TimerInput | null };
+
+export function useCreateRecipe() {
+  return useRecipeMutation((input: RecipeFormInput) =>
+    call<{ recipe: RecipeView }>("/api/recipes", "POST", input)
+  );
+}
+
+export function useUpdateRecipe() {
+  return useRecipeMutation(
+    ({
+      id,
+      ...patch
+    }: Partial<Omit<RecipeFormInput, "workspaceId">> & { id: string }) =>
+      call<{ recipe: RecipeView }>(`/api/recipes/${id}`, "PATCH", patch)
+  );
+}
+
+export function useArchiveRecipe() {
+  return useRecipeMutation((id: string) =>
+    call(`/api/recipes/${id}`, "DELETE")
+  );
+}
+
+export function useRunRecipe() {
+  return useRecipeMutation(
+    (input: { id: string; note?: string; requestId: string }) =>
+      call<{ run: RecipeRun; queued: boolean }>(
+        `/api/recipes/${input.id}/run`,
+        "POST",
+        { note: input.note, requestId: input.requestId }
+      )
+  );
+}
+
+export function useClearCarry() {
+  return useRecipeMutation((id: string) =>
+    call(`/api/recipes/${id}/carry/clear`, "POST", {})
+  );
+}
+
+export function useRecipeDraft() {
+  return useMutation({
+    mutationFn: (sessionId: string) =>
+      call<RecipeDraft>("/api/recipes/draft", "POST", { sessionId }),
+  });
+}

package/data/tasks/index.ts

@@ -97,6 +97,20 @@ export function useApprovePlan() {
   );
 }
 
+// Which waiting pieces of a plan to fold into the one before, or leave out.
+export function usePlanEdits() {
+  return useTaskMutation(
+    async (input: { id: string; merge: number[]; drop: number[] }) =>
+      json(
+        await fetch(`/api/tasks/${input.id}/plan-edits`, {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ merge: input.merge, drop: input.drop }),
+        })
+      )
+  );
+}
+
 export function useResumeTask() {
   return useTaskMutation(async (input: { id: string; force?: boolean }) =>
     json(

package/lib/away/run.ts

@@ -286,7 +286,10 @@ async function rerunReview(
 
 const SHA = /^[0-9a-f]{40}$/;
 
-async function mergeCommit(repo: string, pr: number): Promise<string | null> {
+export async function mergeCommit(
+  repo: string,
+  pr: number
+): Promise<string | null> {
   const out = await run(
     "gh",
     [

package/lib/db/changes.ts

@@ -34,6 +34,13 @@ export const TABLES_WATCHED_78 = [
   "needs_you_dismissed",
 ] as const;
 
+export const TABLES_WATCHED_80 = [
+  "recipes",
+  "recipe_runs",
+  "features",
+  "feature_pieces",
+] as const;
+
 // Every table any migration watches, for the browser's topic map to cover.
 export const WATCHED_TABLES: readonly string[] = [
   ...TABLES_WATCHED_45,
@@ -41,6 +48,7 @@ export const WATCHED_TABLES: readonly string[] = [
   ...TABLES_WATCHED_56,
   ...TABLES_WATCHED_58,
   ...TABLES_WATCHED_78,
+  ...TABLES_WATCHED_80,
 ];
 
 export function installChangeTriggers(