@kylecheng3146/agent-ops 0.7.1 → 0.7.3

package/dist/packages/cli/src/hook-process.js

@@ -240,8 +240,36 @@ function completionGateFor(root, config, gitRunner, harness) {
  * Runs one hook invocation. Exit code stays zero because native JSON carries
  * decisions; only an explicitly installed agy completion gate fails closed.
  */
+/**
+ * Claude's SessionEnd: the conversation closed, so its Office room closes too.
+ * Display-only and fail-open: it writes no output and never fails the host.
+ */
+async function closeOfficeSession(io, dependencies) {
+    try {
+        if (process.env.AGENT_OPS_DISABLE === "1" || dependencies.office === undefined)
+            return 0;
+        const input = parseInput(await readStdin(io.stdin));
+        if (typeof input !== "object" || input === null || Array.isArray(input))
+            return 0;
+        const fields = input;
+        const root = dependencies.root ?? (typeof fields.cwd === "string" ? fields.cwd : process.cwd());
+        const outcome = await hookConfigOutcome(root, dependencies.loadConfig);
+        if (outcome.kind === "invalid" || outcome.config.features.office?.enabled !== true)
+            return 0;
+        await dependencies.office({
+            root, harness: "claude", event: "SessionEnd", input, validated: true,
+            ...(typeof fields.session_id === "string" ? { sessionId: fields.session_id } : {})
+        });
+    }
+    catch {
+        // Office never blocks a session, least of all one that is ending.
+    }
+    return 0;
+}
 export async function runHookProcess(argv, io, cliVersion, dependencies = {}) {
     const [harness, event] = argv;
+    if (harness === "claude" && event === "SessionEnd")
+        return await closeOfficeSession(io, dependencies);
     // Both hosts whose Stop hook can actually refuse a stop. codex never fires
     // Stop under `codex exec` and rejects `permissionDecision:ask`, so its
     // escape hatch could not be user-approved; opencode can only deny a tool

package/dist/packages/cli/src/office-entry.js

@@ -48,7 +48,7 @@ function sessionIdentity(options) {
     return firstText(options.sessionId, recordValue(options.input, "session_id"), recordValue(options.input, "sessionId"), recordValue(options.input, "conversationId"), recordValue(options.input, "thread_id"), recordValue(options.input, "threadId"), recordValue(nested, "sessionID"), recordValue(nested, "session_id"), process.env.AGENT_OPS_SESSION_ID, process.env.CODEX_THREAD_ID);
 }
 function officeEvent(event) {
-    return event === "SessionStart" ? "start" : event === "Stop" ? "stop" : "activity";
+    return event === "SessionStart" ? "start" : event === "Stop" ? "stop" : event === "SessionEnd" ? "end" : "activity";
 }
 /** Phase hints come only from normalized native event kinds and exact agent-ops argv. */
 export function officePhaseHint(event) {
@@ -129,7 +129,7 @@ export async function observeOfficeSession(options) {
         // A resumed session may outlive the ten-minute idle shutdown. Reusing the
         // same ensure path revives the user's server without creating a tab
         // unless this call actually wins a new-server start claim.
-        if (options.event !== "Stop")
+        if (options.event !== "Stop" && options.event !== "SessionEnd")
             await ensureBackgroundOffice(options.root, undefined, openOfficeBrowser);
     }
     catch {

package/dist/runtime/src/adapters/claude/config.js

@@ -125,6 +125,11 @@ export function buildClaudeHookSettings(capabilities, runtimePath, platform = pr
     else if (capabilities.includes("optional-stop-verify") || capabilities.includes("office-presence")) {
         hooks.Stop = [matcherGroup("Stop", runtimePath)];
     }
+    // Stop only ends a turn. SessionEnd is the one signal that the conversation
+    // closed, so a session that never had a task can still leave the Office.
+    if (capabilities.includes("office-presence")) {
+        hooks.SessionEnd = [matcherGroup("SessionEnd", runtimePath)];
+    }
     return { hooks };
 }
 function isRecord(value) {

package/dist/runtime/src/adapters/claude/events.js

@@ -8,7 +8,8 @@ export const CLAUDE_SUPPORTED_EVENTS = [
     "PostCompact",
     "SubagentStart",
     "SubagentStop",
-    "Stop"
+    "Stop",
+    "SessionEnd"
 ];
 export function claudeNonInteractiveTrust(printMode) {
     return printMode ? "dialog-skipped" : "interactive-dialog";

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/page.js

@@ -305,8 +305,8 @@ var supervisor = {x:43, y:19, targetX:43, targetY:19}, supervisorReady = false,
 var roomSupervisor = {x:32, y:34, targetX:32, targetY:34};
 var reducedMotion = window.matchMedia && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
 var STRINGS = {
-  en: {viewer:"You", overview:"Office overview", rooms:"rooms", people:"people", recent:"Recently completed", recentOn:"Hide completed", repos:"Repository", allRepos:"All repositories", back:"Back to overview", connected:"● Connected", offline:"○ Reconnecting", quiet:"The office is quiet. No agent is at work.", waiting:"waiting for your answer", enter:"Enter room", close:"Close", previous:"Previous", next:"Next", page:"Page", details:"Details", progress:"Progress", verify:"Verify", review:"Review", pending:"Awaiting answer", task:"Task", status:"Status", phase:"Phase", host:"Host", now:"Now", owner:"Owner", currentWork:"Current work", question:"Pending question", questions:"Questions", workList:"Work list", clickWork:"Click for work", keyboardWork:"Press L for work list", keyboardPhase:"Press 1-5 for phase work", keyboardQuestions:"Press Q for questions", noPeople:"No known work is in this phase", noQuestions:"No pending questions", files:"Changed files", commands:"Commands", copy:"Copy", copied:"Copied", unknown:"unknown", unassigned:"unassigned", phases:{planning:"Planning", implementing:"Implementing", verifying:"Verifying", reviewing:"Reviewing", integrating:"Integrating", unknown:"Unassigned"}, statuses:{active:"active", idle:"idle", running:"running", reviewing:"reviewing", verifying:"verifying", blocked:"blocked", delivered:"delivered", complete:"complete", unknown:"unknown", unassigned:"unassigned", pending:"pending"}},
-  zh: {viewer:"你", overview:"辦公室總覽", rooms:"個房間", people:"位成員", recent:"最近完成", recentOn:"隱藏已完成", repos:"專案", allRepos:"所有專案", back:"返回總覽", connected:"● 已連線", offline:"○ 重新連線中", quiet:"辦公室很安靜，目前沒有成員工作。", waiting:"等待你的回覆", enter:"進入房間", close:"關閉", previous:"上一頁", next:"下一頁", page:"頁", details:"詳細資料", progress:"進度", verify:"驗證", review:"審查", pending:"待回覆", task:"任務", status:"狀態", phase:"階段", host:"主機", now:"目前", owner:"負責人", currentWork:"目前工作", question:"待回覆問題", questions:"問題", workList:"工作清單", clickWork:"點擊查看工作", keyboardWork:"按 L 開啟工作清單", keyboardPhase:"按 1-5 查看階段工作", keyboardQuestions:"按 Q 查看問題", noPeople:"此階段目前沒有已知工作", noQuestions:"目前沒有待回覆問題", files:"變更檔案", commands:"指令", copy:"複製", copied:"已複製", unknown:"未知", unassigned:"未分配", phases:{planning:"規劃", implementing:"開發", verifying:"驗證", reviewing:"審查", integrating:"整合", unknown:"未分配"}, statuses:{active:"進行中", idle:"閒置", running:"工作中", reviewing:"審查中", verifying:"驗證中", blocked:"受阻", delivered:"已交付", complete:"已完成", unknown:"未知", unassigned:"未分配", pending:"待回覆"}}
+  en: {viewer:"You", overview:"Office overview", rooms:"rooms", people:"people", recent:"Recently completed", recentOn:"Hide completed", repos:"Repository", allRepos:"All repositories", noTask:"No task", noTaskHint:"Nothing to verify or review", back:"Back to overview", connected:"● Connected", offline:"○ Reconnecting", quiet:"The office is quiet. No agent is at work.", waiting:"waiting for your answer", enter:"Enter room", close:"Close", previous:"Previous", next:"Next", page:"Page", details:"Details", progress:"Progress", verify:"Verify", review:"Review", pending:"Awaiting answer", task:"Task", status:"Status", phase:"Phase", host:"Host", now:"Now", owner:"Owner", currentWork:"Current work", question:"Pending question", questions:"Questions", workList:"Work list", clickWork:"Click for work", keyboardWork:"Press L for work list", keyboardPhase:"Press 1-5 for phase work", keyboardQuestions:"Press Q for questions", noPeople:"No known work is in this phase", noQuestions:"No pending questions", files:"Changed files", commands:"Commands", copy:"Copy", copied:"Copied", unknown:"unknown", unassigned:"unassigned", phases:{planning:"Planning", implementing:"Implementing", verifying:"Verifying", reviewing:"Reviewing", integrating:"Integrating", unknown:"Unassigned"}, statuses:{active:"active", idle:"idle", running:"running", reviewing:"reviewing", verifying:"verifying", blocked:"blocked", delivered:"delivered", complete:"complete", unknown:"unknown", unassigned:"unassigned", pending:"pending"}},
+  zh: {viewer:"你", overview:"辦公室總覽", rooms:"個房間", people:"位成員", recent:"最近完成", recentOn:"隱藏已完成", repos:"專案", allRepos:"所有專案", noTask:"無任務", noTaskHint:"沒有需要驗證或審查的工作", back:"返回總覽", connected:"● 已連線", offline:"○ 重新連線中", quiet:"辦公室很安靜，目前沒有成員工作。", waiting:"等待你的回覆", enter:"進入房間", close:"關閉", previous:"上一頁", next:"下一頁", page:"頁", details:"詳細資料", progress:"進度", verify:"驗證", review:"審查", pending:"待回覆", task:"任務", status:"狀態", phase:"階段", host:"主機", now:"目前", owner:"負責人", currentWork:"目前工作", question:"待回覆問題", questions:"問題", workList:"工作清單", clickWork:"點擊查看工作", keyboardWork:"按 L 開啟工作清單", keyboardPhase:"按 1-5 查看階段工作", keyboardQuestions:"按 Q 查看問題", noPeople:"此階段目前沒有已知工作", noQuestions:"目前沒有待回覆問題", files:"變更檔案", commands:"指令", copy:"複製", copied:"已複製", unknown:"未知", unassigned:"未分配", phases:{planning:"規劃", implementing:"開發", verifying:"驗證", reviewing:"審查", integrating:"整合", unknown:"未分配"}, statuses:{active:"進行中", idle:"閒置", running:"工作中", reviewing:"審查中", verifying:"驗證中", blocked:"受阻", delivered:"已交付", complete:"已完成", unknown:"未知", unassigned:"未分配", pending:"待回覆"}}
 };
 function getLanguage(){
   try { var cookie = document.cookie.split(";").map(function(part){ return part.trim().split("="); }).find(function(pair){ return pair[0] === "agent-office-language"; }); if (cookie && (cookie[1] === "en" || cookie[1] === "zh")) return cookie[1]; } catch (_) {}
@@ -472,9 +472,11 @@ function drawRoomBase(floor){
   var b=floor.board,board=progressBoardGeometry(canvas.width,canvas.height),bx=board.x,by=board.y,bw=board.width,bh=board.height;
   ctx.fillStyle=PALETTE[9];ctx.fillRect(bx,by,bw,bh);ctx.fillStyle=PALETTE[15];ctx.fillRect(bx+2*unit,by+2*unit,bw-4*unit,bh-4*unit);
   fillText('▣ '+t('clickWork'),bx+6*unit,by+5*unit,8,PALETTE[1]);
-  fillText(t('progress')+'  '+b.passed+'/'+(b.total||'?'),bx+6*unit,by+16*unit,10,PALETTE[1]);
+  // A room without a task has nothing to verify or review; saying "pending" would claim unfinished work.
+  if(b.taskId==='unassigned'&&!b.total){fillText(t('noTask'),bx+6*unit,by+16*unit,10,PALETTE[1]);fillText(t('noTaskHint'),bx+6*unit,by+40*unit,8,PALETTE[4]);}
+  else{fillText(t('progress')+'  '+b.passed+'/'+(b.total||'?'),bx+6*unit,by+16*unit,10,PALETTE[1]);
   ctx.fillStyle=PALETTE[3];ctx.fillRect(bx+6*unit,by+29*unit,bw-12*unit,5*unit);ctx.fillStyle=PALETTE[2];ctx.fillRect(bx+6*unit,by+29*unit,(bw-12*unit)*Math.min(1,b.total?b.passed/b.total:0),5*unit);
-  fillText(t('verify')+' '+outcomeText(b.verify)+'  '+t('review')+' '+outcomeText(b.review),bx+6*unit,by+40*unit,8,PALETTE[4]);
+  fillText(t('verify')+' '+outcomeText(b.verify)+'  '+t('review')+' '+outcomeText(b.review),bx+6*unit,by+40*unit,8,PALETTE[4]);}
   var pendingRow=pendingBoardGeometry(canvas.width,canvas.height);
   if(b.pending)fillText('! '+t('pending')+' '+b.pending,pendingRow.x+2*unit,pendingRow.y+3*unit,8,PALETTE[13]);
   var oldS=S;S=Math.max(1,Math.round(unit));var cx=52*rx,cy=ry;draw('clock',cx,cy);

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) {
@@ -100,7 +99,7 @@ export async function recordOfficeSession(options) {
             root: options.projectRoot,
             firstSeenAt: previous?.firstSeenAt ?? at,
             lastSeenAt: at,
-            status: options.event === "stop" ? "idle" : "active",
+            status: options.event === "stop" || options.event === "end" ? "idle" : "active",
             ...(options.agentId ?? previous?.agentId ? { agentId: options.agentId ?? previous?.agentId } : {}),
             ...(options.runId ?? previous?.runId ? { runId: options.runId ?? previous?.runId } : {}),
             ...(options.workerId ?? previous?.workerId ? { workerId: options.workerId ?? previous?.workerId } : {}),
@@ -109,7 +108,9 @@ export async function recordOfficeSession(options) {
             ...(options.host ?? previous?.host ? { host: options.host ?? previous?.host } : {}),
             // A finished session keeps its closed room through the tool calls that
             // report the result; only a new start (or resume) reopens it.
-            ...(options.event !== "start" && previous?.completedAt !== undefined ? { completedAt: previous.completedAt } : {})
+            ...(options.event === "end"
+                ? { completedAt: previous?.completedAt ?? at }
+                : options.event !== "start" && previous?.completedAt !== undefined ? { completedAt: previous.completedAt } : {})
         };
         const without = records.filter(record => record.sessionId !== options.sessionId);
         await writePrivateFile(path, JSON.stringify({ schemaVersion: 1, sessions: [...without, next].slice(-MAX_SESSIONS) }) + "\n", options.commonDir);

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.1"
+                version: "0.7.3"
             }
         });
         session.notify("initialized", {});

package/dist/runtime/src/schema/validate.js

@@ -28,7 +28,8 @@ const HOOK_EVENT_VALUES = new Set([
     "PostCompact",
     "SubagentStart",
     "SubagentStop",
-    "Stop"
+    "Stop",
+    "SessionEnd"
 ]);
 const MAX_TIMEOUT_MS = 2_147_483_647;
 const MAX_EXIT_CODE = 4_294_967_295;

package/docs/en/spec/harness-adapters.md

@@ -217,7 +217,12 @@ Claude or Codex transcripts or file contents.
   first report from a repository that still has a 0.7 per-repository record
   boots its launchd job out and removes that record; its pid is never signalled.
   A successful `worktree finish` records the session's completion so its room
-  closes; only a new start or an active task reopens it. Session metadata contains bounded
+  closes; only a new start or an active task reopens it. With Office enabled,
+  Claude Code also gets a managed `SessionEnd` hook: when the conversation
+  closes, its room closes too, even without a task. It writes no output and
+  never fails the host. Other hosts publish no end event and rely on the
+  activity timeout. A room without a task shows a no-task board rather than
+  pending verification and review. Session metadata contains bounded
   identifiers, known work state and activity times, never native transcripts,
   prompts or tool/file contents. Startup and observation failures are advisory.
   The server binds

package/docs/zh-TW/spec/harness-adapters.md

@@ -187,7 +187,10 @@ base 的 `git diff`；旁白只使用路徑（`docs/**` 為「writing docs」、
   帶有 repository 名稱，key 以其區隔，頁面可依 repository 篩選。仍留有 0.7
   per-repository 紀錄的 repository 第一次回報時，會 bootout 其 launchd job 並
   刪除該紀錄，絕不對其 pid 發送訊號。`worktree finish` 成功後會記錄 session
-  完成，使房間關閉；只有新的啟動或 active task 會重新開啟。Session metadata
+  完成，使房間關閉；只有新的啟動或 active task 會重新開啟。啟用 Office 時，Claude Code
+  另有受管理的 `SessionEnd` hook：對話關閉時房間也隨之關閉，即使沒有 task。它不輸出
+  任何內容，也絕不讓 host 失敗。其他 host 沒有結束事件，依活動逾時處理。沒有 task 的
+  房間白板顯示「無任務」，而非待驗證與待審查。Session metadata
   只記錄有界限的識別資訊、已知工作狀態與活動時間，不包含 native transcript、
   prompt、tool 或檔案內容。啟動與活動觀察失敗均為 advisory。
   Server 綁定 127.0.0.1 的隨機 port，要求 URL 中不可猜測的 token，拒絕該位址與

package/package.json

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

package/schemas/manifest.schema.json

@@ -144,7 +144,8 @@
               "PostCompact",
               "SubagentStart",
               "SubagentStop",
-              "Stop"
+              "Stop",
+              "SessionEnd"
             ]
           }
         },