@saadnvd1/agent-os 0.3.826 → 0.3.828

package/content/whats-new.json

@@ -1937,6 +1937,14 @@
       "area": "Chat",
       "text": "Cancelled questions from GitHub Copilot chats now clear right away instead of staying on screen.",
       "url": "https://github.com/saadnvd1/agent-os/pull/552"
+    },
+    {
+      "id": 555,
+      "date": "2026-11-02",
+      "kind": "fixed",
+      "area": "Updates",
+      "text": "Automatic updates no longer get stuck after the first one because of a file the build rewrites.",
+      "url": "https://github.com/saadnvd1/agent-os/pull/555"
     }
   ]
 }

package/lib/updates/generated.ts

@@ -0,0 +1,29 @@
+import fs from "fs";
+import path from "path";
+
+/** Files the build rewrites in a checkout; one list for the updater and the deploy scripts. */
+export function generatedFiles(root: string): string[] {
+  try {
+    return fs
+      .readFileSync(path.join(root, "scripts/generated-files.txt"), "utf8")
+      .split("\n")
+      .map((l) => l.trim())
+      .filter((l) => l && !l.startsWith("#"));
+  } catch {
+    return [];
+  }
+}
+
+/** Splits `git status --porcelain` paths into generated files and real local changes. */
+export function splitDirty(
+  porcelain: string,
+  generated: string[]
+): { generated: string[]; blocking: string[] } {
+  const out = { generated: [] as string[], blocking: [] as string[] };
+  for (const line of porcelain.split("\n")) {
+    const file = line.slice(3).trim();
+    if (!file) continue;
+    (generated.includes(file) ? out.generated : out.blocking).push(file);
+  }
+  return out;
+}

package/lib/updates/run.ts

@@ -32,6 +32,7 @@ import {
   type CheckDeps,
   type CheckResult,
 } from "./check";
