@saadnvd1/agent-os 0.3.660 → 0.3.664

package/app/api/sessions/[id]/route.ts

@@ -7,7 +7,7 @@ import {
   mainCheckoutOf,
 } from "@/lib/worktrees";
 import { releasePort } from "@/lib/ports";
-import { dropSessionDatabase } from "@/lib/project-config/database";
+import { releaseSessionLeftovers } from "@/lib/sessions/leftovers";
 import { killWorker } from "@/lib/orchestration";
 import { endSessionAgent } from "@/lib/sessions/end";
 import { endTmuxSession } from "@/lib/tmux/end";
@@ -261,7 +261,7 @@ export async function DELETE(request: NextRequest, { params }: RouteParams) {
       } catch (error) {
         console.error(`Failed to kill worker ${worker.id}:`, error);
       }
-      void dropSessionDatabase(worker.id);
+      void releaseSessionLeftovers(worker);
       queries.deleteSession(db).run(worker.id);
     }
 
@@ -271,7 +271,7 @@ export async function DELETE(request: NextRequest, { params }: RouteParams) {
     }
 
     // Its private Postgres copy: the row is read now, the drop runs on.
-    void dropSessionDatabase(id);
+    void releaseSessionLeftovers(existing);
 
     // Delete from database immediately for instant UI feedback
     // The agent's tmux and processes go on in the background; the worktree

package/app/api/sessions/[id]/summarize/route.ts

@@ -8,6 +8,7 @@ import { randomUUID } from "crypto";
 import { readFile } from "fs/promises";
 import { homedir } from "os";
 import { pasteText, tmux } from "@/lib/tmux/exec";
