@saadnvd1/agent-os 0.3.698 → 0.3.715

package/scripts/lib/commands.sh

@@ -56,6 +56,7 @@ cmd_install() {
 
     mkdir -p "$bin_dir"
     ln -sf "$REPO_DIR/scripts/agent-os" "$bin_dir/agent-os"
+    "$REPO_DIR/scripts/sync-cli-links" create
 
     # Check if ~/.local/bin is in PATH
     if [[ ":$PATH:" != *":$bin_dir:"* ]]; then
@@ -304,6 +305,8 @@ cmd_update() {
         log_success "Update complete!"
     fi
 
+    scripts/sync-cli-links || log_warn "Could not sync the CLI links"
+
     if [[ "$was_running" == true ]]; then
         cmd_start
     fi
@@ -558,6 +561,8 @@ cmd_help() {
     echo "  pair        Add a phone, tablet or laptop (prints a QR code)"
     echo "  connect     Turn on AgentOS Connect for this machine (in development)"
     echo "  disconnect  Turn Connect off; the tunnel closes within seconds"
+    echo "  link        Link machines on your Connect account (link <name>, link accept <code>)"
+    echo "  unlink      Unlink a machine linked through Connect"
     echo "  passkeys reset  Revoke every passkey (recovery; asks you to confirm)"
     echo "  logs        Tail server logs"
     echo "  update      Update to latest version"

package/scripts/lib/machine.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 # `agent-os machine`: make this Linux box (a WSL distro, a DGX Spark) linkable
-# from another AgentOS: sshd for pairing, Tailscale for reaching it, the
-# server kept running. It never edits sshd_config or authorized_keys.
+# from another AgentOS. Bare, it explains the Connect path (sign in to Connect,
+# then `agent-os link`) and changes nothing. With --tailscale it sets up
+# sshd for pairing, Tailscale for reaching it and the server kept running. It
+# never edits sshd_config or authorized_keys.
 
 # The ssh service's unit name differs by distro (Debian: ssh, others: sshd).
 ssh_unit() {
@@ -21,7 +23,26 @@ tailscale_name() {
         | head -1 | sed 's/\.$//'
 }
 
+machine_connect_help() {
+    log_info "Recommended: link through AgentOS Connect. It works from any network and needs no ssh or Tailscale (Pro)."
+    echo "    1. On this machine:  agent-os connect      (sign in with the code from runagentos.com)"
+    echo "    2. On the other one: open Machines and press Link next to this machine"
+    echo "       (or run 'agent-os link <name>'). It shows a 6-digit code; type it here:"
+    echo "       agent-os link accept <code>"
+    echo "    3. This machine then shows a second code. Type it back on the machine you're"
+    echo "       linking from (in Machines, or at the 'agent-os link' prompt) to finish."
+    echo ""
+    log_info "No Connect? Use ssh over Tailscale instead: agent-os machine --tailscale"
+}
+
 cmd_machine() {
+    local tailscale=0 arg
+    for arg in "$@"; do
+        case "$arg" in
+            --tailscale) tailscale=1 ;;
+            *) log_error "Unknown option '$arg'. Usage: agent-os machine [--tailscale]"; exit 1 ;;
+        esac
+    done
     if [[ "$OS" == "macos" ]]; then
         log_info "A Mac is linked from the other side: on the machine you'll link from, open Machines and add this Mac."
         return 0
@@ -30,6 +51,10 @@ cmd_machine() {
         log_error "AgentOS is not installed. Run 'agent-os install' first."
         exit 1
     fi
+    if [[ "$tailscale" == 0 ]]; then
+        machine_connect_help
+        return 0
+    fi
     if ! has_systemd; then
         if [[ "${WSL:-0}" != 0 ]]; then
             log_error "This needs systemd. Run 'agent-os enable', which offers to turn it on, then try again."

package/scripts/lib/machine.test.ts

@@ -42,7 +42,11 @@ const log = () =>
 const record = (name: string) =>
   fake(name, `echo "${name} $*" >> "${dir}/calls.log"`);
 
-function machine(env: Record<string, string> = {}, os = "debian") {
+function machine(
+  env: Record<string, string> = {},
+  os = "debian",
+  args = "--tailscale"
+) {
   mkdirSync(join(dir, "repo"), { recursive: true });
   return spawnSync(
     "/bin/bash",
@@ -50,7 +54,7 @@ function machine(env: Record<string, string> = {}, os = "debian") {
       "-euo",
       "pipefail",
       "-c",
-      `source "${LIB}/common.sh"; source "${LIB}/prerequisites.sh"; source "${LIB}/commands.sh"; source "${LIB}/machine.sh"; WSL=2 OS=${os} REPO_DIR="${dir}/repo" PORT=3011; has_systemd() { return 0; }; is_running() { return 0; }; cmd_enable() { echo "enable called"; }; cmd_machine`,
+      `source "${LIB}/common.sh"; source "${LIB}/prerequisites.sh"; source "${LIB}/commands.sh"; source "${LIB}/machine.sh"; WSL=2 OS=${os} REPO_DIR="${dir}/repo" PORT=3011; has_systemd() { return 0; }; is_running() { return 0; }; cmd_enable() { echo "enable called"; }; cmd_machine ${args}`,
       join(dir, "agent-os"),
     ],
     {
@@ -86,6 +90,24 @@ beforeEach(() => {
 afterEach(() => rmSync(dir, { recursive: true, force: true }));
 
 describe("agent-os machine", () => {
+  it("bare, points at Connect first, mentions --tailscale and changes nothing", () => {
+    const r = machine({}, "debian", "");
+    expect(r.status).toBe(0);
+    expect(r.stdout).toContain("agent-os connect");
+    expect(r.stdout).toContain("agent-os link accept");
+    expect(r.stdout).toContain("second code");
+    expect(r.stdout).toContain("agent-os machine --tailscale");
+    expect(r.stdout).not.toContain("enable called");
+    expect(log()).toBe("");
+  });
+
+  it("rejects an unknown option", () => {
+    const r = machine({}, "debian", "--bogus");
+    expect(r.status).toBe(1);
+    expect(r.stdout + r.stderr).toContain("Usage: agent-os machine");
+    expect(log()).toBe("");
+  });
+
   it("stops with the install pointer when Tailscale is missing", () => {
     const r = machine();
     expect(r.status).toBe(1);
@@ -128,7 +150,7 @@ describe("agent-os machine", () => {
       "/bin/bash",
       [
         "-c",
-        `source "${LIB}/common.sh"; source "${LIB}/machine.sh"; WSL=2 OS=debian REPO_DIR="${dir}/repo"; has_systemd() { return 1; }; cmd_machine`,
+        `source "${LIB}/common.sh"; source "${LIB}/machine.sh"; WSL=2 OS=debian REPO_DIR="${dir}/repo"; has_systemd() { return 1; }; cmd_machine --tailscale`,
       ],
       {
         encoding: "utf8",

package/scripts/sync-cli-links

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Point ~/.local/bin/{agent-os,aos} at the checkout the live server runs from.
+set -euo pipefail
+here="$(cd "$(dirname "$0")/.." && pwd)"
+# shellcheck source=lib/cli-links.sh
+source "$here/scripts/lib/cli-links.sh"
+sync_cli_links "$(live_checkout "$here")" "${1:-}"

package/scripts/sync-cli-links.test.ts

@@ -0,0 +1,69 @@
+import { execFileSync } from "child_process";
+import * as fs from "fs";
+import * as path from "path";
+import { describe, expect, it } from "vitest";
+import { tempDir } from "@/lib/test-temp";
+
+const script = path.resolve(__dirname, "sync-cli-links");
+
+function setup() {
+  const root = tempDir("aos-synclinks-");
+  const home = path.join(root, "home");
+  const bin = path.join(root, "bin");
+  fs.mkdirSync(home);
+  fs.mkdirSync(bin);
+  const clone = (name: string) => {
+    const dir = path.join(root, name);
+    fs.mkdirSync(path.join(dir, "bin"), { recursive: true });
+    fs.mkdirSync(path.join(dir, "scripts"), { recursive: true });
+    fs.writeFileSync(path.join(dir, "bin/aos"), "");
+    fs.writeFileSync(path.join(dir, "scripts/agent-os"), "");
+    return dir;
+  };
+  const live = clone("live");
+  const old = clone("old");
+  fs.writeFileSync(
+    path.join(home, "live-server.json"),
+    JSON.stringify({ cwd: live })
+  );
+  const run = (...args: string[]) =>
+    execFileSync(script, args, {
+      encoding: "utf-8",
+      env: { ...process.env, AOS_BIN_DIR: bin, AGENT_OS_HOME: home },
+    });
+  return { bin, home, live, old, run };
+}
+
+describe("sync-cli-links", () => {
+  it("repoints a link into another clone and logs it", () => {
+    const t = setup();
+    fs.symlinkSync(path.join(t.old, "bin/aos"), path.join(t.bin, "aos"));
+    const out = t.run();
+    expect(fs.readlinkSync(path.join(t.bin, "aos"))).toBe(
+      path.join(t.live, "bin/aos")
+    );
+    expect(out).toContain("repointed");
+    expect(out).toContain(t.old);
+    expect(t.run()).toBe("");
+  });
+
+  it("leaves absent links alone unless asked to create them", () => {
+    const t = setup();
+    t.run();
+    expect(fs.existsSync(path.join(t.bin, "aos"))).toBe(false);
+    t.run("create");
+    expect(fs.readlinkSync(path.join(t.bin, "aos"))).toBe(
+      path.join(t.live, "bin/aos")
+    );
+    expect(fs.readlinkSync(path.join(t.bin, "agent-os"))).toBe(
+      path.join(t.live, "scripts/agent-os")
+    );
+  });
+
+  it("never replaces a real file", () => {
+    const t = setup();
+    fs.writeFileSync(path.join(t.bin, "aos"), "mine");
+    t.run("create");
+    expect(fs.readFileSync(path.join(t.bin, "aos"), "utf-8")).toBe("mine");
+  });
+});

package/server.ts

@@ -14,12 +14,14 @@ import { setStartGate } from "./lib/stacks/tick";
 import { stackStartGate } from "./lib/orchestrator/brakes";
 import { buildId } from "./lib/build";
 import { startOrchestratorWatcher } from "./lib/orchestrator/watcher";
+import { startWaitWatcher } from "./lib/bus/waits/tick";
 import { installErrorCounter } from "./lib/health/errors";
 import { recordBoot } from "./lib/health/boots";
 import { realDeps, schedulesEnabled, startScheduler } from "./lib/schedules";
 import { startSettling } from "./lib/recipes";
 import { startAutoArchive } from "./lib/done/auto-archive";
 import { startWorktreeSweep } from "./lib/worktree-sweep/start";
+import { startClaimsLoop } from "./lib/claims";
 import { startUsageRollup, usageRollupEnabled } from "./lib/usage/nightly";
 import { resumePhoneOutbox } from "./lib/notify";
 import { resumePushOutbox } from "./lib/notify/push";
@@ -476,6 +478,8 @@ app.prepare().then(async () => {
   if (process.env.AGENTOS_STACKS !== "off") startStackWatcher();
   // Each workspace's orchestrator hears about its sessions as events.
   if (process.env.AGENTOS_ORCHESTRATOR !== "off") startOrchestratorWatcher();
+  // Sessions waiting on each other (aos send --await, aos wait).
+  startWaitWatcher();
   // Schedules tick here, once a minute, and nowhere else.
   if (schedulesEnabled(process.env)) startScheduler(realDeps);
   // Looking for a newer version, and running an update only when one is
@@ -494,6 +498,8 @@ app.prepare().then(async () => {
   startAutoArchive();
   // Settled worktrees older than the setting are removed; branches stay.
   startWorktreeSweep();
+  // Who is working on what, across linked machines.
+  if (!process.env.AGENTOS_DEMO) startClaimsLoop();
   resumePhoneOutbox();
   resumePushOutbox();
   // The usage ledger's daily rollup and its ratchet alerts.

package/stores/claimsUi.ts

@@ -0,0 +1,22 @@
+import { proxy } from "valtio";
+
+// The claims sheet ("Work across machines"). `focus` narrows it to the claims
+// of one overlapping pair, from a row's pill.
+export const claimsUi = proxy<{ open: boolean; focus: string[] | null }>({
+  open: false,
+  focus: null,
+});
+
+export const claimsUiActions = {
+  open: (focus: string[] | null = null) => {
+    claimsUi.focus = focus;
+    claimsUi.open = true;
+  },
+  setOpen: (open: boolean) => {
+    claimsUi.open = open;
+    if (!open) claimsUi.focus = null;
+  },
+  showAll: () => {
+    claimsUi.focus = null;
+  },
+};

package/app/api/groups/[...path]/route.ts

@@ -1,136 +0,0 @@
-import { NextResponse } from "next/server";
-import { db, queries, type Group } from "@/lib/db";
-
-// GET /api/groups/[...path] - Get a single group
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ path: string[] }> }
-) {
-  const { path: pathParts } = await params;
-  const path = pathParts.join("/");
-
-  try {
-    const group = queries.getGroup(db).get(path) as Group | undefined;
-
-    if (!group) {
-      return NextResponse.json({ error: "Group not found" }, { status: 404 });
-    }
-
-    return NextResponse.json({
-      group: { ...group, expanded: Boolean(group.expanded) },
-    });
-  } catch (error) {
-    console.error("Error fetching group:", error);
-    return NextResponse.json(
-      { error: "Failed to fetch group" },
-      { status: 500 }
-    );
-  }
-}
-
-// PATCH /api/groups/[...path] - Update group (name, expanded, order)
-export async function PATCH(
-  request: Request,
-  { params }: { params: Promise<{ path: string[] }> }
-) {
-  const { path: pathParts } = await params;
-  const path = pathParts.join("/");
-
-  try {
-    const body = await request.json();
-    const { name, expanded, sort_order } = body;
-
-    // Check if group exists
-    const group = queries.getGroup(db).get(path) as Group | undefined;
-    if (!group) {
-      return NextResponse.json({ error: "Group not found" }, { status: 404 });
-    }
-
-    // Protect default group from being renamed
-    if (path === "sessions" && name !== undefined && name !== "Sessions") {
-      return NextResponse.json(
-        { error: "Cannot rename the default group" },
-        { status: 400 }
-      );
-    }
-
-    // Update name
-    if (name !== undefined) {
-      queries.updateGroupName(db).run(name, path);
-    }
-
-    // Update expanded state
-    if (expanded !== undefined) {
-      queries.updateGroupExpanded(db).run(expanded ? 1 : 0, path);
-    }
-
-    // Update sort order
-    if (sort_order !== undefined) {
-      queries.updateGroupOrder(db).run(sort_order, path);
-    }
-
-    const updatedGroup = queries.getGroup(db).get(path) as Group;
-    return NextResponse.json({
-      group: { ...updatedGroup, expanded: Boolean(updatedGroup.expanded) },
-    });
-  } catch (error) {
-    console.error("Error updating group:", error);
-    return NextResponse.json(
-      { error: "Failed to update group" },
-      { status: 500 }
-    );
-  }
-}
-
-// DELETE /api/groups/[...path] - Delete group (moves sessions to parent or default)
-export async function DELETE(
-  request: Request,
-  { params }: { params: Promise<{ path: string[] }> }
-) {
-  const { path: pathParts } = await params;
-  const path = pathParts.join("/");
-
-  try {
-    // Protect default group
-    if (path === "sessions") {
-      return NextResponse.json(
-        { error: "Cannot delete the default group" },
-        { status: 400 }
-      );
-    }
-
-    // Check if group exists
-    const group = queries.getGroup(db).get(path) as Group | undefined;
-    if (!group) {
-      return NextResponse.json({ error: "Group not found" }, { status: 404 });
-    }
-
-    // Find parent group or use default
-    const pathParts2 = path.split("/");
-    pathParts2.pop();
-    const parentPath =
-      pathParts2.length > 0 ? pathParts2.join("/") : "sessions";
-
-    // Move all sessions in this group to parent
-    queries.moveSessionsToGroup(db).run(parentPath, path);
-
-    // Also move sessions from any subgroups
-    const allGroups = queries.getAllGroups(db).all() as Group[];
-    const subgroups = allGroups.filter((g) => g.path.startsWith(path + "/"));
-    for (const subgroup of subgroups) {
-      queries.moveSessionsToGroup(db).run(parentPath, subgroup.path);
-      queries.deleteGroup(db).run(subgroup.path);
-    }
-
-    // Delete the group
-    queries.deleteGroup(db).run(path);
-
-    return NextResponse.json({ success: true, movedTo: parentPath });
-  } catch (error) {
-    console.error("Error deleting group:", error);
-    return NextResponse.json(
-      { error: "Failed to delete group" },
-      { status: 500 }
-    );
-  }
-}

package/app/api/groups/route.ts

@@ -1,93 +0,0 @@
-import { NextResponse } from "next/server";
-import { db, queries, type Group } from "@/lib/db";
-
-// GET /api/groups - List all groups
-export async function GET() {
-  try {
-    const groups = queries.getAllGroups(db).all() as Group[];
-
-    // Convert expanded from 0/1 to boolean
-    const formattedGroups = groups.map((g) => ({
-      ...g,
-      expanded: Boolean(g.expanded),
-    }));
-
-    return NextResponse.json({ groups: formattedGroups });
-  } catch (error) {
-    console.error("Error fetching groups:", error);
-    return NextResponse.json(
-      { error: "Failed to fetch groups" },
-      { status: 500 }
-    );
-  }
-}
-
-// POST /api/groups - Create a new group
-export async function POST(request: Request) {
-  try {
-    const body = await request.json();
-    const { name, parentPath } = body;
-
-    if (!name || typeof name !== "string") {
-      return NextResponse.json({ error: "Name is required" }, { status: 400 });
-    }
-
-    // Sanitize name to create path
-    const sanitizedName = name
-      .toLowerCase()
-      .replace(/[^a-z0-9-]/g, "-")
-      .replace(/-+/g, "-")
-      .replace(/^-|-$/g, "");
-
-    if (!sanitizedName) {
-      return NextResponse.json(
-        { error: "Invalid group name" },
-        { status: 400 }
-      );
-    }
-
-    // Build full path
-    const path = parentPath ? `${parentPath}/${sanitizedName}` : sanitizedName;
-
-    // Check if group already exists
-    const existing = queries.getGroup(db).get(path) as Group | undefined;
-    if (existing) {
-      return NextResponse.json(
-        { error: "Group already exists", group: existing },
-        { status: 409 }
-      );
-    }
-
-    // If parent path specified, ensure parent exists
-    if (parentPath) {
-      const parent = queries.getGroup(db).get(parentPath) as Group | undefined;
-      if (!parent) {
-        return NextResponse.json(
-          { error: "Parent group does not exist" },
-          { status: 400 }
-        );
-      }
-    }
-
-    // Get max sort order for new group
-    const groups = queries.getAllGroups(db).all() as Group[];
-    const maxOrder = groups.reduce((max, g) => Math.max(max, g.sort_order), 0);
-
-    // Create the group
-    queries.createGroup(db).run(path, name, maxOrder + 1);
-
-    const newGroup = queries.getGroup(db).get(path) as Group;
-    return NextResponse.json(
-      {
-        group: { ...newGroup, expanded: Boolean(newGroup.expanded) },
-      },
-      { status: 201 }
-    );
-  } catch (error) {
-    console.error("Error creating group:", error);
-    return NextResponse.json(
-      { error: "Failed to create group" },
-      { status: 500 }
-    );
-  }
-}

package/data/groups/index.ts

@@ -1 +0,0 @@
-export { useToggleGroup, useCreateGroup, useDeleteGroup } from "./mutations";

package/data/groups/mutations.ts

@@ -1,95 +0,0 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { sessionKeys } from "../sessions/keys";
-
-export function useToggleGroup() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async ({
-      path,
-      expanded,
-    }: {
-      path: string;
-      expanded: boolean;
-    }) => {
-      const res = await fetch(`/api/groups/${encodeURIComponent(path)}`, {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ expanded }),
-      });
-      if (!res.ok) throw new Error("Failed to toggle group");
-      return res.json();
-    },
-    onMutate: async ({ path, expanded }) => {
-      await queryClient.cancelQueries({ queryKey: sessionKeys.list() });
-      const previous = queryClient.getQueryData(sessionKeys.list());
-      queryClient.setQueryData(
-        sessionKeys.list(),
-        (
-          old:
-            | {
-                sessions: unknown[];
-                groups: Array<{ path: string; expanded: boolean }>;
-              }
-            | undefined
-        ) =>
-          old
-            ? {
-                ...old,
-                groups: old.groups.map((g) =>
-                  g.path === path ? { ...g, expanded } : g
-                ),
-              }
-            : old
-      );
-      return { previous };
-    },
-    onError: (_, __, context) => {
-      if (context?.previous) {
-        queryClient.setQueryData(sessionKeys.list(), context.previous);
-      }
-    },
-  });
-}
-
-export function useCreateGroup() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async ({
-      name,
-      parentPath,
-    }: {
-      name: string;
-      parentPath?: string;
-    }) => {
-      const res = await fetch("/api/groups", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ name, parentPath }),
-      });
-      if (!res.ok) throw new Error("Failed to create group");
-      return res.json();
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: sessionKeys.list() });
-    },
-  });
-}
-
-export function useDeleteGroup() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async (path: string) => {
-      const res = await fetch(`/api/groups/${encodeURIComponent(path)}`, {
-        method: "DELETE",
-      });
-      if (!res.ok) throw new Error("Failed to delete group");
-      return res.json();
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: sessionKeys.list() });
-    },
-  });
-}

package/hooks/useGroups.ts

@@ -1,37 +0,0 @@
-import { useCallback } from "react";
-import { useToggleGroup, useCreateGroup, useDeleteGroup } from "@/data/groups";
-
-export function useGroups() {
-  const toggleMutation = useToggleGroup();
-  const createMutation = useCreateGroup();
-  const deleteMutation = useDeleteGroup();
-
-  const toggleGroup = useCallback(
-    async (path: string, expanded: boolean) => {
-      await toggleMutation.mutateAsync({ path, expanded });
-    },
-    [toggleMutation]
-  );
-
-  const createGroup = useCallback(
-    async (name: string, parentPath?: string) => {
-      await createMutation.mutateAsync({ name, parentPath });
-    },
-    [createMutation]
-  );
-
-  const deleteGroup = useCallback(
-    async (path: string) => {
-      if (!confirm("Delete this group? Sessions will be moved to parent."))
-        return;
-      await deleteMutation.mutateAsync(path);
-    },
-    [deleteMutation]
-  );
-
-  return {
-    toggleGroup,
-    createGroup,
-    deleteGroup,
-  };
-}