@kylecheng3146/agent-ops 0.7.2 → 0.7.3

package/dist/runtime/src/office/collect.js

@@ -141,6 +141,21 @@ export async function worktreeDiff(git, path, base) {
     }
     return { files: paths.length, insertions, deletions, paths: paths.slice(0, MAX_PATHS), recent: recent ?? paths[0] ?? null };
 }
+/**
+ * Work already in the target branch by some route other than `worktree finish`
+ * (a merged pull request): commits past its base, all reachable from the
+ * target, and nothing uncommitted. A fresh worktree (HEAD at base) is not merged.
+ * ponytail: ancestry only, so a squash-merged branch stays visible until removed.
+ */
+export async function worktreeMerged(git, path, base, targetBranch) {
+    const head = (await git(path, ["rev-parse", "HEAD"])).stdout.trim();
+    if (!/^[0-9a-f]{40,64}$/u.test(head) || head === base || !/^[A-Za-z0-9._/-]{1,128}$/u.test(targetBranch))
+        return false;
+    if ((await git(path, ["merge-base", "--is-ancestor", head, `refs/heads/${targetBranch}`])).exitCode !== 0)
+        return false;
+    const status = await git(path, ["status", "--porcelain"]);
+    return status.exitCode === 0 && status.stdout.trim() === "";
+}
 /** Each run is read on its own: one unreadable run must not hide the building. */
 export async function readRuns(commonDir) {
     const directory = join(commonDir, "agent-ops", "runs");
@@ -207,14 +222,21 @@ export async function readReviewSlots(commonDir) {
 export async function collectOfficeInput(mainRoot, commonDir, git = officeGit, now = Date.now()) {
     const worktrees = [];
     const discovered = [];
+    const merged = new Set();
     for (const entry of parseWorktreeListPorcelain((await git(mainRoot, ["worktree", "list", "--porcelain"])).stdout)) {
         const path = await realpath(resolve(entry.path)).catch(() => resolve(entry.path));
         const record = await readWorktreeRecord(path).catch(() => null);
         if (record === null)
             continue;
+        if (record.runId === undefined && await worktreeMerged(git, path, record.base, record.targetBranch)) {
+            // A subagent's worktree shares its coordinator's session, which stays.
+            if (record.agentId === undefined)
+                merged.add(record.sessionId);
+            continue;
+        }
         discovered.push({ path, record });
     }
-    const sessions = await readSessions(mainRoot, commonDir, now, [mainRoot, ...discovered.map(item => item.path)]);
+    const sessions = (await readSessions(mainRoot, commonDir, now, [mainRoot, ...discovered.map(item => item.path)])).filter(session => !merged.has(session.sessionId));
     for (const { path, record } of discovered) {
         const session = sessions.find(item => item.sessionId === record.sessionId);
         const task = await attachedTaskView(path, record.sessionId, session?.taskId);

package/dist/runtime/src/office/sessions.js

@@ -68,13 +68,12 @@ function retained(record, now) {
     const lastSeen = Date.parse(record.lastSeenAt);
     if (!Number.isFinite(lastSeen))
         return false;
-    if (record.status === "active") {
-        // ponytail: one TTL handles crashed hook clients; a persistent host heartbeat can replace it if needed.
+    if (record.status === "active" || record.completedAt === null || record.completedAt === undefined) {
+        // ponytail: one TTL handles crashed hook clients and windows closed without `end`;
+        // a persistent host heartbeat can replace it if needed.
         return now - lastSeen <= OFFICE_SESSION_STALE_MS;
     }
-    const completed = record.completedAt === null || record.completedAt === undefined
-        ? lastSeen
-        : Date.parse(record.completedAt);
+    const completed = Date.parse(record.completedAt);
     return Number.isFinite(completed) && now - completed < OFFICE_SESSION_RETENTION_MS;
 }
 function prune(records, now) {

package/dist/runtime/src/run/hosts/codex.js

@@ -236,7 +236,7 @@ export class CodexGoalHost {
             clientInfo: {
                 name: "agent-ops",
                 title: "agent-ops native goal host",
-                version: "0.7.2"
+                version: "0.7.3"
             }
         });
         session.notify("initialized", {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kylecheng3146/agent-ops",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Evidence-driven development loops for agy, Codex, Claude Code, and opencode",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",