@saadnvd1/agent-os 0.3.503 → 0.3.506

package/lib/tasks/pr-stage.ts

@@ -90,3 +90,17 @@ export const PR_STAGE_LABEL: Record<PrStageName, string> = {
 
 export const prStageText = (s: Pick<PrStage, "stage" | "number">) =>
   `PR #${s.number} · ${PR_STAGE_LABEL[s.stage]}`;
+
+// The short wording for the badge itself; the full wording is the tooltip.
+export const PR_STAGE_SHORT: Record<PrStageName, string> = {
+  merged: "Merged",
+  conflicts: "Conflicts",
+  "ci-failed": "CI failed",
+  "ci-running": "CI",
+  "ci-settling": "CI",
+  "review-running": "Review",
+  "review-blocked": "Blocked",
+  waiting: "Waiting on you",
+  armed: "Armed",
+  open: "PR",
+};

package/lib/tasks/session.ts

@@ -9,6 +9,7 @@ import { getProject } from "../projects";
 import { findPRStrict } from "./gh";
 import { currentBranch, git } from "../git-exec";
 import { lookupPR } from "./pr-poll";
+import { captureMergedTask } from "../session-logs";
 import { notifyStatusChanged } from "../status/hub";
 import type { TaskPR } from "./state";
 
@@ -185,6 +186,9 @@ export async function prFor(
     db.prepare(
       `UPDATE sessions SET pr_url = ?, pr_number = ?, pr_status = ? WHERE id = ?`
     ).run(pr.url, pr.number, pr.state.toLowerCase(), session.id);
+    // Merged on GitHub rather than through AgentOS: its log is due too.
+    if (pr.state === "MERGED")
+      void captureMergedTask(session.id, { head: pr.head });
   }
   // Only an answer just read from GitHub: a cached one may predate a
   // retarget AgentOS made itself (a restack).

package/package.json

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

package/scripts/backfill-session-logs.ts

@@ -0,0 +1,101 @@
+/**
+ * Writes session logs for tasks that merged before logs existed, from what
+ * the database still holds. Their plan files went with their worktrees, so
+ * each says "plan not kept". Idempotent: a task with a log is skipped.
+ *
+ *   npx tsx scripts/backfill-session-logs.ts --db <path to agent-os.db> [--no-gh] [--dry] [--reexport]
+ *
+ * --db is required so a run never lands on a database by accident. Files go
+ * where new logs go: a project's folder, else the workspace's HQ repo (one
+ * commit per HQ at the end of the run), else ~/.agent-os/session-logs; run
+ * with HOME set elsewhere to keep a trial away from the real folder.
+ * --no-gh skips asking GitHub for each merge commit.
+ * --reexport writes the files of logs already in the database to where they
+ * go now, from the stored markdown (no rebuild, no model), and writes no new
+ * logs. Old files are left in place.
+ */
+
+const args = process.argv.slice(2);
+const flag = (name: string) => args.includes(name);
+const dbPath = args[args.indexOf("--db") + 1];
+
+if (!flag("--db") || !dbPath || dbPath.startsWith("--")) {
+  console.error(
+    "usage: backfill-session-logs.ts --db <path> [--no-gh] [--dry] [--reexport]"
+  );
+  process.exit(2);
+}
+process.env.DB_PATH = dbPath;
+
+type Visibility = "private" | "internal" | "none";
+
+async function main() {
+  if (flag("--reexport")) {
+    const { reexportLogs } = await import("../lib/session-logs/reexport");
+    const r = await reexportLogs({ dry: flag("--dry"), log: console.log });
+    console.log(
+      `${r.moved} ${flag("--dry") ? "to move" : "moved"}, ${r.unchanged} already in place, ${r.failed} failed, ${r.committed} committed`
+    );
+    return;
+  }
+  const { db } = await import("../lib/db");
+  const { writeLog } = await import("../lib/session-logs");
+  const { hasLog } = await import("../lib/session-logs/store");
+  const { commitLogs } = await import("../lib/session-logs/hq");
+  const rows = db
+    .prepare(
+      `SELECT id, name FROM sessions
+       WHERE task_prompt IS NOT NULL AND peer_mirror = 0
+         AND (task_status = 'merged' OR (pr_status = 'merged' AND task_status != 'dropped'))
+       ORDER BY COALESCE(merged_at, updated_at)`
+    )
+    .all() as { id: string; name: string }[];
+  const todo = rows.filter((r) => !hasLog(r.id));
+  console.log(
+    `${rows.length} merged tasks, ${rows.length - todo.length} already logged, ${todo.length} to write${flag("--dry") ? " (dry run)" : ""}`
+  );
+  let written = 0;
+  const byHq = new Map<string, { files: string[]; visibility: Visibility }>();
+  for (const r of todo) {
+    if (flag("--dry")) {
+      console.log(`  would log ${r.name} (${r.id.slice(0, 8)})`);
+      continue;
+    }
+    try {
+      const ok = await writeLog(r.id, {
+        planKept: false,
+        noGh: flag("--no-gh"),
+        onFile: (file, hq) => {
+          const e = byHq.get(hq.dir) ?? {
+            files: [],
+            visibility: hq.visibility,
+          };
+          e.files.push(file);
+          byHq.set(hq.dir, e);
+        },
+      });
+      if (ok) written++;
+      console.log(
+        `  ${ok ? "logged" : "skipped"} ${r.name} (${r.id.slice(0, 8)})`
+      );
+    } catch (error) {
+      console.error(`  FAILED ${r.name} (${r.id.slice(0, 8)}):`, error);
+    }
+  }
+  for (const [dir, { files, visibility }] of byHq)
+    await commitLogs(
+      dir,
+      files,
+      `session logs: ${files.length} backfilled`,
+      visibility
+    );
+  console.log(`wrote ${written} logs`);
+}
+
+main().then(
+  () => process.exit(0),
+  (error) => {
+    console.error(error);
+    process.exit(1);
+  }
+);