pullfrog 0.0.201 → 0.0.202

package/dist/cli.mjs

@@ -4293,8 +4293,8 @@ var require_util2 = __commonJS({
     function createDeferredPromise() {
       let res;
       let rej;
-      const promise2 = new Promise((resolve2, reject) => {
-        res = resolve2;
+      const promise2 = new Promise((resolve3, reject) => {
+        res = resolve3;
         rej = reject;
       });
       return { promise: promise2, resolve: res, reject: rej };
@@ -5798,8 +5798,8 @@ Content-Type: ${value2.type || "application/octet-stream"}\r
                 });
               }
             });
-            const busboyResolve = new Promise((resolve2, reject) => {
-              busboy.on("finish", resolve2);
+            const busboyResolve = new Promise((resolve3, reject) => {
+              busboy.on("finish", resolve3);
               busboy.on("error", (err) => reject(new TypeError(err)));
             });
             if (this.body !== null) for await (const chunk of consumeBody(this[kState].body)) busboy.write(chunk);
@@ -6333,9 +6333,9 @@ var require_dispatcher_base = __commonJS({
       }
       close(callback) {
         if (callback === void 0) {
-          return new Promise((resolve2, reject) => {
+          return new Promise((resolve3, reject) => {
             this.close((err, data) => {
-              return err ? reject(err) : resolve2(data);
+              return err ? reject(err) : resolve3(data);
             });
           });
         }
@@ -6373,12 +6373,12 @@ var require_dispatcher_base = __commonJS({
           err = null;
         }
         if (callback === void 0) {
-          return new Promise((resolve2, reject) => {
+          return new Promise((resolve3, reject) => {
             this.destroy(err, (err2, data) => {
               return err2 ? (
                 /* istanbul ignore next: should never error */
                 reject(err2)
-              ) : resolve2(data);
+              ) : resolve3(data);
             });
           });
         }
@@ -7438,16 +7438,16 @@ var require_client = __commonJS({
         return this[kNeedDrain] < 2;
       }
       async [kClose]() {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           if (!this[kSize]) {
-            resolve2(null);
+            resolve3(null);
           } else {
-            this[kClosedResolve] = resolve2;
+            this[kClosedResolve] = resolve3;
           }
         });
       }
       async [kDestroy](err) {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           const requests = this[kQueue].splice(this[kPendingIdx]);
           for (let i = 0; i < requests.length; i++) {
             const request2 = requests[i];
@@ -7458,7 +7458,7 @@ var require_client = __commonJS({
               this[kClosedResolve]();
               this[kClosedResolve] = null;
             }
-            resolve2();
+            resolve3();
           };
           if (this[kHTTP2Session] != null) {
             util2.destroy(this[kHTTP2Session], err);
@@ -8038,7 +8038,7 @@ var require_client = __commonJS({
         });
       }
       try {
-        const socket = await new Promise((resolve2, reject) => {
+        const socket = await new Promise((resolve3, reject) => {
           client[kConnector]({
             host,
             hostname: hostname4,
@@ -8050,7 +8050,7 @@ var require_client = __commonJS({
             if (err) {
               reject(err);
             } else {
-              resolve2(socket2);
+              resolve3(socket2);
             }
           });
         });
@@ -8674,12 +8674,12 @@ upgrade: ${upgrade}\r
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve2, reject) => {
+      const waitForDrain = () => new Promise((resolve3, reject) => {
         assert3(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve2;
+          callback = resolve3;
         }
       });
       if (client[kHTTPConnVersion] === "h2") {
@@ -9024,8 +9024,8 @@ var require_pool_base = __commonJS({
         if (this[kQueue].isEmpty()) {
           return Promise.all(this[kClients].map((c2) => c2.close()));
         } else {
-          return new Promise((resolve2) => {
-            this[kClosedResolve] = resolve2;
+          return new Promise((resolve3) => {
+            this[kClosedResolve] = resolve3;
           });
         }
       }
@@ -9603,7 +9603,7 @@ var require_readable = __commonJS({
         if (this.closed) {
           return Promise.resolve(null);
         }
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           const signalListenerCleanup = signal ? util2.addAbortListener(signal, () => {
             this.destroy();
           }) : noop4;
@@ -9612,7 +9612,7 @@ var require_readable = __commonJS({
             if (signal && signal.aborted) {
               reject(signal.reason || Object.assign(new Error("The operation was aborted"), { name: "AbortError" }));
             } else {
-              resolve2(null);
+              resolve3(null);
             }
           }).on("error", noop4).on("data", function(chunk) {
             limit -= chunk.length;
@@ -9634,11 +9634,11 @@ var require_readable = __commonJS({
         throw new TypeError("unusable");
       }
       assert3(!stream[kConsume]);
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve3, reject) => {
         stream[kConsume] = {
           type: type2,
           stream,
-          resolve: resolve2,
+          resolve: resolve3,
           reject,
           length: 0,
           body: []
@@ -9673,12 +9673,12 @@ var require_readable = __commonJS({
       }
     }
     function consumeEnd(consume2) {
-      const { type: type2, body, resolve: resolve2, stream, length } = consume2;
+      const { type: type2, body, resolve: resolve3, stream, length } = consume2;
       try {
         if (type2 === "text") {
-          resolve2(toUSVString(Buffer.concat(body)));
+          resolve3(toUSVString(Buffer.concat(body)));
         } else if (type2 === "json") {
-          resolve2(JSON.parse(Buffer.concat(body)));
+          resolve3(JSON.parse(Buffer.concat(body)));
         } else if (type2 === "arrayBuffer") {
           const dst = new Uint8Array(length);
           let pos = 0;
@@ -9686,12 +9686,12 @@ var require_readable = __commonJS({
             dst.set(buf, pos);
             pos += buf.byteLength;
           }
-          resolve2(dst.buffer);
+          resolve3(dst.buffer);
         } else if (type2 === "blob") {
           if (!Blob2) {
             Blob2 = __require("buffer").Blob;
           }
-          resolve2(new Blob2(body, { type: stream[kContentType] }));
+          resolve3(new Blob2(body, { type: stream[kContentType] }));
         }
         consumeFinish(consume2);
       } catch (err) {
@@ -9946,9 +9946,9 @@ var require_api_request = __commonJS({
     };
     function request2(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           request2.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -10121,9 +10121,9 @@ var require_api_stream = __commonJS({
     };
     function stream(opts, factory, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           stream.call(this, opts, factory, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -10404,9 +10404,9 @@ var require_api_upgrade = __commonJS({
     };
     function upgrade(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           upgrade.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -10495,9 +10495,9 @@ var require_api_connect = __commonJS({
     };
     function connect(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           connect.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -14119,7 +14119,7 @@ var require_fetch = __commonJS({
       async function dispatch({ body }) {
         const url4 = requestCurrentURL(request2);
         const agent2 = fetchParams.controller.dispatcher;
-        return new Promise((resolve2, reject) => agent2.dispatch(
+        return new Promise((resolve3, reject) => agent2.dispatch(
           {
             path: url4.pathname + url4.search,
             origin: url4.origin,
@@ -14195,7 +14195,7 @@ var require_fetch = __commonJS({
                   }
                 }
               }
-              resolve2({
+              resolve3({
                 status,
                 statusText,
                 headersList: headers[kHeadersList],
@@ -14238,7 +14238,7 @@ var require_fetch = __commonJS({
                 const val = headersList[n + 1].toString("latin1");
                 headers[kHeadersList].append(key, val);
               }
-              resolve2({
+              resolve3({
                 status,
                 statusText: STATUS_CODES[status],
                 headersList: headers[kHeadersList],
@@ -17592,11 +17592,11 @@ var require_lib = __commonJS({
     };
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -17612,7 +17612,7 @@ var require_lib = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -17698,26 +17698,26 @@ var require_lib = __commonJS({
       }
       readBody() {
         return __awaiter(this, void 0, void 0, function* () {
-          return new Promise((resolve2) => __awaiter(this, void 0, void 0, function* () {
+          return new Promise((resolve3) => __awaiter(this, void 0, void 0, function* () {
             let output = Buffer.alloc(0);
             this.message.on("data", (chunk) => {
               output = Buffer.concat([output, chunk]);
             });
             this.message.on("end", () => {
-              resolve2(output.toString());
+              resolve3(output.toString());
             });
           }));
         });
       }
       readBodyBuffer() {
         return __awaiter(this, void 0, void 0, function* () {
-          return new Promise((resolve2) => __awaiter(this, void 0, void 0, function* () {
+          return new Promise((resolve3) => __awaiter(this, void 0, void 0, function* () {
             const chunks = [];
             this.message.on("data", (chunk) => {
               chunks.push(chunk);
             });
             this.message.on("end", () => {
-              resolve2(Buffer.concat(chunks));
+              resolve3(Buffer.concat(chunks));
             });
           }));
         });
@@ -17926,14 +17926,14 @@ var require_lib = __commonJS({
        */
       requestRaw(info3, data) {
         return __awaiter(this, void 0, void 0, function* () {
-          return new Promise((resolve2, reject) => {
+          return new Promise((resolve3, reject) => {
             function callbackForResult(err, res) {
               if (err) {
                 reject(err);
               } else if (!res) {
                 reject(new Error("Unknown error"));
               } else {
-                resolve2(res);
+                resolve3(res);
               }
             }
             this.requestRawWithCallback(info3, data, callbackForResult);
@@ -18115,12 +18115,12 @@ var require_lib = __commonJS({
         return __awaiter(this, void 0, void 0, function* () {
           retryNumber = Math.min(ExponentialBackoffCeiling, retryNumber);
           const ms = ExponentialBackoffTimeSlice * Math.pow(2, retryNumber);
-          return new Promise((resolve2) => setTimeout(() => resolve2(), ms));
+          return new Promise((resolve3) => setTimeout(() => resolve3(), ms));
         });
       }
       _processResponse(res, options) {
         return __awaiter(this, void 0, void 0, function* () {
-          return new Promise((resolve2, reject) => __awaiter(this, void 0, void 0, function* () {
+          return new Promise((resolve3, reject) => __awaiter(this, void 0, void 0, function* () {
             const statusCode = res.message.statusCode || 0;
             const response = {
               statusCode,
@@ -18128,7 +18128,7 @@ var require_lib = __commonJS({
               headers: {}
             };
             if (statusCode === HttpCodes.NotFound) {
-              resolve2(response);
+              resolve3(response);
             }
             function dateTimeDeserializer(key, value2) {
               if (typeof value2 === "string") {
@@ -18167,7 +18167,7 @@ var require_lib = __commonJS({
               err.result = response.result;
               reject(err);
             } else {
-              resolve2(response);
+              resolve3(response);
             }
           }));
         });
@@ -18184,11 +18184,11 @@ var require_auth = __commonJS({
     "use strict";
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -18204,7 +18204,7 @@ var require_auth = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -18288,11 +18288,11 @@ var require_oidc_utils = __commonJS({
     "use strict";
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -18308,7 +18308,7 @@ var require_oidc_utils = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -18386,11 +18386,11 @@ var require_summary = __commonJS({
     "use strict";
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -18406,7 +18406,7 @@ var require_summary = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -18752,11 +18752,11 @@ var require_io_util = __commonJS({
     };
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -18772,7 +18772,7 @@ var require_io_util = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -18925,11 +18925,11 @@ var require_io = __commonJS({
     };
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -18945,7 +18945,7 @@ var require_io = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -19173,11 +19173,11 @@ var require_toolrunner = __commonJS({
     };
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -19193,7 +19193,7 @@ var require_toolrunner = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -19421,7 +19421,7 @@ var require_toolrunner = __commonJS({
             this.toolPath = path3.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath);
           }
           this.toolPath = yield io.which(this.toolPath, true);
-          return new Promise((resolve2, reject) => __awaiter(this, void 0, void 0, function* () {
+          return new Promise((resolve3, reject) => __awaiter(this, void 0, void 0, function* () {
             this._debug(`exec tool: ${this.toolPath}`);
             this._debug("arguments:");
             for (const arg4 of this.args) {
@@ -19504,7 +19504,7 @@ var require_toolrunner = __commonJS({
               if (error49) {
                 reject(error49);
               } else {
-                resolve2(exitCode);
+                resolve3(exitCode);
               }
             });
             if (this.options.input) {
@@ -19657,11 +19657,11 @@ var require_exec = __commonJS({
     };
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -19677,7 +19677,7 @@ var require_exec = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -19768,11 +19768,11 @@ var require_platform = __commonJS({
     };
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -19788,7 +19788,7 @@ var require_platform = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -19887,11 +19887,11 @@ var require_core = __commonJS({
     };
     var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value2) {
-        return value2 instanceof P3 ? value2 : new P3(function(resolve2) {
-          resolve2(value2);
+        return value2 instanceof P3 ? value2 : new P3(function(resolve3) {
+          resolve3(value2);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve2, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve3, reject) {
         function fulfilled(value2) {
           try {
             step(generator.next(value2));
@@ -19907,7 +19907,7 @@ var require_core = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve3(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -45598,8 +45598,8 @@ var require_resolve = __commonJS({
       }
       return count;
     }
-    function getFullPath(resolver, id = "", normalize2) {
-      if (normalize2 !== false)
+    function getFullPath(resolver, id = "", normalize3) {
+      if (normalize3 !== false)
         id = normalizeId(id);
       const p2 = resolver.parse(id);
       return _getFullPath(resolver, p2);
@@ -46347,7 +46347,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve2.call(this, root, ref);
+      let _sch = resolve3.call(this, root, ref);
       if (_sch === void 0) {
         const schema2 = (_a2 = root.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref];
         const { schemaId } = this.opts;
@@ -46374,7 +46374,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve2(root, ref) {
+    function resolve3(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -46939,7 +46939,7 @@ var require_fast_uri = __commonJS({
     "use strict";
     var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils4();
     var { SCHEMES, getSchemeHandler } = require_schemes();
-    function normalize2(uri, options) {
+    function normalize3(uri, options) {
       if (typeof uri === "string") {
         uri = /** @type {T} */
         serialize(parse5(uri, options), options);
@@ -46949,7 +46949,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve2(baseURI, relativeURI, options) {
+    function resolve3(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse5(baseURI, schemelessOptions), parse5(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -47175,8 +47175,8 @@ var require_fast_uri = __commonJS({
     }
     var fastUri = {
       SCHEMES,
-      normalize: normalize2,
-      resolve: resolve2,
+      normalize: normalize3,
+      resolve: resolve3,
       resolveComponent,
       equal,
       serialize,
@@ -52752,9 +52752,9 @@ var require_dispatcher_base2 = __commonJS({
       }
       close(callback) {
         if (callback === void 0) {
-          return new Promise((resolve2, reject) => {
+          return new Promise((resolve3, reject) => {
             this.close((err, data) => {
-              return err ? reject(err) : resolve2(data);
+              return err ? reject(err) : resolve3(data);
             });
           });
         }
@@ -52792,9 +52792,9 @@ var require_dispatcher_base2 = __commonJS({
           err = null;
         }
         if (callback === void 0) {
-          return new Promise((resolve2, reject) => {
+          return new Promise((resolve3, reject) => {
             this.destroy(err, (err2, data) => {
-              return err2 ? reject(err2) : resolve2(data);
+              return err2 ? reject(err2) : resolve3(data);
             });
           });
         }
@@ -56270,8 +56270,8 @@ var require_promise = __commonJS({
     function createDeferredPromise() {
       let res;
       let rej;
-      const promise2 = new Promise((resolve2, reject) => {
-        res = resolve2;
+      const promise2 = new Promise((resolve3, reject) => {
+        res = resolve3;
         rej = reject;
       });
       return { promise: promise2, resolve: res, reject: rej };
@@ -57569,12 +57569,12 @@ upgrade: ${upgrade}\r
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve2, reject) => {
+      const waitForDrain = () => new Promise((resolve3, reject) => {
         assert3(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve2;
+          callback = resolve3;
         }
       });
       socket.on("close", onDrain).on("drain", onDrain);
@@ -58415,12 +58415,12 @@ var require_client_h2 = __commonJS({
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve2, reject) => {
+      const waitForDrain = () => new Promise((resolve3, reject) => {
         assert3(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve2;
+          callback = resolve3;
         }
       });
       h2stream.on("close", onDrain).on("drain", onDrain);
@@ -58728,16 +58728,16 @@ var require_client2 = __commonJS({
         return this[kNeedDrain] < 2;
       }
       [kClose]() {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           if (this[kSize]) {
-            this[kClosedResolve] = resolve2;
+            this[kClosedResolve] = resolve3;
           } else {
-            resolve2(null);
+            resolve3(null);
           }
         });
       }
       [kDestroy](err) {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           const requests = this[kQueue].splice(this[kPendingIdx]);
           for (let i = 0; i < requests.length; i++) {
             const request2 = requests[i];
@@ -58748,7 +58748,7 @@ var require_client2 = __commonJS({
               this[kClosedResolve]();
               this[kClosedResolve] = null;
             }
-            resolve2(null);
+            resolve3(null);
           };
           if (this[kHTTPContext]) {
             this[kHTTPContext].destroy(err, callback);
@@ -59145,8 +59145,8 @@ var require_pool_base2 = __commonJS({
           }
           return Promise.all(closeAll);
         } else {
-          return new Promise((resolve2) => {
-            this[kClosedResolve] = resolve2;
+          return new Promise((resolve3) => {
+            this[kClosedResolve] = resolve3;
           });
         }
       }
@@ -60675,7 +60675,7 @@ var require_readable2 = __commonJS({
         if (this._readableState.closeEmitted) {
           return Promise.resolve(null);
         }
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           if (this[kContentLength] && this[kContentLength] > limit || this[kBytesRead] > limit) {
             this.destroy(new AbortError2());
           }
@@ -60689,11 +60689,11 @@ var require_readable2 = __commonJS({
               if (signal.aborted) {
                 reject(signal.reason ?? new AbortError2());
               } else {
-                resolve2(null);
+                resolve3(null);
               }
             });
           } else {
-            this.on("close", resolve2);
+            this.on("close", resolve3);
           }
           this.on("error", noop4).on("data", () => {
             if (this[kBytesRead] > limit) {
@@ -60721,7 +60721,7 @@ var require_readable2 = __commonJS({
     }
     function consume(stream, type2) {
       assert3(!stream[kConsume]);
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve3, reject) => {
         if (isUnusable(stream)) {
           const rState = stream._readableState;
           if (rState.destroyed && rState.closeEmitted === false) {
@@ -60736,7 +60736,7 @@ var require_readable2 = __commonJS({
             stream[kConsume] = {
               type: type2,
               stream,
-              resolve: resolve2,
+              resolve: resolve3,
               reject,
               length: 0,
               body: []
@@ -60810,18 +60810,18 @@ var require_readable2 = __commonJS({
       return buffer;
     }
     function consumeEnd(consume2, encoding) {
-      const { type: type2, body, resolve: resolve2, stream, length } = consume2;
+      const { type: type2, body, resolve: resolve3, stream, length } = consume2;
       try {
         if (type2 === "text") {
-          resolve2(chunksDecode(body, length, encoding));
+          resolve3(chunksDecode(body, length, encoding));
         } else if (type2 === "json") {
-          resolve2(JSON.parse(chunksDecode(body, length, encoding)));
+          resolve3(JSON.parse(chunksDecode(body, length, encoding)));
         } else if (type2 === "arrayBuffer") {
-          resolve2(chunksConcat(body, length).buffer);
+          resolve3(chunksConcat(body, length).buffer);
         } else if (type2 === "blob") {
-          resolve2(new Blob(body, { type: stream[kContentType] }));
+          resolve3(new Blob(body, { type: stream[kContentType] }));
         } else if (type2 === "bytes") {
-          resolve2(chunksConcat(body, length));
+          resolve3(chunksConcat(body, length));
         }
         consumeFinish(consume2);
       } catch (err) {
@@ -61011,9 +61011,9 @@ var require_api_request2 = __commonJS({
     };
     function request2(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           request2.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -61225,9 +61225,9 @@ var require_api_stream2 = __commonJS({
     };
     function stream(opts, factory, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           stream.call(this, opts, factory, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -61515,9 +61515,9 @@ var require_api_upgrade2 = __commonJS({
     };
     function upgrade(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           upgrade.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -61610,9 +61610,9 @@ var require_api_connect2 = __commonJS({
     };
     function connect(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           connect.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve2(data);
+            return err ? reject(err) : resolve3(data);
           });
         });
       }
@@ -62880,7 +62880,7 @@ var require_snapshot_recorder = __commonJS({
   "node_modules/.pnpm/undici@7.22.0/node_modules/undici/lib/mock/snapshot-recorder.js"(exports, module) {
     "use strict";
     var { writeFile: writeFile2, readFile, mkdir } = __require("node:fs/promises");
-    var { dirname: dirname4, resolve: resolve2 } = __require("node:path");
+    var { dirname: dirname4, resolve: resolve3 } = __require("node:path");
     var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("node:timers");
     var { InvalidArgumentError, UndiciError } = require_errors4();
     var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
@@ -63081,7 +63081,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile(resolve2(path3), "utf8");
+          const data = await readFile(resolve3(path3), "utf8");
           const parsed2 = JSON.parse(data);
           if (Array.isArray(parsed2)) {
             this.#snapshots.clear();
@@ -63110,7 +63110,7 @@ var require_snapshot_recorder = __commonJS({
         if (!path3) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
-        const resolvedPath = resolve2(path3);
+        const resolvedPath = resolve3(path3);
         await mkdir(dirname4(resolvedPath), { recursive: true });
         const data = Array.from(this.#snapshots.entries()).map(([hash2, snapshot2]) => ({
           hash: hash2,
@@ -69687,7 +69687,7 @@ var require_fetch2 = __commonJS({
       function dispatch({ body }) {
         const url4 = requestCurrentURL(request2);
         const agent2 = fetchParams.controller.dispatcher;
-        return new Promise((resolve2, reject) => agent2.dispatch(
+        return new Promise((resolve3, reject) => agent2.dispatch(
           {
             path: url4.pathname + url4.search,
             origin: url4.origin,
@@ -69767,7 +69767,7 @@ var require_fetch2 = __commonJS({
                 }
               }
               const onError = this.onError.bind(this);
-              resolve2({
+              resolve3({
                 status,
                 statusText,
                 headersList,
@@ -69820,7 +69820,7 @@ var require_fetch2 = __commonJS({
                   headersList.append(headerName, String(value2), true);
                 }
               }
-              resolve2({
+              resolve3({
                 status,
                 statusText: STATUS_CODES[status],
                 headersList,
@@ -69836,7 +69836,7 @@ var require_fetch2 = __commonJS({
               for (let i = 0; i < rawHeaders.length; i += 2) {
                 headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i]), rawHeaders[i + 1].toString("latin1"), true);
               }
-              resolve2({
+              resolve3({
                 status,
                 statusText: STATUS_CODES[status],
                 headersList,
@@ -98178,8 +98178,8 @@ var require_light = __commonJS({
           return this.Promise.resolve();
         }
         yieldLoop(t2 = 0) {
-          return new this.Promise(function(resolve2, reject) {
-            return setTimeout(resolve2, t2);
+          return new this.Promise(function(resolve3, reject) {
+            return setTimeout(resolve3, t2);
           });
         }
         computePenalty() {
@@ -98390,15 +98390,15 @@ var require_light = __commonJS({
           return this._queue.length === 0;
         }
         async _tryToRun() {
-          var args2, cb, error49, reject, resolve2, returned, task;
+          var args2, cb, error49, reject, resolve3, returned, task;
           if (this._running < 1 && this._queue.length > 0) {
             this._running++;
-            ({ task, args: args2, resolve: resolve2, reject } = this._queue.shift());
+            ({ task, args: args2, resolve: resolve3, reject } = this._queue.shift());
             cb = await (async function() {
               try {
                 returned = await task(...args2);
                 return function() {
-                  return resolve2(returned);
+                  return resolve3(returned);
                 };
               } catch (error1) {
                 error49 = error1;
@@ -98413,13 +98413,13 @@ var require_light = __commonJS({
           }
         }
         schedule(task, ...args2) {
-          var promise2, reject, resolve2;
-          resolve2 = reject = null;
+          var promise2, reject, resolve3;
+          resolve3 = reject = null;
           promise2 = new this.Promise(function(_resolve, _reject) {
-            resolve2 = _resolve;
+            resolve3 = _resolve;
             return reject = _reject;
           });
-          this._queue.push({ task, args: args2, resolve: resolve2, reject });
+          this._queue.push({ task, args: args2, resolve: resolve3, reject });
           this._tryToRun();
           return promise2;
         }
@@ -98820,14 +98820,14 @@ var require_light = __commonJS({
                 counts = this._states.counts;
                 return counts[0] + counts[1] + counts[2] + counts[3] === at2;
               };
-              return new this.Promise((resolve2, reject) => {
+              return new this.Promise((resolve3, reject) => {
                 if (finished()) {
-                  return resolve2();
+                  return resolve3();
                 } else {
                   return this.on("done", () => {
                     if (finished()) {
                       this.removeAllListeners("done");
-                      return resolve2();
+                      return resolve3();
                     }
                   });
                 }
@@ -98920,9 +98920,9 @@ var require_light = __commonJS({
               options = parser$5.load(options, this.jobDefaults);
             }
             task = (...args3) => {
-              return new this.Promise(function(resolve2, reject) {
+              return new this.Promise(function(resolve3, reject) {
                 return fn2(...args3, function(...args4) {
-                  return (args4[0] != null ? reject : resolve2)(args4);
+                  return (args4[0] != null ? reject : resolve3)(args4);
                 });
               });
             };
@@ -105528,10 +105528,10 @@ var BaseScope = class {
     });
   };
   lazyResolutions = [];
-  lazilyResolve(resolve2, syntheticAlias) {
+  lazilyResolve(resolve3, syntheticAlias) {
     const node2 = this.node("alias", {
       reference: syntheticAlias ?? "synthetic",
-      resolve: resolve2
+      resolve: resolve3
     }, { prereduced: true });
     if (!this.resolved)
       this.lazyResolutions.push(node2);
@@ -107681,6 +107681,81 @@ var core = __toESM(require_core(), 1);
 var import_table = __toESM(require_src(), 1);
 import { AsyncLocalStorage } from "node:async_hooks";
 
+// agents/shared.ts
+import { execFileSync } from "node:child_process";
+var MAX_STDERR_LINES = 20;
+var MAX_COMMIT_RETRIES = 3;
+function getGitStatus() {
+  try {
+    return execFileSync("git", ["status", "--porcelain"], {
+      encoding: "utf-8",
+      timeout: 1e4
+    }).trim();
+  } catch {
+    return "";
+  }
+}
+function buildCommitPrompt(_agentId, status) {
+  return [
+    `UNCOMMITTED CHANGES \u2014 the working tree is dirty. push all changes to a pull request (new or existing). \`git status\` must be clean before you finish.`,
+    "",
+    "```",
+    status,
+    "```"
+  ].join("\n");
+}
+var agent = (input) => {
+  return {
+    ...input,
+    run: async (ctx) => {
+      log.debug(`\xBB payload: ${JSON.stringify(ctx.payload, null, 2)}`);
+      return input.run(ctx);
+    }
+  };
+};
+function formatCostUsd(costUsd) {
+  return costUsd.toFixed(4);
+}
+function mergeAgentUsage(a, b) {
+  if (!a && !b) return void 0;
+  if (!a) return { ...b };
+  if (!b) return { ...a };
+  const cacheRead = (a.cacheReadTokens ?? 0) + (b.cacheReadTokens ?? 0);
+  const cacheWrite = (a.cacheWriteTokens ?? 0) + (b.cacheWriteTokens ?? 0);
+  const cost = (a.costUsd ?? 0) + (b.costUsd ?? 0);
+  return {
+    agent: a.agent,
+    inputTokens: a.inputTokens + b.inputTokens,
+    outputTokens: a.outputTokens + b.outputTokens,
+    cacheReadTokens: cacheRead > 0 ? cacheRead : void 0,
+    cacheWriteTokens: cacheWrite > 0 ? cacheWrite : void 0,
+    costUsd: cost > 0 ? cost : void 0
+  };
+}
+function logTokenTable(t2) {
+  const total = t2.input + t2.cacheRead + t2.cacheWrite + t2.output;
+  const costUsd = typeof t2.costUsd === "number" && t2.costUsd > 0 ? t2.costUsd : void 0;
+  const headerRow = [
+    { data: "Input", header: true },
+    { data: "Cache Read", header: true },
+    { data: "Cache Write", header: true },
+    { data: "Output", header: true },
+    { data: "Total", header: true }
+  ];
+  const dataRow = [
+    String(t2.input),
+    String(t2.cacheRead),
+    String(t2.cacheWrite),
+    String(t2.output),
+    String(total)
+  ];
+  if (costUsd !== void 0) {
+    headerRow.push({ data: "Cost ($)", header: true });
+    dataRow.push(formatCostUsd(costUsd));
+  }
+  log.table([headerRow, dataRow]);
+}
+
 // utils/globals.ts
 import { existsSync } from "node:fs";
 var isCloudflareSandbox = !!process.env.CLOUDFLARE_APPLICATION_ID && !!process.env.SANDBOX_VERSION;
@@ -107877,20 +107952,26 @@ function formatJsonValue(value2) {
 }
 function formatUsageSummary(entries) {
   if (entries.length === 0) return "";
-  const header = "| Agent | Input | Output | Cache Read | Cache Write |";
-  const separatorRow = "| --- | ---: | ---: | ---: | ---: |";
+  const header = "| Agent | Input | Cache Read | Cache Write | Output | Total | Cost ($) |";
+  const separatorRow = "| --- | ---: | ---: | ---: | ---: | ---: | ---: |";
   const fmt = (n) => n.toLocaleString("en-US");
+  const nonCachedInput = (e) => Math.max(0, e.inputTokens - (e.cacheReadTokens ?? 0) - (e.cacheWriteTokens ?? 0));
+  const totalFor = (e) => nonCachedInput(e) + (e.cacheReadTokens ?? 0) + (e.cacheWriteTokens ?? 0) + e.outputTokens;
+  const costCell = (e) => typeof e.costUsd === "number" && e.costUsd > 0 ? formatCostUsd(e.costUsd) : "\u2014";
   const rows = entries.map(
-    (e) => `| ${e.agent} | ${fmt(e.inputTokens)} | ${fmt(e.outputTokens)} | ${fmt(e.cacheReadTokens ?? 0)} | ${fmt(e.cacheWriteTokens ?? 0)} |`
+    (e) => `| ${e.agent} | ${fmt(nonCachedInput(e))} | ${fmt(e.cacheReadTokens ?? 0)} | ${fmt(e.cacheWriteTokens ?? 0)} | ${fmt(e.outputTokens)} | ${fmt(totalFor(e))} | ${costCell(e)} |`
   );
   const totalsRows = [];
   if (entries.length > 1) {
-    const totalInput = entries.reduce((sum, e) => sum + e.inputTokens, 0);
+    const totalInput = entries.reduce((sum, e) => sum + nonCachedInput(e), 0);
     const totalOutput = entries.reduce((sum, e) => sum + e.outputTokens, 0);
     const totalCacheRead = entries.reduce((sum, e) => sum + (e.cacheReadTokens ?? 0), 0);
     const totalCacheWrite = entries.reduce((sum, e) => sum + (e.cacheWriteTokens ?? 0), 0);
+    const grandTotal = totalInput + totalCacheRead + totalCacheWrite + totalOutput;
+    const totalCostUsd = entries.reduce((sum, e) => sum + (e.costUsd ?? 0), 0);
+    const totalCostCell = totalCostUsd > 0 ? `**${formatCostUsd(totalCostUsd)}**` : "\u2014";
     totalsRows.push(
-      `| **Total** | **${fmt(totalInput)}** | **${fmt(totalOutput)}** | **${fmt(totalCacheRead)}** | **${fmt(totalCacheWrite)}** |`
+      `| **Total** | **${fmt(totalInput)}** | **${fmt(totalCacheRead)}** | **${fmt(totalCacheWrite)}** | **${fmt(totalOutput)}** | **${fmt(grandTotal)}** | ${totalCostCell} |`
     );
   }
   return [
@@ -107933,7 +108014,7 @@ var providers = {
     models: {
       "claude-opus": {
         displayName: "Claude Opus",
-        resolve: "anthropic/claude-opus-4-6",
+        resolve: "anthropic/claude-opus-4-7",
         openRouterResolve: "openrouter/anthropic/claude-opus-4.6",
         preferred: true
       },
@@ -107961,7 +108042,7 @@ var providers = {
       },
       "gpt-codex-mini": {
         displayName: "GPT Codex Mini",
-        resolve: "openai/codex-mini-latest",
+        resolve: "openai/gpt-5.1-codex-mini",
         openRouterResolve: "openrouter/openai/gpt-5.1-codex-mini"
       },
       o3: {
@@ -108051,7 +108132,7 @@ var providers = {
       },
       "claude-opus": {
         displayName: "Claude Opus",
-        resolve: "opencode/claude-opus-4-6",
+        resolve: "opencode/claude-opus-4-7",
         openRouterResolve: "openrouter/anthropic/claude-opus-4.6"
       },
       "claude-sonnet": {
@@ -108329,22 +108410,35 @@ async function retry(fn2, options = {}) {
 }
 
 // utils/patchWorkflowRunFields.ts
-var ARTIFACT_PATCH_KEYS = [
+var STRING_KEYS = [
   "prNodeId",
   "issueNodeId",
   "reviewNodeId",
   "planCommentNodeId",
   "summaryCommentNodeId"
 ];
+var NUMBER_KEYS = [
+  "inputTokens",
+  "outputTokens",
+  "cacheReadTokens",
+  "cacheWriteTokens",
+  "costUsd"
+];
 async function patchWorkflowRunFields(ctx, fields) {
   if (ctx.runId === void 0 || !ctx.apiToken) return;
   const body = {};
-  for (const key of ARTIFACT_PATCH_KEYS) {
+  for (const key of STRING_KEYS) {
     const value2 = fields[key];
     if (typeof value2 === "string" && value2.length > 0) {
       body[key] = value2;
     }
   }
+  for (const key of NUMBER_KEYS) {
+    const value2 = fields[key];
+    if (typeof value2 === "number" && Number.isFinite(value2) && value2 >= 0) {
+      body[key] = value2;
+    }
+  }
   if (Object.keys(body).length === 0) return;
   try {
     await retry(
@@ -108371,6 +108465,38 @@ async function patchWorkflowRunFields(ctx, fields) {
     log.warning(`patchWorkflowRunFields exhausted retries: ${error49}`);
   }
 }
+var INT4_MAX = 2147483647;
+function clampInt(value2, field) {
+  if (value2 > INT4_MAX) {
+    log.warning(
+      `aggregateUsage: ${field}=${value2} exceeds INT4_MAX (${INT4_MAX}) \u2014 clamping so the rest of the usage row still persists.`
+    );
+    return INT4_MAX;
+  }
+  return value2;
+}
+function aggregateUsage(entries) {
+  if (entries.length === 0) return {};
+  const sum = entries.reduce(
+    (acc, e) => ({
+      inputTokens: acc.inputTokens + e.inputTokens,
+      outputTokens: acc.outputTokens + e.outputTokens,
+      cacheReadTokens: acc.cacheReadTokens + (e.cacheReadTokens ?? 0),
+      cacheWriteTokens: acc.cacheWriteTokens + (e.cacheWriteTokens ?? 0),
+      costUsd: acc.costUsd + (e.costUsd ?? 0)
+    }),
+    { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0, costUsd: 0 }
+  );
+  const out = {};
+  if (sum.inputTokens > 0) out.inputTokens = clampInt(sum.inputTokens, "inputTokens");
+  if (sum.outputTokens > 0) out.outputTokens = clampInt(sum.outputTokens, "outputTokens");
+  if (sum.cacheReadTokens > 0)
+    out.cacheReadTokens = clampInt(sum.cacheReadTokens, "cacheReadTokens");
+  if (sum.cacheWriteTokens > 0)
+    out.cacheWriteTokens = clampInt(sum.cacheWriteTokens, "cacheWriteTokens");
+  if (sum.costUsd > 0) out.costUsd = sum.costUsd;
+  return out;
+}
 
 // node_modules/.pnpm/@toon-format+toon@1.4.0/node_modules/@toon-format/toon/dist/index.mjs
 var LIST_ITEM_MARKER = "-";
@@ -108727,6 +108853,126 @@ function resolveOptions(options) {
   };
 }
 
+// mcp/geminiSanitizer.ts
+function parseStringEnumBranch(item) {
+  if (!item || typeof item !== "object") return null;
+  const record3 = item;
+  if (Array.isArray(record3.enum)) {
+    const strings = record3.enum.filter((v) => typeof v === "string");
+    return strings.length === record3.enum.length && strings.length > 0 ? { values: strings } : null;
+  }
+  if (typeof record3.const === "string") {
+    return { values: [record3.const] };
+  }
+  return null;
+}
+function collapseStringUnion(branches) {
+  const values = [];
+  for (const item of branches) {
+    const parsed2 = parseStringEnumBranch(item);
+    if (!parsed2) return null;
+    values.push(...parsed2.values);
+  }
+  if (values.length === 0) return null;
+  return { type: "string", enum: [...new Set(values)] };
+}
+function sanitizeForGemini(schema2) {
+  if (!schema2 || typeof schema2 !== "object") return schema2;
+  if (Array.isArray(schema2)) return schema2.map(sanitizeForGemini);
+  const source = schema2;
+  if (Array.isArray(source.enum) && typeof source.type !== "string") {
+    const allStrings = source.enum.every((v) => typeof v === "string");
+    if (allStrings) {
+      const result = { type: "string", enum: source.enum };
+      if (typeof source.description === "string") result.description = source.description;
+      return result;
+    }
+  }
+  for (const unionKey of ["anyOf", "oneOf"]) {
+    const branches = source[unionKey];
+    if (Array.isArray(branches) && branches.length > 0) {
+      const collapsed = collapseStringUnion(branches);
+      if (collapsed) {
+        const result = { ...collapsed };
+        if (typeof source.description === "string") result.description = source.description;
+        return result;
+      }
+    }
+  }
+  if (Array.isArray(source.anyOf) || Array.isArray(source.oneOf)) {
+    const result = {};
+    if (Array.isArray(source.anyOf)) result.anyOf = source.anyOf.map(sanitizeForGemini);
+    if (Array.isArray(source.oneOf)) result.oneOf = source.oneOf.map(sanitizeForGemini);
+    return result;
+  }
+  const sanitized = {};
+  for (const [key, value2] of Object.entries(source)) {
+    if (key === "$schema") continue;
+    if (key === "$defs") {
+      sanitized.definitions = sanitizeForGemini(value2);
+      continue;
+    }
+    sanitized[key] = sanitizeForGemini(value2);
+  }
+  return sanitized;
+}
+function wrapJsonSchemaProducer(producer) {
+  return new Proxy(producer, {
+    get(target, prop, receiver) {
+      const value2 = Reflect.get(target, prop, receiver);
+      if ((prop === "input" || prop === "output") && typeof value2 === "function") {
+        const fn2 = value2;
+        return (...args2) => sanitizeForGemini(fn2.apply(target, args2));
+      }
+      return value2;
+    }
+  });
+}
+function wrapStandard(standard) {
+  return new Proxy(standard, {
+    get(target, prop, receiver) {
+      if (prop === "jsonSchema") {
+        const value2 = Reflect.get(target, prop, receiver);
+        if (value2 && typeof value2 === "object") {
+          return wrapJsonSchemaProducer(value2);
+        }
+        return value2;
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function wrapSchemaForGemini(schema2) {
+  return new Proxy(schema2, {
+    get(target, prop, receiver) {
+      if (prop === "~standard") {
+        const value2 = Reflect.get(target, prop, receiver);
+        if (value2 && typeof value2 === "object") {
+          return wrapStandard(value2);
+        }
+        return value2;
+      }
+      if (prop === "toJsonSchema") {
+        const method = Reflect.get(target, prop, receiver);
+        if (typeof method === "function") {
+          return () => sanitizeForGemini(method.call(target));
+        }
+        return method;
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+}
+function sanitizeToolForGemini(tool2) {
+  if (!tool2.parameters) return tool2;
+  return { ...tool2, parameters: wrapSchemaForGemini(tool2.parameters) };
+}
+function isGeminiRouted(ctx) {
+  const effective = ctx.payload.proxyModel ?? ctx.resolvedModel ?? ctx.payload.model;
+  if (!effective) return false;
+  return effective.toLowerCase().includes("gemini");
+}
+
 // mcp/shared.ts
 var tool = (toolDef) => toolDef;
 var handleToolSuccess = (data) => {
@@ -108762,15 +109008,21 @@ var execute = (fn2, toolName) => {
   };
   return _fn;
 };
-var addTools = (_ctx, server, tools) => {
+var addTools = (ctx, server, tools) => {
+  const shouldSanitize = isGeminiRouted(ctx);
   for (const tool2 of tools) {
-    server.addTool(tool2);
+    server.addTool(shouldSanitize ? sanitizeToolForGemini(tool2) : tool2);
   }
   return server;
 };
 
 // mcp/comment.ts
 var LEAPING_INTO_ACTION_PREFIX = "Leaping into action";
+function isLeapingIntoActionCommentBody(body) {
+  const content = stripExistingFooter(body).trimStart();
+  const firstLine = content.split(/\r?\n/, 1)[0]?.trimEnd() ?? "";
+  return new RegExp(`(^|\\s)${LEAPING_INTO_ACTION_PREFIX}(\\.\\.\\.)?$`).test(firstLine);
+}
 function buildCommentFooter(ctx, customParts) {
   const runId = ctx.runId;
   return buildPullfrogFooter({
@@ -109014,8 +109266,9 @@ function ReportProgressTool(ctx) {
       if (!params.target_plan_comment && ctx.toolState.todoTracker) {
         ctx.toolState.todoTracker.cancel();
         await ctx.toolState.todoTracker.settled();
-        ctx.toolState.todoTracker.completeInProgress();
-        const collapsible = ctx.toolState.todoTracker.renderCollapsible();
+        const collapsible = ctx.toolState.todoTracker.renderCollapsible({
+          completeInProgress: true
+        });
         if (collapsible) {
           body = `${body}
 
@@ -109402,8 +109655,27 @@ import { performance as performance3 } from "node:perf_hooks";
 
 // utils/activity.ts
 import { performance as performance2 } from "node:perf_hooks";
+function isMonitorDebugEnabled() {
+  return process.env.ACTIONS_STEP_DEBUG === "true" || process.env.RUNNER_DEBUG === "1" || process.env.LOG_LEVEL === "debug";
+}
 var DEFAULT_ACTIVITY_TIMEOUT_MS = 3e5;
 var DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5e3;
+var DEBUG_TS_PREFIX = /^(?:\[\d{4}-\d{2}-\d{2}T[^\]]+\]\s+)?/.source;
+var ACTIVITY_NOISE_PATTERNS = [
+  new RegExp(`${DEBUG_TS_PREFIX}\\[mcp-proxy\\]`),
+  new RegExp(`${DEBUG_TS_PREFIX}\xBB provider error detected`),
+  new RegExp(`${DEBUG_TS_PREFIX}\\[DEBUG\\]\\s+(?:spawn|process) activity `),
+  /^::debug::(?:spawn|process) activity /
+];
+function isActivityNoise(chunk) {
+  const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
+  if (!text.trim()) return true;
+  return text.split("\n").every((line) => {
+    const trimmed = line.trim();
+    if (!trimmed) return true;
+    return ACTIVITY_NOISE_PATTERNS.some((pattern) => pattern.test(trimmed));
+  });
+}
 var _lastActivity = performance2.now();
 function markActivity() {
   _lastActivity = performance2.now();
@@ -109413,7 +109685,9 @@ function getIdleMs() {
 }
 function wrapWrite(original, onActivity) {
   const wrapped = (chunk, encodingOrCb, cb) => {
-    onActivity();
+    if (!isActivityNoise(chunk)) {
+      onActivity();
+    }
     if (typeof encodingOrCb === "function") {
       return original(chunk, encodingOrCb);
     }
@@ -109427,10 +109701,15 @@ function startProcessOutputMonitor(ctx) {
   const originalStderrWrite = process.stderr.write.bind(process.stderr);
   process.stdout.write = wrapWrite(originalStdoutWrite, markActivity);
   process.stderr.write = wrapWrite(originalStderrWrite, markActivity);
-  log.debug(`process activity monitor started: timeout=${ctx.timeoutMs}ms`);
+  const debugBypass = (msg) => {
+    if (!isMonitorDebugEnabled()) return;
+    originalStdoutWrite(`[${(/* @__PURE__ */ new Date()).toISOString()}] [DEBUG] ${msg}
+`);
+  };
+  debugBypass(`process activity monitor started: timeout=${ctx.timeoutMs}ms`);
   const intervalId = setInterval(() => {
     const idleMs = getIdleMs();
-    log.debug(`process activity check: idle=${idleMs}ms / ${ctx.timeoutMs}ms`);
+    debugBypass(`process activity check: idle=${idleMs}ms / ${ctx.timeoutMs}ms`);
     if (timedOut || idleMs <= ctx.timeoutMs) return;
     timedOut = true;
     ctx.onTimeout(idleMs);
@@ -109458,12 +109737,26 @@ function createProcessOutputActivityTimeout(ctx) {
       if (monitor) {
         monitor.stop();
       }
-      rejectFn(new Error(`activity timeout: no output for ${idleSec}s`));
+      const reject = rejectFn;
+      rejectFn = null;
+      reject(new Error(`activity timeout: no output for ${idleSec}s`));
     }
   });
   return {
     promise: promise2,
-    stop: monitor.stop
+    // stop() also disarms forceReject so a late safety-net fire can't reject
+    // the promise after the run has already succeeded.
+    stop: () => {
+      monitor?.stop();
+      rejectFn = null;
+    },
+    forceReject: (reason) => {
+      if (!rejectFn) return;
+      monitor?.stop();
+      const reject = rejectFn;
+      rejectFn = null;
+      reject(new Error(reason));
+    }
   };
 }
 
@@ -109493,6 +109786,16 @@ function exitWithSignal(signal) {
 }
 
 // utils/subprocess.ts
+var SPAWN_TIMEOUT_CODE = "E_SPAWN_TIMEOUT";
+var SPAWN_ACTIVITY_TIMEOUT_CODE = "E_SPAWN_ACTIVITY_TIMEOUT";
+var SpawnTimeoutError = class extends Error {
+  code;
+  constructor(message, code) {
+    super(message);
+    this.name = "SpawnTimeoutError";
+    this.code = code;
+  }
+};
 var activeChildren = /* @__PURE__ */ new Map();
 var externalSignalHandler = null;
 function trackChild(options) {
@@ -109538,7 +109841,7 @@ async function spawn(options) {
   const startTime = performance3.now();
   let stdoutBuffer = "";
   let stderrBuffer = "";
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const child = nodeSpawn(options.cmd, options.args, {
       env: options.env || {
         PATH: process.env.PATH || "",
@@ -109549,15 +109852,17 @@ async function spawn(options) {
     });
     trackChild({ child });
     let timeoutId;
+    let sigkillEscalatorId;
     let activityCheckIntervalId;
     let isTimedOut = false;
     let isActivityTimedOut = false;
     let lastActivityTime = performance3.now();
+    let killedAtIdleMs;
     if (options.timeout) {
       timeoutId = setTimeout(() => {
         isTimedOut = true;
         child.kill("SIGTERM");
-        setTimeout(() => {
+        sigkillEscalatorId = setTimeout(() => {
           if (!child.killed) {
             child.kill("SIGKILL");
           }
@@ -109575,12 +109880,20 @@ async function spawn(options) {
         );
         if (idleMs > activityTimeoutMs) {
           isActivityTimedOut = true;
+          killedAtIdleMs = idleMs;
           const idleSec = Math.round(idleMs / 1e3);
           log.info(
             `no output for ${idleSec}s from pid=${child.pid} (${options.cmd}), killing process`
           );
           child.kill("SIGKILL");
           clearInterval(activityCheckIntervalId);
+          try {
+            options.onActivityTimeout?.();
+          } catch (err) {
+            log.debug(
+              `spawn onActivityTimeout handler threw: ${err instanceof Error ? err.message : String(err)}`
+            );
+          }
         }
       }, DEFAULT_ACTIVITY_CHECK_INTERVAL_MS);
     }
@@ -109602,24 +109915,41 @@ async function spawn(options) {
         options.onStderr?.(chunk);
       });
     }
-    child.on("close", (exitCode) => {
+    child.on("close", (exitCode, signal) => {
       const durationMs = performance3.now() - startTime;
       untrackChild(child);
       if (timeoutId) clearTimeout(timeoutId);
+      if (sigkillEscalatorId) clearTimeout(sigkillEscalatorId);
       if (activityCheckIntervalId) clearInterval(activityCheckIntervalId);
       if (isTimedOut) {
-        reject(new Error(`process timed out after ${options.timeout}ms`));
+        reject(
+          new SpawnTimeoutError(`process timed out after ${options.timeout}ms`, SPAWN_TIMEOUT_CODE)
+        );
         return;
       }
       if (isActivityTimedOut) {
-        const idleSec = Math.round((performance3.now() - lastActivityTime) / 1e3);
-        reject(new Error(`activity timeout: no output for ${idleSec}s`));
+        const idleMs = killedAtIdleMs ?? performance3.now() - lastActivityTime;
+        const idleSec = Math.round(idleMs / 1e3);
+        reject(
+          new SpawnTimeoutError(
+            `activity timeout: no output for ${idleSec}s`,
+            SPAWN_ACTIVITY_TIMEOUT_CODE
+          )
+        );
         return;
       }
-      resolve2({
+      let resolvedExitCode = exitCode ?? 0;
+      let resolvedStderr = stderrBuffer;
+      if (exitCode === null && signal) {
+        const killMsg = `[spawn] ${options.cmd}: killed by signal ${signal}`;
+        resolvedStderr = resolvedStderr ? `${resolvedStderr}
+${killMsg}` : killMsg;
+        resolvedExitCode = 1;
+      }
+      resolve3({
         stdout: stdoutBuffer,
-        stderr: stderrBuffer,
-        exitCode: exitCode || 0,
+        stderr: resolvedStderr,
+        exitCode: resolvedExitCode,
         durationMs
       });
     });
@@ -109627,9 +109957,13 @@ async function spawn(options) {
       const durationMs = performance3.now() - startTime;
       untrackChild(child);
       if (timeoutId) clearTimeout(timeoutId);
+      if (sigkillEscalatorId) clearTimeout(sigkillEscalatorId);
       if (activityCheckIntervalId) clearInterval(activityCheckIntervalId);
-      console.error(`[spawn] process spawn error: ${error49.message}`);
-      resolve2({
+      const errMsg = `[spawn] ${options.cmd}: ${error49.message}`;
+      console.error(errMsg);
+      stderrBuffer = stderrBuffer ? `${stderrBuffer}
+${errMsg}` : errMsg;
+      resolve3({
         stdout: stdoutBuffer,
         stderr: stderrBuffer,
         exitCode: 1,
@@ -114396,7 +114730,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
+        await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error49) {
@@ -114413,7 +114747,7 @@ var Protocol = class {
    */
   request(request2, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const earlyReject = (error49) => {
         reject(error49);
       };
@@ -114491,7 +114825,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve2(parseResult.data);
+            resolve3(parseResult.data);
           }
         } catch (error49) {
           reject(error49);
@@ -114752,12 +115086,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve2, interval);
+      const timeoutId = setTimeout(resolve3, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -115627,12 +115961,12 @@ var StdioServerTransport = class {
     this.onclose?.();
   }
   send(message) {
-    return new Promise((resolve2) => {
+    return new Promise((resolve3) => {
       const json4 = serializeMessage(message);
       if (this._stdout.write(json4)) {
-        resolve2();
+        resolve3();
       } else {
-        this._stdout.once("drain", resolve2);
+        this._stdout.once("drain", resolve3);
       }
     });
   }
@@ -136660,12 +136994,12 @@ var require_schemes2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_fast_uri2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
   const { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils5();
   const { SCHEMES, getSchemeHandler } = require_schemes2();
-  function normalize2(uri$2, options) {
+  function normalize3(uri$2, options) {
     if (typeof uri$2 === "string") uri$2 = serialize(parse5(uri$2, options), options);
     else if (typeof uri$2 === "object") uri$2 = parse5(serialize(uri$2, options), options);
     return uri$2;
   }
-  function resolve2(baseURI, relativeURI, options) {
+  function resolve3(baseURI, relativeURI, options) {
     const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
     const resolved = resolveComponent(parse5(baseURI, schemelessOptions), parse5(relativeURI, schemelessOptions), schemelessOptions, true);
     schemelessOptions.skipEscape = true;
@@ -136838,8 +137172,8 @@ var require_fast_uri2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
   }
   const fastUri = {
     SCHEMES,
-    normalize: normalize2,
-    resolve: resolve2,
+    normalize: normalize3,
+    resolve: resolve3,
     resolveComponent,
     equal: equal$1,
     serialize,
@@ -140427,7 +140761,7 @@ ${error49 instanceof Error ? error49.stack : JSON.stringify(error49)}`
         new Error(`Connection is in ${this.#connectionState} state`)
       );
     }
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const timeout = setTimeout(() => {
         reject(
           new Error(
@@ -140437,7 +140771,7 @@ ${error49 instanceof Error ? error49.stack : JSON.stringify(error49)}`
       }, 5e3);
       this.once("ready", () => {
         clearTimeout(timeout);
-        resolve2();
+        resolve3();
       });
       this.once("error", (event) => {
         clearTimeout(timeout);
@@ -140884,7 +141218,7 @@ ${error49 instanceof Error ? error49.stack : JSON.stringify(error49)}`
               }
             });
             if (this.#needsEventLoopFlush) {
-              await new Promise((resolve2) => setImmediate(resolve2));
+              await new Promise((resolve3) => setImmediate(resolve3));
             }
           } catch (progressError) {
             this.#logger.warn(
@@ -140942,7 +141276,7 @@ ${error49 instanceof Error ? error49.stack : JSON.stringify(error49)}`
               }
             });
             if (this.#needsEventLoopFlush) {
-              await new Promise((resolve2) => setImmediate(resolve2));
+              await new Promise((resolve3) => setImmediate(resolve3));
             }
           } catch (streamError) {
             this.#logger.warn(
@@ -141955,7 +142289,7 @@ function formatMcpToolRef(agentId, toolName) {
 }
 
 // utils/browser.ts
-import { execFileSync, spawnSync } from "node:child_process";
+import { execFileSync as execFileSync2, spawnSync } from "node:child_process";
 import { existsSync as existsSync4 } from "node:fs";
 import { dirname } from "node:path";
 
@@ -141970,12 +142304,77 @@ var SENSITIVE_PATTERNS = [
 function isSensitiveEnvName(key) {
   return SENSITIVE_PATTERNS.some((p2) => p2.test(key));
 }
+var SAFE_ENV_PREFIXES = ["GITHUB_", "RUNNER_", "JAVA_HOME_", "GOROOT_"];
+var SAFE_ENV_NAMES = /* @__PURE__ */ new Set([
+  // system
+  "CI",
+  "HOME",
+  "LANG",
+  "LOGNAME",
+  "PATH",
+  "SHELL",
+  "SHLVL",
+  "TERM",
+  "TMPDIR",
+  "TZ",
+  "USER",
+  "XDG_CONFIG_HOME",
+  "XDG_RUNTIME_DIR",
+  "DEBIAN_FRONTEND",
+  // runner image toolchain
+  "ACCEPT_EULA",
+  "AGENT_TOOLSDIRECTORY",
+  "ANDROID_HOME",
+  "ANDROID_NDK",
+  "ANDROID_NDK_HOME",
+  "ANDROID_NDK_LATEST_HOME",
+  "ANDROID_NDK_ROOT",
+  "ANDROID_SDK_ROOT",
+  "ANT_HOME",
+  "AZURE_EXTENSION_DIR",
+  "BOOTSTRAP_HASKELL_NONINTERACTIVE",
+  "CHROME_BIN",
+  "CHROMEWEBDRIVER",
+  "CONDA",
+  "DOTNET_MULTILEVEL_LOOKUP",
+  "DOTNET_NOLOGO",
+  "DOTNET_SKIP_FIRST_TIME_EXPERIENCE",
+  "EDGEWEBDRIVER",
+  "GECKOWEBDRIVER",
+  "GHCUP_INSTALL_BASE_PREFIX",
+  "GRADLE_HOME",
+  "JAVA_HOME",
+  "HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS",
+  "HOMEBREW_NO_AUTO_UPDATE",
+  "ImageOS",
+  "ImageVersion",
+  "NVM_DIR",
+  "PIPX_BIN_DIR",
+  "PIPX_HOME",
+  "PSModulePath",
+  "SELENIUM_JAR_PATH",
+  "SGX_AESM_ADDR",
+  "SWIFT_PATH",
+  "VCPKG_INSTALLATION_ROOT"
+]);
+var _userAllowlist = null;
+function setEnvAllowlist(raw2) {
+  const names = raw2.split("\n").map((line) => line.trim()).filter(Boolean);
+  _userAllowlist = new Set(names);
+}
+function isSafeEnvVar(key) {
+  if (SAFE_ENV_NAMES.has(key)) return true;
+  return SAFE_ENV_PREFIXES.some((p2) => key.startsWith(p2));
+}
 function filterEnv() {
   const filtered = {};
   for (const [key, value2] of Object.entries(process.env)) {
     if (value2 === void 0) continue;
-    if (isSensitiveEnvName(key)) continue;
-    filtered[key] = value2;
+    const userAllowed = _userAllowlist?.has(key) ?? false;
+    if (isSensitiveEnvName(key) && !userAllowed) continue;
+    if (isSafeEnvVar(key) || userAllowed) {
+      filtered[key] = value2;
+    }
   }
   return filtered;
 }
@@ -141995,7 +142394,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.0.201",
+  version: "0.0.202",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -142007,6 +142406,7 @@ var package_default = {
   ],
   scripts: {
     test: "vitest",
+    "test:catalog": "vitest run --config vitest.main.config.ts",
     typecheck: "tsc --noEmit",
     build: "node esbuild.config.js && tsc -p tsconfig.exports.json",
     "check:entrypoints": "node scripts/check-entrypoint-imports.ts",
@@ -142019,7 +142419,7 @@ var package_default = {
   },
   devDependencies: {
     "@actions/core": "^1.11.1",
-    "@anthropic-ai/claude-code": "2.1.85",
+    "@anthropic-ai/claude-code": "2.1.112",
     "@ark/fs": "0.56.0",
     "@ark/util": "0.56.0",
     "@clack/prompts": "^1.2.0",
@@ -142143,7 +142543,7 @@ function ensureBrowserDaemon(toolState) {
   log.info("agent-browser installed");
   let binDir;
   try {
-    const binPath = execFileSync("which", ["agent-browser"], { encoding: "utf-8" }).trim();
+    const binPath = execFileSync2("which", ["agent-browser"], { encoding: "utf-8" }).trim();
     binDir = dirname(binPath);
     log.info(`agent-browser binary: ${binPath}`);
   } catch {
@@ -142190,9 +142590,271 @@ function closeBrowserDaemon(toolState) {
 }
 
 // mcp/checkout.ts
+import { createHash as createHash2 } from "node:crypto";
 import { writeFileSync } from "node:fs";
 import { join as join3 } from "node:path";
 
+// utils/diffCoverage.ts
+import { isAbsolute, normalize as normalize2, resolve } from "node:path";
+function countLines(params) {
+  const content = params.content;
+  if (content.length === 0) return 0;
+  return content.split("\n").length;
+}
+function parseDiffTocEntries(params) {
+  const lines = params.toc.split("\n");
+  const entries = [];
+  for (const line of lines) {
+    const match3 = line.match(/^- (.+) (?:→|->) lines (\d+)-(\d+)(?: · diff-[0-9a-f]+)?$/);
+    if (!match3) continue;
+    const startLine = Number.parseInt(match3[2], 10);
+    const endLine = Number.parseInt(match3[3], 10);
+    if (!Number.isFinite(startLine) || !Number.isFinite(endLine)) continue;
+    entries.push({ filename: match3[1], startLine, endLine });
+  }
+  return entries;
+}
+function createDiffCoverageState(params) {
+  return {
+    diffPath: params.diffPath,
+    totalLines: params.totalLines,
+    tocEntries: parseDiffTocEntries({ toc: params.toc }),
+    coveredRanges: [],
+    coveragePreflightRan: false
+  };
+}
+function recordDiffReadFromToolUse(params) {
+  const state = params.state;
+  if (!state) return false;
+  if (!isReadTool(params.toolName)) return false;
+  const readTarget = extractReadTarget({ input: params.input });
+  if (!readTarget) return false;
+  const normalizedReadPath = normalizePath({ path: readTarget.path, cwd: params.cwd });
+  const normalizedDiffPath = normalize2(state.diffPath);
+  if (normalizedReadPath !== normalizedDiffPath) return false;
+  const range2 = resolveReadRange({
+    totalLines: state.totalLines,
+    offset: readTarget.offset,
+    limit: readTarget.limit,
+    startLine: readTarget.startLine,
+    endLine: readTarget.endLine,
+    offsetBase: resolveOffsetBase({ toolName: params.toolName })
+  });
+  if (!range2) return false;
+  state.coveredRanges = mergeRanges({ ranges: state.coveredRanges, nextRange: range2 });
+  return true;
+}
+function getDiffCoverageBreakdown(params) {
+  const state = params.state;
+  const coveredRanges = mergeRangesList({ ranges: state.coveredRanges });
+  const unreadRanges = invertRanges({ totalLines: state.totalLines, coveredRanges });
+  const coveredLines = countLinesInRanges({ ranges: coveredRanges });
+  const unreadLines = Math.max(0, state.totalLines - coveredLines);
+  const coveragePercent = state.totalLines ? Number((coveredLines / state.totalLines * 100).toFixed(2)) : 100;
+  const files = [];
+  for (const entry of state.tocEntries) {
+    const fileRange = { startLine: entry.startLine, endLine: entry.endLine };
+    const coveredInFile = intersectRangesWithRange({ ranges: coveredRanges, target: fileRange });
+    const unreadInFile = intersectRangesWithRange({ ranges: unreadRanges, target: fileRange });
+    const totalFileLines = Math.max(0, entry.endLine - entry.startLine + 1);
+    const fileCoveredLines = countLinesInRanges({ ranges: coveredInFile });
+    files.push({
+      filename: entry.filename,
+      startLine: entry.startLine,
+      endLine: entry.endLine,
+      totalLines: totalFileLines,
+      coveredLines: fileCoveredLines,
+      coveredRanges: coveredInFile,
+      unreadRanges: unreadInFile
+    });
+  }
+  return {
+    totalLines: state.totalLines,
+    coveredLines,
+    unreadLines,
+    coveragePercent,
+    coveredRanges,
+    unreadRanges,
+    files
+  };
+}
+function renderDiffCoverageBreakdown(params) {
+  const breakdown = params.breakdown;
+  const lines = [];
+  lines.push(`diff coverage report for \`${params.diffPath}\``);
+  lines.push(
+    `overall: ${breakdown.coveredLines}/${breakdown.totalLines} lines read (${breakdown.coveragePercent}%), unread: ${breakdown.unreadLines}`
+  );
+  lines.push(`covered ranges: ${formatRanges({ ranges: breakdown.coveredRanges })}`);
+  lines.push(`unread ranges: ${formatRanges({ ranges: breakdown.unreadRanges })}`);
+  lines.push("");
+  lines.push("per-file TOC coverage:");
+  for (const file2 of breakdown.files) {
+    const filePercent = file2.totalLines ? Number((file2.coveredLines / file2.totalLines * 100).toFixed(2)) : 100;
+    lines.push(
+      `- ${file2.filename} (toc lines ${file2.startLine}-${file2.endLine}): ${file2.coveredLines}/${file2.totalLines} lines read (${filePercent}%)`
+    );
+    lines.push(`  read: ${formatRanges({ ranges: file2.coveredRanges })}`);
+    lines.push(`  unread: ${formatRanges({ ranges: file2.unreadRanges })}`);
+  }
+  return lines.join("\n");
+}
+function resolveOffsetBase(params) {
+  const lower2 = params.toolName.toLowerCase();
+  if (lower2 === "readfile" || lower2.endsWith(".readfile")) {
+    return "one";
+  }
+  return "zero";
+}
+function isReadTool(toolName) {
+  const lower2 = toolName.toLowerCase();
+  if (lower2 === "read" || lower2 === "readfile") return true;
+  if (lower2.endsWith(".read") || lower2.endsWith(".readfile")) return true;
+  return false;
+}
+function extractReadTarget(params) {
+  const inputRecord = asRecord(params.input);
+  if (!inputRecord) return null;
+  const direct = extractReadTargetFromRecord({ record: inputRecord });
+  if (direct) return direct;
+  const nestedCandidates = [inputRecord.args, inputRecord.params, inputRecord.input];
+  for (const candidate of nestedCandidates) {
+    const nestedRecord = asRecord(candidate);
+    if (!nestedRecord) continue;
+    const nested = extractReadTargetFromRecord({ record: nestedRecord });
+    if (nested) return nested;
+  }
+  return null;
+}
+function extractReadTargetFromRecord(params) {
+  const record3 = params.record;
+  const pathValue = readString({ value: record3.path }) ?? readString({ value: record3.file_path }) ?? readString({ value: record3.filePath }) ?? readString({ value: record3.filepath }) ?? readString({ value: record3.file }) ?? readString({ value: record3.target_file });
+  if (!pathValue) return null;
+  const offset = readNumber({ value: record3.offset });
+  const limit = readNumber({ value: record3.limit });
+  const startLine = readNumber({ value: record3.start_line }) ?? readNumber({ value: record3.startLine }) ?? readNumber({ value: record3.line_start });
+  const endLine = readNumber({ value: record3.end_line }) ?? readNumber({ value: record3.endLine }) ?? readNumber({ value: record3.line_end });
+  return { path: pathValue, offset, limit, startLine, endLine };
+}
+function resolveReadRange(params) {
+  const totalLines = params.totalLines;
+  if (totalLines <= 0) return null;
+  if (params.startLine !== void 0 || params.endLine !== void 0) {
+    const rawStart = params.startLine ?? 1;
+    const rawEnd = params.endLine ?? totalLines;
+    const startLine2 = clampLine({ value: rawStart, totalLines });
+    const endLine2 = clampLine({ value: rawEnd, totalLines });
+    if (endLine2 < startLine2) return null;
+    return { startLine: startLine2, endLine: endLine2 };
+  }
+  let startLine = 1;
+  if (params.offset !== void 0) {
+    if (params.offset >= 0) {
+      const normalizedOffset = params.offsetBase === "zero" ? params.offset + 1 : params.offset === 0 ? 1 : params.offset;
+      startLine = clampLine({ value: normalizedOffset, totalLines });
+    } else {
+      startLine = clampLine({ value: totalLines + params.offset + 1, totalLines });
+    }
+  }
+  let endLine = totalLines;
+  if (params.limit !== void 0) {
+    if (params.limit <= 0) return null;
+    endLine = clampLine({ value: startLine + params.limit - 1, totalLines });
+  }
+  if (endLine < startLine) return null;
+  return { startLine, endLine };
+}
+function normalizePath(params) {
+  if (isAbsolute(params.path)) return normalize2(params.path);
+  return normalize2(resolve(params.cwd, params.path));
+}
+function mergeRanges(params) {
+  return mergeRangesList({ ranges: [...params.ranges, params.nextRange] });
+}
+function mergeRangesList(params) {
+  if (params.ranges.length === 0) return [];
+  const sorted = [...params.ranges].sort((a, b) => a.startLine - b.startLine);
+  const merged = [];
+  for (const range2 of sorted) {
+    const last = merged[merged.length - 1];
+    if (!last) {
+      merged.push({ startLine: range2.startLine, endLine: range2.endLine });
+      continue;
+    }
+    if (range2.startLine <= last.endLine + 1) {
+      if (range2.endLine > last.endLine) {
+        last.endLine = range2.endLine;
+      }
+      continue;
+    }
+    merged.push({ startLine: range2.startLine, endLine: range2.endLine });
+  }
+  return merged;
+}
+function invertRanges(params) {
+  if (params.totalLines <= 0) return [];
+  if (params.coveredRanges.length === 0) {
+    return [{ startLine: 1, endLine: params.totalLines }];
+  }
+  const unread = [];
+  let cursor = 1;
+  for (const range2 of params.coveredRanges) {
+    if (cursor < range2.startLine) {
+      unread.push({ startLine: cursor, endLine: range2.startLine - 1 });
+    }
+    cursor = Math.max(cursor, range2.endLine + 1);
+  }
+  if (cursor <= params.totalLines) {
+    unread.push({ startLine: cursor, endLine: params.totalLines });
+  }
+  return unread;
+}
+function intersectRangesWithRange(params) {
+  const intersections = [];
+  for (const range2 of params.ranges) {
+    if (range2.endLine < params.target.startLine) continue;
+    if (range2.startLine > params.target.endLine) continue;
+    const startLine = Math.max(range2.startLine, params.target.startLine);
+    const endLine = Math.min(range2.endLine, params.target.endLine);
+    if (endLine >= startLine) {
+      intersections.push({ startLine, endLine });
+    }
+  }
+  return intersections;
+}
+function countLinesInRanges(params) {
+  let total = 0;
+  for (const range2 of params.ranges) {
+    total += range2.endLine - range2.startLine + 1;
+  }
+  return total;
+}
+function formatRanges(params) {
+  if (params.ranges.length === 0) return "none";
+  return params.ranges.map((range2) => `${range2.startLine}-${range2.endLine}`).join(", ");
+}
+function clampLine(params) {
+  if (params.value < 1) return 1;
+  if (params.value > params.totalLines) return params.totalLines;
+  return params.value;
+}
+function asRecord(value2) {
+  if (!value2 || typeof value2 !== "object" || Array.isArray(value2)) return null;
+  return Object.fromEntries(Object.entries(value2));
+}
+function readString(params) {
+  if (typeof params.value === "string") return params.value;
+  return void 0;
+}
+function readNumber(params) {
+  if (typeof params.value === "number" && Number.isFinite(params.value)) return params.value;
+  if (typeof params.value === "string") {
+    const parsed2 = Number.parseInt(params.value, 10);
+    if (Number.isFinite(parsed2)) return parsed2;
+  }
+  return void 0;
+}
+
 // utils/gitAuth.ts
 import { execSync } from "node:child_process";
 import { createHash } from "node:crypto";
@@ -142206,7 +142868,7 @@ function resolveGit() {
   const resolvedPath = realpathSync(whichPath);
   const sha256 = hashFile(resolvedPath);
   gitBinary = { path: resolvedPath, sha256 };
-  log.info(`git binary: ${resolvedPath} (sha256: ${sha256.slice(0, 12)}...)`);
+  log.debug(`\xBB git binary: ${resolvedPath} (sha256: ${sha256.slice(0, 12)}...)`);
 }
 function verifyGitBinary() {
   if (!gitBinary) {
@@ -142285,29 +142947,43 @@ async function $git(subcommand, args2, options) {
 }
 
 // lifecycle.ts
-var LIFECYCLE_HOOK_TIMEOUT_MS = 12e4;
+var LIFECYCLE_HOOK_TIMEOUT_MS = 6e5;
 
 // utils/lifecycle.ts
 async function executeLifecycleHook(params) {
-  if (!params.script) return;
+  if (!params.script) return {};
   log.info(`\xBB executing ${params.event} lifecycle hook...`);
-  const result = await spawn({
-    cmd: "bash",
-    args: ["-c", params.script],
-    env: process.env,
-    timeout: LIFECYCLE_HOOK_TIMEOUT_MS,
-    activityTimeout: 0,
-    onStdout: (chunk) => process.stdout.write(chunk),
-    onStderr: (chunk) => process.stderr.write(chunk)
-  });
-  if (result.exitCode !== 0) {
-    const output = result.stderr || result.stdout;
-    throw new Error(
-      `lifecycle hook '${params.event}' failed with exit code ${result.exitCode}:
-${output}`
-    );
+  try {
+    const result = await spawn({
+      cmd: "bash",
+      args: ["-c", params.script],
+      env: process.env,
+      timeout: LIFECYCLE_HOOK_TIMEOUT_MS,
+      activityTimeout: 0,
+      onStdout: (chunk) => process.stdout.write(chunk),
+      onStderr: (chunk) => process.stderr.write(chunk)
+    });
+    if (result.exitCode !== 0) {
+      const output = (result.stderr || result.stdout).trim();
+      return {
+        warning: `lifecycle hook '${params.event}' failed with exit code ${result.exitCode}. output: ${output || "(empty)"}. retry the operation if the failure looks flaky (network blips, transient rate limits). do NOT retry if the script is broken (missing commands, syntax errors) or the error is persistent.`
+      };
+    }
+    log.info(`\xBB ${params.event} lifecycle hook completed successfully`);
+    return {};
+  } catch (err) {
+    const isTimeout = err instanceof SpawnTimeoutError && (err.code === SPAWN_TIMEOUT_CODE || err.code === SPAWN_ACTIVITY_TIMEOUT_CODE);
+    if (isTimeout) {
+      const minutes = Math.round(LIFECYCLE_HOOK_TIMEOUT_MS / 6e4);
+      return {
+        warning: `lifecycle hook '${params.event}' timed out after ${minutes}min. do NOT retry \u2014 the script is likely hung or doing too much work. ask the repo owner to simplify the hook (e.g. move long-running work out of the hook, add caching, or split it).`
+      };
+    }
+    const msg = err instanceof Error ? err.message : String(err);
+    return {
+      warning: `lifecycle hook '${params.event}' failed to spawn: ${msg}. this is likely a transient failure \u2014 retry the operation.`
+    };
   }
-  log.info(`\xBB ${params.event} lifecycle hook completed successfully`);
 }
 
 // utils/shell.ts
@@ -142457,6 +143133,787 @@ function postProcessRangeDiff(raw2, contextLines = 3) {
   return hasChanges ? out : null;
 }
 
+// mcp/git.ts
+function getPushDestination(branch, storedDest) {
+  if (storedDest && storedDest.localBranch === branch) {
+    log.debug(`using stored push destination: ${storedDest.remoteName}/${storedDest.remoteBranch}`);
+    const url4 = $("git", ["remote", "get-url", "--push", storedDest.remoteName], {
+      log: false
+    }).trim();
+    return { remoteName: storedDest.remoteName, remoteBranch: storedDest.remoteBranch, url: url4 };
+  }
+  try {
+    const pushRemote = $("git", ["config", `branch.${branch}.pushRemote`], { log: false }).trim();
+    const merge4 = $("git", ["config", `branch.${branch}.merge`], { log: false }).trim();
+    const remoteBranch = merge4.replace(/^refs\/heads\//, "");
+    const url4 = $("git", ["remote", "get-url", "--push", pushRemote], { log: false }).trim();
+    return { remoteName: pushRemote, remoteBranch, url: url4 };
+  } catch {
+    log.debug(`no push config for ${branch}, falling back to origin/${branch}`);
+    const url4 = $("git", ["remote", "get-url", "--push", "origin"], { log: false }).trim();
+    return { remoteName: "origin", remoteBranch: branch, url: url4 };
+  }
+}
+function normalizeUrl(url4) {
+  return url4.replace(/\.git$/, "").toLowerCase();
+}
+function rejectIfLeadingDash(value2, kind) {
+  if (value2.startsWith("-")) {
+    throw new Error(`Blocked: ${kind} '${value2}' starts with '-' \u2014 git could parse it as a flag.`);
+  }
+}
+var SYMBOLIC_REFS = /* @__PURE__ */ new Set(["HEAD", "FETCH_HEAD", "ORIG_HEAD", "MERGE_HEAD"]);
+function rejectSpecialRef(value2, kind) {
+  rejectIfLeadingDash(value2, kind);
+  if (value2.startsWith("refs/")) {
+    throw new Error(
+      `Blocked: ${kind} '${value2}' is a fully-qualified ref path. Use a bare branch name (e.g. 'feature/foo' or 'main'), not a 'refs/heads/...' form.`
+    );
+  }
+  if (SYMBOLIC_REFS.has(value2)) {
+    throw new Error(
+      `Blocked: ${kind} '${value2}' is a git symbolic ref, not a branch name. Pass the resolved branch name (e.g. 'main'), or omit branchName to push the current branch.`
+    );
+  }
+  const BAD = /[:+^~?*[\\\s]/;
+  const badMatch = value2.match(BAD);
+  if (badMatch) {
+    throw new Error(
+      `Blocked: ${kind} '${value2}' contains '${badMatch[0]}', which git interprets as refspec/revision syntax, not as part of a branch name.`
+    );
+  }
+}
+function validateTagName(tag) {
+  rejectIfLeadingDash(tag, "tag");
+  if (!/^[A-Za-z0-9._/-]+$/.test(tag)) {
+    throw new Error(
+      `Blocked: tag '${tag}' contains characters that could be parsed as a refspec or flag. Tags must match [A-Za-z0-9._/-]+.`
+    );
+  }
+}
+function validatePushDestination(ctx, branch) {
+  const pushUrl = ctx.toolState.pushUrl;
+  if (!pushUrl) throw new Error("pushUrl not set - setupGit must run before push_branch");
+  const dest = getPushDestination(branch, ctx.toolState.pushDest);
+  if (normalizeUrl(dest.url) !== normalizeUrl(pushUrl)) {
+    throw new Error(
+      `Push blocked: destination does not match expected repository.
+Expected: ${pushUrl}
+Actual: ${dest.url}
+Git configuration may have been tampered with.`
+    );
+  }
+  return dest;
+}
+var PushBranch = type({
+  branchName: type.string.describe("The branch name to push (defaults to current branch)").optional(),
+  force: type.boolean.describe("Force push (use with caution)").default(false)
+});
+function PushBranchTool(ctx) {
+  const defaultBranch = ctx.repo.data.default_branch || "main";
+  const pushPermission = ctx.payload.push;
+  return tool({
+    name: "push_branch",
+    description: "Push the current branch to the remote repository. Omit branchName to push the current branch (recommended). If specifying branchName, use the LOCAL branch name (e.g., 'pr-1'), not the remote branch name. The correct remote and remote branch are determined automatically from branch config set by checkout_pr. Requires a clean working tree. Runs the repository prepush hook (if configured) before the network push \u2014 hook failure means tests/lint or similar in that script failed, not necessarily a Pullfrog timeout. Never force push unless explicitly requested. Pushes to the default branch are blocked in restricted mode.",
+    parameters: PushBranch,
+    execute: execute(async ({ branchName, force }) => {
+      if (pushPermission === "disabled") {
+        throw new Error("Push is disabled. This repository is configured for read-only access.");
+      }
+      const branch = branchName || $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
+      rejectSpecialRef(branch, "branch");
+      const status = $("git", ["status", "--porcelain"], { log: false });
+      if (status) {
+        throw new Error(
+          `push blocked: working tree is not clean (tracked changes and/or untracked files). commit, discard, or remove stray artifacts before pushing.
+
+git status:
+${status}`
+        );
+      }
+      const pushDest = validatePushDestination(ctx, branch);
+      if (pushPermission === "restricted" && pushDest.remoteBranch === defaultBranch) {
+        throw new Error(
+          `Push blocked: cannot push directly to default branch '${pushDest.remoteBranch}'. Create a feature branch and open a PR instead.`
+        );
+      }
+      const refspec = branch === pushDest.remoteBranch ? branch : `${branch}:${pushDest.remoteBranch}`;
+      const pushArgs = force ? ["--force", "-u", pushDest.remoteName, refspec] : ["-u", pushDest.remoteName, refspec];
+      const prepushHook = await executeLifecycleHook({
+        event: "prepush",
+        script: ctx.prepushScript
+      });
+      if (prepushHook.warning) {
+        throw new Error(prepushHook.warning);
+      }
+      const postHookStatus = $("git", ["status", "--porcelain"], { log: false });
+      if (postHookStatus) {
+        throw new Error(
+          `push blocked: the prepush hook modified the working tree. those changes are not included in the push. commit or discard them (or change the hook to not mutate tracked files) before retrying.
+
+git status:
+${postHookStatus}`
+        );
+      }
+      log.debug(`pushing ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch}`);
+      if (force) {
+        log.warning(`force pushing - this will overwrite remote history`);
+      }
+      try {
+        await $git("push", pushArgs, {
+          token: ctx.gitToken
+        });
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        if (msg.includes("fetch first") || msg.includes("non-fast-forward")) {
+          const integrateStep = ctx.payload.shell === "disabled" ? `2. use the git tool to merge the remote branch into yours: git({ command: "merge", args: ["origin/${pushDest.remoteBranch}"] })` : `2. use the git tool to rebase or merge your changes on top: git({ command: "merge", args: ["origin/${pushDest.remoteBranch}"] }) (or 'rebase')`;
+          throw new Error(
+            `push rejected: the remote branch '${pushDest.remoteBranch}' has new commits you don't have locally.
+
+to resolve this:
+1. use git_fetch to fetch the remote branch: git_fetch({ ref: "${pushDest.remoteBranch}" })
+${integrateStep}
+3. resolve any merge conflicts if needed
+4. retry push_branch`
+          );
+        }
+        throw err;
+      }
+      return {
+        success: true,
+        branch,
+        remoteBranch: pushDest.remoteBranch,
+        remote: pushDest.remoteName,
+        force,
+        message: `successfully pushed ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch}`
+      };
+    })
+  });
+}
+var AUTH_REQUIRED_REDIRECT = {
+  push: "use the push_branch tool instead \u2014 it handles authentication and permission checks.",
+  fetch: "use the git_fetch tool instead \u2014 it handles authentication.",
+  pull: "use git_fetch to fetch the remote ref, then call this git tool with command 'merge' locally.",
+  clone: "the repository is already cloned. use checkout_pr for PR branches."
+};
+var NOSHELL_BLOCKED_SUBCOMMANDS = {
+  config: "Blocked: git config can set up filter drivers or hooks that execute arbitrary code.",
+  submodule: "Blocked: git submodule can reference malicious repositories and execute code on update.",
+  "update-index": "Blocked: git update-index can modify index entries in ways that bypass file protections.",
+  "filter-branch": "Blocked: git filter-branch executes arbitrary code on repository history.",
+  replace: "Blocked: git replace can redirect object lookups.",
+  // subcommands that accept --exec or similar flags for arbitrary code execution
+  rebase: "Blocked: git rebase --exec can execute arbitrary shell commands. Use 'merge' instead to integrate remote changes.",
+  bisect: "Blocked: git bisect run can execute arbitrary shell commands. Bisect by hand (bisect start/good/bad/reset) is not available through this tool either \u2014 ask the user to run the bisect if needed.",
+  // difftool/mergetool exist to shell out to external diff/merge programs.
+  // both accept `--extcmd` / `-x` (difftool) or configured tool commands
+  // (mergetool) that run arbitrary code. NOSHELL_BLOCKED_ARGS catches the
+  // long `--extcmd` form, but not the `-x` short form — and globally blocking
+  // `-x` would false-positive on `git cherry-pick -x`. block the subcommands
+  // wholesale instead; neither has a meaningful use in an automated agent
+  // workflow (agents use `git diff` / `git show` for diffs and resolve
+  // conflicts via file edits, not a TUI merge tool).
+  difftool: "Blocked: git difftool runs an external diff program via --extcmd/-x or configured tool and can execute arbitrary shell commands. Use 'diff' (or 'show' for single commits) to inspect changes \u2014 those output directly and don't invoke an external tool.",
+  mergetool: "Blocked: git mergetool runs an external merge program configured via mergetool.<name>.cmd and can execute arbitrary shell commands. Resolve conflicts by editing the files directly (conflict markers are written into the working tree) and then commit."
+};
+var NOSHELL_BLOCKED_ARGS = ["--exec", "--extcmd", "--upload-pack", "--receive-pack"];
+var COLLAPSE_THRESHOLD = 200;
+var subcommandPattern = regex("^[a-z][a-z0-9-]*$");
+var Git = type({
+  command: type(subcommandPattern).describe("Git command (e.g., 'status', 'log', 'diff')"),
+  args: type.string.array().describe("Additional arguments for the git command").optional()
+});
+function GitTool(ctx) {
+  return tool({
+    name: "git",
+    description: "Run git commands. For push/fetch, use the dedicated MCP tools (push_branch, git_fetch). git pull is not available \u2014 use git_fetch then this tool with command 'merge'.",
+    parameters: Git,
+    execute: execute(async (params) => {
+      const command = params.command;
+      const args2 = params.args ?? [];
+      const redirect = AUTH_REQUIRED_REDIRECT[command];
+      if (redirect) {
+        throw new Error(`git ${command} is not available through this tool \u2014 ${redirect}`);
+      }
+      if (ctx.payload.shell === "disabled") {
+        const blocked = NOSHELL_BLOCKED_SUBCOMMANDS[command];
+        if (blocked) {
+          throw new Error(blocked);
+        }
+        for (const arg4 of args2) {
+          const isBlocked = NOSHELL_BLOCKED_ARGS.some(
+            (flag) => arg4 === flag || arg4.startsWith(flag + "=")
+          );
+          if (isBlocked) {
+            throw new Error(
+              `Blocked: '${arg4}' flag can execute arbitrary code and is not allowed.`
+            );
+          }
+        }
+      }
+      const output = $("git", [command, ...args2], { log: false });
+      const lineCount = output.split("\n").length;
+      if (lineCount > COLLAPSE_THRESHOLD) {
+        log.group(`git ${command} output (${lineCount} lines)`, () => {
+          log.info(output);
+        });
+      } else if (output) {
+        log.info(output);
+      }
+      return { success: true, output };
+    })
+  });
+}
+var GitFetch = type({
+  ref: type.string.describe("Ref to fetch: branch name, tag, or 'pull/N/head' for PRs"),
+  depth: type.number.describe("Fetch depth (for shallow clones)").optional()
+});
+function GitFetchTool(ctx) {
+  return tool({
+    name: "git_fetch",
+    description: "Fetch refs from remote repository. Use this instead of git fetch directly.",
+    parameters: GitFetch,
+    execute: execute(async (params) => {
+      rejectIfLeadingDash(params.ref, "ref");
+      const fetchArgs = ["--no-tags", "origin", params.ref];
+      if (params.depth !== void 0) {
+        fetchArgs.push(`--depth=${params.depth}`);
+      }
+      await $git("fetch", fetchArgs, {
+        token: ctx.gitToken
+      });
+      return { success: true, ref: params.ref };
+    })
+  });
+}
+var DeleteBranch = type({
+  branchName: type.string.describe("Remote branch to delete")
+});
+function DeleteBranchTool(ctx) {
+  const pushPermission = ctx.payload.push;
+  const defaultBranch = ctx.repo.data.default_branch || "main";
+  return tool({
+    name: "delete_branch",
+    description: "Delete a remote branch. Requires push: enabled permission. Deletion of the repository's default branch is always blocked regardless of permission mode.",
+    parameters: DeleteBranch,
+    execute: execute(async (params) => {
+      if (pushPermission !== "enabled") {
+        throw new Error(
+          "Branch deletion requires push: enabled permission. Current mode only allows pushing to non-protected branches."
+        );
+      }
+      rejectSpecialRef(params.branchName, "branchName");
+      if (params.branchName === defaultBranch) {
+        throw new Error(
+          `Blocked: cannot delete the default branch '${defaultBranch}'. If you really need to delete or rename it, do it manually via the repository settings.`
+        );
+      }
+      await $git("push", ["origin", "--delete", `refs/heads/${params.branchName}`], {
+        token: ctx.gitToken
+      });
+      return { success: true, deleted: params.branchName };
+    })
+  });
+}
+var PushTags = type({
+  tag: type.string.describe("Tag name to push"),
+  force: type.boolean.describe("Force push the tag").default(false)
+});
+function PushTagsTool(ctx) {
+  const pushPermission = ctx.payload.push;
+  return tool({
+    name: "push_tags",
+    description: "Push a tag to remote. Requires push: enabled permission.",
+    parameters: PushTags,
+    execute: execute(async (params) => {
+      if (pushPermission !== "enabled") {
+        throw new Error(
+          "Tag pushing requires push: enabled permission. Current mode only allows pushing branches."
+        );
+      }
+      validateTagName(params.tag);
+      const pushArgs = [...params.force ? ["-f"] : [], "origin", `refs/tags/${params.tag}`];
+      await $git("push", pushArgs, {
+        token: ctx.gitToken
+      });
+      return { success: true, tag: params.tag };
+    })
+  });
+}
+
+// mcp/review.ts
+function getHttpStatus(err) {
+  if (typeof err !== "object" || err === null) return void 0;
+  const status = err.status;
+  return typeof status === "number" ? status : void 0;
+}
+function commentableLinesForFile(patch) {
+  const right = /* @__PURE__ */ new Set();
+  const left = /* @__PURE__ */ new Set();
+  if (!patch) return { RIGHT: right, LEFT: left };
+  let oldLine = 0;
+  let newLine = 0;
+  for (const line of patch.split("\n")) {
+    const hunk = line.match(/^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
+    if (hunk) {
+      oldLine = parseInt(hunk[1], 10);
+      newLine = parseInt(hunk[2], 10);
+      continue;
+    }
+    const changeType = line[0];
+    if (changeType === "+") {
+      right.add(newLine);
+      newLine++;
+    } else if (changeType === "-") {
+      left.add(oldLine);
+      oldLine++;
+    } else if (changeType === " ") {
+      right.add(newLine);
+      left.add(oldLine);
+      newLine++;
+      oldLine++;
+    }
+  }
+  return { RIGHT: right, LEFT: left };
+}
+async function buildCommentableMap(ctx, pullNumber) {
+  const cached4 = ctx.toolState.commentableLinesByFile;
+  const cachedFor = ctx.toolState.commentableLinesPullNumber;
+  const cachedSha = ctx.toolState.commentableLinesCheckoutSha;
+  const currentSha = ctx.toolState.checkoutSha;
+  if (cached4 && cachedFor === pullNumber && cachedSha && cachedSha === currentSha) return cached4;
+  const files = await ctx.octokit.paginate(ctx.octokit.rest.pulls.listFiles, {
+    owner: ctx.repo.owner,
+    repo: ctx.repo.name,
+    pull_number: pullNumber,
+    per_page: 100
+  });
+  const map2 = /* @__PURE__ */ new Map();
+  for (const file2 of files) {
+    map2.set(file2.filename, commentableLinesForFile(file2.patch));
+  }
+  return map2;
+}
+function validateInlineComments(comments, map2) {
+  const valid = [];
+  const dropped = [];
+  for (const c2 of comments) {
+    const side = c2.side === "LEFT" ? "LEFT" : "RIGHT";
+    const line = c2.line ?? 0;
+    const startLine = c2.start_line ?? line;
+    const lines = map2.get(c2.path);
+    const record3 = (reason) => {
+      const entry = { path: c2.path, line, side, reason };
+      if (c2.start_line != null) entry.startLine = c2.start_line;
+      dropped.push(entry);
+    };
+    if (!lines) {
+      record3(`file not in PR diff`);
+      continue;
+    }
+    if (lines.LEFT.size === 0 && lines.RIGHT.size === 0) {
+      record3(`file has no textual diff (binary, pure rename, or mode change)`);
+      continue;
+    }
+    const anchors = lines[side];
+    if (!anchors.has(line)) {
+      record3(`line ${line} (${side}) is not inside a diff hunk`);
+      continue;
+    }
+    if (c2.start_line != null && c2.start_line > line) {
+      record3(
+        `start_line ${c2.start_line} is after line ${line} \u2014 ranges must satisfy start_line <= line`
+      );
+      continue;
+    }
+    if (startLine !== line && !anchors.has(startLine)) {
+      record3(`start_line ${startLine} (${side}) is not inside a diff hunk`);
+      continue;
+    }
+    valid.push(c2);
+  }
+  return { valid, dropped };
+}
+var MAX_DROPPED_COMMENT_LINES = 50;
+function reviewSkipDecision(params) {
+  if (params.body || params.hasComments) return null;
+  if (!params.approved) {
+    return {
+      kind: "no-issues",
+      reason: "no issues found \u2014 nothing to post"
+    };
+  }
+  if (!params.prApproveEnabled) {
+    return {
+      kind: "empty-downgraded-approve",
+      reason: "approve requested but prApproveEnabled is disabled; no feedback body or comments to post as a COMMENT review instead"
+    };
+  }
+  return null;
+}
+function formatDroppedCommentsNote(dropped) {
+  const renderEntry = (d3) => {
+    const range2 = d3.startLine != null && d3.startLine !== d3.line ? `${d3.startLine}-${d3.line}` : `${d3.line}`;
+    return `- \`${d3.path}:${range2}\` (${d3.side}) \u2014 ${d3.reason}`;
+  };
+  const shown = dropped.slice(0, MAX_DROPPED_COMMENT_LINES).map(renderEntry);
+  const remainder = dropped.length - shown.length;
+  if (remainder > 0) shown.push(`- \u2026and ${remainder} more dropped comment(s) not shown`);
+  return `
+
+---
+
+**Note:** ${dropped.length} inline comment(s) dropped because they did not anchor to lines inside the PR diff:
+` + shown.join("\n");
+}
+var CreatePullRequestReview = type({
+  pull_number: type.number.describe("The pull request number to review"),
+  body: type.string.describe(
+    "1-2 sentence high-level summary with urgency level, critical callouts, and feedback about code outside the diff. Specific feedback on diff lines goes in 'comments' array."
+  ).optional(),
+  approved: type.boolean.describe(
+    "Set to true to submit as an approval. ONLY when the review contains no actionable feedback \u2014 neither inline comments nor actionable content in the body. Defaults to false (comment-only review). Rejections are not supported."
+  ).optional(),
+  commit_id: type.string.describe("Optional SHA of the commit being reviewed. Defaults to latest.").optional(),
+  comments: type({
+    path: type.string.describe(
+      "The file path to comment on (relative to repo root). Must be a file that appears in the PR diff."
+    ),
+    line: type.number.describe(
+      "Line number to comment on. For multi-line ranges, this is the end line. Use NEW column from diff format."
+    ),
+    side: type.enumerated("LEFT", "RIGHT").describe(
+      "Side of the diff: LEFT (old code, lines starting with -) or RIGHT (new code, lines starting with + or unchanged). Defaults to RIGHT."
+    ).optional(),
+    body: type.string.describe("Explanatory comment text (optional if suggestion is provided)").optional(),
+    suggestion: type.string.describe(
+      "Full replacement code for the line range [start_line, line]. MUST preserve the exact indentation of the original code."
+    ).optional(),
+    start_line: type.number.describe(
+      "Start line for multi-line comment ranges. Omit for single-line comments. The range [start_line, line] defines which lines a suggestion replaces."
+    ).optional()
+  }).array().describe(
+    "Inline comments on lines within diff hunks. Feedback about code outside the diff goes in 'body' instead."
+  ).optional()
+});
+function CreatePullRequestReviewTool(ctx) {
+  return tool({
+    name: "create_pull_request_review",
+    description: `Submit a review for an existing pull request. Each call creates a permanent, visible review on the PR \u2014 NEVER submit test or diagnostic reviews. Reviews with no body AND no comments are silently skipped (nothing to post). IMPORTANT: 95%+ of feedback should be in 'comments' array with file paths and line numbers. Only use 'body' for a 1-2 sentence summary with urgency and critical callouts. Use 'suggestion' to propose replacement code - MUST preserve exact indentation of original code. The first submission may error once with a one-time diff-coverage nudge listing unread TOC regions \u2014 retry with the same arguments and the pre-flight will not block again. Example replacing lines 42-44 (3 lines) with 5 lines: { path: 'src/api.ts', start_line: 42, line: 44, suggestion: '    const result = await fetch(url);\\n    if (!result.ok) {\\n      log.error(result.status);\\n      throw new Error("request failed");\\n    }' } CONSTRAINT: Inline comments can ONLY target files and lines that appear in the PR diff. Comments anchored outside a diff hunk are dropped automatically (with a note appended to the review body) \u2014 the rest of the review still posts.`,
+    parameters: CreatePullRequestReview,
+    execute: execute(async ({ pull_number, body, approved, commit_id, comments = [] }) => {
+      if (body) body = fixDoubleEscapedString(body);
+      ctx.toolState.issueNumber = pull_number;
+      const skip = reviewSkipDecision({
+        approved: approved ?? false,
+        body,
+        hasComments: comments.length > 0,
+        prApproveEnabled: ctx.prApproveEnabled
+      });
+      if (skip) {
+        log.info(`skipping review submission: ${skip.reason}`);
+        return { success: true, skipped: true, reason: skip.reason };
+      }
+      let event = approved ? "APPROVE" : "COMMENT";
+      if (event === "APPROVE" && !ctx.prApproveEnabled) {
+        log.info("prApproveEnabled is disabled \u2014 downgrading APPROVE to COMMENT");
+        event = "COMMENT";
+      }
+      const params = {
+        owner: ctx.repo.owner,
+        repo: ctx.repo.name,
+        pull_number,
+        event
+      };
+      let latestHeadSha;
+      if (commit_id) {
+        params.commit_id = commit_id;
+      } else {
+        const pr = await ctx.octokit.rest.pulls.get({
+          owner: ctx.repo.owner,
+          repo: ctx.repo.name,
+          pull_number
+        });
+        latestHeadSha = pr.data.head.sha;
+        params.commit_id = ctx.toolState.checkoutSha ?? latestHeadSha;
+        if (ctx.toolState.checkoutSha && latestHeadSha !== ctx.toolState.checkoutSha) {
+          log.info(
+            `anchoring review to checkout ${ctx.toolState.checkoutSha.slice(0, 7)} (HEAD is now ${latestHeadSha.slice(0, 7)})`
+          );
+        }
+      }
+      runDiffCoveragePreflight({ ctx });
+      const reviewComments = comments.map((comment) => {
+        let commentBody = fixDoubleEscapedString(comment.body || "");
+        if (comment.suggestion !== void 0) {
+          const suggestionBlock = "```suggestion\n" + comment.suggestion + "\n```";
+          commentBody = commentBody ? commentBody + "\n\n" + suggestionBlock : suggestionBlock;
+        }
+        const side = comment.side || "RIGHT";
+        const reviewComment = {
+          path: comment.path,
+          line: comment.line,
+          body: commentBody,
+          side
+        };
+        if (comment.start_line != null && comment.start_line !== comment.line) {
+          reviewComment.start_line = comment.start_line;
+          reviewComment.start_side = side;
+        }
+        return reviewComment;
+      });
+      let droppedComments = [];
+      if (reviewComments.length > 0) {
+        const commentableMap = await buildCommentableMap(ctx, pull_number);
+        const validation = validateInlineComments(reviewComments, commentableMap);
+        droppedComments = validation.dropped;
+        if (droppedComments.length > 0) {
+          log.info(
+            `dropping ${droppedComments.length}/${reviewComments.length} inline comment(s) that do not anchor to PR diff lines`
+          );
+        }
+        params.comments = validation.valid;
+      }
+      if (droppedComments.length > 0) {
+        const note = formatDroppedCommentsNote(droppedComments);
+        body = body ? body + note : note.replace(/^\n\n/, "");
+      }
+      if (!approved && !body && !params.comments?.length) {
+        log.info("review has no body and all inline comments were dropped \u2014 skipping submission");
+        return {
+          success: true,
+          skipped: true,
+          reason: "all inline comments were invalid \u2014 nothing to post",
+          droppedComments
+        };
+      }
+      let result;
+      try {
+        result = body ? await createAndSubmitWithFooter(ctx, params, {
+          body,
+          approved: approved ?? false,
+          hasComments: (params.comments?.length ?? 0) > 0
+        }) : await createReviewWithStrandedRecovery(ctx, params);
+      } catch (err) {
+        if (getHttpStatus(err) !== 422 || !params.comments?.length) throw err;
+        const details = params.comments.map((c2) => {
+          const line = c2.line ?? 0;
+          const startLine = c2.start_line ?? line;
+          const range2 = startLine !== line ? `${startLine}-${line}` : `${line}`;
+          return `${c2.path}:${range2} (${c2.side ?? "RIGHT"})`;
+        });
+        const rawMsg = err instanceof Error ? err.message : String(err);
+        const checkoutRef = formatMcpToolRef(ctx.agentId, "checkout_pr");
+        throw new Error(
+          `GitHub rejected the review with 422 even after pre-validation. Likely causes (check "GitHub said" below to narrow down): (1) new commits pushed after pre-validation \u2014 call \`${checkoutRef}\` again to refresh the diff snapshot, then resubmit; (2) the review body exceeded GitHub's ~65KB limit \u2014 shorten it and retry; (3) a \`suggestion\` block is malformed (missing backticks, extra backticks, or wrong indentation) \u2014 inspect the affected comments below. If none apply, move the failing comments into the review body as text so the rest still posts. Affected comments: ${details.join(", ")}. GitHub said: ${rawMsg}`,
+          { cause: err }
+        );
+      }
+      log.debug(`createReview response: ${JSON.stringify(result.data)}`);
+      if (!result.data.id) {
+        throw new Error(`createReview returned invalid data: ${JSON.stringify(result.data)}`);
+      }
+      const reviewId = result.data.id;
+      const reviewNodeId = result.data.node_id;
+      const actuallyReviewedSha = ctx.toolState.checkoutSha ?? params.commit_id;
+      ctx.toolState.review = {
+        id: reviewId,
+        nodeId: reviewNodeId,
+        reviewedSha: actuallyReviewedSha
+      };
+      if (ctx.toolState.checkoutSha && latestHeadSha && latestHeadSha !== ctx.toolState.checkoutSha) {
+        const fromSha = ctx.toolState.checkoutSha;
+        const toSha = latestHeadSha;
+        ctx.toolState.beforeSha = fromSha;
+        ctx.toolState.checkoutSha = toSha;
+        log.info(
+          `new commits detected during review: ${fromSha.slice(0, 7)}..${toSha.slice(0, 7)}`
+        );
+        return {
+          success: true,
+          reviewId,
+          html_url: result.data.html_url,
+          state: result.data.state,
+          user: result.data.user?.login,
+          submitted_at: result.data.submitted_at,
+          droppedComments: droppedComments.length > 0 ? droppedComments : void 0,
+          newCommits: {
+            from: fromSha,
+            to: toSha,
+            instructions: `new commits were pushed while you were reviewing. call \`${formatMcpToolRef(ctx.agentId, "checkout_pr")}\` again to fetch the latest version \u2014 it will compute the incremental diff automatically. submit another review covering only the new changes. do not repeat feedback from your previous review.`
+          }
+        };
+      }
+      return {
+        success: true,
+        reviewId,
+        html_url: result.data.html_url,
+        state: result.data.state,
+        user: result.data.user?.login,
+        submitted_at: result.data.submitted_at,
+        droppedComments: droppedComments.length > 0 ? droppedComments : void 0
+      };
+    })
+  });
+}
+function runDiffCoveragePreflight(params) {
+  const coverageState = params.ctx.toolState.diffCoverage;
+  if (!coverageState) {
+    log.debug("diff coverage pre-flight skipped: no diffCoverage state present in toolState");
+    return;
+  }
+  if (coverageState.coveragePreflightRan) {
+    log.debug("diff coverage pre-flight skipped: already ran in this session");
+    return;
+  }
+  coverageState.coveragePreflightRan = true;
+  log.debug(
+    `diff coverage pre-flight start: diffPath=${coverageState.diffPath}, totalLines=${coverageState.totalLines}, tocEntries=${coverageState.tocEntries.length}, coveredRanges=${coverageState.coveredRanges.length}`
+  );
+  const breakdown = getDiffCoverageBreakdown({ state: coverageState });
+  const unread = [];
+  let unreadLines = 0;
+  for (const file2 of breakdown.files) {
+    if (file2.unreadRanges.length === 0) continue;
+    const rangesText = file2.unreadRanges.map((range2) => `${range2.startLine}-${range2.endLine}`).join(", ");
+    const fileUnreadLines = countLinesInRanges({ ranges: file2.unreadRanges });
+    unread.push({ path: file2.filename, ranges: rangesText, unreadLines: fileUnreadLines });
+    unreadLines += fileUnreadLines;
+  }
+  coverageState.lastBreakdown = renderDiffCoverageBreakdown({
+    diffPath: coverageState.diffPath,
+    breakdown
+  });
+  log.debug(
+    `diff coverage pre-flight breakdown: coveredLines=${breakdown.coveredLines}, unreadLines=${unreadLines}`
+  );
+  if (unreadLines === 0) {
+    log.debug("diff coverage pre-flight passed: no unread regions");
+    return;
+  }
+  log.info(
+    `diff coverage pre-flight nudge: unread lines=${unreadLines}, unread files=${unread.length}`
+  );
+  const unreadText = unread.map((entry) => `- ${entry.path} (${entry.unreadLines} lines, ${entry.ranges})`).join("\n");
+  throw new Error(
+    `diff coverage pre-flight: some TOC regions were not read before review submission. this is a one-time nudge \u2014 optionally read the ranges below from ${coverageState.diffPath}, then call create_pull_request_review again with the same arguments. this pre-flight will not block again in this review session.
+
+unread TOC regions:
+${unreadText}
+
+${coverageState.lastBreakdown}`
+  );
+}
+async function clearStrandedPendingReview(ctx, params) {
+  const originalErr = params.originalErr;
+  const msg = originalErr instanceof Error ? originalErr.message.toLowerCase() : "";
+  if (getHttpStatus(originalErr) !== 422 || !msg.includes("pending review")) throw originalErr;
+  const reviews = await ctx.octokit.paginate(ctx.octokit.rest.pulls.listReviews, {
+    owner: params.owner,
+    repo: params.repo,
+    pull_number: params.pull_number,
+    per_page: 100
+  }).catch((listErr) => {
+    log.info(
+      `\xBB listReviews failed during pending-review cleanup, surfacing original 422: ${listErr instanceof Error ? listErr.message : String(listErr)}`
+    );
+    throw originalErr;
+  });
+  const leftover = reviews.find((r) => r.state === "PENDING");
+  if (!leftover?.id) throw originalErr;
+  log.info(
+    `\xBB clearing leftover pending review ${leftover.id} (likely stranded by a killed prior run)`
+  );
+  try {
+    await ctx.octokit.rest.pulls.deletePendingReview({
+      owner: params.owner,
+      repo: params.repo,
+      pull_number: params.pull_number,
+      review_id: leftover.id
+    });
+  } catch (cleanupErr) {
+    const cleanupStatus = getHttpStatus(cleanupErr);
+    if (cleanupStatus !== 404 && cleanupStatus !== 422) throw cleanupErr;
+    log.debug(`\xBB delete of leftover pending ${leftover.id} no-op (status ${cleanupStatus})`);
+  }
+}
+async function createReviewWithStrandedRecovery(ctx, params) {
+  try {
+    return await ctx.octokit.rest.pulls.createReview(params);
+  } catch (err) {
+    await clearStrandedPendingReview(ctx, {
+      owner: params.owner,
+      repo: params.repo,
+      pull_number: params.pull_number,
+      originalErr: err
+    });
+    return await ctx.octokit.rest.pulls.createReview(params);
+  }
+}
+async function createAndSubmitWithFooter(ctx, params, opts) {
+  const { event: _2, ...pendingParams } = params;
+  let pending;
+  try {
+    pending = await ctx.octokit.rest.pulls.createReview(pendingParams);
+  } catch (err) {
+    await clearStrandedPendingReview(ctx, {
+      owner: params.owner,
+      repo: params.repo,
+      pull_number: params.pull_number,
+      originalErr: err
+    });
+    pending = await ctx.octokit.rest.pulls.createReview(pendingParams);
+  }
+  if (!pending.data.id) {
+    throw new Error(`createReview returned invalid data: ${JSON.stringify(pending.data)}`);
+  }
+  try {
+    const customParts = [];
+    if (!opts.approved) {
+      const apiUrl = getApiUrl();
+      if (opts.hasComments) {
+        const fixAllUrl = `${apiUrl}/trigger/${ctx.repo.owner}/${ctx.repo.name}/${params.pull_number}?action=fix&review_id=${pending.data.id}`;
+        const fixApprovedUrl = `${apiUrl}/trigger/${ctx.repo.owner}/${ctx.repo.name}/${params.pull_number}?action=fix-approved&review_id=${pending.data.id}`;
+        customParts.push(`[Fix all \u2794](${fixAllUrl})`, `[Fix \u{1F44D}s \u2794](${fixApprovedUrl})`);
+      } else {
+        const fixUrl = `${apiUrl}/trigger/${ctx.repo.owner}/${ctx.repo.name}/${params.pull_number}?action=fix&review_id=${pending.data.id}`;
+        customParts.push(`[Fix it \u2794](${fixUrl})`);
+      }
+    }
+    const footer = buildPullfrogFooter({
+      workflowRun: ctx.runId ? { owner: ctx.repo.owner, repo: ctx.repo.name, runId: ctx.runId, jobId: ctx.jobId } : void 0,
+      customParts,
+      model: ctx.toolState.model
+    });
+    return await ctx.octokit.rest.pulls.submitReview({
+      owner: params.owner,
+      repo: params.repo,
+      pull_number: params.pull_number,
+      review_id: pending.data.id,
+      event: params.event,
+      body: opts.body + footer
+    });
+  } catch (err) {
+    try {
+      await ctx.octokit.rest.pulls.deletePendingReview({
+        owner: params.owner,
+        repo: params.repo,
+        pull_number: params.pull_number,
+        review_id: pending.data.id
+      });
+      log.debug(`\xBB deleted leftover pending review ${pending.data.id} after failure`);
+    } catch (cleanupErr) {
+      log.debug(
+        `\xBB failed to delete pending review ${pending.data.id}: ${cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr)}`
+      );
+    }
+    throw err;
+  }
+}
+async function reportReviewNodeId(ctx, params) {
+  await patchWorkflowRunFields(ctx, { reviewNodeId: params.nodeId });
+}
+
 // mcp/checkout.ts
 function formatFilesWithLineNumbers(files) {
   const output = [];
@@ -142523,7 +143980,10 @@ function formatFilesWithLineNumbers(files) {
   }
   const tocLines = [`## Files (${files.length})`];
   for (const entry of tocEntries) {
-    tocLines.push(`- ${entry.filename} \u2192 lines ${entry.startLine}-${entry.endLine}`);
+    const anchor = createHash2("sha256").update(entry.filename).digest("hex");
+    tocLines.push(
+      `- ${entry.filename} \u2192 lines ${entry.startLine}-${entry.endLine} \xB7 diff-${anchor}`
+    );
   }
   tocLines.push("");
   tocLines.push("---");
@@ -142545,7 +144005,7 @@ async function fetchAndFormatPrDiff(ctx, pullNumber) {
     pull_number: pullNumber,
     per_page: 100
   });
-  return formatFilesWithLineNumbers(files);
+  return { ...formatFilesWithLineNumbers(files), files };
 }
 async function createTempBranch(params) {
   const response = await params.octokit.rest.git.createRef({
@@ -142612,6 +144072,8 @@ async function ensureBeforeShaReachable(params) {
 async function checkoutPrBranch(pr, params) {
   const { octokit, owner, name, gitToken, toolState, beforeSha } = params;
   log.info(`\xBB checking out PR #${pr.number}...`);
+  rejectIfLeadingDash(pr.baseRef, "PR base ref");
+  rejectIfLeadingDash(pr.headRef, "PR head ref");
   const isFork = pr.headRepoFullName !== pr.baseRepoFullName;
   const localBranch = `pr-${pr.number}`;
   const isShallow = $("git", ["rev-parse", "--is-shallow-repository"], { log: false }).trim() === "true";
@@ -142622,7 +144084,7 @@ async function checkoutPrBranch(pr, params) {
   if (!alreadyOnBranch) {
     $("git", ["checkout", "-B", pr.baseRef, `origin/${pr.baseRef}`], { log: false });
     log.debug(`\xBB fetching PR #${pr.number} (${localBranch})...`);
-    await $git("fetch", ["--no-tags", "origin", `pull/${pr.number}/head:${localBranch}`], {
+    await $git("fetch", ["--no-tags", "origin", `+pull/${pr.number}/head:${localBranch}`], {
       token: gitToken
     });
     $("git", ["checkout", localBranch], { log: false });
@@ -142705,10 +144167,11 @@ async function checkoutPrBranch(pr, params) {
     remoteBranch: pr.headRef,
     localBranch
   };
-  await executeLifecycleHook({
+  const postCheckoutHook = await executeLifecycleHook({
     event: "post-checkout",
     script: params.postCheckoutScript
   });
+  return { hookWarning: postCheckoutHook.warning };
 }
 function CheckoutPrTool(ctx) {
   return tool({
@@ -142734,7 +144197,7 @@ function CheckoutPrTool(ctx) {
         baseRepoFullName: prResponse.data.base.repo.full_name,
         maintainerCanModify: prResponse.data.maintainer_can_modify
       };
-      await checkoutPrBranch(pr, {
+      const checkoutResult = await checkoutPrBranch(pr, {
         octokit: ctx.octokit,
         owner: ctx.repo.owner,
         name: ctx.repo.name,
@@ -142777,11 +144240,49 @@ ${diffPreview}`);
       const diffPath = join3(tempDir, `pr-${pull_number}-${headShort}.diff`);
       writeFileSync(diffPath, formatResult.content);
       log.debug(`wrote diff to ${diffPath} (${formatResult.content.length} bytes)`);
+      ctx.toolState.diffCoverage = createDiffCoverageState({
+        diffPath,
+        totalLines: countLines({ content: formatResult.content }),
+        toc: formatResult.toc
+      });
+      log.debug(
+        `\xBB diff coverage initialized: diffPath=${diffPath}, totalLines=${ctx.toolState.diffCoverage.totalLines}, tocEntries=${ctx.toolState.diffCoverage.tocEntries.length}`
+      );
+      const cached4 = /* @__PURE__ */ new Map();
+      for (const file2 of formatResult.files) {
+        cached4.set(file2.filename, commentableLinesForFile(file2.patch));
+      }
+      ctx.toolState.commentableLinesByFile = cached4;
+      ctx.toolState.commentableLinesPullNumber = pull_number;
+      ctx.toolState.commentableLinesCheckoutSha = ctx.toolState.checkoutSha;
       const incrementalInstructions = incrementalDiffPath ? ` IMPORTANT: incrementalDiffPath contains ONLY the changes since the last reviewed version (computed via range-diff). you MUST read incrementalDiffPath FIRST to understand what changed, then use diffPath for full PR context. do NOT skip the incremental diff.` : "";
+      const COMMIT_LOG_MAX = 200;
+      const baseRange = `origin/${pr.baseRef}..HEAD`;
+      let commitCount = 0;
+      let commitLog = "";
+      let commitLogUnavailable = false;
+      try {
+        commitCount = parseInt(
+          $("git", ["rev-list", "--count", baseRange], { log: false }).trim() || "0",
+          10
+        );
+        commitLog = $("git", ["log", "--oneline", `--max-count=${COMMIT_LOG_MAX}`, baseRange], {
+          log: false
+        });
+      } catch (err) {
+        commitLogUnavailable = true;
+        log.debug(
+          `\xBB unable to compute commit metadata for ${baseRange}: ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+      const commitLogTruncated = commitCount > COMMIT_LOG_MAX;
+      const hookWarningInstructions = checkoutResult.hookWarning ? ` HOOK WARNING: the post-checkout lifecycle hook reported a non-fatal failure (see hookWarning). decide whether to retry based on the guidance in that field before proceeding.` : "";
+      const commitLogInstructions = commitLogUnavailable ? ` NOTE: commit metadata is partial (base ref unreachable, likely a shallow fetch). commitCount/commitLog may be 0/empty or incomplete; treat them as "unknown" rather than "no commits", and use \`git log\` directly if you need the full history.` : commitLogTruncated ? ` NOTE: commitLog was capped at ${COMMIT_LOG_MAX} entries out of ${commitCount} commits; use \`git log\` directly if you need the full history.` : "";
       return {
         success: true,
         number: prResponse.data.number,
         title: prResponse.data.title,
+        body: prResponse.data.body,
         base: pr.baseRef,
         localBranch: `pr-${pull_number}`,
         remoteBranch: `refs/heads/${pr.headRef}`,
@@ -142792,7 +144293,12 @@ ${diffPreview}`);
         diffPath,
         incrementalDiffPath,
         toc: formatResult.toc,
-        instructions: `the diff file at diffPath contains a table of contents (TOC) at the top listing every changed file with its line range. use the line ranges to read specific files from the diff instead of reading the entire file. for example, if the TOC says "src/foo.ts \u2192 lines 5-42", read lines 5-42 from diffPath to see that file's changes. review files selectively based on relevance rather than reading everything sequentially. the local branch is 'localBranch' (pr-{number}), not the remote branch name. when pushing, omit branchName to use the current branch. do not use remoteBranch as a local branch name.` + incrementalInstructions
+        commitCount,
+        commitLog,
+        commitLogTruncated,
+        commitLogUnavailable,
+        hookWarning: checkoutResult.hookWarning,
+        instructions: `the diff file at diffPath contains a table of contents (TOC) at the top listing every changed file with its line range. use the TOC line ranges as your checklist and read specific files from the diff instead of reading the entire file. for example, if the TOC says "src/foo.ts \u2192 lines 5-42", read lines 5-42 from diffPath to see that file's changes. review files selectively based on relevance rather than reading everything sequentially. to inspect the PR's changed files, use diffPath \u2014 do NOT run \`git diff <base>..<head>\` to re-derive what's already in diffPath. the formatted diff with line numbers is authoritative. \`git log\` and \`git diff --stat\` are fine for commit-range overview, and \`git diff\` / \`git diff --cached\` are fine for inspecting *your own* uncommitted changes \u2014 but PR review content MUST come from diffPath. before your review is submitted, a one-time coverage pre-flight may error listing unread TOC regions. retry the same create_pull_request_review call to proceed \u2014 optionally after reading the listed ranges. the pre-flight will not block again this session. the local branch is 'localBranch' (pr-{number}), not the remote branch name. when pushing, omit branchName to use the current branch. do not use remoteBranch as a local branch name.` + incrementalInstructions + hookWarningInstructions + commitLogInstructions
       };
     })
   });
@@ -143020,244 +144526,6 @@ function CommitInfoTool(ctx) {
   });
 }
 
-// mcp/git.ts
-function getPushDestination(branch, storedDest) {
-  if (storedDest && storedDest.localBranch === branch) {
-    log.debug(`using stored push destination: ${storedDest.remoteName}/${storedDest.remoteBranch}`);
-    const url4 = $("git", ["remote", "get-url", "--push", storedDest.remoteName], {
-      log: false
-    }).trim();
-    return { remoteName: storedDest.remoteName, remoteBranch: storedDest.remoteBranch, url: url4 };
-  }
-  try {
-    const pushRemote = $("git", ["config", `branch.${branch}.pushRemote`], { log: false }).trim();
-    const merge4 = $("git", ["config", `branch.${branch}.merge`], { log: false }).trim();
-    const remoteBranch = merge4.replace(/^refs\/heads\//, "");
-    const url4 = $("git", ["remote", "get-url", "--push", pushRemote], { log: false }).trim();
-    return { remoteName: pushRemote, remoteBranch, url: url4 };
-  } catch {
-    log.debug(`no push config for ${branch}, falling back to origin/${branch}`);
-    const url4 = $("git", ["remote", "get-url", "--push", "origin"], { log: false }).trim();
-    return { remoteName: "origin", remoteBranch: branch, url: url4 };
-  }
-}
-function normalizeUrl(url4) {
-  return url4.replace(/\.git$/, "").toLowerCase();
-}
-function validatePushDestination(ctx, branch) {
-  const pushUrl = ctx.toolState.pushUrl;
-  if (!pushUrl) throw new Error("pushUrl not set - setupGit must run before push_branch");
-  const dest = getPushDestination(branch, ctx.toolState.pushDest);
-  if (normalizeUrl(dest.url) !== normalizeUrl(pushUrl)) {
-    throw new Error(
-      `Push blocked: destination does not match expected repository.
-Expected: ${pushUrl}
-Actual: ${dest.url}
-Git configuration may have been tampered with.`
-    );
-  }
-  return dest;
-}
-var PushBranch = type({
-  branchName: type.string.describe("The branch name to push (defaults to current branch)").optional(),
-  force: type.boolean.describe("Force push (use with caution)").default(false)
-});
-function PushBranchTool(ctx) {
-  const defaultBranch = ctx.repo.data.default_branch || "main";
-  const pushPermission = ctx.payload.push;
-  return tool({
-    name: "push_branch",
-    description: "Push the current branch to the remote repository. Omit branchName to push the current branch (recommended). If specifying branchName, use the LOCAL branch name (e.g., 'pr-1'), not the remote branch name. The correct remote and remote branch are determined automatically from branch config set by checkout_pr. Requires a clean working tree. Runs the repository prepush hook (if configured) before the network push \u2014 hook failure means tests/lint or similar in that script failed, not necessarily a Pullfrog timeout. Never force push unless explicitly requested. Pushes to the default branch are blocked in restricted mode.",
-    parameters: PushBranch,
-    execute: execute(async ({ branchName, force }) => {
-      if (pushPermission === "disabled") {
-        throw new Error("Push is disabled. This repository is configured for read-only access.");
-      }
-      const branch = branchName || $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
-      const status = $("git", ["status", "--porcelain"], { log: false });
-      if (status) {
-        throw new Error(
-          `push blocked: working tree is not clean (tracked changes and/or untracked files). commit, discard, or remove stray artifacts before pushing.
-
-git status:
-${status}`
-        );
-      }
-      const pushDest = validatePushDestination(ctx, branch);
-      if (pushPermission === "restricted" && pushDest.remoteBranch === defaultBranch) {
-        throw new Error(
-          `Push blocked: cannot push directly to default branch '${pushDest.remoteBranch}'. Create a feature branch and open a PR instead.`
-        );
-      }
-      const refspec = branch === pushDest.remoteBranch ? branch : `${branch}:${pushDest.remoteBranch}`;
-      const pushArgs = force ? ["--force", "-u", pushDest.remoteName, refspec] : ["-u", pushDest.remoteName, refspec];
-      await executeLifecycleHook({ event: "prepush", script: ctx.prepushScript });
-      log.debug(`pushing ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch}`);
-      if (force) {
-        log.warning(`force pushing - this will overwrite remote history`);
-      }
-      try {
-        await $git("push", pushArgs, {
-          token: ctx.gitToken
-        });
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (msg.includes("fetch first") || msg.includes("non-fast-forward")) {
-          throw new Error(
-            `push rejected: the remote branch '${pushDest.remoteBranch}' has new commits you don't have locally.
-
-to resolve this:
-1. use git_fetch to fetch the remote branch: git_fetch({ ref: "${pushDest.remoteBranch}" })
-2. use the git tool to rebase your changes: git({ subcommand: "rebase", args: ["origin/${pushDest.remoteBranch}"] })
-3. resolve any merge conflicts if needed
-4. retry push_branch`
-          );
-        }
-        throw err;
-      }
-      return {
-        success: true,
-        branch,
-        remoteBranch: pushDest.remoteBranch,
-        remote: pushDest.remoteName,
-        force,
-        message: `successfully pushed ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch}`
-      };
-    })
-  });
-}
-var AUTH_REQUIRED_REDIRECT = {
-  push: "use the push_branch tool instead \u2014 it handles authentication and permission checks.",
-  fetch: "use the git_fetch tool instead \u2014 it handles authentication.",
-  pull: "use git_fetch to fetch the remote ref, then use this git tool with subcommand 'merge' or 'rebase' locally.",
-  clone: "the repository is already cloned. use checkout_pr for PR branches."
-};
-var NOSHELL_BLOCKED_SUBCOMMANDS = {
-  config: "Blocked: git config can set up filter drivers or hooks that execute arbitrary code.",
-  submodule: "Blocked: git submodule can reference malicious repositories and execute code on update.",
-  "update-index": "Blocked: git update-index can modify index entries in ways that bypass file protections.",
-  "filter-branch": "Blocked: git filter-branch executes arbitrary code on repository history.",
-  replace: "Blocked: git replace can redirect object lookups.",
-  // subcommands that accept --exec or similar flags for arbitrary code execution
-  rebase: "Blocked: git rebase --exec can execute arbitrary shell commands.",
-  bisect: "Blocked: git bisect run can execute arbitrary shell commands."
-};
-var NOSHELL_BLOCKED_ARGS = ["--exec", "--extcmd", "--upload-pack", "--receive-pack"];
-var COLLAPSE_THRESHOLD = 200;
-var subcommandPattern = regex("^[a-z][a-z0-9-]*$");
-var Git = type({
-  subcommand: type(subcommandPattern).describe("Git subcommand (e.g., 'status', 'log', 'diff')"),
-  args: type.string.array().describe("Additional arguments for the git command").optional()
-});
-function GitTool(ctx) {
-  return tool({
-    name: "git",
-    description: "Run git commands. For push/fetch/pull, use the dedicated MCP tools instead (push_branch, git_fetch).",
-    parameters: Git,
-    execute: execute(async (params) => {
-      const subcommand = params.subcommand;
-      const args2 = params.args ?? [];
-      const redirect = AUTH_REQUIRED_REDIRECT[subcommand];
-      if (redirect) {
-        throw new Error(`git ${subcommand} is not available through this tool \u2014 ${redirect}`);
-      }
-      if (ctx.payload.shell === "disabled") {
-        const blocked = NOSHELL_BLOCKED_SUBCOMMANDS[subcommand];
-        if (blocked) {
-          throw new Error(blocked);
-        }
-        for (const arg4 of args2) {
-          const isBlocked = NOSHELL_BLOCKED_ARGS.some(
-            (flag) => arg4 === flag || arg4.startsWith(flag + "=")
-          );
-          if (isBlocked) {
-            throw new Error(
-              `Blocked: '${arg4}' flag can execute arbitrary code and is not allowed.`
-            );
-          }
-        }
-      }
-      const output = $("git", [subcommand, ...args2], { log: false });
-      const lineCount = output.split("\n").length;
-      if (lineCount > COLLAPSE_THRESHOLD) {
-        log.group(`git ${subcommand} output (${lineCount} lines)`, () => {
-          log.info(output);
-        });
-      } else if (output) {
-        log.info(output);
-      }
-      return { success: true, output };
-    })
-  });
-}
-var GitFetch = type({
-  ref: type.string.describe("Ref to fetch: branch name, tag, or 'pull/N/head' for PRs"),
-  depth: type.number.describe("Fetch depth (for shallow clones)").optional()
-});
-function GitFetchTool(ctx) {
-  return tool({
-    name: "git_fetch",
-    description: "Fetch refs from remote repository. Use this instead of git fetch directly.",
-    parameters: GitFetch,
-    execute: execute(async (params) => {
-      const fetchArgs = ["--no-tags", "origin", params.ref];
-      if (params.depth !== void 0) {
-        fetchArgs.push(`--depth=${params.depth}`);
-      }
-      await $git("fetch", fetchArgs, {
-        token: ctx.gitToken
-      });
-      return { success: true, ref: params.ref };
-    })
-  });
-}
-var DeleteBranch = type({
-  branchName: type.string.describe("Remote branch to delete")
-});
-function DeleteBranchTool(ctx) {
-  const pushPermission = ctx.payload.push;
-  return tool({
-    name: "delete_branch",
-    description: "Delete a remote branch. Requires push: enabled permission.",
-    parameters: DeleteBranch,
-    execute: execute(async (params) => {
-      if (pushPermission !== "enabled") {
-        throw new Error(
-          "Branch deletion requires push: enabled permission. Current mode only allows pushing to non-protected branches."
-        );
-      }
-      await $git("push", ["origin", "--delete", params.branchName], {
-        token: ctx.gitToken
-      });
-      return { success: true, deleted: params.branchName };
-    })
-  });
-}
-var PushTags = type({
-  tag: type.string.describe("Tag name to push"),
-  force: type.boolean.describe("Force push the tag").default(false)
-});
-function PushTagsTool(ctx) {
-  const pushPermission = ctx.payload.push;
-  return tool({
-    name: "push_tags",
-    description: "Push a tag to remote. Requires push: enabled permission.",
-    parameters: PushTags,
-    execute: execute(async (params) => {
-      if (pushPermission !== "enabled") {
-        throw new Error(
-          "Tag pushing requires push: enabled permission. Current mode only allows pushing branches."
-        );
-      }
-      const pushArgs = [...params.force ? ["-f"] : [], "origin", `refs/tags/${params.tag}`];
-      await $git("push", pushArgs, {
-        token: ctx.gitToken
-      });
-      return { success: true, tag: params.tag };
-    })
-  });
-}
-
 // mcp/issue.ts
 var Issue = type({
   title: type.string.describe("the title of the issue"),
@@ -143720,221 +144988,6 @@ function PullRequestInfoTool(ctx) {
   });
 }
 
-// mcp/review.ts
-function getHttpStatus(err) {
-  if (typeof err !== "object" || err === null) return void 0;
-  const status = err.status;
-  return typeof status === "number" ? status : void 0;
-}
-var CreatePullRequestReview = type({
-  pull_number: type.number.describe("The pull request number to review"),
-  body: type.string.describe(
-    "1-2 sentence high-level summary with urgency level, critical callouts, and feedback about code outside the diff. Specific feedback on diff lines goes in 'comments' array."
-  ).optional(),
-  approved: type.boolean.describe(
-    "Set to true to submit as an approval. ONLY when the review contains no actionable feedback \u2014 neither inline comments nor actionable content in the body. Defaults to false (comment-only review). Rejections are not supported."
-  ).optional(),
-  commit_id: type.string.describe("Optional SHA of the commit being reviewed. Defaults to latest.").optional(),
-  comments: type({
-    path: type.string.describe(
-      "The file path to comment on (relative to repo root). Must be a file that appears in the PR diff."
-    ),
-    line: type.number.describe(
-      "Line number to comment on. For multi-line ranges, this is the end line. Use NEW column from diff format."
-    ),
-    side: type.enumerated("LEFT", "RIGHT").describe(
-      "Side of the diff: LEFT (old code, lines starting with -) or RIGHT (new code, lines starting with + or unchanged). Defaults to RIGHT."
-    ).optional(),
-    body: type.string.describe("Explanatory comment text (optional if suggestion is provided)").optional(),
-    suggestion: type.string.describe(
-      "Full replacement code for the line range [start_line, line]. MUST preserve the exact indentation of the original code."
-    ).optional(),
-    start_line: type.number.describe(
-      "Start line for multi-line comment ranges. Omit for single-line comments. The range [start_line, line] defines which lines a suggestion replaces."
-    ).optional()
-  }).array().describe(
-    "Inline comments on lines within diff hunks. Feedback about code outside the diff goes in 'body' instead."
-  ).optional()
-});
-function CreatePullRequestReviewTool(ctx) {
-  return tool({
-    name: "create_pull_request_review",
-    description: `Submit a review for an existing pull request. Each call creates a permanent, visible review on the PR \u2014 NEVER submit test or diagnostic reviews. Reviews with no body AND no comments are silently skipped (nothing to post). IMPORTANT: 95%+ of feedback should be in 'comments' array with file paths and line numbers. Only use 'body' for a 1-2 sentence summary with urgency and critical callouts. Use 'suggestion' to propose replacement code - MUST preserve exact indentation of original code. Example replacing lines 42-44 (3 lines) with 5 lines: { path: 'src/api.ts', start_line: 42, line: 44, suggestion: '    const result = await fetch(url);\\n    if (!result.ok) {\\n      log.error(result.status);\\n      throw new Error("request failed");\\n    }' } CONSTRAINT: Inline comments can ONLY target files and lines that appear in the PR diff. If GitHub rejects comments due to incorrect line numbers, re-read the diff and retry.`,
-    parameters: CreatePullRequestReview,
-    execute: execute(async ({ pull_number, body, approved, commit_id, comments = [] }) => {
-      if (body) body = fixDoubleEscapedString(body);
-      if (body && ctx.toolState.selectedMode === "Review" && ctx.toolState.todoTracker) {
-        ctx.toolState.todoTracker.cancel();
-        await ctx.toolState.todoTracker.settled();
-        ctx.toolState.todoTracker.completeInProgress();
-        const collapsible = ctx.toolState.todoTracker.renderCollapsible();
-        if (collapsible) {
-          body = `${body}
-
-${collapsible}`;
-        }
-      }
-      ctx.toolState.issueNumber = pull_number;
-      if (!approved && !body && comments.length === 0) {
-        log.info(
-          "review has no body and no inline comments \u2014 skipping submission (no issues found)"
-        );
-        return {
-          success: true,
-          skipped: true,
-          reason: "no issues found \u2014 nothing to post"
-        };
-      }
-      let event = approved ? "APPROVE" : "COMMENT";
-      if (event === "APPROVE" && !ctx.prApproveEnabled) {
-        log.info("prApproveEnabled is disabled \u2014 downgrading APPROVE to COMMENT");
-        event = "COMMENT";
-      }
-      const params = {
-        owner: ctx.repo.owner,
-        repo: ctx.repo.name,
-        pull_number,
-        event
-      };
-      let latestHeadSha;
-      if (commit_id) {
-        params.commit_id = commit_id;
-      } else {
-        const pr = await ctx.octokit.rest.pulls.get({
-          owner: ctx.repo.owner,
-          repo: ctx.repo.name,
-          pull_number
-        });
-        latestHeadSha = pr.data.head.sha;
-        params.commit_id = ctx.toolState.checkoutSha ?? latestHeadSha;
-        if (ctx.toolState.checkoutSha && latestHeadSha !== ctx.toolState.checkoutSha) {
-          log.info(
-            `anchoring review to checkout ${ctx.toolState.checkoutSha.slice(0, 7)} (HEAD is now ${latestHeadSha.slice(0, 7)})`
-          );
-        }
-      }
-      const reviewComments = comments.map((comment) => {
-        let commentBody = fixDoubleEscapedString(comment.body || "");
-        if (comment.suggestion !== void 0) {
-          const suggestionBlock = "```suggestion\n" + comment.suggestion + "\n```";
-          commentBody = commentBody ? commentBody + "\n\n" + suggestionBlock : suggestionBlock;
-        }
-        const side = comment.side || "RIGHT";
-        const reviewComment = {
-          path: comment.path,
-          line: comment.line,
-          body: commentBody,
-          side
-        };
-        if (comment.start_line != null && comment.start_line !== comment.line) {
-          reviewComment.start_line = comment.start_line;
-          reviewComment.start_side = side;
-        }
-        return reviewComment;
-      });
-      if (reviewComments.length > 0) {
-        params.comments = reviewComments;
-      }
-      let result;
-      try {
-        result = body ? await createAndSubmitWithFooter(ctx, params, {
-          body,
-          approved: approved ?? false,
-          hasComments: reviewComments.length > 0
-        }) : await ctx.octokit.rest.pulls.createReview(params);
-      } catch (err) {
-        if (getHttpStatus(err) !== 422 || !params.comments?.length) throw err;
-        const details = params.comments.map((c2) => {
-          const line = c2.line ?? 0;
-          const startLine = c2.start_line ?? line;
-          const range2 = startLine !== line ? `${startLine}-${line}` : `${line}`;
-          return `${c2.path}:${range2} (${c2.side ?? "RIGHT"})`;
-        });
-        throw new Error(
-          `GitHub rejected inline comment(s) with "Line could not be resolved". This usually means the diff changed since you last read it (new commits pushed). Re-read the diff to get current line numbers, or move failing comments to the review body. Affected: ${details.join(", ")}`
-        );
-      }
-      log.debug(`createReview response: ${JSON.stringify(result.data)}`);
-      if (!result.data.id) {
-        throw new Error(`createReview returned invalid data: ${JSON.stringify(result.data)}`);
-      }
-      const reviewId = result.data.id;
-      const reviewNodeId = result.data.node_id;
-      const actuallyReviewedSha = ctx.toolState.checkoutSha ?? params.commit_id;
-      ctx.toolState.review = {
-        id: reviewId,
-        nodeId: reviewNodeId,
-        reviewedSha: actuallyReviewedSha
-      };
-      if (ctx.toolState.checkoutSha && latestHeadSha && latestHeadSha !== ctx.toolState.checkoutSha) {
-        const fromSha = ctx.toolState.checkoutSha;
-        const toSha = latestHeadSha;
-        ctx.toolState.beforeSha = fromSha;
-        ctx.toolState.checkoutSha = toSha;
-        log.info(
-          `new commits detected during review: ${fromSha.slice(0, 7)}..${toSha.slice(0, 7)}`
-        );
-        return {
-          success: true,
-          reviewId,
-          html_url: result.data.html_url,
-          state: result.data.state,
-          user: result.data.user?.login,
-          submitted_at: result.data.submitted_at,
-          newCommits: {
-            from: fromSha,
-            to: toSha,
-            instructions: `new commits were pushed while you were reviewing. call \`${formatMcpToolRef(ctx.agentId, "checkout_pr")}\` again to fetch the latest version \u2014 it will compute the incremental diff automatically. submit another review covering only the new changes. do not repeat feedback from your previous review.`
-          }
-        };
-      }
-      return {
-        success: true,
-        reviewId,
-        html_url: result.data.html_url,
-        state: result.data.state,
-        user: result.data.user?.login,
-        submitted_at: result.data.submitted_at
-      };
-    })
-  });
-}
-async function createAndSubmitWithFooter(ctx, params, opts) {
-  const { event: _2, ...pendingParams } = params;
-  const pending = await ctx.octokit.rest.pulls.createReview(pendingParams);
-  if (!pending.data.id) {
-    throw new Error(`createReview returned invalid data: ${JSON.stringify(pending.data)}`);
-  }
-  const customParts = [];
-  if (!opts.approved) {
-    const apiUrl = getApiUrl();
-    if (opts.hasComments) {
-      const fixAllUrl = `${apiUrl}/trigger/${ctx.repo.owner}/${ctx.repo.name}/${params.pull_number}?action=fix&review_id=${pending.data.id}`;
-      const fixApprovedUrl = `${apiUrl}/trigger/${ctx.repo.owner}/${ctx.repo.name}/${params.pull_number}?action=fix-approved&review_id=${pending.data.id}`;
-      customParts.push(`[Fix all \u2794](${fixAllUrl})`, `[Fix \u{1F44D}s \u2794](${fixApprovedUrl})`);
-    } else {
-      const fixUrl = `${apiUrl}/trigger/${ctx.repo.owner}/${ctx.repo.name}/${params.pull_number}?action=fix&review_id=${pending.data.id}`;
-      customParts.push(`[Fix it \u2794](${fixUrl})`);
-    }
-  }
-  const footer = buildPullfrogFooter({
-    workflowRun: ctx.runId ? { owner: ctx.repo.owner, repo: ctx.repo.name, runId: ctx.runId, jobId: ctx.jobId } : void 0,
-    customParts,
-    model: ctx.toolState.model
-  });
-  return ctx.octokit.rest.pulls.submitReview({
-    owner: params.owner,
-    repo: params.repo,
-    pull_number: params.pull_number,
-    review_id: pending.data.id,
-    event: params.event,
-    body: opts.body + footer
-  });
-}
-async function reportReviewNodeId(ctx, params) {
-  await patchWorkflowRunFields(ctx, { reviewNodeId: params.nodeId });
-}
-
 // mcp/reviewComments.ts
 import { writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join6 } from "node:path";
@@ -143982,7 +145035,7 @@ query ($owner: String!, $name: String!, $prNumber: Int!) {
   }
 }
 `;
-function countLines(str) {
+function countLines2(str) {
   let count = 1;
   let index = -1;
   while ((index = str.indexOf("\n", index + 1)) !== -1) {
@@ -144124,13 +145177,13 @@ function formatReviewThreads(threadBlocks, header) {
   const reviewBodyLines = [];
   if (header.reviewBody) {
     reviewBodyLines.push("## Review Body", "", header.reviewBody, "");
-    currentLine += reviewBodyLines.reduce((sum, line) => sum + countLines(line), 0);
+    currentLine += reviewBodyLines.reduce((sum, line) => sum + countLines2(line), 0);
   }
   const tocEntries = [];
   const threadLines = [];
   for (const block of threadBlocks) {
     const startLine = currentLine;
-    const actualLineCount = block.content.reduce((sum, line) => sum + countLines(line), 0);
+    const actualLineCount = block.content.reduce((sum, line) => sum + countLines2(line), 0);
     const endLine = currentLine + actualLineCount - 1;
     tocEntries.push(`- ${block.path}:${block.lineRange} \u2192 lines ${startLine}-${endLine}`);
     threadLines.push(...block.content);
@@ -144453,7 +145506,7 @@ GitHub's markdown parser requires a blank line between ALL block-level elements.
 Rules:
 - \`##\` titles and key-change bullet lead-ins are plain-language summaries; backtick only actual code tokens (files, types, functions) where they appear in the title
 - ALL variable names, identifiers, and file names in body text must be in backticks
-- ALL file references MUST link to the PR Files Changed view. Compute anchors by running \`echo -n 'path/to/file.ts' | sha256sum\` via shell for each file. NEVER fabricate hex strings \u2014 run the actual command. If shell is unavailable, omit the #diff- anchor rather than guessing.
+- ALL file references MUST link to the PR Files Changed view. Use the \`diff-<hex>\` anchor precomputed next to each filename in the \`checkout_pr\` TOC \u2014 do NOT run \`sha256sum\` or any other shell command to compute anchors. NEVER fabricate hex strings. If a file is not in the TOC, omit the \`#diff-\` anchor rather than guessing.
 - Add <br/> before each ## heading for visual spacing. Do NOT use horizontal rules (---)
 - Do NOT include raw diff stats like '+123 / -45' or line counts
 - Do NOT include code blocks or repeat diff contents
@@ -144528,7 +145581,7 @@ ${learningsStep(t2, 6)}`
       description: "Review code, PRs, or implementations; provide feedback or suggestions; identify issues; or check code quality, style, and correctness",
       prompt: `### Checklist
 
-1. Checkout the PR via \`${t2("checkout_pr")}\` \u2014 this returns PR metadata and a \`diffPath\`. Read the diff to identify the major areas of change.
+1. Checkout the PR via \`${t2("checkout_pr")}\` \u2014 this returns PR metadata and a \`diffPath\`. read the diff TOC first and treat its file line ranges as your coverage checklist.
 
 2. For each area of change:
    - read the diff and trace data flow, check boundaries, and verify assumptions
@@ -144545,6 +145598,7 @@ ${learningsStep(t2, 6)}`
 4. Submit \u2014 ALWAYS submit exactly one review via \`${t2("create_pull_request_review")}\`.
    Do NOT call \`report_progress\` \u2014 the review is the final record and the progress
    comment will be cleaned up automatically.
+   note: the first create_pull_request_review submission may error with a one-time diff-coverage nudge listing unread TOC regions. retry the same call to proceed \u2014 optionally after reading the listed ranges. the pre-flight will not block again this session.
 
    - **critical issues** (blocks merge \u2014 bugs, security, data loss):
      \`approved: false\`. Body begins with a GitHub alert blockquote, e.g.:
@@ -144562,7 +145616,7 @@ ${learningsStep(t2, 6)}`
       description: "Re-review a PR after new commits are pushed; focus on new changes since the last review",
       prompt: `### Checklist
 
-1. Checkout the PR via \`${t2("checkout_pr")}\` \u2014 this returns PR metadata, \`diffPath\` (full diff), and \`incrementalDiffPath\` (changes since last reviewed version, if available).
+1. Checkout the PR via \`${t2("checkout_pr")}\` \u2014 this returns PR metadata, \`diffPath\` (full diff), and \`incrementalDiffPath\` (changes since last reviewed version, if available). read the diff TOC first and use its line ranges as your coverage checklist.
 
 2. If \`incrementalDiffPath\` is present, read it to see what changed since the last review. This is a range-diff that isolates the net changes, filtering out base branch noise. If not present, fall back to reviewing the full PR diff.
 
@@ -144586,6 +145640,7 @@ ${learningsStep(t2, 6)}`
    - in some cases you may receive a complete diff for the whole pull request instead of an incremental one. when this happens, you will need to determine what changes have happened since Pullfrog's most recent review.
 
 7. Submit \u2014 Do NOT call \`report_progress\` or \`create_issue_comment\` \u2014 the review is the final record and the progress comment will be cleaned up automatically. the review body always includes the reviewed changes from step 6a. append \`Prior review feedback:\\n\` with the checklist from step 6b only if any prior comments were addressed. Follow these rules:
+   - note: the first create_pull_request_review submission may error with a one-time diff-coverage nudge listing unread TOC regions. retry the same call to proceed \u2014 optionally after reading the listed ranges. the pre-flight will not block again this session.
    - IF NO NEW ISSUES, NON-SUBSTANTIVE CHANGES ONLY (trivial formatting, import reordering, comment tweaks): do NOT submit a review. Do NOT call \`report_progress\`. Exit \u2014 the progress comment will be cleaned up automatically.
    - ELSE IF NEW CRITICAL ISSUES (blocks merge): call \`${t2("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with a GitHub alert blockquote (e.g. \`> [!CAUTION]\\n> This PR introduces ...\`), then the reviewed changes summary and prior feedback (if any).
    - ELSE IF NEW RECOMMENDED CHANGES (non-critical): call \`${t2("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> [!IMPORTANT]\\n> ...\` alert, then the reviewed changes summary and prior feedback (if any).
@@ -145053,11 +146108,11 @@ Do NOT use this tool for git commands \u2014 use the dedicated git tools instead
           await killProcessGroup(proc);
         }
       }, timeout);
-      const exitCode = await new Promise((resolve2) => {
+      const exitCode = await new Promise((resolve3) => {
         const done = (code) => {
           exited = true;
           clearTimeout(timeoutId);
-          resolve2(code);
+          resolve3(code);
         };
         proc.on("exit", done);
         proc.on("error", () => done(null));
@@ -145196,12 +146251,12 @@ function readEnvPort() {
   return parsed2;
 }
 function isPortAvailable(port) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     const server = createServer();
     server.unref();
-    server.once("error", () => resolve2(false));
+    server.once("error", () => resolve3(false));
     server.once("listening", () => {
-      server.close(() => resolve2(true));
+      server.close(() => resolve3(true));
     });
     server.listen(port, mcpHost);
   });
@@ -145341,9 +146396,12 @@ async function killBackgroundProcesses(toolState) {
 async function startMcpHttpServer(ctx, options) {
   const tools = buildOrchestratorTools(ctx, options?.outputSchema);
   const startResult = await selectMcpPort(ctx, tools);
+  let disposed = false;
   return {
     url: startResult.url,
     [Symbol.asyncDispose]: async () => {
+      if (disposed) return;
+      disposed = true;
       closeBrowserDaemon(ctx.toolState);
       await killBackgroundProcesses(ctx.toolState);
       await startResult.server.stop();
@@ -145538,39 +146596,6 @@ var ThinkingTimer = class {
   }
 };
 
-// agents/shared.ts
-import { execFileSync as execFileSync2 } from "node:child_process";
-var MAX_STDERR_LINES = 20;
-var MAX_COMMIT_RETRIES = 3;
-function getGitStatus() {
-  try {
-    return execFileSync2("git", ["status", "--porcelain"], {
-      encoding: "utf-8",
-      timeout: 1e4
-    }).trim();
-  } catch {
-    return "";
-  }
-}
-function buildCommitPrompt(_agentId, status) {
-  return [
-    `UNCOMMITTED CHANGES \u2014 the working tree is dirty. push all changes to a pull request (new or existing). \`git status\` must be clean before you finish.`,
-    "",
-    "```",
-    status,
-    "```"
-  ].join("\n");
-}
-var agent = (input) => {
-  return {
-    ...input,
-    run: async (ctx) => {
-      log.debug(`\xBB payload: ${JSON.stringify(ctx.payload, null, 2)}`);
-      return input.run(ctx);
-    }
-  };
-};
-
 // agents/claude.ts
 async function installClaudeCli() {
   return await installFromNpmTarball({
@@ -145609,6 +146634,7 @@ async function runClaude(params) {
   let finalOutput = "";
   let sessionId;
   let accumulatedTokens = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+  let accumulatedCostUsd = 0;
   let tokensLogged = false;
   function buildUsage() {
     const totalInput = accumulatedTokens.input + accumulatedTokens.cacheRead + accumulatedTokens.cacheWrite;
@@ -145617,7 +146643,8 @@ async function runClaude(params) {
       inputTokens: totalInput,
       outputTokens: accumulatedTokens.output,
       cacheReadTokens: accumulatedTokens.cacheRead || void 0,
-      cacheWriteTokens: accumulatedTokens.cacheWrite || void 0
+      cacheWriteTokens: accumulatedTokens.cacheWrite || void 0,
+      costUsd: accumulatedCostUsd > 0 ? accumulatedCostUsd : void 0
     } : void 0;
   }
   const handlers2 = {
@@ -145634,6 +146661,12 @@ async function runClaude(params) {
           finalOutput = message;
         } else if (block.type === "tool_use") {
           const toolName = block.name || "unknown";
+          if (params.onToolUse) {
+            params.onToolUse({
+              toolName,
+              input: block.input
+            });
+          }
           thinkingTimer.markToolCall();
           log.toolCall({ toolName, input: block.input || {} });
           if (toolName.includes("report_progress") && params.todoTracker) {
@@ -145649,6 +146682,8 @@ async function runClaude(params) {
       if (msgUsage) {
         accumulatedTokens.input += msgUsage.input_tokens || 0;
         accumulatedTokens.output += msgUsage.output_tokens || 0;
+        accumulatedTokens.cacheRead += msgUsage.cache_read_input_tokens || 0;
+        accumulatedTokens.cacheWrite += msgUsage.cache_creation_input_tokens || 0;
       }
     },
     user: (event) => {
@@ -145679,19 +146714,18 @@ async function runClaude(params) {
         const cacheRead = usage?.cache_read_input_tokens || 0;
         const cacheWrite = usage?.cache_creation_input_tokens || 0;
         const outputTokens = usage?.output_tokens || 0;
-        const totalInput = inputTokens + cacheRead + cacheWrite;
+        const costUsd = typeof event.total_cost_usd === "number" && Number.isFinite(event.total_cost_usd) ? event.total_cost_usd : 0;
         accumulatedTokens = { input: inputTokens, output: outputTokens, cacheRead, cacheWrite };
+        accumulatedCostUsd = costUsd;
         log.info(`\xBB ${params.label} result: subtype=${subtype}, turns=${numTurns}`);
         if (!tokensLogged) {
-          log.table([
-            [
-              { data: "Input", header: true },
-              { data: "Cache Read", header: true },
-              { data: "Cache Write", header: true },
-              { data: "Output", header: true }
-            ],
-            [String(totalInput), String(cacheRead), String(cacheWrite), String(outputTokens)]
-          ]);
+          logTokenTable({
+            input: inputTokens,
+            cacheRead,
+            cacheWrite,
+            output: outputTokens,
+            costUsd
+          });
           tokensLogged = true;
         }
       } else if (subtype === "error_max_turns") {
@@ -145726,6 +146760,7 @@ async function runClaude(params) {
       cwd: params.cwd,
       env: params.env,
       activityTimeout: 3e5,
+      onActivityTimeout: params.onActivityTimeout,
       stdio: ["ignore", "pipe", "pipe"],
       onStdout: async (chunk) => {
         const text = chunk.toString();
@@ -145737,25 +146772,33 @@ async function runClaude(params) {
         for (const line of lines) {
           const trimmed = line.trim();
           if (!trimmed) continue;
+          let event;
           try {
-            const event = JSON.parse(trimmed);
-            eventCount++;
-            log.debug(JSON.stringify(event, null, 2));
-            const timeSinceLastActivity = getIdleMs();
-            if (timeSinceLastActivity > 1e4) {
-              log.info(
-                `\xBB no activity for ${(timeSinceLastActivity / 1e3).toFixed(1)}s (${params.label} may be processing internally) (${eventCount} events processed so far)`
-              );
-            }
-            markActivity();
-            const handler2 = handlers2[event.type];
-            if (handler2) {
-              handler2(event);
-            } else {
-              log.debug(`\xBB ${params.label} event (unhandled): type=${event.type}`);
-            }
+            event = JSON.parse(trimmed);
           } catch {
             log.debug(`\xBB non-JSON stdout line: ${trimmed.substring(0, 200)}`);
+            continue;
+          }
+          eventCount++;
+          log.debug(JSON.stringify(event, null, 2));
+          const timeSinceLastActivity = getIdleMs();
+          if (timeSinceLastActivity > 1e4) {
+            log.info(
+              `\xBB no activity for ${(timeSinceLastActivity / 1e3).toFixed(1)}s (${params.label} may be processing internally) (${eventCount} events processed so far)`
+            );
+          }
+          markActivity();
+          const handler2 = handlers2[event.type];
+          if (!handler2) {
+            log.debug(`\xBB ${params.label} event (unhandled): type=${event.type}`);
+            continue;
+          }
+          try {
+            handler2(event);
+          } catch (err) {
+            log.info(
+              `\xBB ${params.label} handler for type=${event.type} threw: ${err instanceof Error ? err.message : String(err)}`
+            );
           }
         }
       },
@@ -145789,16 +146832,9 @@ async function runClaude(params) {
       if (stderrContext) log.info(`\xBB last stderr output:
 ${stderrContext}`);
     }
-    if (!tokensLogged && (accumulatedTokens.input > 0 || accumulatedTokens.output > 0)) {
-      const totalTokens = accumulatedTokens.input + accumulatedTokens.output;
-      log.table([
-        [
-          { data: "Input Tokens", header: true },
-          { data: "Output Tokens", header: true },
-          { data: "Total Tokens", header: true }
-        ],
-        [String(accumulatedTokens.input), String(accumulatedTokens.output), String(totalTokens)]
-      ]);
+    if (!tokensLogged && (accumulatedTokens.input > 0 || accumulatedTokens.output > 0 || accumulatedTokens.cacheRead > 0 || accumulatedTokens.cacheWrite > 0)) {
+      logTokenTable({ ...accumulatedTokens, costUsd: accumulatedCostUsd });
+      tokensLogged = true;
     }
     const usage = buildUsage();
     if (result.exitCode !== 0) {
@@ -145831,7 +146867,7 @@ ${stderrContext}`);
     params.todoTracker?.cancel();
     const duration4 = performance6.now() - startTime;
     const errorMessage = error49 instanceof Error ? error49.message : String(error49);
-    const isActivityTimeout = errorMessage.includes("activity timeout");
+    const isActivityTimeout = error49 instanceof SpawnTimeoutError && error49.code === SPAWN_ACTIVITY_TIMEOUT_CODE;
     const stderrContext = recentStderr.slice(-10).join("\n");
     const diagnosis = lastProviderError ? `likely cause: ${lastProviderError}` : eventCount === 0 ? "Claude produced 0 stdout events - check if the API is reachable" : `${eventCount} events were processed before the hang`;
     log.info(
@@ -145922,8 +146958,7 @@ var claude = agent({
       "--effort",
       effort,
       "--disallowedTools",
-      "Bash",
-      "Agent(Bash)"
+      "Bash,Agent(Bash)"
     ];
     if (model) {
       baseArgs.push("--model", model);
@@ -145936,11 +146971,19 @@ var claude = agent({
     log.info(`\xBB effort: ${effort}`);
     log.debug(`\xBB starting Pullfrog (Claude Code): node ${baseArgs.join(" ")}`);
     log.debug(`\xBB working directory: ${repoDir}`);
-    const runParams = { label: "Pullfrog", cwd: repoDir, env: env2, todoTracker: ctx.todoTracker };
+    const runParams = {
+      label: "Pullfrog",
+      cwd: repoDir,
+      env: env2,
+      todoTracker: ctx.todoTracker,
+      onActivityTimeout: ctx.onActivityTimeout,
+      onToolUse: ctx.onToolUse
+    };
     let result = await runClaude({
       ...runParams,
       args: [...baseArgs, "-p", ctx.instructions.full]
     });
+    let aggregatedUsage = result.usage;
     for (let attempt = 0; attempt < MAX_COMMIT_RETRIES; attempt++) {
       if (!result.success || !result.sessionId) break;
       const status = getGitStatus();
@@ -145957,8 +147000,9 @@ ${status}`);
           result.sessionId
         ]
       });
+      aggregatedUsage = mergeAgentUsage(aggregatedUsage, result.usage);
     }
-    return result;
+    return { ...result, usage: aggregatedUsage };
   }
 });
 
@@ -146040,6 +147084,7 @@ async function runOpenCode(params) {
   const thinkingTimer = new ThinkingTimer();
   let finalOutput = "";
   let accumulatedTokens = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+  let accumulatedCostUsd = 0;
   let tokensLogged = false;
   const toolCallTimings = /* @__PURE__ */ new Map();
   let currentStepId = null;
@@ -146052,7 +147097,8 @@ async function runOpenCode(params) {
       inputTokens: totalInput,
       outputTokens: accumulatedTokens.output,
       cacheReadTokens: accumulatedTokens.cacheRead || void 0,
-      cacheWriteTokens: accumulatedTokens.cacheWrite || void 0
+      cacheWriteTokens: accumulatedTokens.cacheWrite || void 0,
+      costUsd: accumulatedCostUsd > 0 ? accumulatedCostUsd : void 0
     } : void 0;
   }
   const handlers2 = {
@@ -146063,6 +147109,7 @@ async function runOpenCode(params) {
       log.debug(`\xBB ${params.label} init event (full): ${JSON.stringify(event)}`);
       finalOutput = "";
       accumulatedTokens = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+      accumulatedCostUsd = 0;
       tokensLogged = false;
     },
     message: (event) => {
@@ -146107,6 +147154,9 @@ async function runOpenCode(params) {
         accumulatedTokens.cacheRead += eventTokens.cache?.read || 0;
         accumulatedTokens.cacheWrite += eventTokens.cache?.write || 0;
       }
+      if (typeof event.part?.cost === "number" && Number.isFinite(event.part.cost)) {
+        accumulatedCostUsd += event.part.cost;
+      }
       if (currentStepId === stepId) {
         currentStepId = null;
         currentStepType = null;
@@ -146124,6 +147174,12 @@ async function runOpenCode(params) {
       if (stepHistory.length > 0) {
         stepHistory[stepHistory.length - 1].toolCalls.push(toolName);
       }
+      if (params.onToolUse) {
+        params.onToolUse({
+          toolName,
+          input: event.part?.state?.input
+        });
+      }
       thinkingTimer.markToolCall();
       log.toolCall({ toolName, input: event.part?.state?.input || {} });
       if (event.part?.state?.status === "completed" && event.part.state.output) {
@@ -146179,19 +147235,9 @@ async function runOpenCode(params) {
       if (event.status === "error") {
         log.info(`\xBB ${params.label} failed: ${JSON.stringify(event)}`);
       } else {
-        const inputTokens = event.stats?.input_tokens || accumulatedTokens.input || 0;
-        const outputTokens = event.stats?.output_tokens || accumulatedTokens.output || 0;
-        const totalTokens = event.stats?.total_tokens || inputTokens + outputTokens;
         log.info(`\xBB run complete: tool_calls=${toolCalls}, duration=${duration4}ms`);
-        if ((inputTokens > 0 || outputTokens > 0) && !tokensLogged) {
-          log.table([
-            [
-              { data: "Input Tokens", header: true },
-              { data: "Output Tokens", header: true },
-              { data: "Total Tokens", header: true }
-            ],
-            [String(inputTokens), String(outputTokens), String(totalTokens)]
-          ]);
+        if ((accumulatedTokens.input > 0 || accumulatedTokens.output > 0 || accumulatedTokens.cacheRead > 0 || accumulatedTokens.cacheWrite > 0) && !tokensLogged) {
+          logTokenTable({ ...accumulatedTokens, costUsd: accumulatedCostUsd });
           tokensLogged = true;
         }
       }
@@ -146208,6 +147254,7 @@ async function runOpenCode(params) {
       cwd: params.cwd,
       env: params.env,
       activityTimeout: 3e5,
+      onActivityTimeout: params.onActivityTimeout,
       stdio: ["ignore", "pipe", "pipe"],
       onStdout: async (chunk) => {
         const text = chunk.toString();
@@ -146219,29 +147266,37 @@ async function runOpenCode(params) {
         for (const line of lines) {
           const trimmed = line.trim();
           if (!trimmed) continue;
+          let event;
           try {
-            const event = JSON.parse(trimmed);
-            eventCount++;
-            log.debug(JSON.stringify(event, null, 2));
-            const timeSinceLastActivity = getIdleMs();
-            if (timeSinceLastActivity > 1e4) {
-              const activeToolCalls = toolCallTimings.size;
-              const toolCallInfo = activeToolCalls > 0 ? ` (waiting for ${activeToolCalls} tool call${activeToolCalls > 1 ? "s" : ""})` : ` (${params.label} may be processing internally - LLM calls, planning, etc.)`;
-              log.info(
-                `\xBB no activity for ${(timeSinceLastActivity / 1e3).toFixed(1)}s${toolCallInfo} (${eventCount} events processed so far)`
-              );
-            }
-            markActivity();
-            const handler2 = handlers2[event.type];
-            if (handler2) {
-              await handler2(event);
-            } else {
-              log.info(
-                `\xBB ${params.label} event (unhandled): type=${event.type}, data=${JSON.stringify(event).substring(0, 500)}`
-              );
-            }
+            event = JSON.parse(trimmed);
           } catch {
             log.debug(`\xBB non-JSON stdout line: ${trimmed.substring(0, 200)}`);
+            continue;
+          }
+          eventCount++;
+          log.debug(JSON.stringify(event, null, 2));
+          const timeSinceLastActivity = getIdleMs();
+          if (timeSinceLastActivity > 1e4) {
+            const activeToolCalls = toolCallTimings.size;
+            const toolCallInfo = activeToolCalls > 0 ? ` (waiting for ${activeToolCalls} tool call${activeToolCalls > 1 ? "s" : ""})` : ` (${params.label} may be processing internally - LLM calls, planning, etc.)`;
+            log.info(
+              `\xBB no activity for ${(timeSinceLastActivity / 1e3).toFixed(1)}s${toolCallInfo} (${eventCount} events processed so far)`
+            );
+          }
+          markActivity();
+          const handler2 = handlers2[event.type];
+          if (!handler2) {
+            log.info(
+              `\xBB ${params.label} event (unhandled): type=${event.type}, data=${JSON.stringify(event).substring(0, 500)}`
+            );
+            continue;
+          }
+          try {
+            await handler2(event);
+          } catch (err) {
+            log.info(
+              `\xBB ${params.label} handler for type=${event.type} threw: ${err instanceof Error ? err.message : String(err)}`
+            );
           }
         }
       },
@@ -146275,16 +147330,9 @@ async function runOpenCode(params) {
       if (stderrContext) log.info(`\xBB last stderr output:
 ${stderrContext}`);
     }
-    if (!tokensLogged && (accumulatedTokens.input > 0 || accumulatedTokens.output > 0)) {
-      const totalTokens = accumulatedTokens.input + accumulatedTokens.output;
-      log.table([
-        [
-          { data: "Input Tokens", header: true },
-          { data: "Output Tokens", header: true },
-          { data: "Total Tokens", header: true }
-        ],
-        [String(accumulatedTokens.input), String(accumulatedTokens.output), String(totalTokens)]
-      ]);
+    if (!tokensLogged && (accumulatedTokens.input > 0 || accumulatedTokens.output > 0 || accumulatedTokens.cacheRead > 0 || accumulatedTokens.cacheWrite > 0)) {
+      logTokenTable({ ...accumulatedTokens, costUsd: accumulatedCostUsd });
+      tokensLogged = true;
     }
     const usage = buildUsage();
     if (result.exitCode !== 0) {
@@ -146310,7 +147358,7 @@ ${stderrContext}`);
     params.todoTracker?.cancel();
     const duration4 = performance7.now() - startTime;
     const errorMessage = error49 instanceof Error ? error49.message : String(error49);
-    const isActivityTimeout = errorMessage.includes("activity timeout");
+    const isActivityTimeout = error49 instanceof SpawnTimeoutError && error49.code === SPAWN_ACTIVITY_TIMEOUT_CODE;
     const stderrContext = recentStderr.slice(-10).join("\n");
     const diagnosis = lastProviderError ? `likely cause: ${lastProviderError}` : eventCount === 0 ? "OpenCode produced 0 stdout events - check if the model provider is reachable" : `${eventCount} events were processed before the hang`;
     log.info(
@@ -146367,12 +147415,15 @@ var opencode = agent({
       cliPath,
       cwd: repoDir,
       env: env2,
-      todoTracker: ctx.todoTracker
+      todoTracker: ctx.todoTracker,
+      onActivityTimeout: ctx.onActivityTimeout,
+      onToolUse: ctx.onToolUse
     };
     let result = await runOpenCode({
       ...runParams,
       args: [...baseArgs, ctx.instructions.full]
     });
+    let aggregatedUsage = result.usage;
     for (let attempt = 0; attempt < MAX_COMMIT_RETRIES; attempt++) {
       if (!result.success) break;
       const status = getGitStatus();
@@ -146383,8 +147434,9 @@ ${status}`);
         ...runParams,
         args: [...baseArgs, "--continue", buildCommitPrompt("opencode", status)]
       });
+      aggregatedUsage = mergeAgentUsage(aggregatedUsage, result.usage);
     }
-    return result;
+    return { ...result, usage: aggregatedUsage };
   }
 });
 
@@ -146402,13 +147454,11 @@ function hasClaudeCodeAuth() {
 function resolveModel(ctx) {
   const envModel = process.env.PULLFROG_MODEL?.trim();
   if (envModel) {
-    log.info(`\xBB model: ${envModel} (override via PULLFROG_MODEL)`);
-    return envModel;
+    return resolveCliModel(envModel) ?? envModel;
   }
   if (ctx.slug) {
     const resolved = resolveCliModel(ctx.slug);
     if (resolved) {
-      log.info(`\xBB model: ${resolved} (resolved from ${ctx.slug})`);
       return resolved;
     }
     log.warning(`\xBB unknown model slug "${ctx.slug}" \u2014 agent will auto-select`);
@@ -146419,7 +147469,6 @@ function resolveAgent(ctx) {
   const envAgent = process.env.PULLFROG_AGENT?.trim();
   if (envAgent) {
     if (envAgent in agents) {
-      log.info(`\xBB agent: ${envAgent} (override via PULLFROG_AGENT)`);
       return agents[envAgent];
     }
     log.warning(`\xBB unknown PULLFROG_AGENT="${envAgent}" \u2014 falling through to auto-select`);
@@ -146428,7 +147477,6 @@ function resolveAgent(ctx) {
     try {
       const provider2 = getModelProvider(ctx.model);
       if (provider2 === "anthropic" && hasClaudeCodeAuth()) {
-        log.info(`\xBB agent: claude (auto-selected for ${ctx.model})`);
         return agents.claude;
       }
     } catch {
@@ -150648,9 +151696,9 @@ async function startGitAuthServer(tmpdir3) {
     res.writeHead(409, { "Content-Type": "text/plain" });
     res.end("compromised");
   });
-  await new Promise((resolve2, reject) => {
+  await new Promise((resolve3, reject) => {
     server.on("error", reject);
-    server.listen(0, "127.0.0.1", () => resolve2());
+    server.listen(0, "127.0.0.1", () => resolve3());
   });
   const rawAddr = server.address();
   if (!rawAddr || typeof rawAddr === "string") {
@@ -150694,7 +151742,7 @@ async function startGitAuthServer(tmpdir3) {
       clearTimeout(entry.timeout);
     }
     codes.clear();
-    await new Promise((resolve2) => server.close(() => resolve2()));
+    await new Promise((resolve3) => server.close(() => resolve3()));
     log.debug("git auth server closed");
   }
   return {
@@ -150881,7 +151929,7 @@ MCP servers provide tools you can call. Inspect your available MCP servers at st
 
 ### Git
 
-Use \`${t2("git")}\` for local git commands (status, log, diff, add, commit, checkout, branch, merge, etc.). For operations requiring remote authentication, use the dedicated MCP tools:
+Use \`${t2("git")}\` for local git commands (status, log, add, commit, checkout, branch, merge, etc.). When reviewing a PR, do NOT re-derive the PR diff via \`git diff <base>..<head>\` \u2014 the diffPath returned by \`${t2("checkout_pr")}\` is authoritative. \`git log\` and \`git diff --stat\` are fine for commit-range overview; \`git diff\` / \`git diff --cached\` are fine for inspecting your *own* uncommitted changes. For operations requiring remote authentication, use the dedicated MCP tools:
 - \`${t2("push_branch")}\` - push current or specified branch
 - \`${t2("git_fetch")}\` - fetch refs from remote
 - \`${t2("checkout_pr")}\` - checkout a PR branch (fetches and configures push for forks)
@@ -151059,7 +152107,7 @@ function normalizeEnv() {
 
 // utils/payload.ts
 var core4 = __toESM(require_core(), 1);
-import { isAbsolute, resolve } from "node:path";
+import { isAbsolute as isAbsolute2, resolve as resolve2 } from "node:path";
 
 // utils/versioning.ts
 var import_semver2 = __toESM(require_semver2(), 1);
@@ -151113,8 +152161,8 @@ function isPayloadEvent(value2) {
 function resolveCwd(cwd) {
   const workspace = process.env.GITHUB_WORKSPACE;
   if (!cwd) return workspace;
-  if (isAbsolute(cwd)) return cwd;
-  return workspace ? resolve(workspace, cwd) : cwd;
+  if (isAbsolute2(cwd)) return cwd;
+  return workspace ? resolve2(workspace, cwd) : cwd;
 }
 function resolvePromptInput() {
   const prompt = core4.getInput("prompt", { required: true });
@@ -151293,7 +152341,8 @@ var defaultSettings = {
   shell: "restricted",
   prApproveEnabled: false,
   modeInstructions: {},
-  learnings: null
+  learnings: null,
+  envAllowlist: null
 };
 var defaultRunContext = {
   settings: defaultSettings,
@@ -151373,7 +152422,7 @@ async function resolveRunContextData(params) {
 }
 
 // utils/setup.ts
-import { execSync as execSync3 } from "node:child_process";
+import { execFileSync as execFileSync5, execSync as execSync3 } from "node:child_process";
 import { mkdtempSync } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join13 } from "node:path";
@@ -151383,6 +152432,51 @@ function createTempDirectory() {
   log.info(`\xBB created temp dir at ${sharedTempDir}`);
   return sharedTempDir;
 }
+function envScopedToRepo() {
+  const scoped = { ...process.env };
+  for (const key of Object.keys(scoped)) {
+    if (key.startsWith("GIT_")) delete scoped[key];
+  }
+  return scoped;
+}
+function removeIncludeIfEntries(repoDir) {
+  const env2 = envScopedToRepo();
+  let configOutput;
+  try {
+    configOutput = execSync3("git config --local --get-regexp -z ^includeif\\.", {
+      cwd: repoDir,
+      encoding: "utf-8",
+      stdio: "pipe",
+      env: env2
+    });
+  } catch {
+    log.debug("\xBB no includeIf credential entries to remove");
+    return;
+  }
+  const seen = /* @__PURE__ */ new Set();
+  for (const entry of configOutput.split("\0")) {
+    if (!entry) continue;
+    const nl = entry.indexOf("\n");
+    const key = nl === -1 ? entry : entry.slice(0, nl);
+    if (!key || seen.has(key)) continue;
+    seen.add(key);
+    try {
+      execFileSync5("git", ["config", "--local", "--unset-all", key], {
+        cwd: repoDir,
+        stdio: "pipe",
+        env: env2
+      });
+    } catch (error49) {
+      log.debug(
+        `\xBB failed to unset ${key}: ${error49 instanceof Error ? error49.message : String(error49)}`
+      );
+    }
+  }
+  if (seen.size > 0)
+    log.info(
+      `\xBB removed ${seen.size} includeIf credential ${seen.size === 1 ? "entry" : "entries"}`
+    );
+}
 async function setupGit(params) {
   const repoDir = process.cwd();
   log.info("\xBB setting up git configuration...");
@@ -151429,24 +152523,7 @@ async function setupGit(params) {
   } catch {
     log.debug("\xBB no existing authentication headers to remove");
   }
-  try {
-    const configOutput = execSync3("git config --local --get-regexp ^includeif\\.", {
-      cwd: repoDir,
-      encoding: "utf-8",
-      stdio: "pipe"
-    });
-    for (const line of configOutput.trim().split("\n")) {
-      const key = line.split(" ")[0];
-      if (!key) continue;
-      execSync3(`git config --local --unset "${key}"`, {
-        cwd: repoDir,
-        stdio: "pipe"
-      });
-    }
-    log.info("\xBB removed includeIf credential entries");
-  } catch {
-    log.debug("\xBB no includeIf credential entries to remove");
-  }
+  removeIncludeIfEntries(repoDir);
   const originUrl = `https://github.com/${params.owner}/${params.name}.git`;
   $("git", ["remote", "set-url", "origin", originUrl], { cwd: repoDir });
   params.toolState.pushUrl = originUrl;
@@ -151465,6 +152542,13 @@ function parseTimeString(input) {
   const seconds = parseInt(match3[3] || "0", 10);
   return (hours * 3600 + minutes * 60 + seconds) * 1e3;
 }
+var TIMEOUT_MAX_MS = 2147483647;
+function resolveTimeoutMs(input) {
+  if (!input) return null;
+  const parsed2 = parseTimeString(input);
+  if (parsed2 === null || parsed2 <= 0 || parsed2 > TIMEOUT_MAX_MS) return null;
+  return parsed2;
+}
 
 // utils/todoTracking.ts
 function isValidTodoStatus(value2) {
@@ -151567,9 +152651,12 @@ function createTodoTracker(onUpdate) {
         if (item.status === "in_progress") item.status = "completed";
       }
     },
-    renderCollapsible() {
+    renderCollapsible(options) {
       if (state.size === 0) return "";
-      const todos = Array.from(state.values());
+      const shouldCompleteInProgress = options?.completeInProgress === true;
+      const todos = Array.from(state.values()).map(
+        (item) => shouldCompleteInProgress && item.status === "in_progress" ? { ...item, status: "completed" } : item
+      );
       const completed = todos.filter((t2) => t2.status === "completed").length;
       const markdown = renderTodoMarkdown(todos);
       return `<details>
@@ -151629,6 +152716,32 @@ function resolveOutputSchema() {
   log.info("\xBB structured output schema provided \u2014 output will be required");
   return parsed2;
 }
+function resolveTimeoutForLog(timeout) {
+  if (!timeout) return "1h (default)";
+  if (timeout === TIMEOUT_DISABLED) return "none (disabled)";
+  return timeout;
+}
+function resolveModelForLog(ctx) {
+  const envModel = process.env.PULLFROG_MODEL?.trim();
+  if (envModel) return `${envModel} (override via PULLFROG_MODEL)`;
+  if (ctx.payload.proxyModel) return `${ctx.payload.proxyModel} (proxy)`;
+  if (ctx.resolvedModel && ctx.payload.model && ctx.payload.model !== ctx.resolvedModel) {
+    return `${ctx.resolvedModel} (resolved from ${ctx.payload.model})`;
+  }
+  if (ctx.resolvedModel) return ctx.resolvedModel;
+  if (ctx.payload.model) return `${ctx.payload.model} (unresolved)`;
+  return "auto";
+}
+function resolveAgentForLog(ctx) {
+  const envAgent = process.env.PULLFROG_AGENT?.trim();
+  if (envAgent && envAgent === ctx.agentName) {
+    return `${ctx.agentName} (override via PULLFROG_AGENT)`;
+  }
+  if (ctx.agentName === "claude" && ctx.resolvedModel) {
+    return `${ctx.agentName} (auto-selected for ${ctx.resolvedModel})`;
+  }
+  return ctx.agentName;
+}
 async function mintProxyKey(ctx) {
   try {
     process.env.ACTIONS_ID_TOKEN_REQUEST_URL = ctx.oidcCredentials.requestUrl;
@@ -151688,6 +152801,7 @@ async function main() {
     }
     const timer = new Timer();
     let activityTimeout = null;
+    let safetyNetTimer;
     const resolvedPromptInput = resolvePromptInput();
     const toolState = initToolState({
       progressCommentId: typeof resolvedPromptInput !== "string" ? resolvedPromptInput.progressCommentId : void 0
@@ -151707,6 +152821,9 @@ async function main() {
       const count = Object.keys(runContext.dbSecrets).length;
       if (count > 0) log.info(`\xBB ${count} db secret(s) loaded`);
     }
+    if (runContext.repoSettings.envAllowlist) {
+      setEnvAllowlist(runContext.repoSettings.envAllowlist);
+    }
     const payload = resolvePayload(resolvedPromptInput, runContext.repoSettings);
     toolState.model = payload.model;
     if (payload.event.trigger === "pull_request_synchronize") {
@@ -151771,10 +152888,13 @@ async function main() {
           postCheckoutScript: runContext.repoSettings.postCheckoutScript
         });
         timer.checkpoint("git");
-        await executeLifecycleHook({
+        const setupHook = await executeLifecycleHook({
           event: "setup",
           script: runContext.repoSettings.setupScript
         });
+        if (setupHook.warning) {
+          throw new Error(setupHook.warning);
+        }
         timer.checkpoint("lifecycleHooks::setup");
         const agentId = agent2.name;
         const modes2 = [...computeModes(agentId), ...runContext.repoSettings.modes];
@@ -151796,17 +152916,22 @@ async function main() {
           runId: runInfo.runId,
           jobId: runInfo.jobId,
           mcpServerUrl: "",
-          tmpdir: tmpdir3
+          tmpdir: tmpdir3,
+          resolvedModel
         };
         const mcpHttpServer = __using(_stack, await startMcpHttpServer(toolContext, { outputSchema }), true);
         toolContext.mcpServerUrl = mcpHttpServer.url;
         log.info(`\xBB MCP server started at ${mcpHttpServer.url}`);
         timer.checkpoint("mcpServer");
         startInstallation(toolContext);
-        if (payload.model) log.info(`\xBB model:   ${payload.model}`);
-        if (payload.timeout) log.info(`\xBB timeout: ${payload.timeout}`);
+        const modelForLog = resolveModelForLog({ payload, resolvedModel });
+        const agentForLog = resolveAgentForLog({ agentName: agent2.name, resolvedModel });
+        const timeoutForLog = resolveTimeoutForLog(payload.timeout);
+        log.info(`\xBB model:   ${modelForLog}`);
+        log.info(`\xBB agent:   ${agentForLog}`);
         log.info(`\xBB push:    ${payload.push}`);
         log.info(`\xBB shell:   ${payload.shell}`);
+        log.info(`\xBB timeout: ${timeoutForLog}`);
         const instructions = resolveInstructions({
           payload,
           repo: runContext.repo,
@@ -151855,24 +152980,62 @@ ${instructions.user}` : null,
           }
         });
         toolState.todoTracker = todoTracker;
+        let innerTimeoutFired = false;
+        const onInnerActivityTimeout = () => {
+          if (innerTimeoutFired) return;
+          innerTimeoutFired = true;
+          log.info(
+            "\xBB inner activity timeout fired \u2014 stopping MCP server and starting 5min safety-net timer"
+          );
+          mcpHttpServer[Symbol.asyncDispose]().catch((err) => {
+            log.debug(
+              `mcp server stop after inner kill failed: ${err instanceof Error ? err.message : String(err)}`
+            );
+          });
+          safetyNetTimer = setTimeout(
+            () => {
+              activityTimeout?.forceReject(
+                "agent still pending 5min after inner activity kill \u2014 forcing exit"
+              );
+            },
+            5 * 60 * 1e3
+          );
+          safetyNetTimer.unref?.();
+        };
         const agentPromise = agent2.run({
           payload,
           resolvedModel,
           mcpServerUrl: mcpHttpServer.url,
           tmpdir: tmpdir3,
           instructions,
-          todoTracker
+          todoTracker,
+          onActivityTimeout: onInnerActivityTimeout,
+          onToolUse: (event) => {
+            const wasTracked = recordDiffReadFromToolUse({
+              state: toolState.diffCoverage,
+              toolName: event.toolName,
+              input: event.input,
+              cwd: process.cwd()
+            });
+            if (!wasTracked) return;
+            const trackedRanges = toolState.diffCoverage?.coveredRanges ?? [];
+            log.debug(
+              `\xBB diff coverage tracked from tool ${event.toolName} (${trackedRanges.length} merged range${trackedRanges.length === 1 ? "" : "s"})`
+            );
+          }
+        });
+        agentPromise.catch(() => {
         });
         let result;
         if (payload.timeout === TIMEOUT_DISABLED) {
           result = await Promise.race([agentPromise, activityTimeout.promise]);
         } else {
-          const parsed2 = payload.timeout ? parseTimeString(payload.timeout) : null;
-          if (payload.timeout && parsed2 === null) {
-            log.warning(`invalid timeout format "${payload.timeout}", using default 1h`);
+          const usable = resolveTimeoutMs(payload.timeout);
+          if (payload.timeout && usable === null) {
+            log.warning(`invalid timeout "${payload.timeout}" (use --notimeout to disable), using 1h`);
           }
-          const timeoutMs = parsed2 ?? 36e5;
-          const actualTimeout = parsed2 !== null ? payload.timeout : "1h";
+          const timeoutMs = usable ?? 36e5;
+          const actualTimeout = usable !== null ? payload.timeout : "1h";
           let timeoutId;
           const timeoutPromise = new Promise((_4, reject) => {
             timeoutId = setTimeout(() => {
@@ -151959,8 +153122,21 @@ ${errorMessage}
       };
     } finally {
       activityTimeout?.stop();
+      if (safetyNetTimer) clearTimeout(safetyNetTimer);
       if (usageSummaryPath) {
-        await writeGitHubUsageSummaryToFile(usageSummaryPath);
+        try {
+          await writeGitHubUsageSummaryToFile(usageSummaryPath);
+        } catch (err) {
+          log.debug(
+            `failed to write usage summary to ${usageSummaryPath}: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+      if (toolContext) {
+        const patch = aggregateUsage(toolState.usageEntries);
+        if (Object.keys(patch).length > 0) {
+          await patchWorkflowRunFields(toolContext, patch);
+        }
       }
     }
   } catch (_3) {
@@ -152014,7 +153190,7 @@ async function validateStuckProgressComment(ctx) {
       comment_id: commentId
     });
     const body = commentResult.data.body ?? "";
-    if (body.startsWith(LEAPING_INTO_ACTION_PREFIX)) {
+    if (isLeapingIntoActionCommentBody(body)) {
       log.info(`[post] comment ${commentId} is stuck on "Leaping into action"`);
       return commentId;
     }
@@ -152224,7 +153400,7 @@ async function run(args2) {
 }
 
 // commands/init.ts
-import { execFileSync as execFileSync5 } from "node:child_process";
+import { execFileSync as execFileSync6 } from "node:child_process";
 
 // node_modules/.pnpm/@clack+core@1.2.0/node_modules/@clack/core/dist/index.mjs
 import { styleText as y } from "node:util";
@@ -153216,7 +154392,7 @@ function handleCancel(value2) {
 function getGhToken() {
   let token;
   try {
-    token = execFileSync5("gh", ["auth", "token"], { encoding: "utf-8" }).trim();
+    token = execFileSync6("gh", ["auth", "token"], { encoding: "utf-8" }).trim();
   } catch {
     bail(
       `gh cli not found or not authenticated.
@@ -153259,7 +154435,7 @@ async function ghApi(path3, token) {
 function parseGitRemote() {
   let url4;
   try {
-    url4 = execFileSync5("git", ["remote", "get-url", "origin"], { encoding: "utf-8" }).trim();
+    url4 = execFileSync6("git", ["remote", "get-url", "origin"], { encoding: "utf-8" }).trim();
   } catch {
     bail("not a git repository or no 'origin' remote found.");
   }
@@ -153270,10 +154446,10 @@ function parseGitRemote() {
 function openBrowser(url4) {
   try {
     const platform = process.platform;
-    if (platform === "darwin") execFileSync5("open", [url4], { stdio: "ignore" });
+    if (platform === "darwin") execFileSync6("open", [url4], { stdio: "ignore" });
     else if (platform === "win32")
-      execFileSync5("cmd", ["/c", "start", "", url4], { stdio: "ignore" });
-    else execFileSync5("xdg-open", [url4], { stdio: "ignore" });
+      execFileSync6("cmd", ["/c", "start", "", url4], { stdio: "ignore" });
+    else execFileSync6("xdg-open", [url4], { stdio: "ignore" });
   } catch {
   }
 }
@@ -153500,7 +154676,7 @@ function setGhSecret(ctx) {
   let orgFailed = false;
   if (ctx.org) {
     try {
-      execFileSync5("gh", ["secret", "set", ctx.name, "--org", ctx.org, "--visibility", "all"], {
+      execFileSync6("gh", ["secret", "set", ctx.name, "--org", ctx.org, "--visibility", "all"], {
         input: ctx.value,
         stdio: ["pipe", "ignore", "pipe"],
         encoding: "utf-8"
@@ -153511,7 +154687,7 @@ function setGhSecret(ctx) {
     }
   }
   try {
-    execFileSync5("gh", ["secret", "set", ctx.name, "--repo", ctx.repoSlug], {
+    execFileSync6("gh", ["secret", "set", ctx.name, "--repo", ctx.repoSlug], {
       input: ctx.value,
       stdio: ["pipe", "ignore", "pipe"],
       encoding: "utf-8"
@@ -153881,7 +155057,7 @@ async function run2() {
 }
 
 // cli.ts
-var VERSION10 = "0.0.201";
+var VERSION10 = "0.0.202";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);