@moxxy/cli 0.12.3 → 0.12.6

package/dist/bin.js

@@ -195,6 +195,22 @@ var init_log = __esm({
       listeners = /* @__PURE__ */ new Set();
       clearListeners = /* @__PURE__ */ new Set();
       now;
+      /**
+       * Lazy secondary indexes so `ofType`/`byTurn` are O(matches) instead of an
+       * O(n) full-array `filter` per call (these back hot paths: token-accounting's
+       * `ofType('provider_response')`, lazy-tool gating's
+       * `ofType('tool_call_requested')`, and remote-session's per-turn
+       * `byTurn(turnId)` priming). Built lazily on first query so a cold/seeded log
+       * pays the one-time O(n) build only if anything ever queries it, then kept
+       * O(1) per append/ingest. Reset to `null` (rebuild-on-next-query) by
+       * `clear`/`rebase`, which mutate `events` wholesale.
+       *
+       * Each index holds the SAME event object references in their original
+       * append order — so a query returns an array deep-equal to the old
+       * `events.filter(...)` for every input.
+       */
+      byType = null;
+      byTurnId = null;
       /**
        * Seq of the FIRST event this log holds. 0 for an authoring log; a mirror
        * primed by a partial attach replay (runner protocol v6 `replay.start`)
@@ -224,11 +240,53 @@ var init_log = __esm({
       slice(from = 0, to = this.base + this.events.length) {
         return this.events.slice(Math.max(0, from - this.base), Math.max(0, to - this.base));
       }
+      /** Build both secondary indexes from the current `events` array, preserving
+       * append order. Bucket arrays hold the original event references. */
+      buildIndexes() {
+        const byType = /* @__PURE__ */ new Map();
+        const byTurnId = /* @__PURE__ */ new Map();
+        for (const e3 of this.events) {
+          let typeBucket = byType.get(e3.type);
+          if (!typeBucket)
+            byType.set(e3.type, typeBucket = []);
+          typeBucket.push(e3);
+          let turnBucket = byTurnId.get(e3.turnId);
+          if (!turnBucket)
+            byTurnId.set(e3.turnId, turnBucket = []);
+          turnBucket.push(e3);
+        }
+        this.byType = byType;
+        this.byTurnId = byTurnId;
+      }
+      /** Append one event to the live indexes (no-op while they're cold). Called
+       * after the event is pushed to `events`, so order is preserved. */
+      indexEvent(e3) {
+        if (this.byType) {
+          const bucket = this.byType.get(e3.type);
+          if (bucket)
+            bucket.push(e3);
+          else
+            this.byType.set(e3.type, [e3]);
+        }
+        if (this.byTurnId) {
+          const bucket = this.byTurnId.get(e3.turnId);
+          if (bucket)
+            bucket.push(e3);
+          else
+            this.byTurnId.set(e3.turnId, [e3]);
+        }
+      }
       ofType(type) {
-        return this.events.filter((e3) => e3.type === type);
+        if (!this.byType)
+          this.buildIndexes();
+        const bucket = this.byType.get(type);
+        return bucket ? [...bucket] : [];
       }
       byTurn(turnId) {
-        return this.events.filter((e3) => e3.turnId === turnId);
+        if (!this.byTurnId)
+          this.buildIndexes();
+        const bucket = this.byTurnId.get(turnId);
+        return bucket ? [...bucket] : [];
       }
       toJSON() {
         return [...this.events];
@@ -236,6 +294,7 @@ var init_log = __esm({
       async append(partial) {
         const event = materializeEvent(partial, this.base + this.events.length, this.now);
         this.events.push(event);
+        this.indexEvent(event);
         const snapshot = [...this.listeners];
         for (const fn of snapshot) {
           try {
@@ -262,6 +321,7 @@ var init_log = __esm({
         if (event.seq !== this.base + this.events.length)
           return;
         this.events.push(event);
+        this.indexEvent(event);
         const snapshot = [...this.listeners];
         for (const fn of snapshot) {
           try {
@@ -300,9 +360,13 @@ var init_log = __esm({
           throw new Error(`EventLog.rebase(${seq}): seq must be a non-negative integer`);
         }
         this.base = seq;
+        this.byType = null;
+        this.byTurnId = null;
       }
       clear() {
         this.events.length = 0;
+        this.byType = null;
+        this.byTurnId = null;
         this.base = 0;
         const snapshot = [...this.clearListeners];
         for (const fn of snapshot) {
@@ -820,7 +884,7 @@ async function* runTurn(session, prompt, opts = {}) {
         yield queue.shift();
       if (done)
         break;
-      await new Promise((resolve13) => waiters.push(resolve13));
+      await new Promise((resolve12) => waiters.push(resolve12));
     }
   } finally {
     unsubscribe();
@@ -2224,6 +2288,18 @@ var init_host2 = __esm({
       dataListeners = /* @__PURE__ */ new Set();
       /** In-flight opens, so concurrent `open(kind)` calls share one instance. */
       opening = /* @__PURE__ */ new Map();
+      /**
+       * Viewer attach count per kind. A surface is SHARED (the agent's tool + every
+       * attached viewer drive the same PTY/page), so `open` retains and `close`
+       * releases; the instance is only torn down when the last viewer detaches.
+       * Without this, a single viewer's `close` would destroy the resource out from
+       * under the others — and React StrictMode (dev) makes that routine: it
+       * mounts → unmounts → remounts, so the first mount's late-resolving `open`
+       * closes the very instance the remount just attached to, leaving `input`/
+       * `resize` to hit a now-missing instance (output still flows from the
+       * snapshot, but keystrokes/navigation silently vanish).
+       */
+      refs = /* @__PURE__ */ new Map();
       constructor(registry, ctx, logger) {
         this.registry = registry;
         this.ctx = ctx;
@@ -2256,28 +2332,25 @@ var init_host2 = __esm({
       async open(kind3) {
         const existing = this.instances.get(kind3);
         if (existing) {
-          return {
-            surfaceId: existing.id,
-            kind: existing.kind,
-            ...existing.snapshot ? { snapshot: existing.snapshot() } : {}
-          };
+          this.retain(kind3);
+          return this.describe(existing);
         }
         const pending2 = this.opening.get(kind3);
-        if (pending2)
-          return pending2;
+        if (pending2) {
+          const res = await pending2;
+          this.retain(kind3);
+          return res;
+        }
         const def = this.registry.get(kind3);
         if (!def)
           throw new Error(`No surface registered for kind: ${kind3}`);
         const promise = (async () => {
           const instance = await def.open(this.ctx);
           this.instances.set(kind3, instance);
+          this.refs.set(kind3, 1);
           const unsub = instance.onData((payload) => this.emit({ surfaceId: instance.id, kind: instance.kind, payload }));
           this.unsubs.set(instance.id, unsub);
-          return {
-            surfaceId: instance.id,
-            kind: instance.kind,
-            ...instance.snapshot ? { snapshot: instance.snapshot() } : {}
-          };
+          return this.describe(instance);
         })();
         this.opening.set(kind3, promise);
         try {
@@ -2302,9 +2375,16 @@ var init_host2 = __esm({
         const instance = this.byId(surfaceId);
         if (!instance)
           return;
+        const kind3 = instance.kind;
+        const remaining = (this.refs.get(kind3) ?? 1) - 1;
+        if (remaining > 0) {
+          this.refs.set(kind3, remaining);
+          return;
+        }
+        this.refs.delete(kind3);
         this.unsubs.get(surfaceId)?.();
         this.unsubs.delete(surfaceId);
-        this.instances.delete(instance.kind);
+        this.instances.delete(kind3);
         try {
           await instance.close();
         } catch (err) {
@@ -2314,11 +2394,24 @@ var init_host2 = __esm({
           });
         }
       }
+      /** Bump the viewer attach count for an already-open kind. */
+      retain(kind3) {
+        this.refs.set(kind3, (this.refs.get(kind3) ?? 0) + 1);
+      }
+      describe(instance) {
+        return {
+          surfaceId: instance.id,
+          kind: instance.kind,
+          ...instance.snapshot ? { snapshot: instance.snapshot() } : {}
+        };
+      }
       onData(cb) {
         this.dataListeners.add(cb);
         return () => this.dataListeners.delete(cb);
       }
       async closeAll() {
+        for (const kind3 of [...this.instances.keys()])
+          this.refs.set(kind3, 1);
         const ids = [...this.unsubs.keys()];
         for (const id of ids)
           await this.close(id);
@@ -2474,8 +2567,8 @@ var init_tools2 = __esm({
         const parseResult = tool.inputSchema.safeParse(input);
         if (!parseResult.success) {
           const issues = parseResult.error.issues.map((iss) => {
-            const path60 = iss.path.length ? iss.path.join(".") : "(root)";
-            return `${path60}: ${iss.message}`;
+            const path59 = iss.path.length ? iss.path.join(".") : "(root)";
+            return `${path59}: ${iss.message}`;
           }).join("; ");
           throw new Error(`Invalid input for ${name}: ${issues}`);
         }
@@ -3447,8 +3540,6 @@ var init_session = __esm({
           activeSynthesizer: this.synthesizers.getActiveName()
         };
       }
-      registerHookOptions(_hooks) {
-      }
     };
   }
 });
@@ -3960,6 +4051,14 @@ var init_persistence = __esm({
        * can flush.
        */
       writeQueue = createMutex();
+      /**
+       * Memoized one-time setup: `mkdir -p` the sessions dir and create the empty
+       * `.jsonl` (so resume lists the session before any event). Awaited by both
+       * `attach` and `writeIndex` so an early debounced index flush can't race the
+       * initial creation — but it runs the open+close syscalls ONCE, not on every
+       * 250ms flush as before.
+       */
+      ready = null;
       closed = false;
       logger;
       /**
@@ -3997,7 +4096,7 @@ var init_persistence = __esm({
        * reuses the same Session object.
        */
       attach(log) {
-        void this.ensureDir().then(() => this.ensureLogFile()).then(() => this.scheduleIndexWrite()).catch(() => void 0);
+        void this.ensureReady().then(() => this.scheduleIndexWrite()).catch(() => void 0);
         const unsub = log.subscribe((event) => {
           if (this.closed)
             return;
@@ -4112,19 +4211,27 @@ var init_persistence = __esm({
       async writeIndex() {
         try {
           if (!this.closed) {
-            await this.ensureDir();
-            await this.ensureLogFile();
+            await this.ensureReady();
           }
           await writeJsonAtomic(metaPath(this.dir, this.meta.id), this.meta);
         } catch {
         }
       }
-      async ensureDir() {
-        await promises.mkdir(this.dir, { recursive: true });
-      }
-      async ensureLogFile() {
-        const handle2 = await promises.open(this.logPath, "a");
-        await handle2.close();
+      /** One-time, memoized: `mkdir -p` the dir + create the empty `.jsonl`. On
+       *  failure the latch is cleared so a later flush retries (matching the old
+       *  per-write ensureDir/ensureLogFile recoverability). */
+      ensureReady() {
+        if (!this.ready) {
+          this.ready = (async () => {
+            await promises.mkdir(this.dir, { recursive: true });
+            const handle2 = await promises.open(this.logPath, "a");
+            await handle2.close();
+          })().catch((err) => {
+            this.ready = null;
+            throw err;
+          });
+        }
+        return this.ready;
       }
     };
   }
@@ -8297,17 +8404,17 @@ var require_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    function visit_(key, node, visitor, path60) {
-      const ctrl = callVisitor(key, node, visitor, path60);
+    function visit_(key, node, visitor, path59) {
+      const ctrl = callVisitor(key, node, visitor, path59);
       if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-        replaceNode(key, path60, ctrl);
-        return visit_(key, ctrl, visitor, path60);
+        replaceNode(key, path59, ctrl);
+        return visit_(key, ctrl, visitor, path59);
       }
       if (typeof ctrl !== "symbol") {
         if (identity.isCollection(node)) {
-          path60 = Object.freeze(path60.concat(node));
+          path59 = Object.freeze(path59.concat(node));
           for (let i2 = 0; i2 < node.items.length; ++i2) {
-            const ci = visit_(i2, node.items[i2], visitor, path60);
+            const ci = visit_(i2, node.items[i2], visitor, path59);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -8318,13 +8425,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path60 = Object.freeze(path60.concat(node));
-          const ck = visit_("key", node.key, visitor, path60);
+          path59 = Object.freeze(path59.concat(node));
+          const ck = visit_("key", node.key, visitor, path59);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = visit_("value", node.value, visitor, path60);
+          const cv = visit_("value", node.value, visitor, path59);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -8345,17 +8452,17 @@ var require_visit = __commonJS({
     visitAsync.BREAK = BREAK;
     visitAsync.SKIP = SKIP;
     visitAsync.REMOVE = REMOVE;
-    async function visitAsync_(key, node, visitor, path60) {
-      const ctrl = await callVisitor(key, node, visitor, path60);
+    async function visitAsync_(key, node, visitor, path59) {
+      const ctrl = await callVisitor(key, node, visitor, path59);
       if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-        replaceNode(key, path60, ctrl);
-        return visitAsync_(key, ctrl, visitor, path60);
+        replaceNode(key, path59, ctrl);
+        return visitAsync_(key, ctrl, visitor, path59);
       }
       if (typeof ctrl !== "symbol") {
         if (identity.isCollection(node)) {
-          path60 = Object.freeze(path60.concat(node));
+          path59 = Object.freeze(path59.concat(node));
           for (let i2 = 0; i2 < node.items.length; ++i2) {
-            const ci = await visitAsync_(i2, node.items[i2], visitor, path60);
+            const ci = await visitAsync_(i2, node.items[i2], visitor, path59);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -8366,13 +8473,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path60 = Object.freeze(path60.concat(node));
-          const ck = await visitAsync_("key", node.key, visitor, path60);
+          path59 = Object.freeze(path59.concat(node));
+          const ck = await visitAsync_("key", node.key, visitor, path59);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = await visitAsync_("value", node.value, visitor, path60);
+          const cv = await visitAsync_("value", node.value, visitor, path59);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -8399,23 +8506,23 @@ var require_visit = __commonJS({
       }
       return visitor;
     }
-    function callVisitor(key, node, visitor, path60) {
+    function callVisitor(key, node, visitor, path59) {
       if (typeof visitor === "function")
-        return visitor(key, node, path60);
+        return visitor(key, node, path59);
       if (identity.isMap(node))
-        return visitor.Map?.(key, node, path60);
+        return visitor.Map?.(key, node, path59);
       if (identity.isSeq(node))
-        return visitor.Seq?.(key, node, path60);
+        return visitor.Seq?.(key, node, path59);
       if (identity.isPair(node))
-        return visitor.Pair?.(key, node, path60);
+        return visitor.Pair?.(key, node, path59);
       if (identity.isScalar(node))
-        return visitor.Scalar?.(key, node, path60);
+        return visitor.Scalar?.(key, node, path59);
       if (identity.isAlias(node))
-        return visitor.Alias?.(key, node, path60);
+        return visitor.Alias?.(key, node, path59);
       return void 0;
     }
-    function replaceNode(key, path60, node) {
-      const parent = path60[path60.length - 1];
+    function replaceNode(key, path59, node) {
+      const parent = path59[path59.length - 1];
       if (identity.isCollection(parent)) {
         parent.items[key] = node;
       } else if (identity.isPair(parent)) {
@@ -9016,10 +9123,10 @@ var require_Collection = __commonJS({
     var createNode2 = require_createNode();
     var identity = require_identity();
     var Node = require_Node();
-    function collectionFromPath(schema, path60, value) {
+    function collectionFromPath(schema, path59, value) {
       let v3 = value;
-      for (let i2 = path60.length - 1; i2 >= 0; --i2) {
-        const k3 = path60[i2];
+      for (let i2 = path59.length - 1; i2 >= 0; --i2) {
+        const k3 = path59[i2];
         if (typeof k3 === "number" && Number.isInteger(k3) && k3 >= 0) {
           const a2 = [];
           a2[k3] = v3;
@@ -9038,7 +9145,7 @@ var require_Collection = __commonJS({
         sourceObjects: /* @__PURE__ */ new Map()
       });
     }
-    var isEmptyPath = (path60) => path60 == null || typeof path60 === "object" && !!path60[Symbol.iterator]().next().done;
+    var isEmptyPath = (path59) => path59 == null || typeof path59 === "object" && !!path59[Symbol.iterator]().next().done;
     var Collection = class extends Node.NodeBase {
       constructor(type, schema) {
         super(type);
@@ -9068,11 +9175,11 @@ var require_Collection = __commonJS({
        * be a Pair instance or a `{ key, value }` object, which may not have a key
        * that already exists in the map.
        */
-      addIn(path60, value) {
-        if (isEmptyPath(path60))
+      addIn(path59, value) {
+        if (isEmptyPath(path59))
           this.add(value);
         else {
-          const [key, ...rest] = path60;
+          const [key, ...rest] = path59;
           const node = this.get(key, true);
           if (identity.isCollection(node))
             node.addIn(rest, value);
@@ -9086,8 +9193,8 @@ var require_Collection = __commonJS({
        * Removes a value from the collection.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path60) {
-        const [key, ...rest] = path60;
+      deleteIn(path59) {
+        const [key, ...rest] = path59;
         if (rest.length === 0)
           return this.delete(key);
         const node = this.get(key, true);
@@ -9101,8 +9208,8 @@ var require_Collection = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path60, keepScalar) {
-        const [key, ...rest] = path60;
+      getIn(path59, keepScalar) {
+        const [key, ...rest] = path59;
         const node = this.get(key, true);
         if (rest.length === 0)
           return !keepScalar && identity.isScalar(node) ? node.value : node;
@@ -9120,8 +9227,8 @@ var require_Collection = __commonJS({
       /**
        * Checks if the collection includes a value with the key `key`.
        */
-      hasIn(path60) {
-        const [key, ...rest] = path60;
+      hasIn(path59) {
+        const [key, ...rest] = path59;
         if (rest.length === 0)
           return this.has(key);
         const node = this.get(key, true);
@@ -9131,8 +9238,8 @@ var require_Collection = __commonJS({
        * Sets a value in this collection. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path60, value) {
-        const [key, ...rest] = path60;
+      setIn(path59, value) {
+        const [key, ...rest] = path59;
         if (rest.length === 0) {
           this.set(key, value);
         } else {
@@ -11612,9 +11719,9 @@ var require_Document = __commonJS({
           this.contents.add(value);
       }
       /** Adds a value to the document. */
-      addIn(path60, value) {
+      addIn(path59, value) {
         if (assertCollection(this.contents))
-          this.contents.addIn(path60, value);
+          this.contents.addIn(path59, value);
       }
       /**
        * Create a new `Alias` node, ensuring that the target `node` has the required anchor.
@@ -11689,14 +11796,14 @@ var require_Document = __commonJS({
        * Removes a value from the document.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path60) {
-        if (Collection.isEmptyPath(path60)) {
+      deleteIn(path59) {
+        if (Collection.isEmptyPath(path59)) {
           if (this.contents == null)
             return false;
           this.contents = null;
           return true;
         }
-        return assertCollection(this.contents) ? this.contents.deleteIn(path60) : false;
+        return assertCollection(this.contents) ? this.contents.deleteIn(path59) : false;
       }
       /**
        * Returns item at `key`, or `undefined` if not found. By default unwraps
@@ -11711,10 +11818,10 @@ var require_Document = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path60, keepScalar) {
-        if (Collection.isEmptyPath(path60))
+      getIn(path59, keepScalar) {
+        if (Collection.isEmptyPath(path59))
           return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
-        return identity.isCollection(this.contents) ? this.contents.getIn(path60, keepScalar) : void 0;
+        return identity.isCollection(this.contents) ? this.contents.getIn(path59, keepScalar) : void 0;
       }
       /**
        * Checks if the document includes a value with the key `key`.
@@ -11725,10 +11832,10 @@ var require_Document = __commonJS({
       /**
        * Checks if the document includes a value at `path`.
        */
-      hasIn(path60) {
-        if (Collection.isEmptyPath(path60))
+      hasIn(path59) {
+        if (Collection.isEmptyPath(path59))
           return this.contents !== void 0;
-        return identity.isCollection(this.contents) ? this.contents.hasIn(path60) : false;
+        return identity.isCollection(this.contents) ? this.contents.hasIn(path59) : false;
       }
       /**
        * Sets a value in this document. For `!!set`, `value` needs to be a
@@ -11745,13 +11852,13 @@ var require_Document = __commonJS({
        * Sets a value in this document. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path60, value) {
-        if (Collection.isEmptyPath(path60)) {
+      setIn(path59, value) {
+        if (Collection.isEmptyPath(path59)) {
           this.contents = value;
         } else if (this.contents == null) {
-          this.contents = Collection.collectionFromPath(this.schema, Array.from(path60), value);
+          this.contents = Collection.collectionFromPath(this.schema, Array.from(path59), value);
         } else if (assertCollection(this.contents)) {
-          this.contents.setIn(path60, value);
+          this.contents.setIn(path59, value);
         }
       }
       /**
@@ -13691,9 +13798,9 @@ var require_cst_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    visit.itemAtPath = (cst, path60) => {
+    visit.itemAtPath = (cst, path59) => {
       let item = cst;
-      for (const [field, index] of path60) {
+      for (const [field, index] of path59) {
         const tok = item?.[field];
         if (tok && "items" in tok) {
           item = tok.items[index];
@@ -13702,23 +13809,23 @@ var require_cst_visit = __commonJS({
       }
       return item;
     };
-    visit.parentCollection = (cst, path60) => {
-      const parent = visit.itemAtPath(cst, path60.slice(0, -1));
-      const field = path60[path60.length - 1][0];
+    visit.parentCollection = (cst, path59) => {
+      const parent = visit.itemAtPath(cst, path59.slice(0, -1));
+      const field = path59[path59.length - 1][0];
       const coll = parent?.[field];
       if (coll && "items" in coll)
         return coll;
       throw new Error("Parent collection not found");
     };
-    function _visit(path60, item, visitor) {
-      let ctrl = visitor(item, path60);
+    function _visit(path59, item, visitor) {
+      let ctrl = visitor(item, path59);
       if (typeof ctrl === "symbol")
         return ctrl;
       for (const field of ["key", "value"]) {
         const token = item[field];
         if (token && "items" in token) {
           for (let i2 = 0; i2 < token.items.length; ++i2) {
-            const ci = _visit(Object.freeze(path60.concat([[field, i2]])), token.items[i2], visitor);
+            const ci = _visit(Object.freeze(path59.concat([[field, i2]])), token.items[i2], visitor);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -13729,10 +13836,10 @@ var require_cst_visit = __commonJS({
             }
           }
           if (typeof ctrl === "function" && field === "key")
-            ctrl = ctrl(item, path60);
+            ctrl = ctrl(item, path59);
         }
       }
-      return typeof ctrl === "function" ? ctrl(item, path60) : ctrl;
+      return typeof ctrl === "function" ? ctrl(item, path59) : ctrl;
     }
     exports.visit = visit;
   }
@@ -16454,14 +16561,14 @@ var require_url_state_machine = __commonJS({
       return url2.replace(/\u0009|\u000A|\u000D/g, "");
     }
     function shortenPath(url2) {
-      const path60 = url2.path;
-      if (path60.length === 0) {
+      const path59 = url2.path;
+      if (path59.length === 0) {
         return;
       }
-      if (url2.scheme === "file" && path60.length === 1 && isNormalizedWindowsDriveLetter(path60[0])) {
+      if (url2.scheme === "file" && path59.length === 1 && isNormalizedWindowsDriveLetter(path59[0])) {
         return;
       }
-      path60.pop();
+      path59.pop();
     }
     function includesCredentials(url2) {
       return url2.username !== "" || url2.password !== "";
@@ -21228,7 +21335,7 @@ function consumeBody() {
   let accum = [];
   let accumBytes = 0;
   let abort = false;
-  return new Body.Promise(function(resolve13, reject) {
+  return new Body.Promise(function(resolve12, reject) {
     let resTimeout;
     if (_this4.timeout) {
       resTimeout = setTimeout(function() {
@@ -21262,7 +21369,7 @@ function consumeBody() {
       }
       clearTimeout(resTimeout);
       try {
-        resolve13(Buffer.concat(accum, accumBytes));
+        resolve12(Buffer.concat(accum, accumBytes));
       } catch (err) {
         reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, "system", err));
       }
@@ -21525,7 +21632,7 @@ function fetch3(url2, opts) {
     throw new Error("native promise missing, set fetch.Promise to your favorite alternative");
   }
   Body.Promise = fetch3.Promise;
-  return new fetch3.Promise(function(resolve13, reject) {
+  return new fetch3.Promise(function(resolve12, reject) {
     const request = new Request2(url2, opts);
     const options = getNodeRequestOptions(request);
     const send = (options.protocol === "https:" ? https : http).request;
@@ -21658,7 +21765,7 @@ function fetch3(url2, opts) {
               requestOpts.body = void 0;
               requestOpts.headers.delete("content-length");
             }
-            resolve13(fetch3(new Request2(locationURL, requestOpts)));
+            resolve12(fetch3(new Request2(locationURL, requestOpts)));
             finalize();
             return;
         }
@@ -21679,7 +21786,7 @@ function fetch3(url2, opts) {
       const codings = headers.get("Content-Encoding");
       if (!request.compress || request.method === "HEAD" || codings === null || res.statusCode === 204 || res.statusCode === 304) {
         response = new Response3(body, response_options);
-        resolve13(response);
+        resolve12(response);
         return;
       }
       const zlibOptions = {
@@ -21689,7 +21796,7 @@ function fetch3(url2, opts) {
       if (codings == "gzip" || codings == "x-gzip") {
         body = body.pipe(zlib.createGunzip(zlibOptions));
         response = new Response3(body, response_options);
-        resolve13(response);
+        resolve12(response);
         return;
       }
       if (codings == "deflate" || codings == "x-deflate") {
@@ -21701,12 +21808,12 @@ function fetch3(url2, opts) {
             body = body.pipe(zlib.createInflateRaw());
           }
           response = new Response3(body, response_options);
-          resolve13(response);
+          resolve12(response);
         });
         raw.on("end", function() {
           if (!response) {
             response = new Response3(body, response_options);
-            resolve13(response);
+            resolve12(response);
           }
         });
         return;
@@ -21714,11 +21821,11 @@ function fetch3(url2, opts) {
       if (codings == "br" && typeof zlib.createBrotliDecompress === "function") {
         body = body.pipe(zlib.createBrotliDecompress());
         response = new Response3(body, response_options);
-        resolve13(response);
+        resolve12(response);
         return;
       }
       response = new Response3(body, response_options);
-      resolve13(response);
+      resolve12(response);
     });
     writeToStream(req, request);
   });
@@ -25684,14 +25791,14 @@ __export(fileFromPath_exports, {
   fileFromPathSync: () => fileFromPathSync,
   isFile: () => isFile
 });
-function createFileFromPath(path60, { mtimeMs, size }, filenameOrOptions, options = {}) {
+function createFileFromPath(path59, { mtimeMs, size }, filenameOrOptions, options = {}) {
   let filename;
   if (isPlainObject_default2(filenameOrOptions)) {
     [options, filename] = [filenameOrOptions, void 0];
   } else {
     filename = filenameOrOptions;
   }
-  const file = new FileFromPath({ path: path60, size, lastModified: mtimeMs });
+  const file = new FileFromPath({ path: path59, size, lastModified: mtimeMs });
   if (!filename) {
     filename = file.name;
   }
@@ -25700,13 +25807,13 @@ function createFileFromPath(path60, { mtimeMs, size }, filenameOrOptions, option
     lastModified: file.lastModified
   });
 }
-function fileFromPathSync(path60, filenameOrOptions, options = {}) {
-  const stats = statSync(path60);
-  return createFileFromPath(path60, stats, filenameOrOptions, options);
+function fileFromPathSync(path59, filenameOrOptions, options = {}) {
+  const stats = statSync(path59);
+  return createFileFromPath(path59, stats, filenameOrOptions, options);
 }
-async function fileFromPath2(path60, filenameOrOptions, options) {
-  const stats = await promises.stat(path60);
-  return createFileFromPath(path60, stats, filenameOrOptions, options);
+async function fileFromPath2(path59, filenameOrOptions, options) {
+  const stats = await promises.stat(path59);
+  return createFileFromPath(path59, stats, filenameOrOptions, options);
 }
 var import_node_domexception, __classPrivateFieldSet4, __classPrivateFieldGet5, _FileFromPath_path, _FileFromPath_start, MESSAGE, FileFromPath;
 var init_fileFromPath = __esm({
@@ -35237,7 +35344,7 @@ var require_frameworks = __commonJS({
         end: () => resolveResponse({ status: 204 }),
         respond: (json) => resolveResponse({ jsonBody: json }),
         unauthorized: () => resolveResponse({ status: 401, body: WRONG_TOKEN_ERROR }),
-        handlerReturn: new Promise((resolve13) => resolveResponse = resolve13)
+        handlerReturn: new Promise((resolve12) => resolveResponse = resolve12)
       };
     };
     var bun = (request) => {
@@ -35261,8 +35368,8 @@ var require_frameworks = __commonJS({
     };
     var cloudflare = (event) => {
       let resolveResponse;
-      event.respondWith(new Promise((resolve13) => {
-        resolveResponse = resolve13;
+      event.respondWith(new Promise((resolve12) => {
+        resolveResponse = resolve12;
       }));
       return {
         get update() {
@@ -35346,12 +35453,12 @@ var require_frameworks = __commonJS({
       const secretHeaderFromRequest = req.headers[SECRET_HEADER_LOWERCASE];
       return {
         get update() {
-          return new Promise((resolve13, reject) => {
+          return new Promise((resolve12, reject) => {
             const chunks = [];
             req.on("data", (chunk) => chunks.push(chunk)).once("end", () => {
               const raw = Buffer.concat(chunks).toString("utf-8");
               try {
-                resolve13(JSON.parse(raw));
+                resolve12(JSON.parse(raw));
               } catch (err) {
                 reject(err);
               }
@@ -35601,7 +35708,7 @@ var require_webhook = __commonJS({
     function timeoutIfNecessary(task, onTimeout, timeout) {
       if (timeout === Infinity)
         return task;
-      return new Promise((resolve13, reject) => {
+      return new Promise((resolve12, reject) => {
         const handle2 = setTimeout(() => {
           debugErr(`Request timed out after ${timeout} ms`);
           if (onTimeout === "throw") {
@@ -35609,7 +35716,7 @@ var require_webhook = __commonJS({
           } else {
             if (typeof onTimeout === "function")
               onTimeout();
-            resolve13();
+            resolve12();
           }
           const now = Date.now();
           task.finally(() => {
@@ -35617,7 +35724,7 @@ var require_webhook = __commonJS({
             debugErr(`Request completed ${diff2} ms after timeout!`);
           });
         }, timeout);
-        task.then(resolve13).catch(reject).finally(() => clearTimeout(handle2));
+        task.then(resolve12).catch(reject).finally(() => clearTimeout(handle2));
       });
     }
   }
@@ -38228,7 +38335,7 @@ var init_protocol = __esm({
               return;
             }
             const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-            await new Promise((resolve13) => setTimeout(resolve13, pollInterval));
+            await new Promise((resolve12) => setTimeout(resolve12, pollInterval));
             options?.signal?.throwIfAborted();
           }
         } catch (error2) {
@@ -38245,7 +38352,7 @@ var init_protocol = __esm({
        */
       request(request, resultSchema, options) {
         const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           const earlyReject = (error2) => {
             reject(error2);
           };
@@ -38323,7 +38430,7 @@ var init_protocol = __esm({
               if (!parseResult.success) {
                 reject(parseResult.error);
               } else {
-                resolve13(parseResult.data);
+                resolve12(parseResult.data);
               }
             } catch (error2) {
               reject(error2);
@@ -38584,12 +38691,12 @@ var init_protocol = __esm({
           }
         } catch {
         }
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           if (signal.aborted) {
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
             return;
           }
-          const timeoutId = setTimeout(resolve13, interval);
+          const timeoutId = setTimeout(resolve12, interval);
           signal.addEventListener("abort", () => {
             clearTimeout(timeoutId);
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -41594,7 +41701,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve13.call(this, root, ref);
+      let _sch = resolve12.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
         const { schemaId } = this.opts;
@@ -41621,7 +41728,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve13(root, ref) {
+    function resolve12(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -41838,8 +41945,8 @@ var require_utils2 = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path60) {
-      let input = path60;
+    function removeDotSegments(path59) {
+      let input = path59;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -42090,8 +42197,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path60, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path60 && path60 !== "/" ? path60 : void 0;
+        const [path59, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path59 && path59 !== "/" ? path59 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -42249,7 +42356,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve13(baseURI, relativeURI, options) {
+    function resolve12(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse2(baseURI, schemelessOptions), parse2(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -42507,7 +42614,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize: normalize4,
-      resolve: resolve13,
+      resolve: resolve12,
       resolveComponent,
       equal,
       serialize,
@@ -46249,7 +46356,7 @@ var require_windows = __commonJS({
     module.exports = isexe;
     isexe.sync = sync;
     var fs45 = __require("fs");
-    function checkPathExt(path60, options) {
+    function checkPathExt(path59, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -46260,25 +46367,25 @@ var require_windows = __commonJS({
       }
       for (var i2 = 0; i2 < pathext.length; i2++) {
         var p3 = pathext[i2].toLowerCase();
-        if (p3 && path60.substr(-p3.length).toLowerCase() === p3) {
+        if (p3 && path59.substr(-p3.length).toLowerCase() === p3) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat2, path60, options) {
+    function checkStat(stat2, path59, options) {
       if (!stat2.isSymbolicLink() && !stat2.isFile()) {
         return false;
       }
-      return checkPathExt(path60, options);
+      return checkPathExt(path59, options);
     }
-    function isexe(path60, options, cb) {
-      fs45.stat(path60, function(er2, stat2) {
-        cb(er2, er2 ? false : checkStat(stat2, path60, options));
+    function isexe(path59, options, cb) {
+      fs45.stat(path59, function(er2, stat2) {
+        cb(er2, er2 ? false : checkStat(stat2, path59, options));
       });
     }
-    function sync(path60, options) {
-      return checkStat(fs45.statSync(path60), path60, options);
+    function sync(path59, options) {
+      return checkStat(fs45.statSync(path59), path59, options);
     }
   }
 });
@@ -46289,13 +46396,13 @@ var require_mode = __commonJS({
     module.exports = isexe;
     isexe.sync = sync;
     var fs45 = __require("fs");
-    function isexe(path60, options, cb) {
-      fs45.stat(path60, function(er2, stat2) {
+    function isexe(path59, options, cb) {
+      fs45.stat(path59, function(er2, stat2) {
         cb(er2, er2 ? false : checkStat(stat2, options));
       });
     }
-    function sync(path60, options) {
-      return checkStat(fs45.statSync(path60), options);
+    function sync(path59, options) {
+      return checkStat(fs45.statSync(path59), options);
     }
     function checkStat(stat2, options) {
       return stat2.isFile() && checkMode(stat2, options);
@@ -46328,7 +46435,7 @@ var require_isexe = __commonJS({
     }
     module.exports = isexe;
     isexe.sync = sync;
-    function isexe(path60, options, cb) {
+    function isexe(path59, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -46337,17 +46444,17 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve13, reject) {
-          isexe(path60, options || {}, function(er2, is) {
+        return new Promise(function(resolve12, reject) {
+          isexe(path59, options || {}, function(er2, is) {
             if (er2) {
               reject(er2);
             } else {
-              resolve13(is);
+              resolve12(is);
             }
           });
         });
       }
-      core(path60, options || {}, function(er2, is) {
+      core(path59, options || {}, function(er2, is) {
         if (er2) {
           if (er2.code === "EACCES" || options && options.ignoreErrors) {
             er2 = null;
@@ -46357,9 +46464,9 @@ var require_isexe = __commonJS({
         cb(er2, is);
       });
     }
-    function sync(path60, options) {
+    function sync(path59, options) {
       try {
-        return core.sync(path60, options || {});
+        return core.sync(path59, options || {});
       } catch (er2) {
         if (options && options.ignoreErrors || er2.code === "EACCES") {
           return false;
@@ -46375,7 +46482,7 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js"(exports, module) {
     var isWindows3 = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path60 = __require("path");
+    var path59 = __require("path");
     var COLON = isWindows3 ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -46408,27 +46515,27 @@ var require_which = __commonJS({
         opt = {};
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      const step = (i2) => new Promise((resolve13, reject) => {
+      const step = (i2) => new Promise((resolve12, reject) => {
         if (i2 === pathEnv.length)
-          return opt.all && found.length ? resolve13(found) : reject(getNotFoundError(cmd));
+          return opt.all && found.length ? resolve12(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path60.join(pathPart, cmd);
+        const pCmd = path59.join(pathPart, cmd);
         const p3 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve13(subStep(p3, i2, 0));
+        resolve12(subStep(p3, i2, 0));
       });
-      const subStep = (p3, i2, ii) => new Promise((resolve13, reject) => {
+      const subStep = (p3, i2, ii) => new Promise((resolve12, reject) => {
         if (ii === pathExt.length)
-          return resolve13(step(i2 + 1));
+          return resolve12(step(i2 + 1));
         const ext = pathExt[ii];
         isexe(p3 + ext, { pathExt: pathExtExe }, (er2, is) => {
           if (!er2 && is) {
             if (opt.all)
               found.push(p3 + ext);
             else
-              return resolve13(p3 + ext);
+              return resolve12(p3 + ext);
           }
-          return resolve13(subStep(p3, i2, ii + 1));
+          return resolve12(subStep(p3, i2, ii + 1));
         });
       });
       return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -46440,7 +46547,7 @@ var require_which = __commonJS({
       for (let i2 = 0; i2 < pathEnv.length; i2++) {
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path60.join(pathPart, cmd);
+        const pCmd = path59.join(pathPart, cmd);
         const p3 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j3 = 0; j3 < pathExt.length; j3++) {
           const cur = p3 + pathExt[j3];
@@ -46486,7 +46593,7 @@ var require_path_key = __commonJS({
 // ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = __commonJS({
   "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module) {
-    var path60 = __require("path");
+    var path59 = __require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -46504,7 +46611,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env3[getPathKey({ env: env3 })],
-          pathExt: withoutPathExt ? path60.delimiter : void 0
+          pathExt: withoutPathExt ? path59.delimiter : void 0
         });
       } catch (e3) {
       } finally {
@@ -46513,7 +46620,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path60.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path59.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -46564,8 +46671,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path60, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path60.split("/").pop();
+      const [path59, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path59.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -46598,7 +46705,7 @@ var require_readShebang = __commonJS({
 // ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js
 var require_parse = __commonJS({
   "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js"(exports, module) {
-    var path60 = __require("path");
+    var path59 = __require("path");
     var resolveCommand = require_resolveCommand();
     var escape4 = require_escape();
     var readShebang = require_readShebang();
@@ -46623,7 +46730,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path60.normalize(parsed.command);
+        parsed.command = path59.normalize(parsed.command);
         parsed.command = escape4.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape4.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -46824,7 +46931,7 @@ var init_stdio2 = __esm({
         if (this._process) {
           throw new Error("StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.");
         }
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           this._process = (0, import_cross_spawn.default)(this._serverParams.command, this._serverParams.args ?? [], {
             // merge default env with server env because mcp server needs some env vars
             env: {
@@ -46841,7 +46948,7 @@ var init_stdio2 = __esm({
             this.onerror?.(error2);
           });
           this._process.on("spawn", () => {
-            resolve13();
+            resolve12();
           });
           this._process.on("close", (_code) => {
             this._process = void 0;
@@ -46900,22 +47007,22 @@ var init_stdio2 = __esm({
         if (this._process) {
           const processToClose = this._process;
           this._process = void 0;
-          const closePromise = new Promise((resolve13) => {
+          const closePromise = new Promise((resolve12) => {
             processToClose.once("close", () => {
-              resolve13();
+              resolve12();
             });
           });
           try {
             processToClose.stdin?.end();
           } catch {
           }
-          await Promise.race([closePromise, new Promise((resolve13) => setTimeout(resolve13, 2e3).unref())]);
+          await Promise.race([closePromise, new Promise((resolve12) => setTimeout(resolve12, 2e3).unref())]);
           if (processToClose.exitCode === null) {
             try {
               processToClose.kill("SIGTERM");
             } catch {
             }
-            await Promise.race([closePromise, new Promise((resolve13) => setTimeout(resolve13, 2e3).unref())]);
+            await Promise.race([closePromise, new Promise((resolve12) => setTimeout(resolve12, 2e3).unref())]);
           }
           if (processToClose.exitCode === null) {
             try {
@@ -46927,15 +47034,15 @@ var init_stdio2 = __esm({
         this._readBuffer.clear();
       }
       send(message) {
-        return new Promise((resolve13) => {
+        return new Promise((resolve12) => {
           if (!this._process?.stdin) {
             throw new Error("Not connected");
           }
           const json = serializeMessage(message);
           if (this._process.stdin.write(json)) {
-            resolve13();
+            resolve12();
           } else {
-            this._process.stdin.once("drain", resolve13);
+            this._process.stdin.once("drain", resolve12);
           }
         });
       }
@@ -48364,7 +48471,7 @@ var init_sse = __esm({
       }
       _startOrAuth() {
         const fetchImpl2 = this?._eventSourceInit?.fetch ?? this._fetch ?? fetch;
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           this._eventSource = new EventSource(this._url.href, {
             ...this._eventSourceInit,
             fetch: async (url2, init3) => {
@@ -48385,7 +48492,7 @@ var init_sse = __esm({
           this._abortController = new AbortController();
           this._eventSource.onerror = (event) => {
             if (event.code === 401 && this._authProvider) {
-              this._authThenStart().then(resolve13, reject);
+              this._authThenStart().then(resolve12, reject);
               return;
             }
             const error2 = new SseError(event.code, event.message, event);
@@ -48407,7 +48514,7 @@ var init_sse = __esm({
               void this.close();
               return;
             }
-            resolve13();
+            resolve12();
           });
           this._eventSource.onmessage = (event) => {
             const messageEvent = event;
@@ -48947,20 +49054,27 @@ async function defaultClientFactory(server, options = { servers: [] }) {
   return {
     async listTools() {
       const result = await client.listTools();
-      return { tools: result.tools ?? [] };
+      return { tools: (result.tools ?? []).map(toToolDescriptor) };
     },
     async callTool(args) {
       const result = await client.callTool(args);
-      return {
-        content: result.content,
+      const out = {
+        content: result.content?.map(toContentBlock),
         isError: result.isError
       };
+      return out;
     },
     async close() {
       await client.close();
     }
   };
 }
+function toToolDescriptor(t2) {
+  return t2;
+}
+function toContentBlock(block) {
+  return block;
+}
 async function createTransport(server) {
   const kind3 = server.kind ?? "stdio";
   if (kind3 === "stdio") {
@@ -49001,7 +49115,7 @@ var init_types2 = __esm({
   }
 });
 async function runMcpCallWithFallback(callPromise, signal, toolName) {
-  return await new Promise((resolve13, reject) => {
+  return await new Promise((resolve12, reject) => {
     let settled = false;
     const settle = (fn) => {
       if (settled)
@@ -49018,7 +49132,7 @@ async function runMcpCallWithFallback(callPromise, signal, toolName) {
       settle(() => reject(new Error(`MCP tool "${toolName}" timed out after ${MCP_CALL_TIMEOUT_MS}ms`)));
     }, MCP_CALL_TIMEOUT_MS);
     signal.addEventListener("abort", onAbort, { once: true });
-    callPromise.then((v3) => settle(() => resolve13(v3)), (err) => settle(() => reject(err instanceof Error ? err : new Error(String(err)))));
+    callPromise.then((v3) => settle(() => resolve12(v3)), (err) => settle(() => reject(err instanceof Error ? err : new Error(String(err)))));
   });
 }
 async function wrapMcpServerTools(opts) {
@@ -51760,14 +51874,14 @@ var require_react_development = __commonJS({
               var thenableResult = result;
               var wasAwaited = false;
               var thenable = {
-                then: function(resolve13, reject) {
+                then: function(resolve12, reject) {
                   wasAwaited = true;
                   thenableResult.then(function(returnValue2) {
                     popActScope(prevActScopeDepth);
                     if (actScopeDepth === 0) {
-                      recursivelyFlushAsyncActWork(returnValue2, resolve13, reject);
+                      recursivelyFlushAsyncActWork(returnValue2, resolve12, reject);
                     } else {
-                      resolve13(returnValue2);
+                      resolve12(returnValue2);
                     }
                   }, function(error3) {
                     popActScope(prevActScopeDepth);
@@ -51797,20 +51911,20 @@ var require_react_development = __commonJS({
                   ReactCurrentActQueue.current = null;
                 }
                 var _thenable = {
-                  then: function(resolve13, reject) {
+                  then: function(resolve12, reject) {
                     if (ReactCurrentActQueue.current === null) {
                       ReactCurrentActQueue.current = [];
-                      recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
+                      recursivelyFlushAsyncActWork(returnValue, resolve12, reject);
                     } else {
-                      resolve13(returnValue);
+                      resolve12(returnValue);
                     }
                   }
                 };
                 return _thenable;
               } else {
                 var _thenable2 = {
-                  then: function(resolve13, reject) {
-                    resolve13(returnValue);
+                  then: function(resolve12, reject) {
+                    resolve12(returnValue);
                   }
                 };
                 return _thenable2;
@@ -51826,7 +51940,7 @@ var require_react_development = __commonJS({
             actScopeDepth = prevActScopeDepth;
           }
         }
-        function recursivelyFlushAsyncActWork(returnValue, resolve13, reject) {
+        function recursivelyFlushAsyncActWork(returnValue, resolve12, reject) {
           {
             var queue = ReactCurrentActQueue.current;
             if (queue !== null) {
@@ -51835,16 +51949,16 @@ var require_react_development = __commonJS({
                 enqueueTask(function() {
                   if (queue.length === 0) {
                     ReactCurrentActQueue.current = null;
-                    resolve13(returnValue);
+                    resolve12(returnValue);
                   } else {
-                    recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
+                    recursivelyFlushAsyncActWork(returnValue, resolve12, reject);
                   }
                 });
               } catch (error3) {
                 reject(error3);
               }
             } else {
-              resolve13(returnValue);
+              resolve12(returnValue);
             }
           }
         }
@@ -74458,10 +74572,10 @@ var require_react_reconciler_development = __commonJS({
         var setErrorHandler = null;
         var setSuspenseHandler = null;
         {
-          var copyWithDeleteImpl = function(obj, path60, index2) {
-            var key = path60[index2];
+          var copyWithDeleteImpl = function(obj, path59, index2) {
+            var key = path59[index2];
             var updated = isArray(obj) ? obj.slice() : assign({}, obj);
-            if (index2 + 1 === path60.length) {
+            if (index2 + 1 === path59.length) {
               if (isArray(updated)) {
                 updated.splice(key, 1);
               } else {
@@ -74469,11 +74583,11 @@ var require_react_reconciler_development = __commonJS({
               }
               return updated;
             }
-            updated[key] = copyWithDeleteImpl(obj[key], path60, index2 + 1);
+            updated[key] = copyWithDeleteImpl(obj[key], path59, index2 + 1);
             return updated;
           };
-          var copyWithDelete = function(obj, path60) {
-            return copyWithDeleteImpl(obj, path60, 0);
+          var copyWithDelete = function(obj, path59) {
+            return copyWithDeleteImpl(obj, path59, 0);
           };
           var copyWithRenameImpl = function(obj, oldPath, newPath, index2) {
             var oldKey = oldPath[index2];
@@ -74511,17 +74625,17 @@ var require_react_reconciler_development = __commonJS({
             }
             return copyWithRenameImpl(obj, oldPath, newPath, 0);
           };
-          var copyWithSetImpl = function(obj, path60, index2, value) {
-            if (index2 >= path60.length) {
+          var copyWithSetImpl = function(obj, path59, index2, value) {
+            if (index2 >= path59.length) {
               return value;
             }
-            var key = path60[index2];
+            var key = path59[index2];
             var updated = isArray(obj) ? obj.slice() : assign({}, obj);
-            updated[key] = copyWithSetImpl(obj[key], path60, index2 + 1, value);
+            updated[key] = copyWithSetImpl(obj[key], path59, index2 + 1, value);
             return updated;
           };
-          var copyWithSet = function(obj, path60, value) {
-            return copyWithSetImpl(obj, path60, 0, value);
+          var copyWithSet = function(obj, path59, value) {
+            return copyWithSetImpl(obj, path59, 0, value);
           };
           var findHook = function(fiber, id) {
             var currentHook2 = fiber.memoizedState;
@@ -74531,10 +74645,10 @@ var require_react_reconciler_development = __commonJS({
             }
             return currentHook2;
           };
-          overrideHookState = function(fiber, id, path60, value) {
+          overrideHookState = function(fiber, id, path59, value) {
             var hook = findHook(fiber, id);
             if (hook !== null) {
-              var newState = copyWithSet(hook.memoizedState, path60, value);
+              var newState = copyWithSet(hook.memoizedState, path59, value);
               hook.memoizedState = newState;
               hook.baseState = newState;
               fiber.memoizedProps = assign({}, fiber.memoizedProps);
@@ -74544,10 +74658,10 @@ var require_react_reconciler_development = __commonJS({
               }
             }
           };
-          overrideHookStateDeletePath = function(fiber, id, path60) {
+          overrideHookStateDeletePath = function(fiber, id, path59) {
             var hook = findHook(fiber, id);
             if (hook !== null) {
-              var newState = copyWithDelete(hook.memoizedState, path60);
+              var newState = copyWithDelete(hook.memoizedState, path59);
               hook.memoizedState = newState;
               hook.baseState = newState;
               fiber.memoizedProps = assign({}, fiber.memoizedProps);
@@ -74570,8 +74684,8 @@ var require_react_reconciler_development = __commonJS({
               }
             }
           };
-          overrideProps = function(fiber, path60, value) {
-            fiber.pendingProps = copyWithSet(fiber.memoizedProps, path60, value);
+          overrideProps = function(fiber, path59, value) {
+            fiber.pendingProps = copyWithSet(fiber.memoizedProps, path59, value);
             if (fiber.alternate) {
               fiber.alternate.pendingProps = fiber.pendingProps;
             }
@@ -74580,8 +74694,8 @@ var require_react_reconciler_development = __commonJS({
               scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
             }
           };
-          overridePropsDeletePath = function(fiber, path60) {
-            fiber.pendingProps = copyWithDelete(fiber.memoizedProps, path60);
+          overridePropsDeletePath = function(fiber, path59) {
+            fiber.pendingProps = copyWithDelete(fiber.memoizedProps, path59);
             if (fiber.alternate) {
               fiber.alternate.pendingProps = fiber.pendingProps;
             }
@@ -79676,11 +79790,11 @@ var init_devtools = __esm({
     devtools_stub_default.connectToDevTools();
   }
 });
-var import_react_reconciler, import_constants18, diff, cleanupYogaNode, reconciler_default;
+var import_react_reconciler, import_constants17, diff, cleanupYogaNode, reconciler_default;
 var init_reconciler = __esm({
   async "../../node_modules/.pnpm/ink@5.2.1_@types+react@18.3.28_react@18.3.1/node_modules/ink/build/reconciler.js"() {
     import_react_reconciler = __toESM(require_react_reconciler());
-    import_constants18 = __toESM(require_constants3());
+    import_constants17 = __toESM(require_constants3());
     await init_src();
     await init_dom();
     await init_styles();
@@ -79830,7 +79944,7 @@ $ npm install --save-dev react-devtools-core
       scheduleTimeout: setTimeout,
       cancelTimeout: clearTimeout,
       noTimeout: -1,
-      getCurrentEventPriority: () => import_constants18.DefaultEventPriority,
+      getCurrentEventPriority: () => import_constants17.DefaultEventPriority,
       beforeActiveInstanceBlur() {
       },
       afterActiveInstanceBlur() {
@@ -82023,8 +82137,8 @@ var init_ErrorOverview = __esm({
     init_dist7();
     init_Box();
     init_Text();
-    cleanupPath = (path60) => {
-      return path60?.replace(`file://${cwd()}/`, "");
+    cleanupPath = (path59) => {
+      return path59?.replace(`file://${cwd()}/`, "");
     };
     stackUtils = new import_stack_utils.default({
       cwd: cwd(),
@@ -82519,8 +82633,8 @@ var init_ink = __esm({
         }
       }
       async waitUntilExit() {
-        this.exitPromise ||= new Promise((resolve13, reject) => {
-          this.resolveExitPromise = resolve13;
+        this.exitPromise ||= new Promise((resolve12, reject) => {
+          this.resolveExitPromise = resolve12;
           this.rejectExitPromise = reject;
         });
         return this.exitPromise;
@@ -85197,35 +85311,40 @@ function handleSubagentEvent(e3, subagents, root, groupRef) {
     return;
   }
 }
-function pairToolEvents(events, compactByName = EMPTY_COMPACT_MAP) {
-  const root = [];
-  const callTargets = /* @__PURE__ */ new Map();
-  const suppressedCallIds = /* @__PURE__ */ new Set();
-  let pendingLoadSkillCallId = null;
-  let openScope = null;
-  let continuationSkillEvent = null;
-  let openLive = null;
-  const subagents = /* @__PURE__ */ new Map();
-  const subagentGroup = { current: null };
+function createFoldState(compactByName = EMPTY_COMPACT_MAP) {
+  return {
+    root: [],
+    compactByName,
+    callTargets: /* @__PURE__ */ new Map(),
+    suppressedCallIds: /* @__PURE__ */ new Set(),
+    pendingLoadSkillCallId: null,
+    openScope: null,
+    continuationSkillEvent: null,
+    openLive: null,
+    subagents: /* @__PURE__ */ new Map(),
+    subagentGroup: { current: null }
+  };
+}
+function stepFold(s2, e3) {
   const pushBlock = (block) => {
-    subagentGroup.current = null;
-    if (openScope) {
-      openScope.children.push(block);
+    s2.subagentGroup.current = null;
+    if (s2.openScope) {
+      s2.openScope.children.push(block);
     } else {
-      root.push(block);
+      s2.root.push(block);
     }
   };
   const closeOpenLive = () => {
-    if (openLive) {
-      openLive.closed = true;
-      openLive = null;
+    if (s2.openLive) {
+      s2.openLive.closed = true;
+      s2.openLive = null;
     }
   };
   const closeOpenScope = () => {
     closeOpenLive();
-    if (openScope) {
-      openScope.closed = true;
-      openScope = null;
+    if (s2.openScope) {
+      s2.openScope.closed = true;
+      s2.openScope = null;
     }
   };
   const removeBlockByCallId = (callId) => {
@@ -85237,12 +85356,12 @@ function pairToolEvents(events, compactByName = EMPTY_COMPACT_MAP) {
       }
       return false;
     };
-    if (openScope && removeFrom(openScope.children))
+    if (s2.openScope && removeFrom(s2.openScope.children))
       return;
-    removeFrom(root);
+    removeFrom(s2.root);
   };
   const markOrphansAtTurnBoundary = () => {
-    for (const target of callTargets.values()) {
+    for (const target of s2.callTargets.values()) {
       if (target.outcome === null) {
         target.outcome = {
           type: "denied",
@@ -85250,116 +85369,119 @@ function pairToolEvents(events, compactByName = EMPTY_COMPACT_MAP) {
         };
       }
     }
-    callTargets.clear();
+    s2.callTargets.clear();
   };
-  for (const e3 of events) {
-    if (e3.type === "user_prompt") {
-      closeOpenScope();
-      markOrphansAtTurnBoundary();
-      pendingLoadSkillCallId = null;
-      continuationSkillEvent = null;
-      suppressedCallIds.clear();
-      subagentGroup.current = null;
-      root.push({ kind: "event", id: e3.id, event: e3 });
-      continue;
+  if (e3.type === "user_prompt") {
+    closeOpenScope();
+    markOrphansAtTurnBoundary();
+    s2.pendingLoadSkillCallId = null;
+    s2.continuationSkillEvent = null;
+    s2.suppressedCallIds.clear();
+    s2.subagentGroup.current = null;
+    s2.root.push({ kind: "event", id: e3.id, event: e3 });
+    return;
+  }
+  if (e3.type === "skill_invoked") {
+    closeOpenScope();
+    s2.continuationSkillEvent = null;
+    if (s2.pendingLoadSkillCallId) {
+      s2.suppressedCallIds.add(s2.pendingLoadSkillCallId);
+      removeBlockByCallId(s2.pendingLoadSkillCallId);
+      s2.pendingLoadSkillCallId = null;
+    }
+    s2.subagentGroup.current = null;
+    s2.openScope = {
+      kind: "skill-scope",
+      id: e3.id,
+      skillEvent: e3,
+      children: [],
+      closed: false
+    };
+    s2.root.push(s2.openScope);
+    return;
+  }
+  if (e3.type === "tool_call_requested") {
+    if (e3.name === "load_skill") {
+      s2.pendingLoadSkillCallId = e3.callId;
     }
-    if (e3.type === "skill_invoked") {
-      closeOpenScope();
-      continuationSkillEvent = null;
-      if (pendingLoadSkillCallId) {
-        suppressedCallIds.add(pendingLoadSkillCallId);
-        removeBlockByCallId(pendingLoadSkillCallId);
-        pendingLoadSkillCallId = null;
-      }
-      subagentGroup.current = null;
-      openScope = {
+    if (!s2.openScope && s2.continuationSkillEvent) {
+      s2.openScope = {
         kind: "skill-scope",
-        id: e3.id,
-        skillEvent: e3,
+        id: `${s2.continuationSkillEvent.id}:cont:${e3.id}`,
+        skillEvent: s2.continuationSkillEvent,
         children: [],
         closed: false
       };
-      root.push(openScope);
-      continue;
-    }
-    if (e3.type === "tool_call_requested") {
-      if (e3.name === "load_skill") {
-        pendingLoadSkillCallId = e3.callId;
-      }
-      if (!openScope && continuationSkillEvent) {
-        openScope = {
-          kind: "skill-scope",
-          id: `${continuationSkillEvent.id}:cont:${e3.id}`,
-          skillEvent: continuationSkillEvent,
-          children: [],
-          closed: false
-        };
-        root.push(openScope);
-        continuationSkillEvent = null;
-      }
-      const compact = FILE_DIFF_TOOL_NAMES.has(e3.name) ? void 0 : compactByName.get(e3.name);
-      if (compact) {
-        if (!openLive) {
-          openLive = { kind: "live-tools", id: e3.id, calls: [], closed: false };
-          pushBlock(openLive);
-        }
-        const call = { id: e3.id, request: e3, compact, outcome: null };
-        openLive.calls.push(call);
-        callTargets.set(e3.callId, call);
-        continue;
-      }
-      closeOpenLive();
-      const block = {
-        kind: "tool-call",
-        id: e3.id,
-        request: e3,
-        outcome: null
-      };
-      callTargets.set(e3.callId, block);
-      pushBlock(block);
-      continue;
-    }
-    if (e3.type === "tool_result") {
-      if (suppressedCallIds.has(e3.callId))
-        continue;
-      const target = callTargets.get(e3.callId);
-      if (target) {
-        target.outcome = e3;
-        continue;
-      }
-    }
-    if (e3.type === "tool_call_denied") {
-      if (suppressedCallIds.has(e3.callId))
-        continue;
-      const target = callTargets.get(e3.callId);
-      if (target) {
-        target.outcome = { type: "denied", reason: e3.reason };
-        continue;
-      }
+      s2.root.push(s2.openScope);
+      s2.continuationSkillEvent = null;
+    }
+    const compact = FILE_DIFF_TOOL_NAMES.has(e3.name) ? void 0 : s2.compactByName.get(e3.name);
+    if (compact) {
+      if (!s2.openLive) {
+        s2.openLive = { kind: "live-tools", id: e3.id, calls: [], closed: false };
+        pushBlock(s2.openLive);
+      }
+      const call = { id: e3.id, request: e3, compact, outcome: null };
+      s2.openLive.calls.push(call);
+      s2.callTargets.set(e3.callId, call);
+      return;
     }
-    if (e3.type === "tool_call_approved") {
-      continue;
+    closeOpenLive();
+    const block = {
+      kind: "tool-call",
+      id: e3.id,
+      request: e3,
+      outcome: null
+    };
+    s2.callTargets.set(e3.callId, block);
+    pushBlock(block);
+    return;
+  }
+  if (e3.type === "tool_result") {
+    if (s2.suppressedCallIds.has(e3.callId))
+      return;
+    const target = s2.callTargets.get(e3.callId);
+    if (target) {
+      target.outcome = e3;
+      return;
     }
-    if (e3.type === "assistant_message") {
-      closeOpenLive();
-      if (openScope) {
-        continuationSkillEvent = openScope.skillEvent;
-        openScope.closed = true;
-        openScope = null;
-      } else {
-        continuationSkillEvent = null;
-      }
-      subagentGroup.current = null;
-      root.push({ kind: "event", id: e3.id, event: e3 });
-      continue;
+  }
+  if (e3.type === "tool_call_denied") {
+    if (s2.suppressedCallIds.has(e3.callId))
+      return;
+    const target = s2.callTargets.get(e3.callId);
+    if (target) {
+      target.outcome = { type: "denied", reason: e3.reason };
+      return;
     }
-    if (e3.type === "plugin_event" && e3.pluginId === SUBAGENT_PLUGIN_ID2) {
-      handleSubagentEvent(e3, subagents, root, subagentGroup);
-      continue;
+  }
+  if (e3.type === "tool_call_approved") {
+    return;
+  }
+  if (e3.type === "assistant_message") {
+    closeOpenLive();
+    if (s2.openScope) {
+      s2.continuationSkillEvent = s2.openScope.skillEvent;
+      s2.openScope.closed = true;
+      s2.openScope = null;
+    } else {
+      s2.continuationSkillEvent = null;
     }
-    pushBlock({ kind: "event", id: e3.id, event: e3 });
+    s2.subagentGroup.current = null;
+    s2.root.push({ kind: "event", id: e3.id, event: e3 });
+    return;
+  }
+  if (e3.type === "plugin_event" && e3.pluginId === SUBAGENT_PLUGIN_ID2) {
+    handleSubagentEvent(e3, s2.subagents, s2.root, s2.subagentGroup);
+    return;
   }
-  return root;
+  pushBlock({ kind: "event", id: e3.id, event: e3 });
+}
+function pairToolEvents(events, compactByName = EMPTY_COMPACT_MAP) {
+  const state = createFoldState(compactByName);
+  for (const e3 of events)
+    stepFold(state, e3);
+  return state.root;
 }
 function isSettled(block) {
   if (block.kind === "event")
@@ -85445,13 +85567,97 @@ function countToolCalls(blocks) {
   }
   return n2;
 }
-var SUBAGENT_PLUGIN_ID2, FILE_DIFF_TOOL_NAMES, EMPTY_COMPACT_MAP;
+var SUBAGENT_PLUGIN_ID2, FILE_DIFF_TOOL_NAMES, EMPTY_COMPACT_MAP, IncrementalFold;
 var init_pair_events = __esm({
   "../chat-model/dist/pair-events.js"() {
     init_format();
     SUBAGENT_PLUGIN_ID2 = "@moxxy/subagents";
     FILE_DIFF_TOOL_NAMES = /* @__PURE__ */ new Set(["Write", "Edit"]);
     EMPTY_COMPACT_MAP = /* @__PURE__ */ new Map();
+    IncrementalFold = class {
+      state;
+      prefixLength = 0;
+      rev = 0;
+      /** `id` of the first / last event folded so far — used to detect when the
+       *  source array's prefix has shifted (a scroll-up prepend) or been replaced
+       *  (/clear, a fresh session), in which case the carried fold state is no
+       *  longer valid and we must rebuild from scratch. */
+      headId = null;
+      tailId = null;
+      constructor(compactByName = EMPTY_COMPACT_MAP) {
+        this.state = createFoldState(compactByName);
+      }
+      /** Number of events folded so far (the high-water mark). */
+      get length() {
+        return this.prefixLength;
+      }
+      /** Bumps whenever the folded tree may have changed (every `push`). Use as
+       *  a memo key instead of the (stable) `tree()` reference. */
+      get version() {
+        return this.rev;
+      }
+      /** Fold one freshly-committed event onto the existing tree. */
+      push(event) {
+        stepFold(this.state, event);
+        if (this.prefixLength === 0)
+          this.headId = event.id;
+        this.tailId = event.id;
+        this.prefixLength += 1;
+        this.rev += 1;
+      }
+      /** Fold a batch of newly-committed events (e.g. a replayed page). */
+      pushMany(events) {
+        for (const e3 of events)
+          this.push(e3);
+      }
+      /**
+       * Re-sync to `events` when the source array is the authoritative log. Folds
+       * only the tail past the current high-water mark when `events` extends the
+       * already-folded prefix unchanged (the common live-append case), and
+       * rebuilds from scratch only when that prefix shifted or was replaced (a
+       * scroll-up prepend, /clear, a fresh session). Returns the (stable) root.
+       *
+       * Prefix-unchanged is detected by event `id`: the log never rewrites a
+       * settled event in place (only its tool outcome, which the fold owns), so
+       * matching head+tail ids over an unshrunk length proves the leading
+       * `prefixLength` events are exactly the ones already folded.
+       */
+      syncTo(events) {
+        if (this.canExtend(events)) {
+          for (let i2 = this.prefixLength; i2 < events.length; i2 += 1)
+            this.push(events[i2]);
+          return this.state.root;
+        }
+        this.reset();
+        this.pushMany(events);
+        return this.state.root;
+      }
+      /** Discard all state — folds again from empty. */
+      reset() {
+        this.state = createFoldState(this.state.compactByName);
+        this.prefixLength = 0;
+        this.headId = null;
+        this.tailId = null;
+        this.rev += 1;
+      }
+      /** The folded block tree (stable reference, mutated in place). */
+      tree() {
+        return this.state.root;
+      }
+      /** True when `events` is the already-folded prefix plus zero or more new
+       *  tail events — i.e. a pure append. Requires the head id to still match
+       *  (no prepend) and the event at `prefixLength-1` to be the last one we
+       *  folded (no in-place rewrite or replacement of the prefix). */
+      canExtend(events) {
+        if (this.prefixLength === 0)
+          return true;
+        if (events.length < this.prefixLength)
+          return false;
+        if (events[0].id !== this.headId)
+          return false;
+        return events[this.prefixLength - 1].id === this.tailId;
+      }
+    };
   }
 });
 
@@ -86090,6 +86296,31 @@ var init_BlockLine = __esm({
 });
 
 // ../plugin-cli/dist/components/chat/StreamingPreview.js
+function lastNonEmptyLineShown(content, innerCols) {
+  let end = content.length;
+  let chosenStart = -1;
+  let chosenEnd = -1;
+  while (end > 0) {
+    const nl = content.lastIndexOf("\n", end - 1);
+    const start = nl + 1;
+    if (content.slice(start, end).trim()) {
+      chosenStart = start;
+      chosenEnd = end;
+      break;
+    }
+    if (start === 0)
+      break;
+    end = nl;
+  }
+  let line;
+  if (chosenStart >= 0) {
+    line = content.slice(chosenStart, chosenEnd);
+  } else {
+    const lastNl = content.lastIndexOf("\n");
+    line = lastNl < 0 ? content : content.slice(lastNl + 1);
+  }
+  return line.length > innerCols ? `\u2026${line.slice(line.length - (innerCols - 1))}` : line;
+}
 function tailForViewport(content) {
   return content;
 }
@@ -86103,17 +86334,7 @@ var init_StreamingPreview = __esm({
     StreamingPreview = (0, import_react40.memo)(function StreamingPreview2({ content, dim: dim3 }) {
       const cols = process.stdout.columns ?? 80;
       const innerCols = Math.max(20, cols - 4);
-      const lines = content.split("\n");
-      let line = "";
-      for (let i2 = lines.length - 1; i2 >= 0; i2 -= 1) {
-        if (lines[i2].trim()) {
-          line = lines[i2];
-          break;
-        }
-      }
-      if (!line)
-        line = lines[lines.length - 1] ?? "";
-      const shown = line.length > innerCols ? `\u2026${line.slice(line.length - (innerCols - 1))}` : line;
+      const shown = lastNonEmptyLineShown(content, innerCols);
       return (0, import_jsx_runtime19.jsxs)(Box_default, { flexDirection: "row", marginTop: 1, children: [(0, import_jsx_runtime19.jsx)(Box_default, { marginRight: 1, children: (0, import_jsx_runtime19.jsx)(Text, { dimColor: true, children: Glyphs.filled }) }), (0, import_jsx_runtime19.jsx)(Text, { dimColor: dim3, children: shown || " " })] });
     });
   }
@@ -86130,16 +86351,26 @@ var init_ChatView = __esm({
     init_dist8();
     await init_StreamingPreview();
     ChatView = ({ events, streamingDelta, reasoningDelta, expandToolOutputs, compactTools, hideLive }) => {
-      const blocks = (0, import_react41.useMemo)(() => pairToolEvents(events, compactTools), [events, compactTools]);
+      const foldRef = (0, import_react41.useRef)(null);
+      const compactRef = (0, import_react41.useRef)(void 0);
+      const blocks = (0, import_react41.useMemo)(() => {
+        if (typeof IncrementalFold !== "function")
+          return pairToolEvents(events, compactTools);
+        if (!foldRef.current || compactRef.current !== compactTools) {
+          foldRef.current = new IncrementalFold(compactTools);
+          compactRef.current = compactTools;
+        }
+        return foldRef.current.syncTo(events).slice();
+      }, [events, compactTools]);
       const settledRef = (0, import_react41.useRef)([]);
       const clearGenerationRef = (0, import_react41.useRef)(0);
       if (blocks.length < settledRef.current.length) {
         settledRef.current = [];
         clearGenerationRef.current += 1;
       }
-      let settledCount = 0;
-      for (const b3 of blocks) {
-        if (isSettled(b3))
+      let settledCount = settledRef.current.length;
+      for (let i2 = settledRef.current.length; i2 < blocks.length; i2 += 1) {
+        if (isSettled(blocks[i2]))
           settledCount += 1;
         else
           break;
@@ -86869,14 +87100,14 @@ function usePermissionQueue(session, registerInteractiveResolver) {
       if (yoloRef.current) {
         return { mode: "allow", reason: "yolo mode" };
       }
-      return new Promise((resolve13) => {
-        setPendingPermissions((prev) => [...prev, { call, ctx, resolve: resolve13 }]);
+      return new Promise((resolve12) => {
+        setPendingPermissions((prev) => [...prev, { call, ctx, resolve: resolve12 }]);
       });
     });
     session.setApprovalResolver({
       name: "tui-approval",
-      confirm: (request) => new Promise((resolve13) => {
-        setPendingApproval({ request, resolve: resolve13 });
+      confirm: (request) => new Promise((resolve12) => {
+        setPendingApproval({ request, resolve: resolve12 });
       })
     });
     return () => {
@@ -86959,14 +87190,14 @@ async function startVoiceRecording(opts = {}) {
     while (Buffer$1.concat(stderrChunks).byteLength > 16384)
       stderrChunks.shift();
   });
-  const closed = new Promise((resolve13) => {
+  const closed = new Promise((resolve12) => {
     child.once("close", (code, signal) => {
       closeState = { code, signal };
-      resolve13();
+      resolve12();
     });
   });
-  await new Promise((resolve13, reject) => {
-    child.once("spawn", resolve13);
+  await new Promise((resolve12, reject) => {
+    child.once("spawn", resolve12);
     child.once("error", (err) => reject(toSpawnError(command, err)));
   });
   let stopPromise = null;
@@ -86989,14 +87220,14 @@ async function checkVoiceCaptureAvailable(opts = {}) {
   const child = (opts.spawnImpl ?? spawn)(command, ["-version"], {
     stdio: ["ignore", "ignore", "ignore"]
   });
-  return new Promise((resolve13) => {
+  return new Promise((resolve12) => {
     let settled = false;
     const done = (check) => {
       if (settled)
         return;
       settled = true;
       clearTimeout(timer);
-      resolve13(check);
+      resolve12(check);
     };
     const timer = setTimeout(() => {
       if (!child.killed)
@@ -88213,6 +88444,13 @@ function modelBreakdownRows(file, liveByModel) {
     output: m3.outputTokens
   })).sort((a2, b3) => b3.prompt - a2.prompt);
 }
+function peak(series, seed = 0) {
+  let m3 = seed;
+  for (const v3 of series)
+    if (v3 > m3)
+      m3 = v3;
+  return m3;
+}
 function perCallPrompt(events) {
   const out = [];
   for (const e3 of events) {
@@ -88297,7 +88535,7 @@ var init_UsagePanel = __esm({
       const subtitle = hasSession ? `${s2.calls} calls   \xB7   ${fmt(s2.totalPrompt)} prompt   \xB7   ${fmt(s2.totalOutput)} output` : "saved across sessions";
       const showSession = hasSession && (!tabs || activeTab === "session");
       const showLifetime = hasModels && (!tabs || activeTab === "lifetime");
-      return (0, import_jsx_runtime28.jsxs)(Modal, { title: "Usage", subtitle, ...tabs ? { tabs, activeTabId: activeTab, onTabChange: (id) => setActiveTab(id) } : {}, ...onClose ? { onClose } : {}, children: [showSession ? (0, import_jsx_runtime28.jsxs)(import_jsx_runtime28.Fragment, { children: [(0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "Prompt composition" }), (0, import_jsx_runtime28.jsx)(CompRow, { label: "cache read", frac: readFrac, value: s2.totalCacheRead, color: Colors.active }), (0, import_jsx_runtime28.jsx)(CompRow, { label: "fresh input", frac: freshFrac, value: s2.totalInput }), (0, import_jsx_runtime28.jsx)(CompRow, { label: "cache write", frac: writeFrac, value: s2.totalCacheCreation, color: Colors.busy }), (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: 1, flexDirection: "column", children: [(0, import_jsx_runtime28.jsx)(MetricRow, { label: "Cache hit", frac: s2.cacheHitRate, color: s2.cacheHitRate >= 0.5 ? Colors.active : Colors.busy }), ctxFrac != null ? (0, import_jsx_runtime28.jsx)(MetricRow, { label: "Context fill", frac: ctxFrac, color: ctxColor, suffix: `${fmt(contextTokens ?? 0)} / ${fmt(contextWindow ?? 0)}` }) : null] }), (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: 1, children: [(0, import_jsx_runtime28.jsx)(Box_default, { width: LABEL_COL, children: (0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "Input cost" }) }), (0, import_jsx_runtime28.jsxs)(Text, { children: [fmt(s2.billedInputEq), " billed-eq"] }), saved > 5e-3 ? (0, import_jsx_runtime28.jsx)(Text, { color: Colors.active, bold: true, children: `   saved ${pct(saved)}` }) : (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: "   no cache savings yet" })] }), (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: 1, flexDirection: "column", children: [(0, import_jsx_runtime28.jsxs)(Box_default, { children: [(0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "Per-call prompt " }), (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: `peak ${fmt(Math.max(...series, 0))}` })] }), (0, import_jsx_runtime28.jsxs)(Box_default, { children: [(0, import_jsx_runtime28.jsx)(Text, { children: sparkline(series) }), trend ? (0, import_jsx_runtime28.jsx)(Text, { color: trend === "growing" ? Colors.busy : Colors.active, children: trend === "growing" ? "  \u2191 growing" : "  \u2248 bounded" }) : null] })] }), !s2.cacheEffective ? (0, import_jsx_runtime28.jsx)(Box_default, { marginTop: 1, children: (0, import_jsx_runtime28.jsx)(Text, { color: Colors.danger, children: "\u26A0 cache ineffective \u2014 writing cache but not reading it back (prefix likely unstable)" }) }) : null] }) : null, showLifetime ? (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: showSession ? 1 : 0, flexDirection: "column", children: [(0, import_jsx_runtime28.jsxs)(Box_default, { children: [(0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "By model " }), (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: `(saved + this session \xB7 ${lifeRows.length} model${lifeRows.length === 1 ? "" : "s"})` })] }), lifeRows.slice(0, 8).map((r2) => (0, import_jsx_runtime28.jsx)(ModelRow, { name: r2.name, calls: r2.calls, prompt: r2.prompt, output: r2.output }, r2.name)), lifeRows.length > 1 ? (0, import_jsx_runtime28.jsx)(ModelRow, { name: "total", calls: lifeTotal.calls, prompt: lifeTotal.prompt, output: lifeTotal.output, dim: true }) : null, (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: "  /usage clear resets saved history" })] }) : null] });
+      return (0, import_jsx_runtime28.jsxs)(Modal, { title: "Usage", subtitle, ...tabs ? { tabs, activeTabId: activeTab, onTabChange: (id) => setActiveTab(id) } : {}, ...onClose ? { onClose } : {}, children: [showSession ? (0, import_jsx_runtime28.jsxs)(import_jsx_runtime28.Fragment, { children: [(0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "Prompt composition" }), (0, import_jsx_runtime28.jsx)(CompRow, { label: "cache read", frac: readFrac, value: s2.totalCacheRead, color: Colors.active }), (0, import_jsx_runtime28.jsx)(CompRow, { label: "fresh input", frac: freshFrac, value: s2.totalInput }), (0, import_jsx_runtime28.jsx)(CompRow, { label: "cache write", frac: writeFrac, value: s2.totalCacheCreation, color: Colors.busy }), (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: 1, flexDirection: "column", children: [(0, import_jsx_runtime28.jsx)(MetricRow, { label: "Cache hit", frac: s2.cacheHitRate, color: s2.cacheHitRate >= 0.5 ? Colors.active : Colors.busy }), ctxFrac != null ? (0, import_jsx_runtime28.jsx)(MetricRow, { label: "Context fill", frac: ctxFrac, color: ctxColor, suffix: `${fmt(contextTokens ?? 0)} / ${fmt(contextWindow ?? 0)}` }) : null] }), (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: 1, children: [(0, import_jsx_runtime28.jsx)(Box_default, { width: LABEL_COL, children: (0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "Input cost" }) }), (0, import_jsx_runtime28.jsxs)(Text, { children: [fmt(s2.billedInputEq), " billed-eq"] }), saved > 5e-3 ? (0, import_jsx_runtime28.jsx)(Text, { color: Colors.active, bold: true, children: `   saved ${pct(saved)}` }) : (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: "   no cache savings yet" })] }), (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: 1, flexDirection: "column", children: [(0, import_jsx_runtime28.jsxs)(Box_default, { children: [(0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "Per-call prompt " }), (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: `peak ${fmt(peak(series))}` })] }), (0, import_jsx_runtime28.jsxs)(Box_default, { children: [(0, import_jsx_runtime28.jsx)(Text, { children: sparkline(series) }), trend ? (0, import_jsx_runtime28.jsx)(Text, { color: trend === "growing" ? Colors.busy : Colors.active, children: trend === "growing" ? "  \u2191 growing" : "  \u2248 bounded" }) : null] })] }), !s2.cacheEffective ? (0, import_jsx_runtime28.jsx)(Box_default, { marginTop: 1, children: (0, import_jsx_runtime28.jsx)(Text, { color: Colors.danger, children: "\u26A0 cache ineffective \u2014 writing cache but not reading it back (prefix likely unstable)" }) }) : null] }) : null, showLifetime ? (0, import_jsx_runtime28.jsxs)(Box_default, { marginTop: showSession ? 1 : 0, flexDirection: "column", children: [(0, import_jsx_runtime28.jsxs)(Box_default, { children: [(0, import_jsx_runtime28.jsx)(Text, { bold: true, children: "By model " }), (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: `(saved + this session \xB7 ${lifeRows.length} model${lifeRows.length === 1 ? "" : "s"})` })] }), lifeRows.slice(0, 8).map((r2) => (0, import_jsx_runtime28.jsx)(ModelRow, { name: r2.name, calls: r2.calls, prompt: r2.prompt, output: r2.output }, r2.name)), lifeRows.length > 1 ? (0, import_jsx_runtime28.jsx)(ModelRow, { name: "total", calls: lifeTotal.calls, prompt: lifeTotal.prompt, output: lifeTotal.output, dim: true }) : null, (0, import_jsx_runtime28.jsx)(Text, { dimColor: true, children: "  /usage clear resets saved history" })] }) : null] });
     };
   }
 });
@@ -89133,9 +89371,9 @@ var init_SessionView = __esm({
       }, onApprovalDecide: (decision) => {
         if (!pendingApproval)
           return;
-        const { resolve: resolve13 } = pendingApproval;
+        const { resolve: resolve12 } = pendingApproval;
         permissions.setPendingApproval(null);
-        resolve13(decision);
+        resolve12(decision);
       }, onPickerSelect: handlePickerSelect, onPickerCancel: () => setPicker(null), onSubmit: handleSubmit, onPasteText: images.handlePasteText }), (0, import_jsx_runtime36.jsx)(StatusLine, { busyStartedAt: turn.busy && !pendingPermission && !pendingApproval ? turn.busyStartedAt : null, queueCount: turn.queueCount, modeName, modeBadge, provider: providerName2, model: activeModel2, mcp: mcpStatus, contextUsed, ...contextWindow ? { contextWindow } : {}, ...version ? { version } : {}, ...updateAvailable ? { updateLatest: updateAvailable.latest } : {} })] });
     };
   }
@@ -91103,10 +91341,10 @@ var require_segments = __commonJS({
       const segs = getSegmentsFromString(data, Utils.isKanjiModeEnabled());
       const nodes = buildNodes(segs);
       const graph = buildGraph(nodes, version);
-      const path60 = dijkstra.find_path(graph.map, "start", "end");
+      const path59 = dijkstra.find_path(graph.map, "start", "end");
       const optimizedSegs = [];
-      for (let i2 = 1; i2 < path60.length - 1; i2++) {
-        optimizedSegs.push(graph.table[path60[i2]].node);
+      for (let i2 = 1; i2 < path59.length - 1; i2++) {
+        optimizedSegs.push(graph.table[path59[i2]].node);
       }
       return exports.fromArray(mergeSegments(optimizedSegs));
     };
@@ -93558,7 +93796,7 @@ var require_png2 = __commonJS({
       });
       png.pack();
     };
-    exports.renderToFile = function renderToFile(path60, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path59, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
@@ -93569,7 +93807,7 @@ var require_png2 = __commonJS({
         called = true;
         cb.apply(null, args);
       };
-      const stream = fs45.createWriteStream(path60);
+      const stream = fs45.createWriteStream(path59);
       stream.on("error", done);
       stream.on("close", done);
       exports.renderToFileStream(stream, qrData, options);
@@ -93631,14 +93869,14 @@ var require_utf8 = __commonJS({
       }
       return output;
     };
-    exports.renderToFile = function renderToFile(path60, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path59, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
       }
       const fs45 = __require("fs");
       const utf8 = exports.render(qrData, options);
-      fs45.writeFile(path60, utf8, cb);
+      fs45.writeFile(path59, utf8, cb);
     };
   }
 });
@@ -93759,7 +93997,7 @@ var require_svg_tag = __commonJS({
       return str2;
     }
     function qrToPath(data, size, margin) {
-      let path60 = "";
+      let path59 = "";
       let moveBy = 0;
       let newRow = false;
       let lineLength = 0;
@@ -93770,19 +94008,19 @@ var require_svg_tag = __commonJS({
         if (data[i2]) {
           lineLength++;
           if (!(i2 > 0 && col > 0 && data[i2 - 1])) {
-            path60 += newRow ? svgCmd("M", col + margin, 0.5 + row + margin) : svgCmd("m", moveBy, 0);
+            path59 += newRow ? svgCmd("M", col + margin, 0.5 + row + margin) : svgCmd("m", moveBy, 0);
             moveBy = 0;
             newRow = false;
           }
           if (!(col + 1 < size && data[i2 + 1])) {
-            path60 += svgCmd("h", lineLength);
+            path59 += svgCmd("h", lineLength);
             lineLength = 0;
           }
         } else {
           moveBy++;
         }
       }
-      return path60;
+      return path59;
     }
     exports.render = function render2(qrData, options, cb) {
       const opts = Utils.getOptions(options);
@@ -93790,10 +94028,10 @@ var require_svg_tag = __commonJS({
       const data = qrData.modules.data;
       const qrcodesize = size + opts.margin * 2;
       const bg = !opts.color.light.a ? "" : "<path " + getColorAttrib(opts.color.light, "fill") + ' d="M0 0h' + qrcodesize + "v" + qrcodesize + 'H0z"/>';
-      const path60 = "<path " + getColorAttrib(opts.color.dark, "stroke") + ' d="' + qrToPath(data, size, opts.margin) + '"/>';
+      const path59 = "<path " + getColorAttrib(opts.color.dark, "stroke") + ' d="' + qrToPath(data, size, opts.margin) + '"/>';
       const viewBox = 'viewBox="0 0 ' + qrcodesize + " " + qrcodesize + '"';
       const width = !opts.width ? "" : 'width="' + opts.width + '" height="' + opts.width + '" ';
-      const svgTag = '<svg xmlns="http://www.w3.org/2000/svg" ' + width + viewBox + ' shape-rendering="crispEdges">' + bg + path60 + "</svg>\n";
+      const svgTag = '<svg xmlns="http://www.w3.org/2000/svg" ' + width + viewBox + ' shape-rendering="crispEdges">' + bg + path59 + "</svg>\n";
       if (typeof cb === "function") {
         cb(null, svgTag);
       }
@@ -93807,7 +94045,7 @@ var require_svg = __commonJS({
   "../../node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/svg.js"(exports) {
     var svgTagRenderer = require_svg_tag();
     exports.render = svgTagRenderer.render;
-    exports.renderToFile = function renderToFile(path60, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path59, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
@@ -93815,7 +94053,7 @@ var require_svg = __commonJS({
       const fs45 = __require("fs");
       const svgTag = exports.render(qrData, options);
       const xmlStr = '<?xml version="1.0" encoding="utf-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">' + svgTag;
-      fs45.writeFile(path60, xmlStr, cb);
+      fs45.writeFile(path59, xmlStr, cb);
     };
   }
 });
@@ -93918,10 +94156,10 @@ var require_browser2 = __commonJS({
           text = canvas;
           canvas = void 0;
         }
-        return new Promise(function(resolve13, reject) {
+        return new Promise(function(resolve12, reject) {
           try {
             const data = QRCode2.create(text, opts);
-            resolve13(renderFunc(data, canvas, opts));
+            resolve12(renderFunc(data, canvas, opts));
           } catch (e3) {
             reject(e3);
           }
@@ -93973,8 +94211,8 @@ var require_server = __commonJS({
         cb
       };
     }
-    function getTypeFromFilename(path60) {
-      return path60.slice((path60.lastIndexOf(".") - 1 >>> 0) + 2).toLowerCase();
+    function getTypeFromFilename(path59) {
+      return path59.slice((path59.lastIndexOf(".") - 1 >>> 0) + 2).toLowerCase();
     }
     function getRendererFromType(type) {
       switch (type) {
@@ -94002,11 +94240,11 @@ var require_server = __commonJS({
     }
     function render2(renderFunc, text, params) {
       if (!params.cb) {
-        return new Promise(function(resolve13, reject) {
+        return new Promise(function(resolve12, reject) {
           try {
             const data = QRCode2.create(text, params.opts);
             return renderFunc(data, params.opts, function(err, data2) {
-              return err ? reject(err) : resolve13(data2);
+              return err ? reject(err) : resolve12(data2);
             });
           } catch (e3) {
             reject(e3);
@@ -94038,17 +94276,17 @@ var require_server = __commonJS({
       const renderer2 = getRendererFromType(params.opts.type);
       return render2(renderer2.renderToBuffer, text, params);
     };
-    exports.toFile = function toFile3(path60, text, opts, cb) {
-      if (typeof path60 !== "string" || !(typeof text === "string" || typeof text === "object")) {
+    exports.toFile = function toFile3(path59, text, opts, cb) {
+      if (typeof path59 !== "string" || !(typeof text === "string" || typeof text === "object")) {
         throw new Error("Invalid argument");
       }
       if (arguments.length < 3 && !canPromise()) {
         throw new Error("Too few arguments provided");
       }
       const params = checkParams(text, opts, cb);
-      const type = params.opts.type || getTypeFromFilename(path60);
+      const type = params.opts.type || getTypeFromFilename(path59);
       const renderer2 = getRendererFromType(type);
-      const renderToFile = renderer2.renderToFile.bind(null, path60);
+      const renderToFile = renderer2.renderToFile.bind(null, path59);
       return render2(renderToFile, text, params);
     };
     exports.toFileStream = function toFileStream(stream, text, opts) {
@@ -94868,14 +95106,14 @@ var require_util2 = __commonJS({
         }
         const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80;
         let origin = url2.origin != null ? url2.origin : `${url2.protocol || ""}//${url2.hostname || ""}:${port}`;
-        let path60 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
+        let path59 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
         if (origin[origin.length - 1] === "/") {
           origin = origin.slice(0, origin.length - 1);
         }
-        if (path60 && path60[0] !== "/") {
-          path60 = `/${path60}`;
+        if (path59 && path59[0] !== "/") {
+          path59 = `/${path59}`;
         }
-        return new URL(`${origin}${path60}`);
+        return new URL(`${origin}${path59}`);
       }
       if (!isHttpOrHttpsPrefixed(url2.origin || url2.protocol)) {
         throw new InvalidArgumentError("Invalid URL protocol: the URL must start with `http:` or `https:`.");
@@ -95325,39 +95563,39 @@ var require_diagnostics = __commonJS({
       });
       diagnosticsChannel.channel("undici:client:sendHeaders").subscribe((evt) => {
         const {
-          request: { method, path: path60, origin }
+          request: { method, path: path59, origin }
         } = evt;
-        debuglog("sending request to %s %s/%s", method, origin, path60);
+        debuglog("sending request to %s %s/%s", method, origin, path59);
       });
       diagnosticsChannel.channel("undici:request:headers").subscribe((evt) => {
         const {
-          request: { method, path: path60, origin },
+          request: { method, path: path59, origin },
           response: { statusCode }
         } = evt;
         debuglog(
           "received response to %s %s/%s - HTTP %d",
           method,
           origin,
-          path60,
+          path59,
           statusCode
         );
       });
       diagnosticsChannel.channel("undici:request:trailers").subscribe((evt) => {
         const {
-          request: { method, path: path60, origin }
+          request: { method, path: path59, origin }
         } = evt;
-        debuglog("trailers received from %s %s/%s", method, origin, path60);
+        debuglog("trailers received from %s %s/%s", method, origin, path59);
       });
       diagnosticsChannel.channel("undici:request:error").subscribe((evt) => {
         const {
-          request: { method, path: path60, origin },
+          request: { method, path: path59, origin },
           error: error2
         } = evt;
         debuglog(
           "request to %s %s/%s errored - %s",
           method,
           origin,
-          path60,
+          path59,
           error2.message
         );
       });
@@ -95406,9 +95644,9 @@ var require_diagnostics = __commonJS({
         });
         diagnosticsChannel.channel("undici:client:sendHeaders").subscribe((evt) => {
           const {
-            request: { method, path: path60, origin }
+            request: { method, path: path59, origin }
           } = evt;
-          debuglog("sending request to %s %s/%s", method, origin, path60);
+          debuglog("sending request to %s %s/%s", method, origin, path59);
         });
       }
       diagnosticsChannel.channel("undici:websocket:open").subscribe((evt) => {
@@ -95470,7 +95708,7 @@ var require_request = __commonJS({
     var kHandler = /* @__PURE__ */ Symbol("handler");
     var Request4 = class {
       constructor(origin, {
-        path: path60,
+        path: path59,
         method,
         body,
         headers,
@@ -95485,11 +95723,11 @@ var require_request = __commonJS({
         expectContinue,
         servername
       }, handler) {
-        if (typeof path60 !== "string") {
+        if (typeof path59 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path60[0] !== "/" && !(path60.startsWith("http://") || path60.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path59[0] !== "/" && !(path59.startsWith("http://") || path59.startsWith("https://")) && method !== "CONNECT") {
           throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
-        } else if (invalidPathRegex.test(path60)) {
+        } else if (invalidPathRegex.test(path59)) {
           throw new InvalidArgumentError("invalid request path");
         }
         if (typeof method !== "string") {
@@ -95555,7 +95793,7 @@ var require_request = __commonJS({
         this.completed = false;
         this.aborted = false;
         this.upgrade = upgrade || null;
-        this.path = query ? buildURL(path60, query) : path60;
+        this.path = query ? buildURL(path59, query) : path59;
         this.origin = origin;
         this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
         this.blocking = blocking == null ? false : blocking;
@@ -95878,9 +96116,9 @@ var require_dispatcher_base = __commonJS({
       }
       close(callback) {
         if (callback === void 0) {
-          return new Promise((resolve13, reject) => {
+          return new Promise((resolve12, reject) => {
             this.close((err, data) => {
-              return err ? reject(err) : resolve13(data);
+              return err ? reject(err) : resolve12(data);
             });
           });
         }
@@ -95918,12 +96156,12 @@ var require_dispatcher_base = __commonJS({
           err = null;
         }
         if (callback === void 0) {
-          return new Promise((resolve13, reject) => {
+          return new Promise((resolve12, reject) => {
             this.destroy(err, (err2, data) => {
               return err2 ? (
                 /* istanbul ignore next: should never error */
                 reject(err2)
-              ) : resolve13(data);
+              ) : resolve12(data);
             });
           });
         }
@@ -98173,8 +98411,8 @@ var require_util3 = __commonJS({
     function createDeferredPromise() {
       let res;
       let rej;
-      const promise = new Promise((resolve13, reject) => {
-        res = resolve13;
+      const promise = new Promise((resolve12, reject) => {
+        res = resolve12;
         rej = reject;
       });
       return { promise, resolve: res, reject: rej };
@@ -100093,7 +100331,7 @@ var require_client_h1 = __commonJS({
       return method !== "GET" && method !== "HEAD" && method !== "OPTIONS" && method !== "TRACE" && method !== "CONNECT";
     }
     function writeH1(client, request) {
-      const { method, path: path60, host, upgrade, blocking, reset } = request;
+      const { method, path: path59, host, upgrade, blocking, reset } = request;
       let { body, headers, contentLength } = request;
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH" || method === "QUERY" || method === "PROPFIND" || method === "PROPPATCH";
       if (util.isFormDataLike(body)) {
@@ -100159,7 +100397,7 @@ var require_client_h1 = __commonJS({
       if (blocking) {
         socket[kBlocking] = true;
       }
-      let header = `${method} ${path60} HTTP/1.1\r
+      let header = `${method} ${path59} HTTP/1.1\r
 `;
       if (typeof host === "string") {
         header += `host: ${host}\r
@@ -100346,12 +100584,12 @@ upgrade: ${upgrade}\r
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve13, reject) => {
+      const waitForDrain = () => new Promise((resolve12, reject) => {
         assert(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve13;
+          callback = resolve12;
         }
       });
       socket.on("close", onDrain).on("drain", onDrain);
@@ -100684,7 +100922,7 @@ var require_client_h2 = __commonJS({
     }
     function writeH2(client, request) {
       const session = client[kHTTP2Session];
-      const { method, path: path60, host, upgrade, expectContinue, signal, headers: reqHeaders } = request;
+      const { method, path: path59, host, upgrade, expectContinue, signal, headers: reqHeaders } = request;
       let { body } = request;
       if (upgrade) {
         util.errorRequest(client, request, new Error("Upgrade not supported for H2"));
@@ -100751,7 +100989,7 @@ var require_client_h2 = __commonJS({
         });
         return true;
       }
-      headers[HTTP2_HEADER_PATH] = path60;
+      headers[HTTP2_HEADER_PATH] = path59;
       headers[HTTP2_HEADER_SCHEME] = "https";
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
       if (body && typeof body.read === "function") {
@@ -100987,12 +101225,12 @@ var require_client_h2 = __commonJS({
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve13, reject) => {
+      const waitForDrain = () => new Promise((resolve12, reject) => {
         assert(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve13;
+          callback = resolve12;
         }
       });
       h2stream.on("close", onDrain).on("drain", onDrain);
@@ -101103,9 +101341,9 @@ var require_redirect_handler = __commonJS({
           return this.handler.onHeaders(statusCode, headers, resume, statusText);
         }
         const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)));
-        const path60 = search ? `${pathname}${search}` : pathname;
+        const path59 = search ? `${pathname}${search}` : pathname;
         this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
-        this.opts.path = path60;
+        this.opts.path = path59;
         this.opts.origin = origin;
         this.opts.maxRedirections = 0;
         this.opts.query = null;
@@ -101465,16 +101703,16 @@ var require_client2 = __commonJS({
         return this[kNeedDrain] < 2;
       }
       async [kClose]() {
-        return new Promise((resolve13) => {
+        return new Promise((resolve12) => {
           if (this[kSize]) {
-            this[kClosedResolve] = resolve13;
+            this[kClosedResolve] = resolve12;
           } else {
-            resolve13(null);
+            resolve12(null);
           }
         });
       }
       async [kDestroy](err) {
-        return new Promise((resolve13) => {
+        return new Promise((resolve12) => {
           const requests = this[kQueue].splice(this[kPendingIdx]);
           for (let i2 = 0; i2 < requests.length; i2++) {
             const request = requests[i2];
@@ -101485,7 +101723,7 @@ var require_client2 = __commonJS({
               this[kClosedResolve]();
               this[kClosedResolve] = null;
             }
-            resolve13(null);
+            resolve12(null);
           };
           if (this[kHTTPContext]) {
             this[kHTTPContext].destroy(err, callback);
@@ -101536,7 +101774,7 @@ var require_client2 = __commonJS({
         });
       }
       try {
-        const socket = await new Promise((resolve13, reject) => {
+        const socket = await new Promise((resolve12, reject) => {
           client[kConnector]({
             host,
             hostname,
@@ -101548,7 +101786,7 @@ var require_client2 = __commonJS({
             if (err) {
               reject(err);
             } else {
-              resolve13(socket2);
+              resolve12(socket2);
             }
           });
         });
@@ -101882,8 +102120,8 @@ var require_pool_base = __commonJS({
         if (this[kQueue].isEmpty()) {
           await Promise.all(this[kClients].map((c2) => c2.close()));
         } else {
-          await new Promise((resolve13) => {
-            this[kClosedResolve] = resolve13;
+          await new Promise((resolve12) => {
+            this[kClosedResolve] = resolve12;
           });
         }
       }
@@ -102330,10 +102568,10 @@ var require_proxy_agent = __commonJS({
         };
         const {
           origin,
-          path: path60 = "/",
+          path: path59 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path60;
+        opts.path = origin + path59;
         if (!("host" in headers) && !("Host" in headers)) {
           const { host } = new URL3(origin);
           headers.host = host;
@@ -103090,7 +103328,7 @@ var require_readable = __commonJS({
         if (this._readableState.closeEmitted) {
           return null;
         }
-        return await new Promise((resolve13, reject) => {
+        return await new Promise((resolve12, reject) => {
           if (this[kContentLength] > limit2) {
             this.destroy(new AbortError2());
           }
@@ -103103,7 +103341,7 @@ var require_readable = __commonJS({
             if (signal?.aborted) {
               reject(signal.reason ?? new AbortError2());
             } else {
-              resolve13(null);
+              resolve12(null);
             }
           }).on("error", noop3).on("data", function(chunk) {
             limit2 -= chunk.length;
@@ -103122,7 +103360,7 @@ var require_readable = __commonJS({
     }
     async function consume(stream, type) {
       assert(!stream[kConsume]);
-      return new Promise((resolve13, reject) => {
+      return new Promise((resolve12, reject) => {
         if (isUnusable(stream)) {
           const rState = stream._readableState;
           if (rState.destroyed && rState.closeEmitted === false) {
@@ -103139,7 +103377,7 @@ var require_readable = __commonJS({
             stream[kConsume] = {
               type,
               stream,
-              resolve: resolve13,
+              resolve: resolve12,
               reject,
               length: 0,
               body: []
@@ -103209,18 +103447,18 @@ var require_readable = __commonJS({
       return buffer;
     }
     function consumeEnd(consume2) {
-      const { type, body, resolve: resolve13, stream, length } = consume2;
+      const { type, body, resolve: resolve12, stream, length } = consume2;
       try {
         if (type === "text") {
-          resolve13(chunksDecode(body, length));
+          resolve12(chunksDecode(body, length));
         } else if (type === "json") {
-          resolve13(JSON.parse(chunksDecode(body, length)));
+          resolve12(JSON.parse(chunksDecode(body, length)));
         } else if (type === "arrayBuffer") {
-          resolve13(chunksConcat(body, length).buffer);
+          resolve12(chunksConcat(body, length).buffer);
         } else if (type === "blob") {
-          resolve13(new Blob(body, { type: stream[kContentType] }));
+          resolve12(new Blob(body, { type: stream[kContentType] }));
         } else if (type === "bytes") {
-          resolve13(chunksConcat(body, length));
+          resolve12(chunksConcat(body, length));
         }
         consumeFinish(consume2);
       } catch (err) {
@@ -103476,9 +103714,9 @@ var require_api_request = __commonJS({
     };
     function request(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           request.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve13(data);
+            return err ? reject(err) : resolve12(data);
           });
         });
       }
@@ -103700,9 +103938,9 @@ var require_api_stream = __commonJS({
     };
     function stream(opts, factory2, callback) {
       if (callback === void 0) {
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           stream.call(this, opts, factory2, (err, data) => {
-            return err ? reject(err) : resolve13(data);
+            return err ? reject(err) : resolve12(data);
           });
         });
       }
@@ -103985,9 +104223,9 @@ var require_api_upgrade = __commonJS({
     };
     function upgrade(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           upgrade.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve13(data);
+            return err ? reject(err) : resolve12(data);
           });
         });
       }
@@ -104078,9 +104316,9 @@ var require_api_connect = __commonJS({
     };
     function connect(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve13, reject) => {
+        return new Promise((resolve12, reject) => {
           connect.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve13(data);
+            return err ? reject(err) : resolve12(data);
           });
         });
       }
@@ -104241,20 +104479,20 @@ var require_mock_utils = __commonJS({
       }
       return true;
     }
-    function safeUrl(path60) {
-      if (typeof path60 !== "string") {
-        return path60;
+    function safeUrl(path59) {
+      if (typeof path59 !== "string") {
+        return path59;
       }
-      const pathSegments = path60.split("?");
+      const pathSegments = path59.split("?");
       if (pathSegments.length !== 2) {
-        return path60;
+        return path59;
       }
       const qp = new URLSearchParams(pathSegments.pop());
       qp.sort();
       return [...pathSegments, qp.toString()].join("?");
     }
-    function matchKey(mockDispatch2, { path: path60, method, body, headers }) {
-      const pathMatch = matchValue(mockDispatch2.path, path60);
+    function matchKey(mockDispatch2, { path: path59, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path59);
       const methodMatch = matchValue(mockDispatch2.method, method);
       const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true;
       const headersMatch = matchHeaders(mockDispatch2, headers);
@@ -104276,7 +104514,7 @@ var require_mock_utils = __commonJS({
     function getMockDispatch(mockDispatches, key) {
       const basePath = key.query ? buildURL(key.path, key.query) : key.path;
       const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath;
-      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path60 }) => matchValue(safeUrl(path60), resolvedPath));
+      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path59 }) => matchValue(safeUrl(path59), resolvedPath));
       if (matchedMockDispatches.length === 0) {
         throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`);
       }
@@ -104314,9 +104552,9 @@ var require_mock_utils = __commonJS({
       }
     }
     function buildKey(opts) {
-      const { path: path60, method, body, headers, query } = opts;
+      const { path: path59, method, body, headers, query } = opts;
       return {
-        path: path60,
+        path: path59,
         method,
         body,
         headers,
@@ -104774,10 +105012,10 @@ var require_pending_interceptors_formatter = __commonJS({
       }
       format(pendingInterceptors) {
         const withPrettyHeaders = pendingInterceptors.map(
-          ({ method, path: path60, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
+          ({ method, path: path59, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path60,
+            Path: path59,
             "Status code": statusCode,
             Persistent: persist ? PERSISTENT : NOT_PERSISTENT,
             Invocations: timesInvoked,
@@ -107902,7 +108140,7 @@ var require_fetch = __commonJS({
       function dispatch3({ body }) {
         const url2 = requestCurrentURL(request);
         const agent = fetchParams.controller.dispatcher;
-        return new Promise((resolve13, reject) => agent.dispatch(
+        return new Promise((resolve12, reject) => agent.dispatch(
           {
             path: url2.pathname + url2.search,
             origin: url2.origin,
@@ -107978,7 +108216,7 @@ var require_fetch = __commonJS({
                 }
               }
               const onError2 = this.onError.bind(this);
-              resolve13({
+              resolve12({
                 status,
                 statusText,
                 headersList,
@@ -108024,7 +108262,7 @@ var require_fetch = __commonJS({
               for (let i2 = 0; i2 < rawHeaders.length; i2 += 2) {
                 headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i2]), rawHeaders[i2 + 1].toString("latin1"), true);
               }
-              resolve13({
+              resolve12({
                 status,
                 statusText: STATUS_CODES2[status],
                 headersList,
@@ -109616,9 +109854,9 @@ var require_util7 = __commonJS({
         }
       }
     }
-    function validateCookiePath(path60) {
-      for (let i2 = 0; i2 < path60.length; ++i2) {
-        const code = path60.charCodeAt(i2);
+    function validateCookiePath(path59) {
+      for (let i2 = 0; i2 < path59.length; ++i2) {
+        const code = path59.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
         code === 127 || // DEL
         code === 59) {
@@ -111675,8 +111913,8 @@ var require_util9 = __commonJS({
       return true;
     }
     function delay(ms) {
-      return new Promise((resolve13) => {
-        setTimeout(resolve13, ms).unref();
+      return new Promise((resolve12) => {
+        setTimeout(resolve12, ms).unref();
       });
     }
     module.exports = {
@@ -112278,11 +112516,11 @@ var require_undici = __commonJS({
           if (typeof opts.path !== "string") {
             throw new InvalidArgumentError("invalid opts.path");
           }
-          let path60 = opts.path;
+          let path59 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path60 = `/${path60}`;
+            path59 = `/${path59}`;
           }
-          url2 = new URL(util.parseOrigin(url2).origin + path60);
+          url2 = new URL(util.parseOrigin(url2).origin + path59);
         } else {
           if (!opts) {
             opts = typeof url2 === "object" ? url2 : {};
@@ -112624,7 +112862,7 @@ function classify(input, signals) {
 }
 var CMD_TIMEOUT_MS = 5 * 6e4;
 function runCmd(cmd, args, cwd2) {
-  return new Promise((resolve13) => {
+  return new Promise((resolve12) => {
     const child = spawn(cmd, [...args], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
     let output = "";
     const onData = (d2) => {
@@ -112635,11 +112873,11 @@ function runCmd(cmd, args, cwd2) {
     const timer = setTimeout(() => child.kill("SIGKILL"), CMD_TIMEOUT_MS);
     child.on("error", (err) => {
       clearTimeout(timer);
-      resolve13({ exitCode: -1, output: `${cmd} failed to start: ${err.message}` });
+      resolve12({ exitCode: -1, output: `${cmd} failed to start: ${err.message}` });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve13({ exitCode: code ?? -1, output });
+      resolve12({ exitCode: code ?? -1, output });
     });
   });
 }
@@ -112720,7 +112958,7 @@ function shortName(pkg) {
   return pkg.startsWith(SCOPE) ? pkg.slice(SCOPE.length) : pkg;
 }
 function run(cmd, args, cwd2, timeoutMs = BUILD_TIMEOUT_MS) {
-  return new Promise((resolve13) => {
+  return new Promise((resolve12) => {
     const child = spawn(cmd, [...args], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
     let output = "";
     const onData = (d2) => {
@@ -112731,11 +112969,11 @@ function run(cmd, args, cwd2, timeoutMs = BUILD_TIMEOUT_MS) {
     const timer = setTimeout(() => child.kill("SIGKILL"), timeoutMs);
     child.on("error", (err) => {
       clearTimeout(timer);
-      resolve13({ code: -1, output: `${cmd} failed to start: ${err.message}` });
+      resolve12({ code: -1, output: `${cmd} failed to start: ${err.message}` });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve13({ code: code ?? -1, output });
+      resolve12({ code: code ?? -1, output });
     });
   });
 }
@@ -113794,7 +114032,7 @@ async function findFile(dir, names) {
 var scopeSchema = z$1.enum(["user", "project"]);
 var scopeSchemaOptional = scopeSchema.optional().default("project");
 var USER_YAML = () => moxxyPath("config.yaml");
-var MAX_CONFIG_SEARCH_DEPTH2 = 12;
+var PROJECT_YAML_NAMES = ["moxxy.config.yaml", "moxxy.config.yml"];
 async function findScopePath(scope, cwd2) {
   if (scope === "user") {
     const yaml = USER_YAML();
@@ -113805,22 +114043,7 @@ async function findScopePath(scope, cwd2) {
       return null;
     }
   }
-  let cursor = path3.resolve(cwd2);
-  for (let i2 = 0; i2 < MAX_CONFIG_SEARCH_DEPTH2; i2++) {
-    for (const name of ["moxxy.config.yaml", "moxxy.config.yml"]) {
-      const candidate = path3.join(cursor, name);
-      try {
-        await promises.access(candidate);
-        return candidate;
-      } catch {
-      }
-    }
-    const parent = path3.dirname(cursor);
-    if (parent === cursor)
-      break;
-    cursor = parent;
-  }
-  return null;
+  return findUpward(cwd2, PROJECT_YAML_NAMES);
 }
 function scopeDefaultPath(scope, cwd2) {
   return scope === "user" ? USER_YAML() : path3.join(cwd2, "moxxy.config.yaml");
@@ -116149,13 +116372,13 @@ var MultipartBody = class {
   }
 };
 var fileFromPathWarned = false;
-async function fileFromPath3(path60, ...args) {
+async function fileFromPath3(path59, ...args) {
   const { fileFromPath: _fileFromPath } = await Promise.resolve().then(() => (init_fileFromPath(), fileFromPath_exports));
   if (!fileFromPathWarned) {
-    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path60)}) instead`);
+    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path59)}) instead`);
     fileFromPathWarned = true;
   }
-  return await _fileFromPath(path60, ...args);
+  return await _fileFromPath(path59, ...args);
 }
 var defaultHttpAgent = new import_agentkeepalive.default({ keepAlive: true, timeout: 5 * 60 * 1e3 });
 var defaultHttpsAgent = new import_agentkeepalive.default.HttpsAgent({ keepAlive: true, timeout: 5 * 60 * 1e3 });
@@ -116776,8 +116999,8 @@ function _addRequestID(value, response) {
 }
 var APIPromise = class _APIPromise extends Promise {
   constructor(responsePromise, parseResponse2 = defaultParseResponse) {
-    super((resolve13) => {
-      resolve13(null);
+    super((resolve12) => {
+      resolve12(null);
     });
     this.responsePromise = responsePromise;
     this.parseResponse = parseResponse2;
@@ -116878,29 +117101,29 @@ var APIClient = class {
   defaultIdempotencyKey() {
     return `stainless-node-retry-${uuid4()}`;
   }
-  get(path60, opts) {
-    return this.methodRequest("get", path60, opts);
+  get(path59, opts) {
+    return this.methodRequest("get", path59, opts);
   }
-  post(path60, opts) {
-    return this.methodRequest("post", path60, opts);
+  post(path59, opts) {
+    return this.methodRequest("post", path59, opts);
   }
-  patch(path60, opts) {
-    return this.methodRequest("patch", path60, opts);
+  patch(path59, opts) {
+    return this.methodRequest("patch", path59, opts);
   }
-  put(path60, opts) {
-    return this.methodRequest("put", path60, opts);
+  put(path59, opts) {
+    return this.methodRequest("put", path59, opts);
   }
-  delete(path60, opts) {
-    return this.methodRequest("delete", path60, opts);
+  delete(path59, opts) {
+    return this.methodRequest("delete", path59, opts);
   }
-  methodRequest(method, path60, opts) {
+  methodRequest(method, path59, opts) {
     return this.request(Promise.resolve(opts).then(async (opts2) => {
       const body = opts2 && isBlobLike(opts2?.body) ? new DataView(await opts2.body.arrayBuffer()) : opts2?.body instanceof DataView ? opts2.body : opts2?.body instanceof ArrayBuffer ? new DataView(opts2.body) : opts2 && ArrayBuffer.isView(opts2?.body) ? new DataView(opts2.body.buffer) : opts2?.body;
-      return { method, path: path60, ...opts2, body };
+      return { method, path: path59, ...opts2, body };
     }));
   }
-  getAPIList(path60, Page3, opts) {
-    return this.requestAPIList(Page3, { method: "get", path: path60, ...opts });
+  getAPIList(path59, Page3, opts) {
+    return this.requestAPIList(Page3, { method: "get", path: path59, ...opts });
   }
   calculateContentLength(body) {
     if (typeof body === "string") {
@@ -116919,10 +117142,10 @@ var APIClient = class {
   }
   buildRequest(inputOptions, { retryCount = 0 } = {}) {
     const options = { ...inputOptions };
-    const { method, path: path60, query, headers = {} } = options;
+    const { method, path: path59, query, headers = {} } = options;
     const body = ArrayBuffer.isView(options.body) || options.__binaryRequest && typeof options.body === "string" ? options.body : isMultipartBody(options.body) ? options.body.body : options.body ? JSON.stringify(options.body, null, 2) : null;
     const contentLength = this.calculateContentLength(body);
-    const url2 = this.buildURL(path60, query);
+    const url2 = this.buildURL(path59, query);
     if ("timeout" in options)
       validatePositiveInteger("timeout", options.timeout);
     options.timeout = options.timeout ?? this.timeout;
@@ -117046,8 +117269,8 @@ var APIClient = class {
     const request = this.makeRequest(options, null);
     return new PagePromise(this, request, Page3);
   }
-  buildURL(path60, query) {
-    const url2 = isAbsoluteURL(path60) ? new URL(path60) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path60.startsWith("/") ? path60.slice(1) : path60));
+  buildURL(path59, query) {
+    const url2 = isAbsoluteURL(path59) ? new URL(path59) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path59.startsWith("/") ? path59.slice(1) : path59));
     const defaultQuery = this.defaultQuery();
     if (!isEmptyObj(defaultQuery)) {
       query = { ...defaultQuery, ...query };
@@ -117369,7 +117592,7 @@ var startsWithSchemeRegexp = /^[a-z][a-z0-9+.-]*:/i;
 var isAbsoluteURL = (url2) => {
   return startsWithSchemeRegexp.test(url2);
 };
-var sleep = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
+var sleep = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
 var validatePositiveInteger = (name, n2) => {
   if (typeof n2 !== "number" || !Number.isInteger(n2)) {
     throw new AnthropicError(`${name} must be an integer`);
@@ -117979,12 +118202,12 @@ var BetaMessageStream = class _BetaMessageStream {
       }
       return this._emit("error", new AnthropicError(String(error2)));
     });
-    __classPrivateFieldSet7(this, _BetaMessageStream_connectedPromise, new Promise((resolve13, reject) => {
-      __classPrivateFieldSet7(this, _BetaMessageStream_resolveConnectedPromise, resolve13, "f");
+    __classPrivateFieldSet7(this, _BetaMessageStream_connectedPromise, new Promise((resolve12, reject) => {
+      __classPrivateFieldSet7(this, _BetaMessageStream_resolveConnectedPromise, resolve12, "f");
       __classPrivateFieldSet7(this, _BetaMessageStream_rejectConnectedPromise, reject, "f");
     }));
-    __classPrivateFieldSet7(this, _BetaMessageStream_endPromise, new Promise((resolve13, reject) => {
-      __classPrivateFieldSet7(this, _BetaMessageStream_resolveEndPromise, resolve13, "f");
+    __classPrivateFieldSet7(this, _BetaMessageStream_endPromise, new Promise((resolve12, reject) => {
+      __classPrivateFieldSet7(this, _BetaMessageStream_resolveEndPromise, resolve12, "f");
       __classPrivateFieldSet7(this, _BetaMessageStream_rejectEndPromise, reject, "f");
     }));
     __classPrivateFieldGet8(this, _BetaMessageStream_connectedPromise, "f").catch(() => {
@@ -118142,11 +118365,11 @@ var BetaMessageStream = class _BetaMessageStream {
    *   const message = await stream.emitted('message') // rejects if the stream errors
    */
   emitted(event) {
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve12, reject) => {
       __classPrivateFieldSet7(this, _BetaMessageStream_catchingPromiseCreated, true);
       if (event !== "error")
         this.once("error", reject);
-      this.once(event, resolve13);
+      this.once(event, resolve12);
     });
   }
   async done() {
@@ -118427,7 +118650,7 @@ var BetaMessageStream = class _BetaMessageStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -118699,12 +118922,12 @@ var MessageStream = class _MessageStream {
       }
       return this._emit("error", new AnthropicError(String(error2)));
     });
-    __classPrivateFieldSet8(this, _MessageStream_connectedPromise, new Promise((resolve13, reject) => {
-      __classPrivateFieldSet8(this, _MessageStream_resolveConnectedPromise, resolve13, "f");
+    __classPrivateFieldSet8(this, _MessageStream_connectedPromise, new Promise((resolve12, reject) => {
+      __classPrivateFieldSet8(this, _MessageStream_resolveConnectedPromise, resolve12, "f");
       __classPrivateFieldSet8(this, _MessageStream_rejectConnectedPromise, reject, "f");
     }));
-    __classPrivateFieldSet8(this, _MessageStream_endPromise, new Promise((resolve13, reject) => {
-      __classPrivateFieldSet8(this, _MessageStream_resolveEndPromise, resolve13, "f");
+    __classPrivateFieldSet8(this, _MessageStream_endPromise, new Promise((resolve12, reject) => {
+      __classPrivateFieldSet8(this, _MessageStream_resolveEndPromise, resolve12, "f");
       __classPrivateFieldSet8(this, _MessageStream_rejectEndPromise, reject, "f");
     }));
     __classPrivateFieldGet9(this, _MessageStream_connectedPromise, "f").catch(() => {
@@ -118862,11 +119085,11 @@ var MessageStream = class _MessageStream {
    *   const message = await stream.emitted('message') // rejects if the stream errors
    */
   emitted(event) {
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve12, reject) => {
       __classPrivateFieldSet8(this, _MessageStream_catchingPromiseCreated, true);
       if (event !== "error")
         this.once("error", reject);
-      this.once(event, resolve13);
+      this.once(event, resolve12);
     });
   }
   async done() {
@@ -119147,7 +119370,7 @@ var MessageStream = class _MessageStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -120249,13 +120472,13 @@ var MultipartBody2 = class {
   }
 };
 var fileFromPathWarned2 = false;
-async function fileFromPath5(path60, ...args) {
+async function fileFromPath5(path59, ...args) {
   const { fileFromPath: _fileFromPath } = await Promise.resolve().then(() => (init_fileFromPath(), fileFromPath_exports));
   if (!fileFromPathWarned2) {
-    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path60)}) instead`);
+    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path59)}) instead`);
     fileFromPathWarned2 = true;
   }
-  return await _fileFromPath(path60, ...args);
+  return await _fileFromPath(path59, ...args);
 }
 var defaultHttpAgent2 = new import_agentkeepalive2.default({ keepAlive: true, timeout: 5 * 60 * 1e3 });
 var defaultHttpsAgent2 = new import_agentkeepalive2.default.HttpsAgent({ keepAlive: true, timeout: 5 * 60 * 1e3 });
@@ -120930,8 +121153,8 @@ function _addRequestID2(value, response) {
 }
 var APIPromise2 = class _APIPromise extends Promise {
   constructor(responsePromise, parseResponse2 = defaultParseResponse2) {
-    super((resolve13) => {
-      resolve13(null);
+    super((resolve12) => {
+      resolve12(null);
     });
     this.responsePromise = responsePromise;
     this.parseResponse = parseResponse2;
@@ -121033,29 +121256,29 @@ var APIClient2 = class {
   defaultIdempotencyKey() {
     return `stainless-node-retry-${uuid42()}`;
   }
-  get(path60, opts) {
-    return this.methodRequest("get", path60, opts);
+  get(path59, opts) {
+    return this.methodRequest("get", path59, opts);
   }
-  post(path60, opts) {
-    return this.methodRequest("post", path60, opts);
+  post(path59, opts) {
+    return this.methodRequest("post", path59, opts);
   }
-  patch(path60, opts) {
-    return this.methodRequest("patch", path60, opts);
+  patch(path59, opts) {
+    return this.methodRequest("patch", path59, opts);
   }
-  put(path60, opts) {
-    return this.methodRequest("put", path60, opts);
+  put(path59, opts) {
+    return this.methodRequest("put", path59, opts);
   }
-  delete(path60, opts) {
-    return this.methodRequest("delete", path60, opts);
+  delete(path59, opts) {
+    return this.methodRequest("delete", path59, opts);
   }
-  methodRequest(method, path60, opts) {
+  methodRequest(method, path59, opts) {
     return this.request(Promise.resolve(opts).then(async (opts2) => {
       const body = opts2 && isBlobLike2(opts2?.body) ? new DataView(await opts2.body.arrayBuffer()) : opts2?.body instanceof DataView ? opts2.body : opts2?.body instanceof ArrayBuffer ? new DataView(opts2.body) : opts2 && ArrayBuffer.isView(opts2?.body) ? new DataView(opts2.body.buffer) : opts2?.body;
-      return { method, path: path60, ...opts2, body };
+      return { method, path: path59, ...opts2, body };
     }));
   }
-  getAPIList(path60, Page3, opts) {
-    return this.requestAPIList(Page3, { method: "get", path: path60, ...opts });
+  getAPIList(path59, Page3, opts) {
+    return this.requestAPIList(Page3, { method: "get", path: path59, ...opts });
   }
   calculateContentLength(body) {
     if (typeof body === "string") {
@@ -121074,10 +121297,10 @@ var APIClient2 = class {
   }
   buildRequest(inputOptions, { retryCount = 0 } = {}) {
     const options = { ...inputOptions };
-    const { method, path: path60, query, headers = {} } = options;
+    const { method, path: path59, query, headers = {} } = options;
     const body = ArrayBuffer.isView(options.body) || options.__binaryRequest && typeof options.body === "string" ? options.body : isMultipartBody2(options.body) ? options.body.body : options.body ? JSON.stringify(options.body, null, 2) : null;
     const contentLength = this.calculateContentLength(body);
-    const url2 = this.buildURL(path60, query);
+    const url2 = this.buildURL(path59, query);
     if ("timeout" in options)
       validatePositiveInteger2("timeout", options.timeout);
     options.timeout = options.timeout ?? this.timeout;
@@ -121193,8 +121416,8 @@ var APIClient2 = class {
     const request = this.makeRequest(options, null);
     return new PagePromise2(this, request, Page3);
   }
-  buildURL(path60, query) {
-    const url2 = isAbsoluteURL2(path60) ? new URL(path60) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path60.startsWith("/") ? path60.slice(1) : path60));
+  buildURL(path59, query) {
+    const url2 = isAbsoluteURL2(path59) ? new URL(path59) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path59.startsWith("/") ? path59.slice(1) : path59));
     const defaultQuery = this.defaultQuery();
     if (!isEmptyObj2(defaultQuery)) {
       query = { ...defaultQuery, ...query };
@@ -121506,7 +121729,7 @@ var startsWithSchemeRegexp2 = /^[a-z][a-z0-9+.-]*:/i;
 var isAbsoluteURL2 = (url2) => {
   return startsWithSchemeRegexp2.test(url2);
 };
-var sleep2 = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
+var sleep2 = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
 var validatePositiveInteger2 = (name, n2) => {
   if (typeof n2 !== "number" || !Number.isInteger(n2)) {
     throw new OpenAIError(`${name} must be an integer`);
@@ -121937,12 +122160,12 @@ var EventStream = class {
     _EventStream_errored.set(this, false);
     _EventStream_aborted.set(this, false);
     _EventStream_catchingPromiseCreated.set(this, false);
-    __classPrivateFieldSet11(this, _EventStream_connectedPromise, new Promise((resolve13, reject) => {
-      __classPrivateFieldSet11(this, _EventStream_resolveConnectedPromise, resolve13, "f");
+    __classPrivateFieldSet11(this, _EventStream_connectedPromise, new Promise((resolve12, reject) => {
+      __classPrivateFieldSet11(this, _EventStream_resolveConnectedPromise, resolve12, "f");
       __classPrivateFieldSet11(this, _EventStream_rejectConnectedPromise, reject, "f");
     }));
-    __classPrivateFieldSet11(this, _EventStream_endPromise, new Promise((resolve13, reject) => {
-      __classPrivateFieldSet11(this, _EventStream_resolveEndPromise, resolve13, "f");
+    __classPrivateFieldSet11(this, _EventStream_endPromise, new Promise((resolve12, reject) => {
+      __classPrivateFieldSet11(this, _EventStream_resolveEndPromise, resolve12, "f");
       __classPrivateFieldSet11(this, _EventStream_rejectEndPromise, reject, "f");
     }));
     __classPrivateFieldGet12(this, _EventStream_connectedPromise, "f").catch(() => {
@@ -122026,11 +122249,11 @@ var EventStream = class {
    *   const message = await stream.emitted('message') // rejects if the stream errors
    */
   emitted(event) {
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve12, reject) => {
       __classPrivateFieldSet11(this, _EventStream_catchingPromiseCreated, true);
       if (event !== "error")
         this.once("error", reject);
-      this.once(event, resolve13);
+      this.once(event, resolve12);
     });
   }
   async done() {
@@ -122181,7 +122404,7 @@ var AssistantStream = class _AssistantStream extends EventStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -123786,7 +124009,7 @@ var ChatCompletionStream = class _ChatCompletionStream extends AbstractChatCompl
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -125432,7 +125655,7 @@ var ResponseStream = class _ResponseStream extends EventStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((event2) => event2 ? { value: event2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((event2) => event2 ? { value: event2, done: false } : { value: void 0, done: true });
         }
         const event = pushQueue.shift();
         return { value: event, done: false };
@@ -126198,22 +126421,23 @@ var OpenAIProvider = class {
     const tokenLimitKey = usesCompletionTokens ? "max_completion_tokens" : "max_tokens";
     const emitReasoning = req.reasoning != null && req.reasoning !== false;
     const reasoningEffort = typeof req.reasoning === "object" ? req.reasoning.effort : void 0;
+    const params = {
+      model,
+      messages,
+      ...tools ? { tools } : {},
+      ...req.temperature !== void 0 ? { temperature: req.temperature } : {},
+      ...req.maxTokens ? { [tokenLimitKey]: req.maxTokens } : {},
+      ...emitReasoning && usesCompletionTokens && reasoningEffort ? { reasoning_effort: reasoningEffort } : {},
+      stream: true,
+      // OpenAI only emits the final `usage` chunk when this is set;
+      // without it `raw.usage` is null on every chunk and token usage
+      // (and cache-read counts) are silently lost for every streamed turn.
+      stream_options: { include_usage: true }
+    };
     let stream;
     try {
       stream = await this.client.chat.completions.create(
-        {
-          model,
-          messages,
-          ...tools ? { tools } : {},
-          ...req.temperature !== void 0 ? { temperature: req.temperature } : {},
-          ...req.maxTokens ? { [tokenLimitKey]: req.maxTokens } : {},
-          ...emitReasoning && usesCompletionTokens && reasoningEffort ? { reasoning_effort: reasoningEffort } : {},
-          stream: true,
-          // OpenAI only emits the final `usage` chunk when this is set;
-          // without it `raw.usage` is null on every chunk and token usage
-          // (and cache-read counts) are silently lost for every streamed turn.
-          stream_options: { include_usage: true }
-        },
+        params,
         // Pass the AbortSignal into the SDK request options so cancelling
         // mid-stream tears down the underlying HTTP request instead of just
         // stopping our consumption loop. Without this, Esc / Ctrl+C felt
@@ -126392,7 +126616,7 @@ var openaiPlugin = definePlugin({
 init_pkce();
 async function openInBrowser(url2) {
   const { cmd, args, verbatim } = browserOpenCommand(url2);
-  await new Promise((resolve13, reject) => {
+  await new Promise((resolve12, reject) => {
     const child = spawn(cmd, args, {
       stdio: "ignore",
       detached: true,
@@ -126402,7 +126626,7 @@ async function openInBrowser(url2) {
     });
     child.once("error", reject);
     child.unref();
-    setTimeout(resolve13, 50);
+    setTimeout(resolve12, 50);
   });
 }
 function browserOpenCommand(url2, platform2 = process.platform) {
@@ -126418,7 +126642,7 @@ function browserOpenCommand(url2, platform2 = process.platform) {
   return { cmd: "xdg-open", args: [url2] };
 }
 function waitForCallback(opts) {
-  return new Promise((resolve13, reject) => {
+  return new Promise((resolve12, reject) => {
     const servers = [];
     let settled = false;
     const settle = (fn) => {
@@ -126495,7 +126719,7 @@ function waitForCallback(opts) {
       }
       res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
       res.end(htmlPage("Authorized", "You can close this window \u2014 moxxy received the token."));
-      settle(() => resolve13(code));
+      settle(() => resolve12(code));
     };
     const onFatalError = (e3) => {
       if (e3.code === "EADDRINUSE") {
@@ -126619,11 +126843,11 @@ function buildAuthUrl(input) {
 }
 async function runAuthorizationCodeFlow(opts) {
   const port = opts.redirectPort ?? 8765;
-  const path60 = opts.redirectPath ?? "/callback";
+  const path59 = opts.redirectPath ?? "/callback";
   const codeVerifier = generateCodeVerifier();
   const codeChallenge = computeCodeChallenge(codeVerifier);
   const state = generateState();
-  const redirectUri = `http://localhost:${port}${path60}`;
+  const redirectUri = `http://localhost:${port}${path59}`;
   const authUrl = buildAuthUrl({
     authUrl: opts.authUrl,
     clientId: opts.clientId,
@@ -126635,7 +126859,7 @@ async function runAuthorizationCodeFlow(opts) {
   });
   const codePromise = waitForCallback({
     port,
-    path: path60,
+    path: path59,
     expectedState: state,
     timeoutMs: opts.timeoutMs ?? 3e5,
     ...opts.signal ? { signal: opts.signal } : {}
@@ -126692,10 +126916,10 @@ function abortedError(label3) {
   });
 }
 function sleep3(ms, signal, label3) {
-  return new Promise((resolve13, reject) => {
+  return new Promise((resolve12, reject) => {
     if (signal?.aborted)
       return reject(abortedError(label3));
-    const t2 = setTimeout(resolve13, ms);
+    const t2 = setTimeout(resolve12, ms);
     const onAbort = () => {
       clearTimeout(t2);
       reject(abortedError(label3));
@@ -126777,7 +127001,6 @@ function classifyDeviceTokenResponse(res, json, state) {
 }
 
 // ../plugin-oauth/dist/oauth/device-flow.js
-var DEVICE_POLL_SAFETY_MARGIN_MS = 0;
 async function runDeviceCodeFlow(opts) {
   const auth2 = await requestDeviceAuthorization({
     deviceUrl: opts.deviceUrl,
@@ -126793,7 +127016,7 @@ async function runDeviceCodeFlow(opts) {
     interval: auth2.intervalSec
   });
   return pollUntil((state) => pollOnce(opts, auth2.deviceCode, state), {
-    intervalMs: auth2.intervalSec * 1e3 + DEVICE_POLL_SAFETY_MARGIN_MS,
+    intervalMs: auth2.intervalSec * 1e3,
     timeoutMs: Math.min(opts.timeoutMs ?? auth2.expiresInSec * 1e3, auth2.expiresInSec * 1e3),
     label: "OAuth device flow",
     leadingWait: true,
@@ -127000,7 +127223,7 @@ async function acquireFileLock(lockPath, staleMs, pollMs, waitMs) {
   }
 }
 function sleep4(ms) {
-  return new Promise((resolve13) => setTimeout(resolve13, ms));
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
 async function refreshAndStore(vault, spec, stored, retried = false) {
   if (!stored.tokenSet.refreshToken) {
@@ -127155,11 +127378,11 @@ function buildOauthAuthorizeTool(deps) {
           const { computeCodeChallenge: computeCodeChallenge2 } = await Promise.resolve().then(() => (init_pkce(), pkce_exports));
           const challenge = computeCodeChallenge2(verifier);
           const port = input.redirectPort ?? 8765;
-          const path60 = input.redirectPath ?? "/callback";
+          const path59 = input.redirectPath ?? "/callback";
           const url2 = buildAuthUrl({
             authUrl: input.authUrl,
             clientId: input.clientId,
-            redirectUri: `http://localhost:${port}${path60}`,
+            redirectUri: `http://localhost:${port}${path59}`,
             scopes: input.scopes,
             codeChallenge: challenge,
             state,
@@ -127281,7 +127504,7 @@ function summarizeTokens(provider, tokens, opts = {}) {
 init_pkce();
 var DEFAULT_BROWSER_TIMEOUT_MS = 5 * 60 * 1e3;
 var DEFAULT_DEVICE_TIMEOUT_MS = 10 * 60 * 1e3;
-var DEVICE_POLL_SAFETY_MARGIN_MS2 = 3e3;
+var DEVICE_POLL_SAFETY_MARGIN_MS = 3e3;
 async function runOauthLogin(profile, ctx) {
   const tokens = ctx.headless ? await runDeviceFlow(profile, ctx) : await runBrowserFlow(profile, ctx);
   const accountId = profile.extractAccountId?.(tokens);
@@ -127303,7 +127526,7 @@ async function runOauthLogin(profile, ctx) {
 }
 async function runBrowserFlow(profile, ctx) {
   const port = profile.redirect?.port ?? 8765;
-  const path60 = profile.redirect?.path ?? "/callback";
+  const path59 = profile.redirect?.path ?? "/callback";
   const serviceName = profile.displayName ?? profile.id;
   return runAuthorizationCodeFlow({
     authUrl: profile.authUrl,
@@ -127312,7 +127535,7 @@ async function runBrowserFlow(profile, ctx) {
     ...profile.clientSecret ? { clientSecret: profile.clientSecret } : {},
     scopes: profile.scopes,
     redirectPort: port,
-    redirectPath: path60,
+    redirectPath: path59,
     ...profile.extraAuthParams ? { extraAuthParams: profile.extraAuthParams } : {},
     timeoutMs: DEFAULT_BROWSER_TIMEOUT_MS,
     ...ctx.signal ? { signal: ctx.signal } : {},
@@ -127324,7 +127547,7 @@ If your browser doesn't open automatically, paste this URL:
 
   ${url2}
 
-Waiting for callback on http://localhost:${port}${path60} (5 min timeout)\u2026
+Waiting for callback on http://localhost:${port}${path59} (5 min timeout)\u2026
 
 `);
     }
@@ -127361,7 +127584,7 @@ Polling every ${Math.round(init3.intervalMs / 1e3)}s (${Math.round(init3.expires
 `);
   const timeoutMs = Math.min(init3.expiresInMs, DEFAULT_DEVICE_TIMEOUT_MS);
   return pollUntil((state) => adapter.poll(init3, state), {
-    intervalMs: init3.intervalMs + DEVICE_POLL_SAFETY_MARGIN_MS2,
+    intervalMs: init3.intervalMs + DEVICE_POLL_SAFETY_MARGIN_MS,
     timeoutMs,
     label: `${profile.id} device flow`,
     leadingWait: true,
@@ -128301,7 +128524,7 @@ async function refreshClaudeUnderLock(vault, baseline) {
 }
 var fetchImpl = fetch;
 var openBrowserImpl = openInBrowser;
-var sleepImpl = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
+var sleepImpl = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
 var TOKEN_POST_MAX_ATTEMPTS = 3;
 var TOKEN_POST_BACKOFF_MS = [600, 1800];
 async function exchangeClaudeCode(code, state, verifier) {
@@ -128645,14 +128868,15 @@ var WhisperTranscriber = class {
         ...language ? { language } : {},
         ...opts.prompt ? { prompt: opts.prompt } : {}
       }, { signal: opts.signal }));
-      const r2 = response2;
+      const r2 = requireTextResponse(response2);
       const result = { text: r2.text };
-      if (r2.language)
+      if (typeof r2.language === "string")
         result.language = r2.language;
       if (typeof r2.duration === "number")
         result.durationSec = r2.duration;
-      if (r2.segments)
+      if (Array.isArray(r2.segments)) {
         result.segments = r2.segments.map((s2) => ({ start: s2.start, end: s2.end, text: s2.text }));
+      }
       return result;
     }
     const response = await this.run(() => this.client.audio.transcriptions.create({
@@ -128661,7 +128885,7 @@ var WhisperTranscriber = class {
       ...language ? { language } : {},
       ...opts.prompt ? { prompt: opts.prompt } : {}
     }, { signal: opts.signal }));
-    return { text: response.text };
+    return { text: requireTextResponse(response).text };
   }
   /**
    * Run an SDK transcription call, translating failures into structured
@@ -128698,6 +128922,16 @@ var WhisperTranscriber = class {
     }
   }
 };
+function requireTextResponse(response) {
+  if (!response || typeof response !== "object" || typeof response.text !== "string") {
+    throw new MoxxyError({
+      code: "PROVIDER_UNKNOWN_RESPONSE",
+      message: "OpenAI transcription response was missing a text field.",
+      context: { provider: WHISPER_PROVIDER_ID }
+    });
+  }
+  return response;
+}
 
 // ../plugin-stt-whisper/dist/index.js
 function buildWhisperPlugin(opts = {}) {
@@ -128792,7 +129026,18 @@ var CodexOAuthTranscriber = class {
         context: { provider: CODEX_PROVIDER_ID, url: this.endpoint }
       });
     }
-    return { text: payload.text.trim() };
+    const obj = payload;
+    const result = { text: obj.text.trim() };
+    if (typeof obj.language === "string")
+      result.language = obj.language;
+    if (typeof obj.duration === "number")
+      result.durationSec = obj.duration;
+    if (Array.isArray(obj.segments)) {
+      const segments = obj.segments.filter((s2) => !!s2 && typeof s2 === "object" && typeof s2.start === "number" && typeof s2.end === "number" && typeof s2.text === "string").map((s2) => ({ start: s2.start, end: s2.end, text: s2.text }));
+      if (segments.length > 0)
+        result.segments = segments;
+    }
+    return result;
   }
   async loadTokens() {
     try {
@@ -128861,12 +129106,16 @@ function buildWhisperCodexPlugin(opts) {
         name: OPENAI_CODEX_TRANSCRIBER_NAME,
         displayName: "OpenAI Codex transcription (OAuth)",
         createClient: (config) => {
+          const cfg = config ?? {};
+          const configBaseUrl = typeof cfg.baseUrl === "string" ? cfg.baseUrl : void 0;
+          const configSessionIdProvider = typeof cfg.sessionIdProvider === "function" ? cfg.sessionIdProvider : void 0;
+          const baseUrl = configBaseUrl ?? opts.baseUrl;
+          const sessionIdProvider = configSessionIdProvider ?? opts.sessionIdProvider;
           const merged = {
             vault: opts.vault,
-            ...opts.baseUrl ? { baseUrl: opts.baseUrl } : {},
+            ...baseUrl ? { baseUrl } : {},
             ...opts.fetch ? { fetch: opts.fetch } : {},
-            ...opts.sessionIdProvider ? { sessionIdProvider: opts.sessionIdProvider } : {},
-            ...config
+            ...sessionIdProvider ? { sessionIdProvider } : {}
           };
           return new CodexOAuthTranscriber(merged);
         }
@@ -128967,7 +129216,7 @@ var bashTool = defineTool({
     if (ctx.signal.aborted) {
       throw new MoxxyError({ code: "ABORTED", message: `Bash aborted before start: ${command}` });
     }
-    return await new Promise((resolve13, reject) => {
+    return await new Promise((resolve12, reject) => {
       const child = spawn("/bin/sh", ["-lc", command], {
         cwd: cwd2 ?? ctx.cwd,
         env: env3 ? { ...process.env, ...env3 } : process.env,
@@ -129020,9 +129269,9 @@ ${err.text.trimEnd()}
 ` : "") + `[exit ${code ?? "null"}]`;
         const dropped = out.dropped + err.dropped;
         if (dropped === 0) {
-          resolve13(clampString(combined, OUTPUT_LIMIT));
+          resolve12(clampString(combined, OUTPUT_LIMIT));
         } else {
-          resolve13(combined.slice(0, OUTPUT_LIMIT) + `
+          resolve12(combined.slice(0, OUTPUT_LIMIT) + `
 ... [truncated ${combined.length + dropped - OUTPUT_LIMIT} chars]`);
         }
       });
@@ -129343,6 +129592,15 @@ async function* walk(root, regex2, cursor, signal, visited) {
     }
   }
 }
+var MAX_FILE_BYTES = 10 * 1024 * 1024;
+function looksBinary(content) {
+  const limit2 = Math.min(content.length, 8192);
+  for (let i2 = 0; i2 < limit2; i2 += 1) {
+    if (content.charCodeAt(i2) === 0)
+      return true;
+  }
+  return false;
+}
 var grepTool = defineTool({
   name: "Grep",
   description: "Recursively search files for a regex pattern. Returns lines as `path:line:text`.",
@@ -129406,12 +129664,21 @@ async function walk2(root, cursor, re2, fileRe, matches, max, signal) {
       continue;
     if (fileRe && !fileRe.test(entry.name))
       continue;
+    try {
+      const st3 = await promises.stat(full);
+      if (st3.size > MAX_FILE_BYTES)
+        continue;
+    } catch {
+      continue;
+    }
     let content;
     try {
       content = await promises.readFile(full, "utf8");
     } catch {
       continue;
     }
+    if (looksBinary(content))
+      continue;
     const lines = content.split("\n");
     for (let i2 = 0; i2 < lines.length; i2++) {
       if (re2.test(lines[i2])) {
@@ -129603,10 +129870,10 @@ var sleepTool = defineTool({
     if (ctx.signal.aborted) {
       throw new MoxxyError({ code: "ABORTED", message: "Sleep aborted before start" });
     }
-    await new Promise((resolve13, reject) => {
+    await new Promise((resolve12, reject) => {
       const timer = setTimeout(() => {
         ctx.signal.removeEventListener("abort", onAbort);
-        resolve13();
+        resolve12();
       }, totalMs);
       const onAbort = () => {
         clearTimeout(timer);
@@ -129679,16 +129946,16 @@ function retryBackoffMs(attempt) {
   const cap = 3e4;
   return Math.min(cap, base2 * 2 ** Math.max(0, attempt - 1));
 }
-var sleepImpl2 = (ms, signal) => new Promise((resolve13) => {
+var sleepImpl2 = (ms, signal) => new Promise((resolve12) => {
   if (signal.aborted)
-    return resolve13();
+    return resolve12();
   const timer = setTimeout(() => {
     signal.removeEventListener("abort", onAbort);
-    resolve13();
+    resolve12();
   }, ms);
   const onAbort = () => {
     clearTimeout(timer);
-    resolve13();
+    resolve12();
   };
   signal.addEventListener("abort", onAbort, { once: true });
 });
@@ -130527,20 +130794,17 @@ function parseFollowups(text) {
 function parseNumberedBlock(text, headerRegex) {
   const lines = text.split("\n");
   const items = [];
-  let inBlock = false;
   for (const raw of lines) {
     const line = raw.trim();
     if (!line)
       continue;
     if (headerRegex.test(line)) {
-      inBlock = true;
       continue;
     }
     const m3 = /^(?:\d+[.)]|[-*•])\s*(.+)$/.exec(line);
     if (m3) {
       items.push(m3[1].trim());
-      inBlock = true;
-    } else if (inBlock && items.length > 0 && !/^[A-Z]/.test(line)) ;
+    }
   }
   return items;
 }
@@ -131137,11 +131401,11 @@ var TelegramPermissionResolver = class {
     if (!this.deciderFn) {
       return { mode: "deny", reason: "no decider attached (bot not running)" };
     }
-    const decision = await new Promise((resolve13) => {
-      this.pending.set(call.callId, { callId: call.callId, call, ctx, resolve: resolve13 });
+    const decision = await new Promise((resolve12) => {
+      this.pending.set(call.callId, { callId: call.callId, call, ctx, resolve: resolve12 });
       this.deciderFn(call, ctx).catch((err) => {
         this.pending.delete(call.callId);
-        resolve13({ mode: "deny", reason: err instanceof Error ? err.message : String(err) });
+        resolve12({ mode: "deny", reason: err instanceof Error ? err.message : String(err) });
       });
     });
     if (decision.mode === "allow_session")
@@ -131179,11 +131443,11 @@ var TelegramApprovalResolver = class {
       return { optionId: request.defaultOptionId ?? request.options[0]?.id ?? "approve" };
     }
     const id = `appr_${this.nextId++}`;
-    return new Promise((resolve13) => {
-      this.pending.set(id, { id, request, resolve: resolve13 });
+    return new Promise((resolve12) => {
+      this.pending.set(id, { id, request, resolve: resolve12 });
       this.deciderFn(id, request).catch((err) => {
         this.pending.delete(id);
-        resolve13({
+        resolve12({
           optionId: request.defaultOptionId ?? request.options[0]?.id ?? "cancel",
           text: `decider failed: ${err instanceof Error ? err.message : String(err)}`
         });
@@ -132649,17 +132913,9 @@ var TelegramChannel = class {
   handleVoice(ctx, token) {
     return handleVoiceMessage(ctx, {
       session: this.session,
-      model: this.model,
-      activeModelOverride: this.activeModelOverride,
-      yolo: this.yolo,
-      busy: this.busy,
-      turnController: this.turnController,
-      handle: this.handle
+      busy: this.busy
     }, {
       pairing: this.pairing,
-      approvalResolver: this.approvalResolver,
-      permissionResolver: this.permissionResolver,
-      framePump: this.framePump,
       token,
       ...this.opts.logger ? { logger: this.opts.logger } : {}
     }, {
@@ -133732,8 +133988,8 @@ async function runPairFlow(ctx) {
   });
   session.setPermissionResolver(channel.permissionResolver);
   let issuedResolve = null;
-  const issued = new Promise((resolve13) => {
-    issuedResolve = resolve13;
+  const issued = new Promise((resolve12) => {
+    issuedResolve = resolve12;
   });
   const unsubscribe = channel.onPairingIssued((e3) => {
     issuedResolve?.(e3);
@@ -134109,6 +134365,22 @@ function reply(res, status, body) {
   res.writeHead(status, { "content-type": "application/json" });
   res.end(JSON.stringify(body));
 }
+async function driveTurn(session, prompt, runOptions, res) {
+  const controller = new AbortController();
+  const onClose = () => controller.abort();
+  res.on("close", onClose);
+  const events = [];
+  try {
+    for await (const event of session.runTurn(prompt, { ...runOptions, signal: controller.signal })) {
+      events.push(event);
+    }
+  } finally {
+    res.off("close", onClose);
+  }
+  const finalAssistant = events.findLast?.((e3) => e3.type === "assistant_message");
+  const assistant = finalAssistant && finalAssistant.type === "assistant_message" ? finalAssistant.content : "";
+  return { events, assistant };
+}
 async function handleTurn(req, res, ctx) {
   if (!checkAuth(req, ctx.authToken)) {
     reply(res, 401, { error: "unauthorized" });
@@ -134122,27 +134394,17 @@ async function handleTurn(req, res, ctx) {
     reply(res, 400, { error: "bad_request", message: err instanceof Error ? err.message : String(err) });
     return;
   }
-  const controller = new AbortController();
-  const onClose = () => controller.abort();
-  res.on("close", onClose);
-  const events = [];
+  let result;
   try {
-    for await (const event of ctx.session.runTurn(body.prompt, {
+    result = await driveTurn(ctx.session, body.prompt, {
       ...body.model ? { model: body.model } : {},
-      ...body.systemPrompt ? { systemPrompt: body.systemPrompt } : {},
-      signal: controller.signal
-    })) {
-      events.push(event);
-    }
+      ...body.systemPrompt ? { systemPrompt: body.systemPrompt } : {}
+    }, res);
   } catch (err) {
     reply(res, 500, { error: "turn_failed", message: err instanceof Error ? err.message : String(err) });
     return;
-  } finally {
-    res.off("close", onClose);
   }
-  const finalAssistant = events.findLast?.((e3) => e3.type === "assistant_message");
-  const assistant = finalAssistant && finalAssistant.type === "assistant_message" ? finalAssistant.content : "";
-  reply(res, 200, { events, assistant });
+  reply(res, 200, { events: result.events, assistant: result.assistant });
 }
 async function handleTurnAudio(req, res, ctx) {
   if (!checkAuth(req, ctx.authToken)) {
@@ -134183,12 +134445,12 @@ async function handleTurnAudio(req, res, ctx) {
   const systemPrompt = url2.searchParams.get("systemPrompt") ?? void 0;
   let transcript;
   try {
-    const result = await transcriber.transcribe(new Uint8Array(bytes), {
+    const result2 = await transcriber.transcribe(new Uint8Array(bytes), {
       mimeType: contentType,
       ...language ? { language } : {},
       ...promptHint ? { prompt: promptHint } : {}
     });
-    transcript = result.text.trim();
+    transcript = result2.text.trim();
   } catch (err) {
     ctx.logger?.warn("http audio transcription failed", { err: err instanceof Error ? err.message : String(err) });
     reply(res, 502, { error: "transcription_failed", message: err instanceof Error ? err.message : String(err) });
@@ -134198,27 +134460,17 @@ async function handleTurnAudio(req, res, ctx) {
     reply(res, 422, { error: "empty_transcript", message: "transcriber returned empty text" });
     return;
   }
-  const controller = new AbortController();
-  const onClose = () => controller.abort();
-  res.on("close", onClose);
-  const events = [];
+  let result;
   try {
-    for await (const event of ctx.session.runTurn(transcript, {
+    result = await driveTurn(ctx.session, transcript, {
       ...model ? { model } : {},
-      ...systemPrompt ? { systemPrompt } : {},
-      signal: controller.signal
-    })) {
-      events.push(event);
-    }
+      ...systemPrompt ? { systemPrompt } : {}
+    }, res);
   } catch (err) {
     reply(res, 500, { error: "turn_failed", message: err instanceof Error ? err.message : String(err) });
     return;
-  } finally {
-    res.off("close", onClose);
   }
-  const finalAssistant = events.findLast?.((e3) => e3.type === "assistant_message");
-  const assistant = finalAssistant && finalAssistant.type === "assistant_message" ? finalAssistant.content : "";
-  reply(res, 200, { transcript, events, assistant });
+  reply(res, 200, { transcript, events: result.events, assistant: result.assistant });
 }
 async function handleTurnStream(req, res, ctx) {
   if (!checkAuth(req, ctx.authToken)) {
@@ -134320,11 +134572,11 @@ var HttpChannel = class {
     this.server = server;
     let rejectRunning;
     let resolveRunning;
-    const running = new Promise((resolve13, reject) => {
-      resolveRunning = resolve13;
+    const running = new Promise((resolve12, reject) => {
+      resolveRunning = resolve12;
       rejectRunning = reject;
     });
-    const listening = new Promise((resolve13, reject) => {
+    const listening = new Promise((resolve12, reject) => {
       const onListenError = (err) => reject(err);
       server.once("error", onListenError);
       server.listen(this.port, this.host, () => {
@@ -134340,7 +134592,7 @@ var HttpChannel = class {
           port: this.boundPortValue,
           authEnabled: this.authToken !== null
         });
-        resolve13();
+        resolve12();
       });
     });
     await listening;
@@ -134348,10 +134600,10 @@ var HttpChannel = class {
     return {
       running,
       stop: async () => {
-        await new Promise((resolve13) => {
+        await new Promise((resolve12) => {
           if (!this.server)
-            return resolve13();
-          this.server.close(() => resolve13());
+            return resolve12();
+          this.server.close(() => resolve12());
         });
       }
     };
@@ -134494,17 +134746,17 @@ function isAddrInUse(err) {
 }
 async function captureStdout(cmd, args) {
   const { spawn: spawn15 } = await import('child_process');
-  return await new Promise((resolve13) => {
+  return await new Promise((resolve12) => {
     let out = "";
     try {
       const child = spawn15(cmd, [...args], { stdio: ["ignore", "pipe", "ignore"] });
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve13(""));
-      child.on("close", () => resolve13(out));
+      child.on("error", () => resolve12(""));
+      child.on("close", () => resolve12(out));
     } catch {
-      resolve13("");
+      resolve12("");
     }
   });
 }
@@ -134631,7 +134883,7 @@ var WebChannel = class {
     await this.openTunnel();
     this.publishSurface?.({ url: this.shareUrl, nextViewId: () => `v_srv_${++this.viewSeq}` });
     this.publishControls?.({ retunnel: () => this.retunnel() });
-    const running = new Promise((resolve13) => server.once("close", () => resolve13()));
+    const running = new Promise((resolve12) => server.once("close", () => resolve12()));
     return { running, stop: () => this.stop() };
   }
   /**
@@ -134644,7 +134896,7 @@ var WebChannel = class {
    * surface actually got (the share URL embeds the real port either way).
    */
   async bindServerWithRetry(server) {
-    const tryListen = () => new Promise((resolve13, reject) => {
+    const tryListen = () => new Promise((resolve12, reject) => {
       const onError2 = (err) => {
         server.off("listening", onListening);
         reject(err);
@@ -134655,7 +134907,7 @@ var WebChannel = class {
         if (addr && typeof addr === "object")
           this.port = addr.port;
         this.logger?.info?.("web channel listening", { url: this.url });
-        resolve13();
+        resolve12();
       };
       server.once("error", onError2);
       server.once("listening", onListening);
@@ -134736,8 +134988,8 @@ var WebChannel = class {
       }
     }
     this.clients.clear();
-    await new Promise((resolve13) => this.wss ? this.wss.close(() => resolve13()) : resolve13());
-    await new Promise((resolve13) => this.server ? this.server.close(() => resolve13()) : resolve13());
+    await new Promise((resolve12) => this.wss ? this.wss.close(() => resolve12()) : resolve12());
+    await new Promise((resolve12) => this.server ? this.server.close(() => resolve12()) : resolve12());
   }
   validToken(reqUrl) {
     try {
@@ -135137,9 +135389,9 @@ async function createWebSocketTransportServer(opts) {
     for (const handler of connectionHandlers)
       handler(transport);
   });
-  await new Promise((resolve13, reject) => {
+  await new Promise((resolve12, reject) => {
     wss.once("error", reject);
-    wss.once("listening", resolve13);
+    wss.once("listening", resolve12);
   });
   const bound = wss.address();
   const boundPort = typeof bound === "object" && bound !== null ? bound.port : opts.port;
@@ -135160,10 +135412,10 @@ async function createWebSocketTransportServer(opts) {
       return connections;
     },
     close() {
-      return new Promise((resolve13) => {
+      return new Promise((resolve12) => {
         for (const client of wss.clients)
           client.terminate();
-        wss.close(() => resolve13());
+        wss.close(() => resolve12());
       });
     }
   };
@@ -135215,8 +135467,8 @@ var JsonRpcPeer = class {
     if (this.closed)
       return Promise.reject(new RpcError("rpc peer is closed"));
     const id = this.nextId++;
-    return new Promise((resolve13, reject) => {
-      this.pending.set(id, { resolve: resolve13, reject });
+    return new Promise((resolve12, reject) => {
+      this.pending.set(id, { resolve: resolve12, reject });
       const frame = { id, method, ...params !== void 0 ? { params } : {} };
       this.transport.send(frame);
     });
@@ -135368,11 +135620,11 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
     for (const handler of connectionHandlers)
       handler(transport);
   });
-  await new Promise((resolve13, reject) => {
+  await new Promise((resolve12, reject) => {
     server.once("error", reject);
     server.listen(socketPath, () => {
       server.removeListener("error", reject);
-      resolve13();
+      resolve12();
     });
   });
   if (process.platform !== "win32") {
@@ -135391,7 +135643,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
       connectionHandlers.push(handler);
     },
     close() {
-      return new Promise((resolve13) => {
+      return new Promise((resolve12) => {
         server.close(() => {
           if (process.platform !== "win32") {
             try {
@@ -135399,7 +135651,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
             } catch {
             }
           }
-          resolve13();
+          resolve12();
         });
       });
     }
@@ -135408,7 +135660,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
 var DEFAULT_CONNECT_TIMEOUT_MS = 1e4;
 function connectUnixSocket(socketPath, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
-  return new Promise((resolve13, reject) => {
+  return new Promise((resolve12, reject) => {
     const socket = net.connect(socketPath);
     let settled = false;
     const timer = setTimeout(() => {
@@ -135433,7 +135685,7 @@ function connectUnixSocket(socketPath, opts = {}) {
       settled = true;
       clearTimeout(timer);
       socket.removeListener("error", onError2);
-      resolve13(new NdjsonTransport(socket));
+      resolve12(new NdjsonTransport(socket));
     });
   });
 }
@@ -135465,11 +135717,11 @@ function warnWindowsPipeAclOnce(logger, pipePath) {
 async function reclaimStaleSocket(socketPath) {
   if (!fs28__default.existsSync(socketPath))
     return;
-  const alive = await new Promise((resolve13) => {
+  const alive = await new Promise((resolve12) => {
     const probe = net.connect(socketPath);
     const finish = (up) => {
       probe.destroy();
-      resolve13(up);
+      resolve12(up);
     };
     probe.once("connect", () => finish(true));
     probe.once("error", () => finish(false));
@@ -135494,11 +135746,11 @@ function runnerSocketPath() {
   return platformSocket("serve", path3__default.join(os5__default.homedir(), ".moxxy", "serve.sock"));
 }
 function isRunnerUp(socketPath = runnerSocketPath()) {
-  return new Promise((resolve13) => {
+  return new Promise((resolve12) => {
     const socket = net.connect(socketPath);
     const finish = (up) => {
       socket.destroy();
-      resolve13(up);
+      resolve12(up);
     };
     socket.once("connect", () => finish(true));
     socket.once("error", () => finish(false));
@@ -135706,9 +135958,38 @@ var workflowResumeParamsSchema = z.object({
 var surfaceOpenParamsSchema = z.object({
   kind: z.string().min(1).max(64)
 });
+var MAX_SURFACE_INPUT_BYTES = 1e6;
+function surfaceInputWithinCap(m3) {
+  let upper = 2;
+  let primitiveOnly = true;
+  for (const key in m3) {
+    if (!Object.prototype.hasOwnProperty.call(m3, key))
+      continue;
+    const v3 = m3[key];
+    const t2 = typeof v3;
+    if (v3 === void 0 || t2 === "function")
+      continue;
+    upper += key.length * 6 + 2 + 1 + 1;
+    if (t2 === "string") {
+      upper += v3.length * 6 + 2;
+    } else if (t2 === "number") {
+      upper += 25;
+    } else if (t2 === "boolean" || v3 === null) {
+      upper += 5;
+    } else {
+      primitiveOnly = false;
+      break;
+    }
+    if (upper > MAX_SURFACE_INPUT_BYTES)
+      break;
+  }
+  if (primitiveOnly && upper <= MAX_SURFACE_INPUT_BYTES)
+    return true;
+  return JSON.stringify(m3).length <= MAX_SURFACE_INPUT_BYTES;
+}
 var surfaceInputParamsSchema = z.object({
   surfaceId: z.string().min(1).max(120),
-  message: z.object({ type: z.string().min(1).max(64) }).passthrough().refine((m3) => JSON.stringify(m3).length <= 1e6, {
+  message: z.object({ type: z.string().min(1).max(64) }).passthrough().refine((m3) => surfaceInputWithinCap(m3), {
     message: "surface input message too large"
   })
 });
@@ -136285,7 +136566,7 @@ var TurnStream = class {
         yield this.queue.shift();
       if (this.done)
         break;
-      await new Promise((resolve13) => this.waiters.push(resolve13));
+      await new Promise((resolve12) => this.waiters.push(resolve12));
     }
     if (this.error)
       throw new Error(this.error);
@@ -136920,7 +137201,7 @@ async function isMoxxyProcess(pid) {
 }
 async function pidCommand2(pid) {
   const { spawn: spawn15 } = await import('child_process');
-  return await new Promise((resolve13) => {
+  return await new Promise((resolve12) => {
     let out = "";
     try {
       const child = spawn15("ps", ["-p", String(pid), "-o", "command="], {
@@ -136929,10 +137210,10 @@ async function pidCommand2(pid) {
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve13(""));
-      child.on("close", () => resolve13(out.trim()));
+      child.on("error", () => resolve12(""));
+      child.on("close", () => resolve12(out.trim()));
     } catch {
-      resolve13("");
+      resolve12("");
     }
   });
 }
@@ -136962,7 +137243,7 @@ async function pidsListeningOnPort(port) {
 }
 async function runLsof(args) {
   const { spawn: spawn15 } = await import('child_process');
-  return await new Promise((resolve13) => {
+  return await new Promise((resolve12) => {
     let out = "";
     try {
       const child = spawn15("lsof", [...args], {
@@ -136971,10 +137252,10 @@ async function runLsof(args) {
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve13([]));
-      child.on("close", () => resolve13(parsePids(out)));
+      child.on("error", () => resolve12([]));
+      child.on("close", () => resolve12(parsePids(out)));
     } catch {
-      resolve13([]);
+      resolve12([]);
     }
   });
 }
@@ -137514,8 +137795,8 @@ var MobileSessionHost = class {
     for (const controller of this.turns.values())
       controller.abort();
     this.turns.clear();
-    for (const resolve13 of this.pendingAsks.values())
-      resolve13({ mode: "deny" });
+    for (const resolve12 of this.pendingAsks.values())
+      resolve12({ mode: "deny" });
     this.pendingAsks.clear();
     this.session.setApprovalResolver(null);
   }
@@ -137565,17 +137846,17 @@ var MobileSessionHost = class {
   }
   openAsk(req) {
     const requestId = `ask-${++this.askCounter}`;
-    return new Promise((resolve13) => {
-      this.pendingAsks.set(requestId, resolve13);
+    return new Promise((resolve12) => {
+      this.pendingAsks.set(requestId, resolve12);
       this.bus.broadcast("ask.request", { ...req, requestId });
     });
   }
   answerAsk(requestId, response) {
-    const resolve13 = this.pendingAsks.get(requestId);
-    if (!resolve13)
+    const resolve12 = this.pendingAsks.get(requestId);
+    if (!resolve12)
       return;
     this.pendingAsks.delete(requestId);
-    resolve13(response);
+    resolve12(response);
   }
 };
 var TOKEN_FILE = "mobile-token";
@@ -137799,8 +138080,8 @@ var MobileChannel = class {
       throw err;
     }
     let resolveRunning;
-    const running = new Promise((resolve13) => {
-      resolveRunning = resolve13;
+    const running = new Promise((resolve12) => {
+      resolveRunning = resolve12;
     });
     return {
       running,
@@ -138360,7 +138641,7 @@ ${tail}` : " (no stderr captured)")
       throw new MoxxyError({ code: "NETWORK_ABORTED", message: "browser_session aborted" });
     const id = randomUUID();
     const req = { id, method, params };
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve12, reject) => {
       const onAbort = () => {
         if (this.pending.delete(id))
           reject(new MoxxyError({ code: "NETWORK_ABORTED", message: "browser_session aborted" }));
@@ -138369,7 +138650,7 @@ ${tail}` : " (no stderr captured)")
       this.pending.set(id, {
         resolve: (v3) => {
           cleanup();
-          resolve13(v3);
+          resolve12(v3);
         },
         reject: (e3) => {
           cleanup();
@@ -138522,9 +138803,12 @@ function buildBrowserSurface(deps) {
           fails = 0;
           emit2({ type: "frame", base64: frame.base64, mime: frame.mediaType, url: frame.url });
         } catch (err) {
-          if (++fails === FAIL_GRACE && !last) {
+          if (++fails === FAIL_GRACE) {
             const message = err instanceof Error ? err.message : String(err);
-            emit2({ type: "status", text: `Browser unavailable: ${message}` });
+            emit2({
+              type: "status",
+              text: last ? `Browser disconnected: ${message}` : `Browser unavailable: ${message}`
+            });
           }
         } finally {
           inFlight = false;
@@ -138600,6 +138884,8 @@ function defaultShell() {
     return process.env["COMSPEC"] ?? "powershell.exe";
   return process.env["SHELL"] ?? "/bin/bash";
 }
+var MAX_SCROLLBACK = 2e5;
+var SCROLLBACK_SLACK = 1e5;
 var TerminalProcessImpl = class {
   backend;
   pty;
@@ -138623,7 +138909,10 @@ var TerminalProcessImpl = class {
     }
   }
   emitData(d2) {
-    this.buffer = (this.buffer + d2).slice(-2e5);
+    this.buffer += d2;
+    if (this.buffer.length > MAX_SCROLLBACK + SCROLLBACK_SLACK) {
+      this.buffer = this.buffer.slice(-MAX_SCROLLBACK);
+    }
     for (const cb of this.dataListeners) {
       try {
         cb(d2);
@@ -138651,7 +138940,7 @@ var TerminalProcessImpl = class {
     return () => this.exitListeners.delete(cb);
   }
   scrollback() {
-    return this.buffer;
+    return this.buffer.length > MAX_SCROLLBACK ? this.buffer.slice(-MAX_SCROLLBACK) : this.buffer;
   }
   write(data) {
     if (!this.alive)
@@ -138787,7 +139076,7 @@ function buildTerminalTool() {
   });
 }
 function runCommand(proc, command, marker, timeoutMs) {
-  return new Promise((resolve13) => {
+  return new Promise((resolve12) => {
     let acc = "";
     let settled = false;
     const finish = (exitCode, timedOut) => {
@@ -138796,13 +139085,19 @@ function runCommand(proc, command, marker, timeoutMs) {
       settled = true;
       unsub();
       clearTimeout(timer);
-      resolve13({ output: cleanOutput(acc, command, marker), exitCode, timedOut });
+      resolve12({ output: cleanOutput(acc, command, marker), exitCode, timedOut });
     };
+    const sentinel2 = new RegExp(`${marker} (\\d+)`);
+    const carry = marker.length + 32;
+    let scanFrom = 0;
     const unsub = proc.onData((d2) => {
+      const from = Math.max(scanFrom, acc.length - carry, 0);
       acc += d2;
-      const m3 = new RegExp(`${marker} (\\d+)`).exec(acc);
+      sentinel2.lastIndex = 0;
+      const m3 = sentinel2.exec(from > 0 ? acc.slice(from) : acc);
       if (m3)
         finish(Number(m3[1]), false);
+      scanFrom = Math.max(0, acc.length - carry);
     });
     const timer = setTimeout(() => finish(null, true), timeoutMs);
     proc.write(`${command}
@@ -138873,26 +139168,21 @@ function buildDispatchAgentTool(deps) {
 function resolveSpec(input, deps) {
   const requested = input.agentType ?? "default";
   const def = deps.getAgent(requested) ?? DEFAULT_AGENT;
+  const systemPrompt = input.systemPrompt ?? def.systemPrompt;
+  const model = input.model ?? def.model;
+  const mode = input.mode ?? def.mode;
+  const allowedTools = input.allowedTools ?? def.allowedTools;
   const merged = {
     prompt: input.prompt,
     label: input.label ?? def.name,
     // The requested kind, surfaced in subagent_* payloads for group rendering.
-    agentType: requested
+    agentType: requested,
+    ...systemPrompt !== void 0 && { systemPrompt },
+    ...model !== void 0 && { model },
+    ...mode !== void 0 && { mode },
+    ...def.maxIterations !== void 0 && { maxIterations: def.maxIterations },
+    ...allowedTools !== void 0 && { allowedTools }
   };
-  const systemPrompt = input.systemPrompt ?? def.systemPrompt;
-  if (systemPrompt !== void 0)
-    merged.systemPrompt = systemPrompt;
-  const model = input.model ?? def.model;
-  if (model !== void 0)
-    merged.model = model;
-  const mode = input.mode ?? def.mode;
-  if (mode !== void 0)
-    merged.mode = mode;
-  if (def.maxIterations !== void 0)
-    merged.maxIterations = def.maxIterations;
-  const allowedTools = input.allowedTools ?? def.allowedTools;
-  if (allowedTools !== void 0)
-    merged.allowedTools = allowedTools;
   return merged;
 }
 
@@ -139042,7 +139332,7 @@ async function ensurePackageJson(dir) {
   }
 }
 function runNpm(args, signal) {
-  return new Promise((resolve13, reject) => {
+  return new Promise((resolve12, reject) => {
     if (signal?.aborted) {
       reject(new Error("npm aborted before start"));
       return;
@@ -139068,7 +139358,7 @@ function runNpm(args, signal) {
     });
     child.on("close", (code) => {
       signal?.removeEventListener("abort", onAbort);
-      resolve13({ exitCode: code ?? -1, stdout, stderr });
+      resolve12({ exitCode: code ?? -1, stdout, stderr });
     });
   });
 }
@@ -139857,9 +140147,9 @@ function buildViewPlugin(opts) {
 }
 var IS_DARWIN = process.platform === "darwin";
 function runProcess(cmd, args, opts = {}) {
-  return new Promise((resolve13, reject) => {
+  return new Promise((resolve12, reject) => {
     const child = spawn(cmd, [...args], { stdio: ["pipe", "pipe", "pipe"] });
-    let stdout = Buffer.alloc(0);
+    const stdoutChunks = [];
     let stderr = "";
     let settled = false;
     const onAbort = () => {
@@ -139880,7 +140170,7 @@ function runProcess(cmd, args, opts = {}) {
       }
     }, opts.timeoutMs) : null;
     child.stdout.on("data", (chunk) => {
-      stdout = Buffer.concat([stdout, chunk]);
+      stdoutChunks.push(chunk);
     });
     child.stderr.on("data", (chunk) => {
       stderr += chunk.toString("utf8");
@@ -139901,9 +140191,9 @@ function runProcess(cmd, args, opts = {}) {
       if (timer)
         clearTimeout(timer);
       opts.signal?.removeEventListener("abort", onAbort);
-      resolve13({
+      resolve12({
         exitCode: code ?? -1,
-        stdout: stdout.toString("utf8"),
+        stdout: Buffer.concat(stdoutChunks).toString("utf8"),
         stderr
       });
     });
@@ -140552,43 +140842,7 @@ async function syncSkillSchedules(registry, store) {
     if (draft)
       wanted.set(skill.frontmatter.name, draft);
   }
-  const existing = await store.list();
-  const existingSkill = /* @__PURE__ */ new Map();
-  for (const e3 of existing) {
-    if (e3.source === "skill" && e3.skillName)
-      existingSkill.set(e3.skillName, e3);
-  }
-  let added = 0;
-  let removed = 0;
-  let updated = 0;
-  for (const [skillName2, entry] of existingSkill) {
-    if (!wanted.has(skillName2)) {
-      const ok = await store.delete(entry.id);
-      if (ok)
-        removed += 1;
-    }
-  }
-  for (const [skillName2, draft] of wanted) {
-    const current = existingSkill.get(skillName2);
-    if (!current) {
-      await store.create(draft);
-      added += 1;
-      continue;
-    }
-    const changed = current.prompt !== draft.prompt || current.cron !== draft.cron || current.runAt !== draft.runAt || current.timeZone !== draft.timeZone || current.channel !== draft.channel || current.enabled !== draft.enabled;
-    if (changed) {
-      await store.update(current.id, {
-        prompt: draft.prompt,
-        ...draft.cron ? { cron: draft.cron } : { cron: void 0 },
-        ...draft.runAt !== void 0 ? { runAt: draft.runAt } : { runAt: void 0 },
-        ...draft.timeZone ? { timeZone: draft.timeZone } : { timeZone: void 0 },
-        ...draft.channel ? { channel: draft.channel } : { channel: void 0 },
-        enabled: draft.enabled
-      });
-      updated += 1;
-    }
-  }
-  return { added, removed, updated };
+  return store.reconcileSkillSchedules(wanted);
 }
 
 // ../plugin-scheduler/dist/poller.js
@@ -140820,6 +141074,79 @@ var ScheduleStore = class {
     });
     return removed;
   }
+  /**
+   * Batch-reconcile every `source='skill'` row against `wanted` (skillName →
+   * desired draft) in a SINGLE atomic write, instead of one whole-file
+   * serialization + fsync per changed row. The diff (and the resulting array)
+   * is byte-identical to running the equivalent sequence of
+   * create/update/delete calls:
+   *   - skill rows whose skillName is absent from `wanted` are removed;
+   *   - present skillNames with no existing row are created (fresh id +
+   *     createdAt), appended in `wanted` iteration order;
+   *   - present skillNames with an existing row are updated IN PLACE (id,
+   *     createdAt, position preserved) only when a field actually changed.
+   * Returns the add/remove/update counts so the caller's telemetry is
+   * unchanged. Manual/workflow rows are never touched.
+   */
+  async reconcileSkillSchedules(wanted) {
+    let added = 0;
+    let removed = 0;
+    let updated = 0;
+    await this.store.mutate((schedules) => {
+      const existingByName = /* @__PURE__ */ new Map();
+      for (let i2 = 0; i2 < schedules.length; i2 += 1) {
+        const s2 = schedules[i2];
+        if (s2.source === "skill" && s2.skillName && !existingByName.has(s2.skillName)) {
+          existingByName.set(s2.skillName, i2);
+        }
+      }
+      const next = [];
+      for (const s2 of schedules) {
+        if (s2.source === "skill" && s2.skillName && !wanted.has(s2.skillName)) {
+          removed += 1;
+          continue;
+        }
+        next.push(s2);
+      }
+      const posInNext = /* @__PURE__ */ new Map();
+      for (let i2 = 0; i2 < next.length; i2 += 1) {
+        const s2 = next[i2];
+        if (s2.source === "skill" && s2.skillName && !posInNext.has(s2.skillName)) {
+          posInNext.set(s2.skillName, i2);
+        }
+      }
+      for (const [skillName2, draft] of wanted) {
+        const idx = posInNext.get(skillName2);
+        if (idx === void 0) {
+          next.push(scheduleEntrySchema.parse({
+            ...draft,
+            id: ulid(),
+            createdAt: Date.now(),
+            enabled: draft.enabled ?? true,
+            source: draft.source ?? "skill"
+          }));
+          added += 1;
+          continue;
+        }
+        const current = next[idx];
+        const patch = {
+          prompt: draft.prompt,
+          ...draft.cron ? { cron: draft.cron } : { cron: void 0 },
+          ...draft.runAt !== void 0 ? { runAt: draft.runAt } : { runAt: void 0 },
+          ...draft.timeZone ? { timeZone: draft.timeZone } : { timeZone: void 0 },
+          ...draft.channel ? { channel: draft.channel } : { channel: void 0 },
+          enabled: draft.enabled ?? true
+        };
+        const changed = current.prompt !== patch.prompt || current.cron !== patch.cron || current.runAt !== patch.runAt || current.timeZone !== patch.timeZone || current.channel !== patch.channel || current.enabled !== patch.enabled;
+        if (changed) {
+          next[idx] = scheduleEntrySchema.parse({ ...current, ...patch });
+          updated += 1;
+        }
+      }
+      return next;
+    });
+    return { added, removed, updated };
+  }
   /**
    * Replace every `source='skill'` schedule for the given `skillName`
    * with the supplied entry, OR remove all of them if `entry` is null.
@@ -141106,12 +141433,8 @@ var WebhookConfigStore = class {
       const raw = await readFile(this.file, "utf8");
       const parsed = fileSchema2.safeParse(JSON.parse(raw));
       this.cache = parsed.success ? parsed.data.config : webhookConfigSchema.parse({});
-    } catch (err) {
-      if (err.code === "ENOENT") {
-        this.cache = webhookConfigSchema.parse({});
-      } else {
-        this.cache = webhookConfigSchema.parse({});
-      }
+    } catch {
+      this.cache = webhookConfigSchema.parse({});
     }
   }
   async persist(config) {
@@ -141259,23 +141582,26 @@ function readHeader(headers, name) {
     return v3[0] ?? null;
   return v3 ?? null;
 }
-function readJsonPath(body, path60) {
-  let parsed;
+function parseBody(body) {
   try {
-    parsed = JSON.parse(body.toString("utf8"));
+    return { ok: true, value: JSON.parse(body.toString("utf8")) };
   } catch {
-    return null;
+    return { ok: false, value: null };
   }
-  let cur = parsed;
-  for (const seg of path60.split(".")) {
+}
+function readJsonPath(parsed, path59) {
+  if (!parsed.ok)
+    return null;
+  let cur = parsed.value;
+  for (const seg of path59.split(".")) {
     if (cur === null || cur === void 0 || typeof cur !== "object")
       return null;
     cur = cur[seg];
   }
   return asString2(cur);
 }
-function ruleMatches(rule, input) {
-  const value = rule.source === "header" ? readHeader(input.headers, rule.name) : readJsonPath(input.body, rule.path);
+function ruleMatches(rule, input, parsed) {
+  const value = rule.source === "header" ? readHeader(input.headers, rule.name) : readJsonPath(parsed, rule.path);
   if (value === null)
     return false;
   if (rule.equals && rule.equals.includes(value))
@@ -141291,11 +141617,12 @@ function ruleMatches(rule, input) {
   return false;
 }
 function shouldFire(filter, input) {
-  if (filter.exclude.some((r2) => ruleMatches(r2, input)))
+  const parsed = parseBody(input.body);
+  if (filter.exclude.some((r2) => ruleMatches(r2, input, parsed)))
     return false;
   if (filter.include.length === 0)
     return true;
-  return filter.include.some((r2) => ruleMatches(r2, input));
+  return filter.include.some((r2) => ruleMatches(r2, input, parsed));
 }
 
 // ../plugin-webhooks/dist/template.js
@@ -141455,14 +141782,14 @@ var WebhookServer = class {
       });
     });
     this.server = server;
-    await new Promise((resolve13, reject) => {
+    await new Promise((resolve12, reject) => {
       server.once("error", reject);
       server.listen(this.opts.port, this.opts.host, () => {
         this.opts.logger?.info?.("webhooks: listening", {
           host: this.opts.host,
           port: this.opts.port
         });
-        resolve13();
+        resolve12();
       });
     });
     return {
@@ -141476,7 +141803,7 @@ var WebhookServer = class {
       return;
     const s2 = this.server;
     this.server = null;
-    await new Promise((resolve13) => s2.close(() => resolve13()));
+    await new Promise((resolve12) => s2.close(() => resolve12()));
   }
   async handle(req, res) {
     const url2 = req.url ?? "/";
@@ -142670,7 +142997,7 @@ var inprocIsolator = {
         internal.abort(signal.reason ?? new Error(`[security:inproc] tool '${call.toolName}' aborted`));
       }
     };
-    return new Promise((resolve13, reject) => {
+    return new Promise((resolve12, reject) => {
       if (signal.aborted) {
         onExternalAbort();
         reject(new Error(`[security:inproc] tool '${call.toolName}' aborted`));
@@ -142690,7 +143017,7 @@ var inprocIsolator = {
       runHandler(handler, call.input, handlerSignal).then((out) => {
         clearTimeout(timer);
         signal.removeEventListener("abort", onAbort);
-        resolve13(out);
+        resolve12(out);
       }, (err) => {
         clearTimeout(timer);
         signal.removeEventListener("abort", onAbort);
@@ -143001,7 +143328,7 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
       throw new Error(`[broker:exec] command '${command}' is outside the tool's declared commands allowlist`);
     }
   }
-  return await new Promise((resolve13, reject) => {
+  return await new Promise((resolve12, reject) => {
     const child = spawn(command, [...argv], {
       cwd: opts.cwd ?? cwd2,
       // Filter the parent env through the tool's `caps.env` allowlist (or a
@@ -143049,7 +143376,7 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
       finish(() => reject(e3));
     });
     child.on("close", (exitCode) => {
-      finish(() => resolve13({
+      finish(() => resolve12({
         stdout: Buffer.concat(outChunks).toString("utf8"),
         stderr: Buffer.concat(errChunks).toString("utf8"),
         exitCode
@@ -143319,7 +143646,7 @@ function createWorkerIsolator(opts = {}) {
           maxYoungGenerationSizeMb: Math.max(16, Math.floor(memMb / 4))
         }
       });
-      return new Promise((resolve13, reject) => {
+      return new Promise((resolve12, reject) => {
         const cleanup = /* @__PURE__ */ new Set();
         let settled = false;
         let terminated = false;
@@ -143375,7 +143702,7 @@ function createWorkerIsolator(opts = {}) {
           if (settled)
             return;
           if (msg.ok) {
-            finish(() => resolve13(msg.value));
+            finish(() => resolve12(msg.value));
           } else {
             const e3 = new Error(msg.errorMessage);
             e3.name = msg.errorName;
@@ -143524,7 +143851,7 @@ function createSubprocessIsolator(opts = {}) {
         env: env3,
         stdio: ["pipe", "pipe", "pipe"]
       });
-      return new Promise((resolve13, reject) => {
+      return new Promise((resolve12, reject) => {
         let stderr = "";
         let stdoutBuffer = "";
         let settled = false;
@@ -143598,7 +143925,7 @@ function createSubprocessIsolator(opts = {}) {
             return;
           }
           if (msg.ok) {
-            finish(() => resolve13(msg.value));
+            finish(() => resolve12(msg.value));
           } else {
             const e3 = new Error(msg.errorMessage);
             e3.name = msg.errorName;
@@ -143705,6 +144032,9 @@ async function invoke(call, caps, _signal) {
   const inputPtr = exports.alloc(inputBytes.length);
   new Uint8Array(exports.memory.buffer, inputPtr, inputBytes.length).set(inputBytes);
   const packed = handler(inputPtr, inputBytes.length);
+  if (typeof packed !== "bigint") {
+    throw new Error(`[security:wasm] handler must return i64 (got ${typeof packed}); check the (i32,i32)->i64 calling convention`);
+  }
   const outputPtr = Number(packed >> 32n & 0xffffffffn);
   const outputLen = Number(packed & 0xffffffffn);
   if (outputLen === 0)
@@ -144460,8 +144790,8 @@ function formatIssues(error2, raw) {
       const field = rest.join(".");
       return field ? `${where}: ${field} ${msg}` : `${where} ${msg}`;
     }
-    const path60 = iss.path.join(".");
-    return path60 ? `${path60} ${msg}` : `workflow ${msg}`;
+    const path59 = iss.path.join(".");
+    return path59 ? `${path59} ${msg}` : `workflow ${msg}`;
   });
 }
 function validateWorkflow(raw) {
@@ -145461,7 +145791,7 @@ function buildSubagentSpecWithDeps(step, scope, deps, opts) {
 }
 var dagExecutor = defineWorkflowExecutor({
   name: DAG_EXECUTOR_NAME,
-  description: "Parallel DAG runner: steps with settled dependencies run in waves up to `concurrency`.",
+  description: "DAG runner: steps with settled dependencies are scheduled in waves of up to `concurrency` ready steps, then executed sequentially within each wave (no overlap yet \u2014 `concurrency` caps the batch size, not wall-clock latency).",
   run: runExecutor
 });
 
@@ -147164,60 +147494,23 @@ function scopedSessionView(session, allowedTools, triggerName) {
       return parent.execute(name, input, signal, opts);
     }
   };
-  return {
-    get id() {
-      return session.id;
-    },
-    get log() {
-      return session.log;
-    },
-    get signal() {
-      return session.signal;
-    },
-    tools,
-    get skills() {
-      return session.skills;
-    },
-    get providers() {
-      return session.providers;
-    },
-    get modes() {
-      return session.modes;
-    },
-    get compactors() {
-      return session.compactors;
-    },
-    get cacheStrategies() {
-      return session.cacheStrategies;
-    },
-    resolver: resolver2,
-    get approvalResolver() {
-      return session.approvalResolver;
-    },
-    get elisionSettings() {
-      return session.elisionSettings;
-    },
-    get lazyTools() {
-      return session.lazyTools;
-    },
-    get dispatcher() {
-      return session.dispatcher;
-    },
-    get pluginHost() {
-      return session.pluginHost;
-    },
-    // Read-through AND write-through: runTurn records the resolved model on
-    // the session it was handed, and that must land on the real session, not
-    // this per-fire view.
-    get lastResolvedModel() {
-      return session.lastResolvedModel;
-    },
-    set lastResolvedModel(model) {
-      session.lastResolvedModel = model;
-    },
-    startTurn: () => session.startTurn(),
-    appContext: () => session.appContext()
-  };
+  const view = Object.create(session);
+  Object.defineProperties(view, {
+    tools: { value: tools, enumerable: true },
+    resolver: { value: resolver2, enumerable: true },
+    // Write-through: `runTurn` records the resolved model on the session it
+    // was handed; that must land on the real session, not this per-fire view.
+    // An own data property on the prototype-chained view would otherwise
+    // shadow the real one on write, so install an explicit accessor.
+    lastResolvedModel: {
+      get: () => session.lastResolvedModel,
+      set: (model) => {
+        session.lastResolvedModel = model;
+      },
+      enumerable: true
+    }
+  });
+  return view;
 }
 
 // src/setup/register-plugins.ts
@@ -147856,7 +148149,11 @@ async function runPromptCommand(argv) {
 ${stdinBuf}` : prompt;
   const allowTools = parseList(argv.flags["allow-tools"]);
   const allowAll = hasBoolFlag(argv, "allow-all");
-  const outputFormat = stringFlag(argv, "output-format") ?? "text";
+  const outputFormat = parseOutputFormat(stringFlag(argv, "output-format"));
+  if (outputFormat === null) {
+    printError(`--output-format must be one of: ${OUTPUT_FORMATS.join(", ")}`);
+    return 2;
+  }
   const model = stringFlag(argv, "model");
   const resolver2 = allowAll ? denyByDefaultResolver : allowTools.length > 0 ? createAllowListResolver(allowTools) : denyByDefaultResolver;
   const session = await setupSession({
@@ -147898,6 +148195,11 @@ ${stdinBuf}` : prompt;
   }
   return exitCode;
 }
+var OUTPUT_FORMATS = ["text", "json", "stream-json"];
+function parseOutputFormat(raw) {
+  if (raw === void 0) return "text";
+  return OUTPUT_FORMATS.includes(raw) ? raw : null;
+}
 function parseList(v3) {
   if (typeof v3 !== "string" || !v3) return [];
   return v3.split(",").map((s2) => s2.trim()).filter(Boolean);
@@ -148338,7 +148640,7 @@ function makeStdinLinePrompt(input) {
     const queued = lineQueue.shift();
     if (queued !== void 0) return Promise.resolve(queued);
     if (stdinEnded) return Promise.resolve("");
-    return new Promise((resolve13) => lineWaiters.push(resolve13));
+    return new Promise((resolve12) => lineWaiters.push(resolve12));
   };
   return async (question, promptOpts) => {
     process.stdout.write(encodeLoginPrompt({ question, mask: promptOpts?.mask === true }));
@@ -148495,8 +148797,8 @@ function titleCase(s2) {
 // src/commands/run-tui.ts
 async function killStaleRunnerAt(socketPath) {
   if (!existsSync(socketPath)) return;
-  const pid = await new Promise((resolve13) => {
-    if (process.platform === "win32") return resolve13(null);
+  const pid = await new Promise((resolve12) => {
+    if (process.platform === "win32") return resolve12(null);
     let out = "";
     try {
       const child = spawn("lsof", ["-t", socketPath], {
@@ -148505,13 +148807,13 @@ async function killStaleRunnerAt(socketPath) {
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve13(null));
+      child.on("error", () => resolve12(null));
       child.on("close", () => {
         const parsed = parseInt(out.trim().split("\n")[0] ?? "", 10);
-        resolve13(Number.isFinite(parsed) && parsed > 0 ? parsed : null);
+        resolve12(Number.isFinite(parsed) && parsed > 0 ? parsed : null);
       });
     } catch {
-      resolve13(null);
+      resolve12(null);
     }
   });
   if (pid && pid !== process.pid) {
@@ -148964,19 +149266,25 @@ async function removeAuditEntry(slug) {
 }
 function groupSimilarPrompts(entries) {
   const groups = [];
+  const groupTokenSets = [];
   for (const entry of entries) {
     const tokens = tokenize8(entry.originatingPrompt);
     let placed = false;
-    for (const group of groups) {
-      const groupTokens = new Set(group.flatMap((e3) => tokenize8(e3.originatingPrompt)));
-      const overlap = tokens.filter((t2) => groupTokens.has(t2)).length;
+    for (let i2 = 0; i2 < groups.length; i2 += 1) {
+      const groupTokens = groupTokenSets[i2];
+      let overlap = 0;
+      for (const t2 of tokens) if (groupTokens.has(t2)) overlap += 1;
       if (overlap >= 2) {
-        group.push(entry);
+        groups[i2].push(entry);
+        for (const t2 of tokens) groupTokens.add(t2);
         placed = true;
         break;
       }
     }
-    if (!placed) groups.push([entry]);
+    if (!placed) {
+      groups.push([entry]);
+      groupTokenSets.push(new Set(tokens));
+    }
   }
   return groups;
 }
@@ -152305,14 +152613,14 @@ var HELP14 = formatHelp({
 async function runCommand2(cmd) {
   const [bin, ...args] = cmd;
   if (!bin) return 1;
-  return new Promise((resolve13) => {
+  return new Promise((resolve12) => {
     const proc = spawn(bin, args, {
       stdio: "inherit",
       // npm/pnpm/yarn/bun are `.cmd` shims on Windows — needs a shell to launch.
       shell: process.platform === "win32"
     });
-    proc.on("error", () => resolve13(127));
-    proc.on("exit", (code) => resolve13(code ?? 1));
+    proc.on("error", () => resolve12(127));
+    proc.on("exit", (code) => resolve12(code ?? 1));
   });
 }
 async function runUpdateCommand(argv, deps = {}) {