+import { generatedFiles, splitDirty } from "./generated";
 import { decideAutoUpdate, pickTarget, type AutoDecision } from "./auto";
 import {
   attemptOf,
@@ -325,6 +326,16 @@ export type Refusal = { code: UpdateRefusal; error: string };
 export const NO_RESTART =
   "This server can't restart itself, so an update would leave the old build running on new files. Set AGENTOS_RESTART to its restart command, or start it with agent-os start (started at login on Linux: run agent-os enable again to update its service).";
 
+/** A build leaves these modified; the pull would refuse to overwrite them. */
+export async function discardGenerated(deps: RunDeps): Promise<void> {
+  const { generated } = splitDirty(
+    await deps.git(["status", "--porcelain", "--untracked-files=no"]),
+    generatedFiles(deps.cwd)
+  );
+  if (generated.length)
+    await deps.git(["checkout", "--", ...generated]).catch(() => {});
+}
+
 export async function preflight(
   check: CheckResult | null,
   deps: RunDeps
@@ -356,12 +367,10 @@ export async function preflight(
       error:
         "Another update or deploy is building. Try again when it finishes.",
     };
-  const dirty = (
-    await deps.git(["status", "--porcelain", "--untracked-files=no"])
-  )
-    .split("\n")
-    .map((l) => l.slice(3).trim())
-    .filter(Boolean);
+  const dirty = splitDirty(
+    await deps.git(["status", "--porcelain", "--untracked-files=no"]),
+    generatedFiles(deps.cwd)
+  ).blocking;
   if (dirty.length)
     return {
       code: "dirty",
@@ -463,6 +472,7 @@ async function begin(
       code: "unknown",
       error: `Couldn't look for updates: ${result.error}`,
     };
+  await discardGenerated(deps);
   const refused = await preflight(result, deps);
   if (refused) return { ok: false, ...refused };
   if (when === "idle") {

package/package.json

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

package/scripts/autodeploy

@@ -51,6 +51,10 @@ published=$(cat "$state/published" 2>/dev/null || true)
 [ "$head" = "$deployed" ] && [ "$head" = "$published" ] && exit 0
 log() { echo "$(date '+%Y-%m-%d %-I:%M %p') $*"; }
 
+# shellcheck source=lib/generated.sh
+source scripts/lib/generated.sh
+discard_generated
+
 # A head that differs from the deployed one only in the changelog file needs
 # a pull, not a build or a restart: the file is read from disk when asked.
 changelog=content/whats-new.json

package/scripts/autodeploy.test.ts

@@ -22,7 +22,12 @@ function setup() {
   fs.mkdirSync(path.join(work, "scripts"));
   fs.copyFileSync(script, path.join(work, "scripts/autodeploy"));
   fs.mkdirSync(path.join(work, "scripts/lib"));
-  for (const f of ["sync-cli-links", "lib/cli-links.sh"])
+  for (const f of [
+    "sync-cli-links",
+    "lib/cli-links.sh",
+    "lib/generated.sh",
+    "generated-files.txt",
+  ])
     fs.copyFileSync(path.join(__dirname, f), path.join(work, "scripts", f));
   fs.chmodSync(path.join(work, "scripts/sync-cli-links"), 0o755);
   fs.mkdirSync(path.join(work, "bin"));

package/scripts/generated-files.txt

@@ -0,0 +1,3 @@
+# Files the build or dev server rewrites in a checkout. The updater and the
+# deploy scripts discard changes to these before pulling; one path per line.
+next-env.d.ts

package/scripts/generated.test.ts

@@ -0,0 +1,77 @@
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { describe, expect, it } from "vitest";
+import { tempDir } from "@/lib/test-temp";
+
+// discard_generated in a real clone: a build-modified generated file must not
+// block a pull that deletes it upstream, and a real local edit still does.
+const git = (cwd: string, ...args: string[]) =>
+  execFileSync("git", ["-c", "user.name=t", "-c", "user.email=t@t", ...args], {
+    cwd,
+    encoding: "utf-8",
+  });
+
+function setup() {
+  const root = tempDir("aos-generated-");
+  const origin = path.join(root, "origin");
+  const seed = path.join(root, "seed");
+  const work = path.join(root, "work");
+  git(root, "init", "-q", "-b", "main", seed);
+  fs.mkdirSync(path.join(seed, "scripts/lib"), { recursive: true });
+  for (const f of ["generated-files.txt", "lib/generated.sh"])
+    fs.copyFileSync(
+      path.join(import.meta.dirname, f),
+      path.join(seed, "scripts", f)
+    );
+  fs.writeFileSync(path.join(seed, "next-env.d.ts"), "dev\n");
+  fs.writeFileSync(path.join(seed, "app.ts"), "a\n");
+  git(seed, "add", ".");
+  git(seed, "commit", "-qm", "first");
+  git(root, "clone", "-q", "--bare", seed, origin);
+  git(root, "clone", "-q", origin, work);
+  // Upstream stops tracking the generated file.
+  git(seed, "remote", "add", "origin", origin);
+  git(seed, "rm", "-q", "--cached", "next-env.d.ts");
+  git(seed, "commit", "-qm", "untrack");
+  git(seed, "push", "-q", "origin", "main");
+  return work;
+}
+
+const discard = (cwd: string) =>
+  execFileSync(
+    "bash",
+    ["-c", "source scripts/lib/generated.sh && discard_generated"],
+    { cwd, encoding: "utf-8" }
+  );
+
+describe("discard_generated", () => {
+  it("restores a build-modified generated file so the pull goes through", () => {
+    const work = setup();
+    fs.writeFileSync(path.join(work, "next-env.d.ts"), "build\n");
+    discard(work);
+    expect(git(work, "status", "--porcelain", "--untracked-files=no")).toBe("");
+    git(work, "pull", "-q", "--ff-only");
+    expect(git(work, "ls-files", "next-env.d.ts")).toBe("");
+  });
+
+  it("leaves real local changes in place", () => {
+    const work = setup();
+    fs.writeFileSync(path.join(work, "next-env.d.ts"), "build\n");
+    fs.writeFileSync(path.join(work, "app.ts"), "edited\n");
+    discard(work);
+    expect(git(work, "status", "--porcelain", "--untracked-files=no")).toBe(
+      " M app.ts\n"
+    );
+  });
+
+  it("leaves an untracked generated file alone", () => {
+    const work = setup();
+    git(work, "pull", "-q", "--ff-only");
+    fs.writeFileSync(path.join(work, "next-env.d.ts"), "build\n");
+    discard(work);
+    expect(fs.readFileSync(path.join(work, "next-env.d.ts"), "utf-8")).toBe(
+      "build\n"
+    );
+  });
+});

package/scripts/lib/build-swap.sh

@@ -7,6 +7,9 @@
 # .next-prev for one rollback. A failed build never touches .next.
 # Sourced by scripts/redeploy; run from the repository root.
 
+# shellcheck source=generated.sh
+source scripts/lib/generated.sh
+
 LIVE=.next
 NEXT_BUILD=.next-build
 PREV=.next-prev
@@ -47,6 +50,7 @@ build_beside() {
   [ -d "$LIVE/types.building" ] && mv "$LIVE/types.building" "$LIVE/types"
   for f in "${REWRITTEN[@]}"; do [ -f "$saved/$f" ] && cp -p "$saved/$f" "$f"; done
   rm -rf "$saved"
+  discard_generated
   # `next build` exits non-zero on a type error, so a build that got here
   # typechecked; a missing BUILD_ID means it stopped short anyway.
   if [ "$status" = 0 ] && [ ! -s "$NEXT_BUILD/BUILD_ID" ]; then

package/scripts/lib/generated.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Generated files (scripts/generated-files.txt) are rewritten by `next build`
+# and `next dev`, which would leave the checkout dirty and make a pull fail.
+# Sourced by scripts/redeploy and scripts/autodeploy; run from the repository root.
+
+# Put every tracked, modified generated file back to HEAD. Untracked ones are
+# left alone.
+discard_generated() {
+  local f
+  [ -f scripts/generated-files.txt ] || return 0
+  while IFS= read -r f; do
+    case "$f" in ''|'#'*) continue ;; esac
+    if git ls-files --error-unmatch -- "$f" >/dev/null 2>&1 &&
+      [ -n "$(git status --porcelain --untracked-files=no -- "$f")" ]; then
+      git checkout -q -- "$f" || true
+    fi
+  done < scripts/generated-files.txt
+}

package/scripts/redeploy

@@ -38,6 +38,7 @@ check_disk() {
 # The pull can replace this script, so what follows runs from a fresh start.
 if [ "${1:-}" != "--rollback" ] && [ "${1:-}" != "--pulled" ]; then
   check_disk
+  discard_generated
   echo "::phase pulling"
   if [ -n "${AGENTOS_UPDATE_TO:-}" ]; then
     git fetch -q origin

package/scripts/redeploy.test.ts

@@ -20,6 +20,7 @@ beforeEach(() => {
   for (const f of [
     "redeploy",
     "lib/build-swap.sh",
+    "lib/generated.sh",
     "lib/pnpm.sh",
     "lib/deps-swap.sh",
   ])