+import { sessionBaseEnv, UNSET_SERVER_ENV } from "@/lib/agents/server-env";
 
 // Get Claude session ID from tmux environment
 async function getClaudeSessionId(tmuxSession: string): Promise<string | null> {
@@ -135,7 +136,7 @@ async function generateSummary(conversation: string): Promise<string> {
   const routed = await routedRun("helper");
   return new Promise((resolve, reject) => {
     const claude = spawn("claude", ["-p", prompt, "--model", routed.model], {
-      env: { ...process.env, ...routed.env },
+      env: { ...sessionBaseEnv(), ...routed.env },
       stdio: ["pipe", "pipe", "pipe"],
     });
 
@@ -309,7 +310,7 @@ export async function POST(
 
       // Start new tmux session with Claude directly
       const isRoot = process.getuid?.() === 0;
-      const envPrefix = isRoot ? "IS_SANDBOX=1 " : "";
+      const envPrefix = UNSET_SERVER_ENV + (isRoot ? "IS_SANDBOX=1 " : "");
       const claudeCmd = effectiveAutoApprove(session.auto_approve)
         ? `${envPrefix}claude --dangerously-skip-permissions`
         : "claude";

package/app/api/worktree-sweep/route.test.ts

@@ -5,10 +5,11 @@ import { NextRequest } from "next/server";
 const { GET, PUT } = await import("./route");
 const { createProject } = await import("@/lib/projects");
 
-const put = (body: unknown) =>
+const put = (body: unknown, trust: string | null = "loopback") =>
   PUT(
     new NextRequest("http://localhost/api/worktree-sweep", {
       method: "PUT",
+      headers: trust ? { "x-agentos-trust": trust } : {},
       body: JSON.stringify(body),
     })
   );
@@ -30,6 +31,23 @@ describe("/api/worktree-sweep", () => {
     expect((await (await put({ days: null })).json()).days).toBeNull();
   });
 
+  it("turns the full clean-up on and off, off by default", async () => {
+    expect((await (await GET()).json()).armed).toBe(false);
+    expect((await (await put({ armed: true })).json()).armed).toBe(true);
+    expect((await (await GET()).json()).armed).toBe(true);
+    expect((await (await put({ armed: false })).json()).armed).toBe(false);
+    expect((await put({ armed: "yes" })).status).toBe(400);
+  });
+
+  it("turns the full clean-up on only from this machine or the tailnet, off from anywhere", async () => {
+    expect((await put({ armed: true }, null)).status).toBe(403);
+    expect((await put({ armed: true }, "device")).status).toBe(403);
+    expect((await (await GET()).json()).armed).toBe(false);
+    expect((await put({ armed: true }, "tailnet")).status).toBe(200);
+    expect((await put({ armed: false }, null)).status).toBe(200);
+    expect((await (await GET()).json()).armed).toBe(false);
+  });
+
   it("refuses a number that isn't a whole 0-365", async () => {
     for (const days of [-1, 1.5, 400, "7", undefined]) {
       const res = await put({ days });

package/app/api/worktree-sweep/route.ts

@@ -2,16 +2,21 @@ import { NextRequest, NextResponse } from "next/server";
 import { z } from "zod";
 import {
   setGlobalSweepDays,
+  setReaperArmed,
   setProjectSweepDays,
   sweepDays,
 } from "@/lib/worktree-sweep/settings";
+import { requireLocalTrust } from "@/lib/security/route-guard";
 import { sweepState } from "@/lib/worktree-sweep/state";
 
-const body = z.object({
-  // Null clears the setting: the global one, then the default, applies.
-  days: sweepDays.nullable(),
-  projectId: z.string().min(1).optional(),
-});
+const body = z.union([
+  z.object({
+    // Null clears the setting: the global one, then the default, applies.
+    days: sweepDays.nullable(),
+    projectId: z.string().min(1).optional(),
+  }),
+  z.object({ armed: z.boolean() }),
+]);
 
 export async function GET() {
   return NextResponse.json(sweepState());
@@ -21,9 +26,23 @@ export async function PUT(request: NextRequest) {
   const got = body.safeParse(await request.json().catch(() => null));
   if (!got.success)
     return NextResponse.json(
-      { error: "days must be a whole number from 0 to 365, or null" },
+      {
+        error:
+          "days must be a whole number from 0 to 365, or null; or armed true or false",
+      },
       { status: 400 }
     );
+  if ("armed" in got.data) {
+    // Turning the removal on is a person's call, made on this machine or
+    // over Tailscale: a stolen device token must not be able to. Turning it
+    // off stays on the ordinary gate.
+    if (got.data.armed) {
+      const refused = requireLocalTrust(request);
+      if (refused) return refused;
+    }
+    setReaperArmed(got.data.armed);
+    return NextResponse.json(sweepState());
+  }
   const { days, projectId } = got.data;
   if (projectId) setProjectSweepDays(projectId, days);
   else setGlobalSweepDays(days);

package/components/Health/SweepRuns.tsx

@@ -1,7 +1,11 @@
 "use client";
 
 import { Button } from "@/components/ui/button";
-import { useRunSweep, useWorktreeSweep } from "@/data/worktree-sweep";
+import {
+  useRunSweep,
+  useSetReaperArmed,
+  useWorktreeSweep,
+} from "@/data/worktree-sweep";
 import { compactTimeAgo, fromSqliteTime } from "@/lib/session-meta";
 import { formatBytes } from "@/lib/share/view";
 import type { SweepRun } from "@/lib/worktree-sweep/types";
@@ -10,8 +14,34 @@ const KIND: Record<string, string> = {
   settled: "settled session",
   orphan: "orphan folder",
   "test-leak": "test leftover",
+  database: "task database",
+  spare: "dependency spare",
+  temp: "temp folder",
+  "derived-data": "Xcode build folder",
 };
 
+// "18.2 GB in 3,876 worktrees · 12 task databases (270 MB) · ..." from the
+// latest run that measured, and what the last real run freed.
+export function diskSummary(runs: SweepRun[]): string | null {
+  const totals = runs.find((r) => r.details?.totals)?.details?.totals;
+  if (!totals) return null;
+  const part = (n: number, bytes: number, what: string) =>
+    `${n.toLocaleString()} ${what}${bytes ? ` (${formatBytes(bytes)})` : ""}`;
+  const last = runs.find((r) => !r.dryRun && r.finishedAt);
+  return [
+    `Task leftovers: ${part(totals.worktrees.count, totals.worktrees.bytes, "worktrees")}`,
+    part(
+      totals.databases.count,
+      totals.databases.bytes,
+      "stale task databases"
+    ),
+    part(totals.spares.count, totals.spares.bytes, "dependency spares"),
+    last
+      ? `last clean-up freed ${formatBytes(last.freedBytes)}, ${compactTimeAgo(fromSqliteTime(last.finishedAt!))}`
+      : "no clean-up has run yet",
+  ].join(" · ");
+}
+
 const name = (p: string) => p.split("/").pop();
 
 function Run({ run }: { run: SweepRun }) {
@@ -51,6 +81,22 @@ function Run({ run }: { run: SweepRun }) {
             </ul>
           </div>
         )}
+        {(run.details?.pending?.length ?? 0) > 0 && (
+          <div className="mt-2 space-y-1 pb-2">
+            <p className="text-sm font-medium">
+              Waiting for the full clean-up to be turned on (
+              {run.details?.pendingTotal?.count ?? 0},{" "}
+              {formatBytes(run.details?.pendingTotal?.bytes ?? 0)})
+            </p>
+            <ul className="text-muted-foreground space-y-1 text-xs">
+              {run.details?.pending?.slice(0, 100).map((p) => (
+                <li key={p.path} className="break-all">
+                  {name(p.path)} ({KIND[p.kind]}, {formatBytes(p.bytes)})
+                </li>
+              ))}
+            </ul>
+          </div>
+        )}
         {removed.length > 0 && (
           <div className="mt-2 space-y-1 pb-2">
             <p className="text-sm font-medium">Removed</p>
@@ -72,8 +118,37 @@ function Run({ run }: { run: SweepRun }) {
 export function SweepRuns() {
   const { data, isPending, error } = useWorktreeSweep();
   const run = useRunSweep();
+  const arm = useSetReaperArmed();
+  const summary = data ? diskSummary(data.runs) : null;
   return (
     <div className="space-y-3">
+      {summary && (
+        <p
+          className="text-sm font-medium tabular-nums"
+          data-testid="disk-summary"
+        >
+          {summary}
+        </p>
+      )}
+      {data && (
+        <div className="flex flex-wrap items-center gap-2">
+          <p className="text-muted-foreground min-w-0 flex-1 text-sm">
+            Full clean-up is {data.armed ? "on" : "off"}: test leftovers, stale
+            task databases, spares, temp folders and build caches{" "}
+            {data.armed
+              ? "are removed with each run."
+              : "are only listed until you turn it on. Read a dry run first."}
+          </p>
+          <Button
+            variant="outline"
+            className="min-h-11 md:min-h-8"
+            disabled={arm.isPending}
+            onClick={() => arm.mutate(!data.armed)}
+          >
+            {data.armed ? "Turn off" : "Turn on"}
+          </Button>
+        </div>
+      )}
       <div className="flex flex-wrap items-center gap-2">
         <p className="text-muted-foreground min-w-0 flex-1 text-sm">
           Settled worktrees older than {data?.days ?? data?.defaultDays ?? 7}{" "}

package/data/worktree-sweep/index.ts

@@ -33,6 +33,21 @@ export function useSetSweepDays() {
   });
 }
 
+export function useSetReaperArmed() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (armed: boolean) =>
+      json<SweepState>(
+        await fetch("/api/worktree-sweep", {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ armed }),
+        })
+      ),
+    onSuccess: (data) => queryClient.setQueryData(sweepKeys.all, data),
+  });
+}
+
 export function useRunSweep() {
   const queryClient = useQueryClient();
   return useMutation({

package/lib/agentos-home.ts

@@ -0,0 +1,11 @@
+import os from "os";
+import path from "path";
+import { refuseRealStateUnderTest } from "./test-home-guard";
+
+// Every path under ~/.agent-os is built here, so a test run that resolves one
+// to the real home throws instead of leaving files in the owner's state.
+export function agentosHome(...parts: string[]): string {
+  return refuseRealStateUnderTest(
+    path.join(os.homedir(), ".agent-os", ...parts)
+  );
+}

package/lib/agents/launch.ts

@@ -1,5 +1,5 @@
+import { agentosHome } from "../agentos-home";
 import fs from "fs";
-import os from "os";
 import path from "path";
 import { execFile } from "child_process";
 import { promisify } from "util";
@@ -10,6 +10,7 @@ import { runInBackground } from "../async-operations";
 import { trustPromptKeys } from "../tasks/state";
 import { BUS_BRIEF } from "./brief";
 import { selfUrl } from "./self-env";
+import { sessionBaseEnv, UNSET_SERVER_ENV } from "./server-env";
 import { sessionPath } from "./tool-path";
 import { autoCompactEnv } from "../chat/refresh";
 import { subagentEnv } from "../models/subagents";
@@ -21,12 +22,8 @@ import {
 } from "../project-config/session";
 
 const execFileAsync = promisify(execFile);
-const PROMPTS_DIR = path.join(os.homedir(), ".agent-os", "prompts");
-export const BUS_BRIEF_FILE = path.join(
-  os.homedir(),
-  ".agent-os",
-  "bus-brief.md"
-);
+const PROMPTS_DIR = agentosHome("prompts");
+export const BUS_BRIEF_FILE = agentosHome("bus-brief.md");
 
 export function ensureBusBrief(): void {
   fs.mkdirSync(path.dirname(BUS_BRIEF_FILE), { recursive: true });
@@ -110,7 +107,7 @@ export async function launchClaude(opts: {
     model_provider: opts.provider ?? null,
   });
   const mcpFlags = routedMcpFlags(opts.provider);
-  const agent = `export PATH=${shellQuote(AOS_BIN_DIR)}:"$HOME/.local/bin:$PATH"; ${routing.exportKey} ${provider.command} ${flags} ${mcpFlags}${CLAUDE_STATUS_SETTINGS_FLAG} --append-system-prompt-file ${shellQuote(briefFile)} "$(cat ${shellQuote(promptFile)})"; exec "\${SHELL:-/bin/sh}" -l`;
+  const agent = `${UNSET_SERVER_ENV}export PATH=${shellQuote(AOS_BIN_DIR)}:"$HOME/.local/bin:$PATH"; ${routing.exportKey} ${provider.command} ${flags} ${mcpFlags}${CLAUDE_STATUS_SETTINGS_FLAG} --append-system-prompt-file ${shellQuote(briefFile)} "$(cat ${shellQuote(promptFile)})"; exec "\${SHELL:-/bin/sh}" -l`;
   await execFileAsync(
     "tmux",
     [
@@ -123,7 +120,7 @@ export async function launchClaude(opts: {
       ...envArgs({ ...agentEnv(opts.sessionId), ...routing.env }),
       agent,
     ],
-    { cwd: opts.cwd }
+    { cwd: opts.cwd, env: sessionBaseEnv() }
   );
   runInBackground(
     () => acceptTrustPrompt(opts.tmuxName),

package/lib/agents/server-env.ts

@@ -0,0 +1,24 @@
+// Variables the server sets only for itself (`npm start`, `npm run dev`,
+// the dev-instance spawner). A session that inherits them breaks the
+// project it works in: NODE_ENV=production makes Vitest load React's
+// production build, PORT makes a dev server bind the live one's port.
+// AGENTOS_URL, AGENTOS_PORT and the session ids are not here: sessions need them.
+export const SERVER_ONLY_ENV = [
+  "NODE_ENV",
+  "PORT",
+  "AGENTOS_SERVER",
+  "AGENTOS_DEV",
+] as const;
+
+// Shell text that clears them inside a pane. `tmux new-session -e` can only
+// add variables, and an already-running tmux server may hold them globally.
+export const UNSET_SERVER_ENV = `unset ${SERVER_ONLY_ENV.join(" ")}; `;
+
+// The server's environment as an agent or its tools should see it.
+export function sessionBaseEnv(
+  env: NodeJS.ProcessEnv = process.env
+): NodeJS.ProcessEnv {
+  const out = { ...env };
+  for (const k of SERVER_ONLY_ENV) delete out[k];
+  return out;
+}

package/lib/artifacts/store.ts

@@ -3,8 +3,8 @@
  * ~/.agent-os/artifacts/<session id>/, and a row saying whose it is.
  */
 
+import { agentosHome } from "../agentos-home";
 import fs from "fs";
-import os from "os";
 import path from "path";
 import { randomUUID } from "crypto";
 import { db } from "../db";
@@ -23,10 +23,7 @@ export const MAX_TITLE_CHARS = 120;
 const ID = /^[0-9a-f-]{36}$/;
 
 export function artifactsDir(): string {
-  return (
-    process.env.AGENTOS_ARTIFACTS_DIR ||
-    path.join(os.homedir(), ".agent-os", "artifacts")
-  );
+  return process.env.AGENTOS_ARTIFACTS_DIR || agentosHome("artifacts");
 }
 
 // Session ids are UUIDs; anything else must not become a path segment.

package/lib/chat/drivers/claude.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import { randomUUID } from "crypto";
 import {
   getSessionMessages,
@@ -145,7 +146,7 @@ export const claudeDriver: ChatDriver = {
         cwd,
         permissionMode: "bypassPermissions",
         allowDangerouslySkipPermissions: true,
-        env: { ...process.env, ...env },
+        env: { ...sessionBaseEnv(), ...env },
       },
     });
     try {
@@ -235,7 +236,7 @@ export const claudeDriver: ChatDriver = {
           append: options.systemAppend,
         },
         env: {
-          ...process.env,
+          ...sessionBaseEnv(),
           ...options.env,
           // When the agent is done with every turn it had queued: the end
           // of a turn that never sent its result.

package/lib/chat/drivers/codex.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -16,7 +17,7 @@ export const codexDriver: ChatDriver = {
 
   async discover({ cwd, env }) {
     const rpc = new CodexRpc(
-      { cwd, env: { ...process.env, ...env } },
+      { cwd, env: { ...sessionBaseEnv(), ...env } },
       { notify: () => {}, request: () => {}, exit: () => {} }
     );
     try {
@@ -51,7 +52,7 @@ export const codexDriver: ChatDriver = {
     let starting = false;
     let stopOnStart = false;
     const rpc: CodexRpc = new CodexRpc(
-      { cwd: options.cwd, env: { ...process.env, ...options.env } },
+      { cwd: options.cwd, env: { ...sessionBaseEnv(), ...options.env } },
       {
         notify(method, params) {
           if (method === "item/started") approvals.sawItem(params.item as P);

package/lib/chat/drivers/copilot.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver, ChatStartOptions } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -52,7 +53,7 @@ export const copilotDriver: ChatDriver = {
     const held: { text: string; images?: ChatImage[] }[] = [];
     const rpc: CopilotRpc = new CopilotRpc(
       copilotArgs(options),
-      { cwd: options.cwd, env: { ...process.env, ...options.env } },
+      { cwd: options.cwd, env: { ...sessionBaseEnv(), ...options.env } },
       {
         notify(method, params) {
           if (method === "session/update")

package/lib/chat/drivers/opencode.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -46,7 +47,7 @@ export const openCodeDriver: ChatDriver = {
   atRest: false,
 
   async discover({ cwd, env }) {
-    const server = new OpenCodeServer(cwd, { ...process.env, ...env });
+    const server = new OpenCodeServer(cwd, { ...sessionBaseEnv(), ...env });
     try {
       const [providers, commands] = await Promise.all([
         server.call<{ all: P[]; connected: string[] }>("GET", "/provider"),
@@ -79,7 +80,7 @@ export const openCodeDriver: ChatDriver = {
     const out = new InputQueue<DriverEvent>();
     const emit = (e: DriverEvent) => out.push(e);
     const server = new OpenCodeServer(options.cwd, {
-      ...process.env,
+      ...sessionBaseEnv(),
       ...options.env,
     });
     let sessionId: string | null = null;

package/lib/chat/drivers/pi-approvals.ts

@@ -1,5 +1,5 @@
+import { agentosHome } from "../../agentos-home";
 import fs from "fs";
-import os from "os";
 import path from "path";
 import { randomUUID } from "crypto";
 import type { ChatAccess, DriverEvent } from "../events";
@@ -9,7 +9,7 @@ import { piTool } from "./pi-mapper";
 type P = Record<string, unknown>;
 const str = (v: unknown) => (typeof v === "string" ? v : "");
 
-const DIR = path.join(os.homedir(), ".agent-os", "pi");
+const DIR = agentosHome("pi");
 const MARK = "agentos:";
 
 // Pi runs every tool without asking. This extension asks the chat first,

package/lib/chat/drivers/pi.ts

@@ -1,3 +1,4 @@
+import { sessionBaseEnv } from "../../agents/server-env";
 import type { ChatConversation, ChatDriver, ChatStartOptions } from "../driver";
 import type { ChatImage, DriverEvent } from "../events";
 import { InputQueue } from "../queue";
@@ -45,7 +46,7 @@ export const piDriver: ChatDriver = {
   async discover({ cwd, env }) {
     const rpc = new PiRpc(
       ["--no-session", "--offline"],
-      { cwd, env: { ...process.env, ...env } },
+      { cwd, env: { ...sessionBaseEnv(), ...env } },
       { event: () => {}, ui: () => {}, exit: () => {} }
     );
     try {
@@ -82,7 +83,7 @@ export const piDriver: ChatDriver = {
       {
         cwd: options.cwd,
         env: {
-          ...process.env,
+          ...sessionBaseEnv(),
           ...options.env,
           AGENTOS_PI_ACCESS_FILE: access.file,
           PI_OFFLINE: "1",

package/lib/chat/worker/client.ts

@@ -1,3 +1,4 @@
+import { UNSET_SERVER_ENV, sessionBaseEnv } from "../../agents/server-env";
 /**
  * The server's side of a chat worker: starts one in tmux when none is
  * running, connects to its socket, and passes commands and events along.
@@ -224,7 +225,7 @@ async function spawnWorker(sessionId: string): Promise<void> {
   if (await tmuxHas(name)) return;
   fs.mkdirSync(workerDir(), { recursive: true, mode: 0o700 });
   const env: Record<string, string | undefined> = {
-    ...process.env,
+    ...sessionBaseEnv(),
     DB_PATH: path.resolve(
       process.env.DB_PATH || path.join(process.cwd(), "agent-os.db")
     ),
@@ -233,18 +234,22 @@ async function spawnWorker(sessionId: string): Promise<void> {
   delete env.TMUX_PANE;
   fs.writeFileSync(envPath(sessionId), JSON.stringify(env), { mode: 0o600 });
   const entry = path.join(process.cwd(), "lib/chat/worker/main.ts");
-  await execFileAsync("tmux", [
-    "new-session",
-    "-d",
-    "-s",
-    name,
-    "-c",
-    process.cwd(),
-    // The worker finds its env file by DB_PATH, so it can't come from there.
-    "-e",
-    `DB_PATH=${env.DB_PATH}`,
-    `exec ${shellQuote(process.execPath)} --import tsx ${shellQuote(entry)} ${shellQuote(sessionId)} > ${shellQuote(path.join(workerDir(), `${sessionId}.log`))} 2>&1`,
-  ]);
+  await execFileAsync(
+    "tmux",
+    [
+      "new-session",
+      "-d",
+      "-s",
+      name,
+      "-c",
+      process.cwd(),
+      // The worker finds its env file by DB_PATH, so it can't come from there.
+      "-e",
+      `DB_PATH=${env.DB_PATH}`,
+      `${UNSET_SERVER_ENV}exec ${shellQuote(process.execPath)} --import tsx ${shellQuote(entry)} ${shellQuote(sessionId)} > ${shellQuote(path.join(workerDir(), `${sessionId}.log`))} 2>&1`,
+    ],
+    { env: sessionBaseEnv() }
+  );
 }
 
 const shellQuote = (s: string) => `'${s.replace(/'/g, `'\\''`)}'`;

package/lib/chat/worker/protocol.ts

@@ -3,8 +3,8 @@
  * worker's Unix socket: one JSON message per line.
  */
 
+import { agentosHome } from "../../agentos-home";
 import crypto from "crypto";
-import os from "os";
 import path from "path";
 import type {
   ApprovalDecision,
@@ -116,7 +116,7 @@ export function workerDir(): string {
     process.env.DB_PATH || path.join(process.cwd(), "agent-os.db")
   );
   const key = crypto.createHash("sha1").update(db).digest("hex").slice(0, 8);
-  return path.join(os.homedir(), ".agent-os", "chat", key);
+  return agentosHome("chat", key);
 }
 
 export const socketPath = (sessionId: string) =>

package/lib/connect/config.ts

@@ -11,8 +11,8 @@
  * each time the tunnel starts.
  */
 
+import { agentosHome } from "../agentos-home";
 import fs from "fs";
-import os from "os";
 import path from "path";
 
 export interface ConnectConfig {
@@ -32,8 +32,7 @@ export interface ConnectFiles {
 export const MACHINE_HOST = /^m-[0-9a-f]{16}\.runagentos\.com$/;
 
 export const connectDir = () =>
-  process.env.AGENTOS_CONNECT_DIR ||
-  path.join(os.homedir(), ".agent-os", "connect");
+  process.env.AGENTOS_CONNECT_DIR || agentosHome("connect");
 
 export type ConnectRead =
   | { ok: true; files: ConnectFiles; enabled: boolean }

package/lib/db/backup.ts

@@ -1,13 +1,13 @@
+import { agentosHome } from "../agentos-home";
 import type Database from "better-sqlite3";
 import Sqlite from "better-sqlite3";
 import { randomBytes } from "crypto";
 import fs from "fs";
-import os from "os";
 import path from "path";
 import { refuseRealStateUnderTest } from "../test-home-guard";
 
 export const backupsDir = (): string =>
-  refuseRealStateUnderTest(path.join(os.homedir(), ".agent-os", "backups"));
+  refuseRealStateUnderTest(agentosHome("backups"));
 
 // A full copy of the database (VACUUM INTO) under ~/.agent-os/backups, taken
 // before a destructive migration. Throws, and the migration must stop, unless

package/lib/db/migrations/20261018T1600_health_boot_deploys.ts

@@ -0,0 +1,13 @@
+import type { Migration } from "../migration-types";
+
+export default {
+  key: "20261018T1600_health_boot_deploys",
+  up: (db) => {
+    const cols = (
+      db.prepare(`PRAGMA table_info(health_boots)`).all() as { name: string }[]
+    ).map((c) => c.name);
+    // 1 when autodeploy planned the restart that started this boot.
+    if (!cols.includes("deploy"))
+      db.exec(`ALTER TABLE health_boots ADD COLUMN deploy INTEGER`);
+  },
+} satisfies Migration;