@kylecheng3146/agent-ops 0.8.4 → 0.8.5

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

@@ -9,7 +9,7 @@ import { resolveContainedPath } from "../../../runtime/src/fs/paths.js";
 import { redactSecrets } from "../../../runtime/src/security/redact.js";
 import { claudeStopRecursionMarker } from "../../../runtime/src/adapters/claude/input.js";
 import { HARNESS_IDS, harnessDescriptor } from "../../../runtime/src/install/harness.js";
-import { officePhaseHint } from "./office-entry.js";
+import { officePhaseHint, officeLoopPhaseHint } from "./office-entry.js";
 import { evaluateWorktreeEnter } from "../../../runtime/src/parallel/enter.js";
 import { evaluateWorktreeWrite, resolveMainRoot } from "../../../runtime/src/parallel/guard.js";
 import { ensureSessionWorktree, recordSessionOrigin } from "../../../runtime/src/parallel/service.js";
@@ -461,7 +461,7 @@ export async function runHookProcess(argv, io, cliVersion, dependencies = {}) {
             await startDebugSession(root, normalized.sessionId, harnessId).catch(() => undefined);
         if (dependencies.office !== undefined && config.features.office?.enabled === true) {
             if (normalized !== null) {
-                const phase = officePhaseHint(normalized);
+                const phase = officePhaseHint(normalized) ?? (harnessId === "codex" ? officeLoopPhaseHint(parsedInput, root) : undefined);
                 void dependencies.office({
                     root,
                     harness: harnessId,
@@ -472,6 +472,9 @@ export async function runHookProcess(argv, io, cliVersion, dependencies = {}) {
                     ...(normalized.agentId === undefined ? {} : { agentId: normalized.agentId }),
                     ...(phase === undefined ? {} : { phase })
                 }).catch(() => undefined);
+                // Native patch hooks added for Office must not emit unsupported-policy messages.
+                if (harnessId === "codex" && normalized.event === "unsupported" && phase === "implementing")
+                    return 0;
             }
         }
         const gitRunner = dependencies.gitRunner ?? defaultGitRunner(root);

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

@@ -1,5 +1,5 @@
 import { fileURLToPath } from "node:url";
-import { basename, join } from "node:path";
+import { basename, join, resolve } from "node:path";
 import { homedir } from "node:os";
 import { rm } from "node:fs/promises";
 import { createHash } from "node:crypto";
@@ -64,17 +64,46 @@ export function officePhaseHint(event) {
             : [];
     let phase;
     for (const command of commands) {
-        if (basename(command.command) !== "agent-ops")
+        let argv = [command.command, ...command.args];
+        // Unwrap display hints here; command-policy normalization stays unchanged.
+        while (basename(argv[0] ?? "") === "env") {
+            argv = argv.slice(1);
+            while (argv.length > 0) {
+                if (argv[0] === "-u" || argv[0] === "--unset") {
+                    if (argv[1] === undefined || !/^[A-Za-z_][A-Za-z0-9_]*$/u.test(argv[1]))
+                        break;
+                    argv = argv.slice(2);
+                }
+                else if (/^--unset=[A-Za-z_][A-Za-z0-9_]*$/u.test(argv[0] ?? ""))
+                    argv = argv.slice(1);
+                else
+                    break;
+            }
+            if (argv[0] === "--")
+                argv = argv.slice(1);
+            while (/^[A-Za-z_][A-Za-z0-9_]*=/u.test(argv[0] ?? ""))
+                argv = argv.slice(1);
+        }
+        if (basename(argv[0] ?? "") === "node" || basename(argv[0] ?? "") === "node.exe") {
+            const script = argv[1];
+            if (script === undefined || ![
+                fileURLToPath(new URL("./bin.js", import.meta.url)),
+                resolve(event.projectRoot, "dist/packages/cli/src/bin.js")
+            ].includes(resolve(event.projectRoot, script)))
+                continue;
+            argv = ["agent-ops", ...argv.slice(2)];
+        }
+        if (basename(argv[0] ?? "") !== "agent-ops")
             continue;
-        const action = command.args[0];
+        const action = argv[1];
         // batch and advance report their later steps themselves; this is their first.
         const next = action === "verify" || action === "batch"
             ? "verifying"
             : action === "review"
                 ? "reviewing"
-                : action === "worktree" && command.args[1] === "finish"
+                : action === "worktree" && argv[2] === "finish"
                     ? "integrating"
-                    : action === "task" && (command.args[1] === "complete" || command.args[1] === "advance")
+                    : action === "task" && (argv[2] === "complete" || argv[2] === "advance")
                         ? "integrating"
                         : action === "task"
                             ? "planning"
@@ -93,10 +122,12 @@ export function officeLoopPhaseHint(input, root) {
     const tool = input.tool_name;
     if (tool === "Edit" || tool === "Write" || tool === "NotebookEdit" || tool === "FileWrite")
         return "implementing";
+    const toolInput = recordValue(input, "tool_input");
+    const command = recordValue(toolInput, "command") ?? recordValue(toolInput, "cmd");
+    if (tool === "apply_patch")
+        return typeof command === "string" && command.length > 0 ? "implementing" : undefined;
     if (tool !== "Bash")
         return undefined;
-    const toolInput = recordValue(input, "tool_input");
-    const command = recordValue(toolInput, "command");
     return typeof command === "string" ? officePhaseHint(normalizeShellHookEvent(command, root)) : undefined;
 }
 /** Records hook presence and starts Office at the production process boundary. */

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

@@ -96,6 +96,9 @@ export function buildCodexHookConfig(capabilities, runtimePath) {
     if (capabilities.includes("task-debug")) {
         hooks.Interrupt = [{ hooks: [{ ...commandHook("Interrupt", runtimePath), timeout: 3 }] }];
     }
+    if (capabilities.includes("office-presence") && hooks.PreToolUse !== undefined) {
+        hooks.PreToolUse = hooks.PreToolUse.map(group => ({ ...group, matcher: "^(Bash|apply_patch)$" }));
+    }
     return {
         description: "agent-ops lifecycle hooks.",
         hooks

package/package.json

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