@kylecheng3146/agent-ops 0.3.5 → 0.3.6

package/dist/runtime/src/hooks/completion-gate.js

@@ -6,7 +6,7 @@ import { readPrivateFile, withPrivateFileLock, writePrivateFile } from "../secur
 import { checkTaskCompletionEvidence, findIncompleteSubtask } from "../task/completion.js";
 import { collectBaseChangePaths, collectChangeSurface } from "../verify/change-surface.js";
 import { calculateSourceFingerprint } from "../verify/source-fingerprint.js";
-import { readWorktreeRecord } from "../parallel/service.js";
+import { NOTES_REF, noteSessionLine, readWorktreeRecord } from "../parallel/service.js";
 const FINGERPRINT = /^[a-f0-9]{64}$/u;
 const SESSION = /^[^\0\r\n]{1,256}$/u;
 function gateDirectory(root) {
@@ -248,12 +248,32 @@ export class CompletionGateService {
             event.event === "command-batch" ? event.commands : [];
         return commands.some(({ command, args }) => [command, ...args].includes("allow-stop"));
     }
+    /**
+     * Whether `worktree finish` merged this session's reviewed work: a note
+     * naming the session on a commit HEAD contains, and nothing uncommitted on
+     * top. finish moves the task into that note, so the checkout has none left.
+     */
+    async #finishedByWorktree(sessionId) {
+        const runner = this.#options.gitRunner;
+        if ((await collectChangeSurface(runner)).paths.length > 0)
+            return false;
+        // ponytail: newest 500 commits only; older merges need a one-time allow-stop
+        const log = await runner.run(["log", `--notes=${NOTES_REF}`, "--format=%N%x00", "-n", "500", "HEAD"]);
+        if (log.exitCode !== 0)
+            return false;
+        const line = noteSessionLine(sessionId);
+        return new TextDecoder().decode(log.stdout).split("\0").some((note) => note.split("\n").includes(line));
+    }
     async #validateTask(sessionId) {
         let stored;
         try {
             stored = await this.#options.taskService.status({ sessionId });
         }
         catch (error) {
+            if (error instanceof AgentOpsError && error.code === "TASK_SESSION_UNATTACHED" &&
+                await this.#finishedByWorktree(sessionId)) {
+                return null;
+            }
             return error instanceof AgentOpsError && error.code === "TASK_SESSION_UNATTACHED"
                 ? gateResult("block", "FAIL", "COMPLETION_GATE_TASK_REQUIRED", `Attach this conversation to a formal task: agent-ops task create --title <title> --criterion <json> --criterion <json> (two to five criteria), then agent-ops task attach --task <task-id> --session ${shellQuote(sessionId)}.`)
                 : gateResult("block", "UNKNOWN", "COMPLETION_GATE_TASK_UNAVAILABLE", "Repair task state with agent-ops doctor before stopping.");

package/dist/runtime/src/parallel/finish.js

@@ -5,8 +5,7 @@ import { AgentOpsError, resolveContainedPath } from "../fs/paths.js";
 import { currentGateFingerprint } from "../hooks/completion-gate.js";
 import { collectChangeSurface } from "../verify/change-surface.js";
 import { aggregateVerificationStatus, executeConfiguredCommand } from "../verify/command-executor.js";
-import { assertWorktreeName, parseWorktreeListPorcelain, readWorktreeRecord, removeCheckout, resolveCheckouts, worktreePath } from "./service.js";
-export const NOTES_REF = "agent-ops";
+import { assertWorktreeName, NOTES_REF, noteSessionLine, parseWorktreeListPorcelain, readWorktreeRecord, removeCheckout, resolveCheckouts, worktreePath } from "./service.js";
 const LOCK_NAME = "agent-ops-finish.lock";
 const LOCK_POLL_MS = 2_000;
 const LOCK_WAIT_MS = 30 * 60 * 1000;
@@ -180,6 +179,7 @@ function taskTree(tasks) {
 function noteText(record, tasks) {
     return [
         `worktree: ${record.name} (${record.branch})`,
+        noteSessionLine(record.sessionId),
         ...tasks.flatMap(({ task, depth }) => {
             const indent = "  ".repeat(depth);
             return [
@@ -314,8 +314,11 @@ export async function finishWorktree(deps, options) {
         if (gateEnabled) {
             await attempt("gate", async () => {
                 const mainGate = await deps.gate(mainRoot, mainConfig);
-                await mainGate.redirect(record.sessionId, null);
-                await mainGate.rebase(before, await currentGateFingerprint(mainRoot, mainRunner));
+                const after = await currentGateFingerprint(mainRoot, mainRunner);
+                await mainGate.rebase(before, after);
+                // rebase only moves baselines equal to `before`; a main that moved since
+                // this session began would leave it reading the merge as its own change.
+                await mainGate.seed(record.sessionId, after);
             });
         }
         await attempt("trust", async () => await deps.trust.revoke(record.path, worktreeConfig));

package/dist/runtime/src/parallel/service.js

@@ -15,6 +15,10 @@ import { readPrivateFile, withPrivateFileLock, writePrivateFile } from "../secur
 export const WORKTREE_DIRECTORY = ".worktrees";
 export const WORKTREE_BRANCH_PREFIX = "agent-ops/";
 export const WORKTREE_RECORD_PATH = ".agent-ops/tasks/worktree.json";
+/** The notes ref `worktree finish` records a merge in. */
+export const NOTES_REF = "agent-ops";
+/** The note line binding a merge to the session that finished it. */
+export const noteSessionLine = (sessionId) => `session: ${sessionId}`;
 const EXCLUDE_LINE = `/${WORKTREE_DIRECTORY}/`;
 const NAME = /^[a-z0-9](?:[a-z0-9._-]{0,62}[a-z0-9])?$/u;
 const SESSION = /^[^\0\r\n]{1,256}$/u;

package/docs/en/guides/configuration.md

@@ -213,7 +213,13 @@ evidence. Give each editing conversation its own worktree instead:
   another worktree is refused, naming that path. If the target moved, it rebases; a clean rebase whose own patch
   is unchanged is re-verified before merging, and a conflict is reported with
   the `refs/notes/agent-ops` intent of the work that landed first. The note
-  records every task of the worktree, subtasks indented under their parent.
+  records every task of the worktree, subtasks indented under their parent,
+  and a `session: <id>` line naming the session that finished it. Finish
+  also resets that session's gate baseline to the merged source, so the
+  session can stop although the task now lives only in the note. As a
+  fallback, the gate lets an unattached session stop when the checkout is
+  clean and a note with its `session:` line sits within the newest 500
+  commits of `HEAD`; older merges need a one-time `allow-stop`.
 - `worktree list`, `resume <name> --session <id>` and `remove <name>` manage
   what is left; `remove --force` discards work and asks the user first.
   `doctor` reports worktrees idle for more than seven days.

package/docs/zh-TW/guides/configuration.md

@@ -183,7 +183,12 @@ fingerprint，因此兩個對話修改同一個 checkout 會互相作廢對方
   target 的 ref，checkout、檔案與未 commit 的變更都不會被動到。Target 若被其他
   worktree checkout 則拒絕，並指出該路徑。Target 若已前進會先 rebase；沒有衝突且自身 patch 不變的 rebase 會先
   重新驗證再合併；衝突則連同先合併那份工作在 `refs/notes/agent-ops` 的意圖一起
-  回報。Note 會記錄 worktree 的每個 task，subtask 縮排在其 parent 之下。
+  回報。Note 會記錄 worktree 的每個 task，subtask 縮排在其 parent 之下，並附上
+  一行 `session: <id>`，標明完成這次 finish 的 session。Finish 也會把該 session
+  的 gate baseline 重設為合併後的原始碼，所以即使 task 現在只存在於 note 裡，
+  session 仍可停止。作為後備，gate 在 checkout 乾淨、且 `HEAD` 最近 500 個 commit
+  內有帶該 `session:` 行的 note 時，會讓未附著 task 的 session 停止；更舊的合併需要
+  一次性的 `allow-stop`。
 - `worktree list`、`resume <name> --session <id>` 與 `remove <name>` 管理剩下的
   worktree；`remove --force` 會丟棄工作，執行前會先詢問使用者。`doctor` 會回報
   閒置超過七天的 worktree。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kylecheng3146/agent-ops",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Evidence-driven development loops for agy, Codex, Claude Code, and opencode",
   "type": "module",
   "license": "MIT",