@moxxy/cli 0.12.2 → 0.12.3

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { z as z$1, defineProvider, definePlugin, defineTool, MoxxyError, writeFileAtomic, asTurnId, defineMode, asPluginId, defineChannel, defineTunnelProvider, spawnCliTunnel, isCliTunnelAvailable, createMutex, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, moxxyPath, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, bearerTokenMatches, resolveChannelToken, rotateChannelToken, defineSurface, estimateContextTokens as estimateContextTokens$1, readRequestBody, isFileDiffDisplay, MOXXY_WS_SUBPROTOCOL, defineEmbedder, migrateModeName, bearerGuard, tokenFromWsProtocolHeader, skillFrontmatterSchema, asSkillId, getInstallHint, moxxyHome, defineTranscriber, summarizeTokensByModel, countNodes, createDeferredPermissionResolver, writeFileAtomicSync, encodeLoginPrompt, classifyNetworkError, addModelTotals, ISOLATION_RANK, moxxyPackageSchema, defineCommand, fileDiffVerb, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, assertNever, isSafeViewUrl, evaluateToolRule, summarizeSessionTokensFromEvents, toDiffRows, diffGutterNo, computeElisionState, toolResultStubbed, toolResultStub, toolResultBytes, conversationalStubbed, conversationalStub, asEventId } from '@moxxy/sdk';
+import { z as z$1, defineProvider, definePlugin, defineTool, MoxxyError, writeFileAtomic, asTurnId, defineMode, asPluginId, defineChannel, defineTunnelProvider, spawnCliTunnel, isCliTunnelAvailable, createMutex, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, moxxyPath, moxxyHome, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, bearerTokenMatches, resolveChannelToken, rotateChannelToken, defineSurface, estimateContextTokens as estimateContextTokens$1, readRequestBody, isFileDiffDisplay, MOXXY_WS_SUBPROTOCOL, renderFrontmatter, defineEmbedder, migrateModeName, bearerGuard, tokenFromWsProtocolHeader, skillFrontmatterSchema, asSkillId, getInstallHint, parseFrontmatterFile, defineTranscriber, summarizeTokensByModel, countNodes, createDeferredPermissionResolver, writeFileAtomicSync, encodeLoginPrompt, classifyNetworkError, addModelTotals, createJsonFileStore, ISOLATION_RANK, moxxyPackageSchema, defineCommand, fileDiffVerb, parseFrontmatter, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, assertNever, isSafeViewUrl, evaluateToolRule, summarizeSessionTokensFromEvents, toDiffRows, diffGutterNo, computeElisionState, toolResultStubbed, toolResultStub, toolResultBytes, conversationalStubbed, conversationalStub, asEventId } from '@moxxy/sdk';
 import * as fs28 from 'fs';
 import fs28__default, { existsSync, promises, ReadStream, readFileSync, statSync, readdirSync, mkdirSync, writeFileSync, unlinkSync, watch, createReadStream } from 'fs';
 import * as path3 from 'path';
@@ -477,8 +477,16 @@ function getRetainedChild(childSessionId) {
 function releaseRetainedChild(childSessionId) {
   retained.delete(String(childSessionId));
 }
-function clearRetainedChildren() {
-  retained.clear();
+function clearRetainedChildren(parentSessionId) {
+  if (parentSessionId === void 0) {
+    retained.clear();
+    return;
+  }
+  const target = String(parentSessionId);
+  for (const [childId, entry] of retained) {
+    if (String(entry.parentSession.id) === target)
+      retained.delete(childId);
+  }
 }
 var retained;
 var init_registry = __esm({
@@ -656,9 +664,12 @@ async function resolveChildModel(rt3, spec, label3, childSessionId) {
 }
 function buildChildContext(rt3, spec, model, childSessionId, childTurnId, toolRegistry, childLog, spawner) {
   const { parentSession, parentSignal } = rt3;
+  const parentAppCtx = parentSession.appContext();
   return {
     sessionId: childSessionId,
     turnId: childTurnId,
+    cwd: parentAppCtx.cwd,
+    env: parentAppCtx.env,
     model,
     ...spec.systemPrompt !== void 0 ? { systemPrompt: spec.systemPrompt } : {},
     provider: parentSession.providers.getActive(),
@@ -753,9 +764,12 @@ async function* runTurn(session, prompt, opts = {}) {
     });
     const strategy = session.modes.getActive();
     const effectiveSignal = opts.signal ? AbortSignal.any([session.signal, opts.signal]) : session.signal;
+    const appCtx = session.appContext();
     const ctx = {
       sessionId: session.id,
       turnId,
+      cwd: appCtx.cwd,
+      env: appCtx.env,
       model,
       systemPrompt: opts.systemPrompt,
       provider,
@@ -786,7 +800,7 @@ async function* runTurn(session, prompt, opts = {}) {
       },
       emit: (event) => session.log.append(event)
     };
-    const turnStartCtx = { ...session.appContext(), turnId, iteration: 0 };
+    const turnStartCtx = { ...appCtx, turnId, iteration: 0 };
     strategyPromise = (async () => {
       try {
         await session.dispatcher.dispatchTurnStart(turnStartCtx);
@@ -1169,7 +1183,7 @@ var init_host = __esm({
         this.loaded.set(manifest.packageName, record2);
         this.clearSkip(plugin4.name);
         this.clearSkip(manifest.packageName);
-        this.opts.requirements.registerPlugin(plugin4.name, plugin4.version);
+        this.opts.requirements.registerPlugin(manifest.packageName, plugin4.version);
         this.refreshDispatcher();
       }
       async discoverAndLoad(extraPaths) {
@@ -1262,7 +1276,7 @@ var init_host = __esm({
         for (const wfxName of record2.workflowExecutorNames)
           this.opts.workflowExecutors.unregister(wfxName);
         this.loaded.delete(name);
-        this.opts.requirements.unregisterPlugin(record2.plugin.name);
+        this.opts.requirements.unregisterPlugin(record2.manifest?.packageName ?? record2.plugin.name);
         this.refreshDispatcher();
       }
       async reload() {
@@ -2248,9 +2262,9 @@ var init_host2 = __esm({
             ...existing.snapshot ? { snapshot: existing.snapshot() } : {}
           };
         }
-        const pending = this.opening.get(kind3);
-        if (pending)
-          return pending;
+        const pending2 = this.opening.get(kind3);
+        if (pending2)
+          return pending2;
         const def = this.registry.get(kind3);
         if (!def)
           throw new Error(`No surface registered for kind: ${kind3}`);
@@ -2366,6 +2380,10 @@ var init_skills = __esm({
         this.byNameIdx.set(skill.frontmatter.name, skill);
       }
       replace(skill) {
+        const prior = this.byId.get(skill.id);
+        if (prior && prior.frontmatter.name !== skill.frontmatter.name) {
+          this.byNameIdx.delete(prior.frontmatter.name);
+        }
         this.byId.set(skill.id, skill);
         this.byNameIdx.set(skill.frontmatter.name, skill);
       }
@@ -2456,8 +2474,8 @@ var init_tools2 = __esm({
         const parseResult = tool.inputSchema.safeParse(input);
         if (!parseResult.success) {
           const issues = parseResult.error.issues.map((iss) => {
-            const path62 = iss.path.length ? iss.path.join(".") : "(root)";
-            return `${path62}: ${iss.message}`;
+            const path60 = iss.path.length ? iss.path.join(".") : "(root)";
+            return `${path60}: ${iss.message}`;
           }).join("; ");
           throw new Error(`Invalid input for ${name}: ${issues}`);
         }
@@ -3340,7 +3358,7 @@ var init_session = __esm({
           await this.surfaces.closeAll();
           await this.dispatcher.dispatchShutdown(this.appContext());
         } finally {
-          clearRetainedChildren();
+          clearRetainedChildren(this.id);
           this.abort(reason);
         }
       }
@@ -3523,111 +3541,10 @@ var init_usage_stats = __esm({
     mergeMutex = createMutex();
   }
 });
-
-// ../core/dist/skills/parse.js
-function parseSkillFile(content) {
-  if (!content.startsWith(FRONTMATTER_FENCE + "\n") && !content.startsWith(FRONTMATTER_FENCE + "\r\n")) {
-    return { frontmatter: {}, body: content };
-  }
-  const fenceLen = content.startsWith(FRONTMATTER_FENCE + "\r\n") ? 5 : 4;
-  const rest = content.slice(fenceLen);
-  const endRe = /\r?\n---(?:\r?\n|$)/;
-  const endMatch = endRe.exec(rest);
-  if (!endMatch)
-    return { frontmatter: {}, body: content };
-  const fmText = rest.slice(0, endMatch.index);
-  const body = rest.slice(endMatch.index + endMatch[0].length);
-  return { frontmatter: parseFrontmatter(fmText), body };
-}
-function parseFrontmatter(text) {
-  const result = {};
-  const lines = text.split(/\r?\n/);
-  for (let i2 = 0; i2 < lines.length; i2++) {
-    const line = lines[i2] ?? "";
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#"))
-      continue;
-    const colon = trimmed.indexOf(":");
-    if (colon === -1)
-      continue;
-    const key = trimmed.slice(0, colon).trim();
-    const raw = trimmed.slice(colon + 1).trim();
-    if (raw === "" && i2 + 1 < lines.length && /^\s*-\s/.test(lines[i2 + 1] ?? "")) {
-      const items = [];
-      while (i2 + 1 < lines.length && /^\s*-\s/.test(lines[i2 + 1] ?? "")) {
-        i2 += 1;
-        items.push(parseScalar((lines[i2] ?? "").replace(/^\s*-\s*/, "").trim()));
-      }
-      result[key] = items;
-      continue;
-    }
-    result[key] = parseScalar(raw);
-  }
-  return result;
-}
-function parseScalar(v3) {
-  if (!v3)
-    return "";
-  if (v3.startsWith("[") && v3.endsWith("]")) {
-    const inner = v3.slice(1, -1).trim();
-    if (!inner)
-      return [];
-    return splitArray(inner).map((s2) => parseScalar(s2.trim()));
-  }
-  if (v3 === "true")
-    return true;
-  if (v3 === "false")
-    return false;
-  if (v3 === "null" || v3 === "~")
-    return null;
-  if (/^-?\d+$/.test(v3))
-    return Number(v3);
-  if (/^-?\d+\.\d+$/.test(v3))
-    return Number(v3);
-  return stripQuotes(v3);
-}
-function stripQuotes(s2) {
-  if (s2.length >= 2 && (s2.startsWith('"') && s2.endsWith('"') || s2.startsWith("'") && s2.endsWith("'"))) {
-    return s2.slice(1, -1);
-  }
-  return s2;
-}
-function splitArray(s2) {
-  const out = [];
-  let depth = 0;
-  let buf = "";
-  let inStr = null;
-  for (const c2 of s2) {
-    if (inStr) {
-      buf += c2;
-      if (c2 === inStr)
-        inStr = null;
-      continue;
-    }
-    if (c2 === '"' || c2 === "'") {
-      inStr = c2;
-      buf += c2;
-      continue;
-    }
-    if (c2 === "[" || c2 === "{")
-      depth++;
-    if (c2 === "]" || c2 === "}")
-      depth--;
-    if (c2 === "," && depth === 0) {
-      out.push(buf);
-      buf = "";
-      continue;
-    }
-    buf += c2;
-  }
-  if (buf.trim())
-    out.push(buf);
-  return out;
-}
-var FRONTMATTER_FENCE;
+var parseSkillFile;
 var init_parse2 = __esm({
   "../core/dist/skills/parse.js"() {
-    FRONTMATTER_FENCE = "---";
+    parseSkillFile = parseFrontmatterFile;
   }
 });
 
@@ -3748,7 +3665,7 @@ var init_synthesize_draft = __esm({
 The body is the instructions for future invocations. Keep it under 30 lines. Numbered steps preferred.`;
   }
 });
-async function synthesizeSkill(session, intent, scope, opts = {}) {
+async function synthesizeSkill(session, intent, scope, opts = {}, turnId) {
   const provider = session.providers.getActive();
   const model = opts.model ?? session.lastResolvedModel ?? provider.models[0]?.id ?? "default";
   const draft = await draftSkill(provider, model, intent, session.signal);
@@ -3774,7 +3691,7 @@ async function synthesizeSkill(session, intent, scope, opts = {}) {
   await session.log.append({
     type: "skill_created",
     sessionId: session.id,
-    turnId: session.startTurn().turnId,
+    turnId: turnId ?? session.startTurn().turnId,
     source: "system",
     skillId: skill.id,
     name: skill.frontmatter.name,
@@ -3829,8 +3746,8 @@ function buildSynthesizeSkillPlugin(session, opts = {}) {
           scope: z.enum(["user", "project"]).optional().default("user").describe('Where to write the skill. "user" \u2192 ~/.moxxy/skills/ (default, recommended). "project" \u2192 <cwd>/.moxxy/skills/ \u2014 ONLY when the user explicitly asks for a project-scoped skill.')
         }),
         permission: { action: "prompt" },
-        handler: async ({ intent, scope }) => {
-          const result = await synthesizeSkill(session, intent, scope, opts);
+        handler: async ({ intent, scope }, ctx) => {
+          const result = await synthesizeSkill(session, intent, scope, opts, ctx.turnId);
           return {
             path: result.path,
             scope: result.scope,
@@ -3844,7 +3761,7 @@ function buildSynthesizeSkillPlugin(session, opts = {}) {
         inputSchema: z.object({
           name: z.string().min(1).describe('The exact skill name from the "Available skills" list in the system prompt.')
         }),
-        handler: async ({ name }) => {
+        handler: async ({ name }, ctx) => {
           const skill = session.skills.byName(name);
           if (!skill) {
             const known = session.skills.list().map((s2) => s2.frontmatter.name).join(", ");
@@ -3853,7 +3770,7 @@ function buildSynthesizeSkillPlugin(session, opts = {}) {
           await session.log.append({
             type: "skill_invoked",
             sessionId: session.id,
-            turnId: session.startTurn().turnId,
+            turnId: ctx.turnId,
             source: "model",
             skillId: skill.id,
             name: skill.frontmatter.name,
@@ -8380,17 +8297,17 @@ var require_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    function visit_(key, node, visitor, path62) {
-      const ctrl = callVisitor(key, node, visitor, path62);
+    function visit_(key, node, visitor, path60) {
+      const ctrl = callVisitor(key, node, visitor, path60);
       if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-        replaceNode(key, path62, ctrl);
-        return visit_(key, ctrl, visitor, path62);
+        replaceNode(key, path60, ctrl);
+        return visit_(key, ctrl, visitor, path60);
       }
       if (typeof ctrl !== "symbol") {
         if (identity.isCollection(node)) {
-          path62 = Object.freeze(path62.concat(node));
+          path60 = Object.freeze(path60.concat(node));
           for (let i2 = 0; i2 < node.items.length; ++i2) {
-            const ci = visit_(i2, node.items[i2], visitor, path62);
+            const ci = visit_(i2, node.items[i2], visitor, path60);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -8401,13 +8318,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path62 = Object.freeze(path62.concat(node));
-          const ck = visit_("key", node.key, visitor, path62);
+          path60 = Object.freeze(path60.concat(node));
+          const ck = visit_("key", node.key, visitor, path60);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = visit_("value", node.value, visitor, path62);
+          const cv = visit_("value", node.value, visitor, path60);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -8428,17 +8345,17 @@ var require_visit = __commonJS({
     visitAsync.BREAK = BREAK;
     visitAsync.SKIP = SKIP;
     visitAsync.REMOVE = REMOVE;
-    async function visitAsync_(key, node, visitor, path62) {
-      const ctrl = await callVisitor(key, node, visitor, path62);
+    async function visitAsync_(key, node, visitor, path60) {
+      const ctrl = await callVisitor(key, node, visitor, path60);
       if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-        replaceNode(key, path62, ctrl);
-        return visitAsync_(key, ctrl, visitor, path62);
+        replaceNode(key, path60, ctrl);
+        return visitAsync_(key, ctrl, visitor, path60);
       }
       if (typeof ctrl !== "symbol") {
         if (identity.isCollection(node)) {
-          path62 = Object.freeze(path62.concat(node));
+          path60 = Object.freeze(path60.concat(node));
           for (let i2 = 0; i2 < node.items.length; ++i2) {
-            const ci = await visitAsync_(i2, node.items[i2], visitor, path62);
+            const ci = await visitAsync_(i2, node.items[i2], visitor, path60);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -8449,13 +8366,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path62 = Object.freeze(path62.concat(node));
-          const ck = await visitAsync_("key", node.key, visitor, path62);
+          path60 = Object.freeze(path60.concat(node));
+          const ck = await visitAsync_("key", node.key, visitor, path60);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = await visitAsync_("value", node.value, visitor, path62);
+          const cv = await visitAsync_("value", node.value, visitor, path60);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -8482,23 +8399,23 @@ var require_visit = __commonJS({
       }
       return visitor;
     }
-    function callVisitor(key, node, visitor, path62) {
+    function callVisitor(key, node, visitor, path60) {
       if (typeof visitor === "function")
-        return visitor(key, node, path62);
+        return visitor(key, node, path60);
       if (identity.isMap(node))
-        return visitor.Map?.(key, node, path62);
+        return visitor.Map?.(key, node, path60);
       if (identity.isSeq(node))
-        return visitor.Seq?.(key, node, path62);
+        return visitor.Seq?.(key, node, path60);
       if (identity.isPair(node))
-        return visitor.Pair?.(key, node, path62);
+        return visitor.Pair?.(key, node, path60);
       if (identity.isScalar(node))
-        return visitor.Scalar?.(key, node, path62);
+        return visitor.Scalar?.(key, node, path60);
       if (identity.isAlias(node))
-        return visitor.Alias?.(key, node, path62);
+        return visitor.Alias?.(key, node, path60);
       return void 0;
     }
-    function replaceNode(key, path62, node) {
-      const parent = path62[path62.length - 1];
+    function replaceNode(key, path60, node) {
+      const parent = path60[path60.length - 1];
       if (identity.isCollection(parent)) {
         parent.items[key] = node;
       } else if (identity.isPair(parent)) {
@@ -9099,10 +9016,10 @@ var require_Collection = __commonJS({
     var createNode2 = require_createNode();
     var identity = require_identity();
     var Node = require_Node();
-    function collectionFromPath(schema, path62, value) {
+    function collectionFromPath(schema, path60, value) {
       let v3 = value;
-      for (let i2 = path62.length - 1; i2 >= 0; --i2) {
-        const k3 = path62[i2];
+      for (let i2 = path60.length - 1; i2 >= 0; --i2) {
+        const k3 = path60[i2];
         if (typeof k3 === "number" && Number.isInteger(k3) && k3 >= 0) {
           const a2 = [];
           a2[k3] = v3;
@@ -9121,7 +9038,7 @@ var require_Collection = __commonJS({
         sourceObjects: /* @__PURE__ */ new Map()
       });
     }
-    var isEmptyPath = (path62) => path62 == null || typeof path62 === "object" && !!path62[Symbol.iterator]().next().done;
+    var isEmptyPath = (path60) => path60 == null || typeof path60 === "object" && !!path60[Symbol.iterator]().next().done;
     var Collection = class extends Node.NodeBase {
       constructor(type, schema) {
         super(type);
@@ -9151,11 +9068,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(path62, value) {
-        if (isEmptyPath(path62))
+      addIn(path60, value) {
+        if (isEmptyPath(path60))
           this.add(value);
         else {
-          const [key, ...rest] = path62;
+          const [key, ...rest] = path60;
           const node = this.get(key, true);
           if (identity.isCollection(node))
             node.addIn(rest, value);
@@ -9169,8 +9086,8 @@ var require_Collection = __commonJS({
        * Removes a value from the collection.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path62) {
-        const [key, ...rest] = path62;
+      deleteIn(path60) {
+        const [key, ...rest] = path60;
         if (rest.length === 0)
           return this.delete(key);
         const node = this.get(key, true);
@@ -9184,8 +9101,8 @@ var require_Collection = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path62, keepScalar) {
-        const [key, ...rest] = path62;
+      getIn(path60, keepScalar) {
+        const [key, ...rest] = path60;
         const node = this.get(key, true);
         if (rest.length === 0)
           return !keepScalar && identity.isScalar(node) ? node.value : node;
@@ -9203,8 +9120,8 @@ var require_Collection = __commonJS({
       /**
        * Checks if the collection includes a value with the key `key`.
        */
-      hasIn(path62) {
-        const [key, ...rest] = path62;
+      hasIn(path60) {
+        const [key, ...rest] = path60;
         if (rest.length === 0)
           return this.has(key);
         const node = this.get(key, true);
@@ -9214,8 +9131,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(path62, value) {
-        const [key, ...rest] = path62;
+      setIn(path60, value) {
+        const [key, ...rest] = path60;
         if (rest.length === 0) {
           this.set(key, value);
         } else {
@@ -11695,9 +11612,9 @@ var require_Document = __commonJS({
           this.contents.add(value);
       }
       /** Adds a value to the document. */
-      addIn(path62, value) {
+      addIn(path60, value) {
         if (assertCollection(this.contents))
-          this.contents.addIn(path62, value);
+          this.contents.addIn(path60, value);
       }
       /**
        * Create a new `Alias` node, ensuring that the target `node` has the required anchor.
@@ -11772,14 +11689,14 @@ var require_Document = __commonJS({
        * Removes a value from the document.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path62) {
-        if (Collection.isEmptyPath(path62)) {
+      deleteIn(path60) {
+        if (Collection.isEmptyPath(path60)) {
           if (this.contents == null)
             return false;
           this.contents = null;
           return true;
         }
-        return assertCollection(this.contents) ? this.contents.deleteIn(path62) : false;
+        return assertCollection(this.contents) ? this.contents.deleteIn(path60) : false;
       }
       /**
        * Returns item at `key`, or `undefined` if not found. By default unwraps
@@ -11794,10 +11711,10 @@ var require_Document = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path62, keepScalar) {
-        if (Collection.isEmptyPath(path62))
+      getIn(path60, keepScalar) {
+        if (Collection.isEmptyPath(path60))
           return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
-        return identity.isCollection(this.contents) ? this.contents.getIn(path62, keepScalar) : void 0;
+        return identity.isCollection(this.contents) ? this.contents.getIn(path60, keepScalar) : void 0;
       }
       /**
        * Checks if the document includes a value with the key `key`.
@@ -11808,10 +11725,10 @@ var require_Document = __commonJS({
       /**
        * Checks if the document includes a value at `path`.
        */
-      hasIn(path62) {
-        if (Collection.isEmptyPath(path62))
+      hasIn(path60) {
+        if (Collection.isEmptyPath(path60))
           return this.contents !== void 0;
-        return identity.isCollection(this.contents) ? this.contents.hasIn(path62) : false;
+        return identity.isCollection(this.contents) ? this.contents.hasIn(path60) : false;
       }
       /**
        * Sets a value in this document. For `!!set`, `value` needs to be a
@@ -11828,13 +11745,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(path62, value) {
-        if (Collection.isEmptyPath(path62)) {
+      setIn(path60, value) {
+        if (Collection.isEmptyPath(path60)) {
           this.contents = value;
         } else if (this.contents == null) {
-          this.contents = Collection.collectionFromPath(this.schema, Array.from(path62), value);
+          this.contents = Collection.collectionFromPath(this.schema, Array.from(path60), value);
         } else if (assertCollection(this.contents)) {
-          this.contents.setIn(path62, value);
+          this.contents.setIn(path60, value);
         }
       }
       /**
@@ -13774,9 +13691,9 @@ var require_cst_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    visit.itemAtPath = (cst, path62) => {
+    visit.itemAtPath = (cst, path60) => {
       let item = cst;
-      for (const [field, index] of path62) {
+      for (const [field, index] of path60) {
         const tok = item?.[field];
         if (tok && "items" in tok) {
           item = tok.items[index];
@@ -13785,23 +13702,23 @@ var require_cst_visit = __commonJS({
       }
       return item;
     };
-    visit.parentCollection = (cst, path62) => {
-      const parent = visit.itemAtPath(cst, path62.slice(0, -1));
-      const field = path62[path62.length - 1][0];
+    visit.parentCollection = (cst, path60) => {
+      const parent = visit.itemAtPath(cst, path60.slice(0, -1));
+      const field = path60[path60.length - 1][0];
       const coll = parent?.[field];
       if (coll && "items" in coll)
         return coll;
       throw new Error("Parent collection not found");
     };
-    function _visit(path62, item, visitor) {
-      let ctrl = visitor(item, path62);
+    function _visit(path60, item, visitor) {
+      let ctrl = visitor(item, path60);
       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(path62.concat([[field, i2]])), token.items[i2], visitor);
+            const ci = _visit(Object.freeze(path60.concat([[field, i2]])), token.items[i2], visitor);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -13812,10 +13729,10 @@ var require_cst_visit = __commonJS({
             }
           }
           if (typeof ctrl === "function" && field === "key")
-            ctrl = ctrl(item, path62);
+            ctrl = ctrl(item, path60);
         }
       }
-      return typeof ctrl === "function" ? ctrl(item, path62) : ctrl;
+      return typeof ctrl === "function" ? ctrl(item, path60) : ctrl;
     }
     exports.visit = visit;
   }
@@ -16537,14 +16454,14 @@ var require_url_state_machine = __commonJS({
       return url2.replace(/\u0009|\u000A|\u000D/g, "");
     }
     function shortenPath(url2) {
-      const path62 = url2.path;
-      if (path62.length === 0) {
+      const path60 = url2.path;
+      if (path60.length === 0) {
         return;
       }
-      if (url2.scheme === "file" && path62.length === 1 && isNormalizedWindowsDriveLetter(path62[0])) {
+      if (url2.scheme === "file" && path60.length === 1 && isNormalizedWindowsDriveLetter(path60[0])) {
         return;
       }
-      path62.pop();
+      path60.pop();
     }
     function includesCredentials(url2) {
       return url2.username !== "" || url2.password !== "";
@@ -25767,14 +25684,14 @@ __export(fileFromPath_exports, {
   fileFromPathSync: () => fileFromPathSync,
   isFile: () => isFile
 });
-function createFileFromPath(path62, { mtimeMs, size }, filenameOrOptions, options = {}) {
+function createFileFromPath(path60, { mtimeMs, size }, filenameOrOptions, options = {}) {
   let filename;
   if (isPlainObject_default2(filenameOrOptions)) {
     [options, filename] = [filenameOrOptions, void 0];
   } else {
     filename = filenameOrOptions;
   }
-  const file = new FileFromPath({ path: path62, size, lastModified: mtimeMs });
+  const file = new FileFromPath({ path: path60, size, lastModified: mtimeMs });
   if (!filename) {
     filename = file.name;
   }
@@ -25783,13 +25700,13 @@ function createFileFromPath(path62, { mtimeMs, size }, filenameOrOptions, option
     lastModified: file.lastModified
   });
 }
-function fileFromPathSync(path62, filenameOrOptions, options = {}) {
-  const stats = statSync(path62);
-  return createFileFromPath(path62, stats, filenameOrOptions, options);
+function fileFromPathSync(path60, filenameOrOptions, options = {}) {
+  const stats = statSync(path60);
+  return createFileFromPath(path60, stats, filenameOrOptions, options);
 }
-async function fileFromPath2(path62, filenameOrOptions, options) {
-  const stats = await promises.stat(path62);
-  return createFileFromPath(path62, stats, filenameOrOptions, options);
+async function fileFromPath2(path60, filenameOrOptions, options) {
+  const stats = await promises.stat(path60);
+  return createFileFromPath(path60, stats, filenameOrOptions, options);
 }
 var import_node_domexception, __classPrivateFieldSet4, __classPrivateFieldGet5, _FileFromPath_path, _FileFromPath_start, MESSAGE, FileFromPath;
 var init_fileFromPath = __esm({
@@ -29648,7 +29565,7 @@ var require_has_flag = __commonJS({
 // ../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js
 var require_supports_color = __commonJS({
   "../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js"(exports, module) {
-    var os22 = __require("os");
+    var os20 = __require("os");
     var tty2 = __require("tty");
     var hasFlag2 = require_has_flag();
     var { env: env3 } = process;
@@ -29696,7 +29613,7 @@ var require_supports_color = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os22.release().split(".");
+        const osRelease = os20.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -41921,8 +41838,8 @@ var require_utils2 = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path62) {
-      let input = path62;
+    function removeDotSegments(path60) {
+      let input = path60;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -42173,8 +42090,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path62, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path62 && path62 !== "/" ? path62 : void 0;
+        const [path60, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path60 && path60 !== "/" ? path60 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -46332,7 +46249,7 @@ var require_windows = __commonJS({
     module.exports = isexe;
     isexe.sync = sync;
     var fs45 = __require("fs");
-    function checkPathExt(path62, options) {
+    function checkPathExt(path60, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -46343,25 +46260,25 @@ var require_windows = __commonJS({
       }
       for (var i2 = 0; i2 < pathext.length; i2++) {
         var p3 = pathext[i2].toLowerCase();
-        if (p3 && path62.substr(-p3.length).toLowerCase() === p3) {
+        if (p3 && path60.substr(-p3.length).toLowerCase() === p3) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat2, path62, options) {
+    function checkStat(stat2, path60, options) {
       if (!stat2.isSymbolicLink() && !stat2.isFile()) {
         return false;
       }
-      return checkPathExt(path62, options);
+      return checkPathExt(path60, options);
     }
-    function isexe(path62, options, cb) {
-      fs45.stat(path62, function(er2, stat2) {
-        cb(er2, er2 ? false : checkStat(stat2, path62, options));
+    function isexe(path60, options, cb) {
+      fs45.stat(path60, function(er2, stat2) {
+        cb(er2, er2 ? false : checkStat(stat2, path60, options));
       });
     }
-    function sync(path62, options) {
-      return checkStat(fs45.statSync(path62), path62, options);
+    function sync(path60, options) {
+      return checkStat(fs45.statSync(path60), path60, options);
     }
   }
 });
@@ -46372,13 +46289,13 @@ var require_mode = __commonJS({
     module.exports = isexe;
     isexe.sync = sync;
     var fs45 = __require("fs");
-    function isexe(path62, options, cb) {
-      fs45.stat(path62, function(er2, stat2) {
+    function isexe(path60, options, cb) {
+      fs45.stat(path60, function(er2, stat2) {
         cb(er2, er2 ? false : checkStat(stat2, options));
       });
     }
-    function sync(path62, options) {
-      return checkStat(fs45.statSync(path62), options);
+    function sync(path60, options) {
+      return checkStat(fs45.statSync(path60), options);
     }
     function checkStat(stat2, options) {
       return stat2.isFile() && checkMode(stat2, options);
@@ -46411,7 +46328,7 @@ var require_isexe = __commonJS({
     }
     module.exports = isexe;
     isexe.sync = sync;
-    function isexe(path62, options, cb) {
+    function isexe(path60, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -46421,7 +46338,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve13, reject) {
-          isexe(path62, options || {}, function(er2, is) {
+          isexe(path60, options || {}, function(er2, is) {
             if (er2) {
               reject(er2);
             } else {
@@ -46430,7 +46347,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path62, options || {}, function(er2, is) {
+      core(path60, options || {}, function(er2, is) {
         if (er2) {
           if (er2.code === "EACCES" || options && options.ignoreErrors) {
             er2 = null;
@@ -46440,9 +46357,9 @@ var require_isexe = __commonJS({
         cb(er2, is);
       });
     }
-    function sync(path62, options) {
+    function sync(path60, options) {
       try {
-        return core.sync(path62, options || {});
+        return core.sync(path60, options || {});
       } catch (er2) {
         if (options && options.ignoreErrors || er2.code === "EACCES") {
           return false;
@@ -46458,7 +46375,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 path62 = __require("path");
+    var path60 = __require("path");
     var COLON = isWindows3 ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -46496,7 +46413,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve13(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path62.join(pathPart, cmd);
+        const pCmd = path60.join(pathPart, cmd);
         const p3 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve13(subStep(p3, i2, 0));
       });
@@ -46523,7 +46440,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 = path62.join(pathPart, cmd);
+        const pCmd = path60.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];
@@ -46569,7 +46486,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 path62 = __require("path");
+    var path60 = __require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -46587,7 +46504,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env3[getPathKey({ env: env3 })],
-          pathExt: withoutPathExt ? path62.delimiter : void 0
+          pathExt: withoutPathExt ? path60.delimiter : void 0
         });
       } catch (e3) {
       } finally {
@@ -46596,7 +46513,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path62.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path60.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -46647,8 +46564,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path62, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path62.split("/").pop();
+      const [path60, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path60.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -46681,7 +46598,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 path62 = __require("path");
+    var path60 = __require("path");
     var resolveCommand = require_resolveCommand();
     var escape4 = require_escape();
     var readShebang = require_readShebang();
@@ -46706,7 +46623,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path62.normalize(parsed.command);
+        parsed.command = path60.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(" ");
@@ -49503,7 +49420,7 @@ var init_schema = __esm({
   }
 });
 function buildAddServerTool(deps) {
-  const { registry, attachServer, writeMcpUsageSkill } = deps;
+  const { registry, attachServer, detachServer, writeMcpUsageSkill } = deps;
   return defineTool({
     name: "mcp_add_server",
     description: 'Register a new MCP server in ~/.moxxy/mcp.json. Pick "stdio" for local commands (npm/uv packages, scripts); pick "http" or "sse" for remote HTTP servers. The new server\'s tools become available after the next moxxy restart. Call mcp_test_server first if you want to verify connectivity before persisting. NEVER pass API keys or tokens in plaintext: store the secret in the vault first (vault_set), then reference it as "${vault:NAME}" in the env/header value \u2014 the placeholder is what gets persisted, and it is resolved only at connect time.',
@@ -49520,15 +49437,20 @@ function buildAddServerTool(deps) {
       }
       const { toolNames, descriptors } = await attachServer(server);
       const stored = { ...server, cachedTools: descriptors };
-      await mutateMcpConfig((current) => {
-        if (current.servers.some((s2) => s2.name === server.name)) {
-          throw new MoxxyError({
-            code: "CONFIG_INVALID",
-            message: `mcp_add_server: an MCP server named "${server.name}" already exists. Use mcp_remove_server first, or pick a different name.`
-          });
-        }
-        return { next: { servers: [...current.servers, stored] }, result: void 0 };
-      });
+      try {
+        await mutateMcpConfig((current) => {
+          if (current.servers.some((s2) => s2.name === server.name)) {
+            throw new MoxxyError({
+              code: "CONFIG_INVALID",
+              message: `mcp_add_server: an MCP server named "${server.name}" already exists. Use mcp_remove_server first, or pick a different name.`
+            });
+          }
+          return { next: { servers: [...current.servers, stored] }, result: void 0 };
+        });
+      } catch (err) {
+        await detachServer(server.name).catch(() => void 0);
+        throw err;
+      }
       let skillResult = null;
       if (input.autoSkill !== false) {
         try {
@@ -49718,6 +49640,7 @@ function buildMcpAdminPluginInternal(opts) {
       buildAddServerTool({
         registry,
         attachServer: runtime.attachServer,
+        detachServer: runtime.detachServer,
         writeMcpUsageSkill
       }),
       buildRemoveServerTool({ detachServer: runtime.detachServer }),
@@ -51007,9 +50930,9 @@ var require_react_development = __commonJS({
               }
             });
             if (payload._status === Uninitialized) {
-              var pending = payload;
-              pending._status = Pending;
-              pending._result = thenable;
+              var pending2 = payload;
+              pending2._status = Pending;
+              pending2._result = thenable;
             }
           }
           if (payload._status === Resolved) {
@@ -63647,12 +63570,12 @@ var require_react_reconciler_development = __commonJS({
                     if (updateQueue === null) ;
                     else {
                       var sharedQueue = updateQueue.shared;
-                      var pending = sharedQueue.pending;
-                      if (pending === null) {
+                      var pending2 = sharedQueue.pending;
+                      if (pending2 === null) {
                         update.next = update;
                       } else {
-                        update.next = pending.next;
-                        pending.next = update;
+                        update.next = pending2.next;
+                        pending2.next = update;
                       }
                       sharedQueue.pending = update;
                     }
@@ -63917,12 +63840,12 @@ var require_react_reconciler_development = __commonJS({
             }
           }
           if (isUnsafeClassRenderPhaseUpdate()) {
-            var pending = sharedQueue.pending;
-            if (pending === null) {
+            var pending2 = sharedQueue.pending;
+            if (pending2 === null) {
               update.next = update;
             } else {
-              update.next = pending.next;
-              pending.next = update;
+              update.next = pending2.next;
+              pending2.next = update;
             }
             sharedQueue.pending = update;
             return unsafe_markUpdateLaneFromFiberToRoot(fiber, lane);
@@ -65363,12 +65286,12 @@ var require_react_reconciler_development = __commonJS({
         }
         function enqueueRenderPhaseUpdate(queue, update) {
           didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = true;
-          var pending = queue.pending;
-          if (pending === null) {
+          var pending2 = queue.pending;
+          if (pending2 === null) {
             update.next = update;
           } else {
-            update.next = pending.next;
-            pending.next = update;
+            update.next = pending2.next;
+            pending2.next = update;
           }
           queue.pending = update;
         }
@@ -74535,10 +74458,10 @@ var require_react_reconciler_development = __commonJS({
         var setErrorHandler = null;
         var setSuspenseHandler = null;
         {
-          var copyWithDeleteImpl = function(obj, path62, index2) {
-            var key = path62[index2];
+          var copyWithDeleteImpl = function(obj, path60, index2) {
+            var key = path60[index2];
             var updated = isArray(obj) ? obj.slice() : assign({}, obj);
-            if (index2 + 1 === path62.length) {
+            if (index2 + 1 === path60.length) {
               if (isArray(updated)) {
                 updated.splice(key, 1);
               } else {
@@ -74546,11 +74469,11 @@ var require_react_reconciler_development = __commonJS({
               }
               return updated;
             }
-            updated[key] = copyWithDeleteImpl(obj[key], path62, index2 + 1);
+            updated[key] = copyWithDeleteImpl(obj[key], path60, index2 + 1);
             return updated;
           };
-          var copyWithDelete = function(obj, path62) {
-            return copyWithDeleteImpl(obj, path62, 0);
+          var copyWithDelete = function(obj, path60) {
+            return copyWithDeleteImpl(obj, path60, 0);
           };
           var copyWithRenameImpl = function(obj, oldPath, newPath, index2) {
             var oldKey = oldPath[index2];
@@ -74588,17 +74511,17 @@ var require_react_reconciler_development = __commonJS({
             }
             return copyWithRenameImpl(obj, oldPath, newPath, 0);
           };
-          var copyWithSetImpl = function(obj, path62, index2, value) {
-            if (index2 >= path62.length) {
+          var copyWithSetImpl = function(obj, path60, index2, value) {
+            if (index2 >= path60.length) {
               return value;
             }
-            var key = path62[index2];
+            var key = path60[index2];
             var updated = isArray(obj) ? obj.slice() : assign({}, obj);
-            updated[key] = copyWithSetImpl(obj[key], path62, index2 + 1, value);
+            updated[key] = copyWithSetImpl(obj[key], path60, index2 + 1, value);
             return updated;
           };
-          var copyWithSet = function(obj, path62, value) {
-            return copyWithSetImpl(obj, path62, 0, value);
+          var copyWithSet = function(obj, path60, value) {
+            return copyWithSetImpl(obj, path60, 0, value);
           };
           var findHook = function(fiber, id) {
             var currentHook2 = fiber.memoizedState;
@@ -74608,10 +74531,10 @@ var require_react_reconciler_development = __commonJS({
             }
             return currentHook2;
           };
-          overrideHookState = function(fiber, id, path62, value) {
+          overrideHookState = function(fiber, id, path60, value) {
             var hook = findHook(fiber, id);
             if (hook !== null) {
-              var newState = copyWithSet(hook.memoizedState, path62, value);
+              var newState = copyWithSet(hook.memoizedState, path60, value);
               hook.memoizedState = newState;
               hook.baseState = newState;
               fiber.memoizedProps = assign({}, fiber.memoizedProps);
@@ -74621,10 +74544,10 @@ var require_react_reconciler_development = __commonJS({
               }
             }
           };
-          overrideHookStateDeletePath = function(fiber, id, path62) {
+          overrideHookStateDeletePath = function(fiber, id, path60) {
             var hook = findHook(fiber, id);
             if (hook !== null) {
-              var newState = copyWithDelete(hook.memoizedState, path62);
+              var newState = copyWithDelete(hook.memoizedState, path60);
               hook.memoizedState = newState;
               hook.baseState = newState;
               fiber.memoizedProps = assign({}, fiber.memoizedProps);
@@ -74647,8 +74570,8 @@ var require_react_reconciler_development = __commonJS({
               }
             }
           };
-          overrideProps = function(fiber, path62, value) {
-            fiber.pendingProps = copyWithSet(fiber.memoizedProps, path62, value);
+          overrideProps = function(fiber, path60, value) {
+            fiber.pendingProps = copyWithSet(fiber.memoizedProps, path60, value);
             if (fiber.alternate) {
               fiber.alternate.pendingProps = fiber.pendingProps;
             }
@@ -74657,8 +74580,8 @@ var require_react_reconciler_development = __commonJS({
               scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
             }
           };
-          overridePropsDeletePath = function(fiber, path62) {
-            fiber.pendingProps = copyWithDelete(fiber.memoizedProps, path62);
+          overridePropsDeletePath = function(fiber, path60) {
+            fiber.pendingProps = copyWithDelete(fiber.memoizedProps, path60);
             if (fiber.alternate) {
               fiber.alternate.pendingProps = fiber.pendingProps;
             }
@@ -82100,8 +82023,8 @@ var init_ErrorOverview = __esm({
     init_dist7();
     init_Box();
     init_Text();
-    cleanupPath = (path62) => {
-      return path62?.replace(`file://${cwd()}/`, "");
+    cleanupPath = (path60) => {
+      return path60?.replace(`file://${cwd()}/`, "");
     };
     stackUtils = new import_stack_utils.default({
       cwd: cwd(),
@@ -86824,10 +86747,10 @@ function useImageAttachments(onError2) {
     }
     const attachments = [];
     for (const id of referencedIds) {
-      const pending = imageAttachmentsRef.current.get(id);
-      if (!pending)
+      const pending2 = imageAttachmentsRef.current.get(id);
+      if (!pending2)
         continue;
-      const att = await pending;
+      const att = await pending2;
       if (att)
         attachments.push(att);
     }
@@ -86853,6 +86776,11 @@ function useTurnRunner(opts) {
   const queueRef = (0, import_react48.useRef)([]);
   const [queueCount, setQueueCount] = (0, import_react48.useState)(0);
   const [priorityMessage, setPriorityMessage] = (0, import_react48.useState)(null);
+  const priorityRef = (0, import_react48.useRef)(null);
+  const setPriority = (value) => {
+    priorityRef.current = value;
+    setPriorityMessage(value);
+  };
   const busyRef = (0, import_react48.useRef)(false);
   const turnControllerRef = (0, import_react48.useRef)(null);
   const runTurnWith = async (text, attachments) => {
@@ -86879,9 +86807,9 @@ function useTurnRunner(opts) {
       setBusy(false);
       busyRef.current = false;
       setBusyStartedAt(null);
-      if (priorityMessage) {
-        const p3 = priorityMessage;
-        setPriorityMessage(null);
+      if (priorityRef.current) {
+        const p3 = priorityRef.current;
+        setPriority(null);
         await runTurnWith(p3.text, p3.attachments);
       } else if (queueRef.current.length > 0) {
         const batch = queueRef.current.splice(0);
@@ -86897,7 +86825,7 @@ function useTurnRunner(opts) {
       return false;
     const first = queueRef.current.shift();
     setQueueCount(queueRef.current.length);
-    setPriorityMessage(first);
+    setPriority(first);
     return true;
   };
   const dropFirst = () => {
@@ -86920,7 +86848,8 @@ function useTurnRunner(opts) {
     runTurnWith,
     priorityMessage,
     forceSendFirst,
-    dropFirst
+    dropFirst,
+    setPriority
   };
 }
 var import_react48;
@@ -88396,7 +88325,7 @@ var init_WorkflowsPanel = __esm({
       const [loading, setLoading] = import_react57.default.useState(true);
       const [busy, setBusy] = import_react57.default.useState(false);
       const [status, setStatus] = import_react57.default.useState(null);
-      const [pending, setPending] = import_react57.default.useState(null);
+      const [pending2, setPending] = import_react57.default.useState(null);
       const [reply2, setReply] = import_react57.default.useState("");
       const reload = import_react57.default.useCallback(async () => {
         if (!view) {
@@ -88415,7 +88344,7 @@ var init_WorkflowsPanel = __esm({
       import_react57.default.useEffect(() => {
         void reload();
       }, [reload]);
-      const active = !busy && !pending && !!view && rows.length > 0;
+      const active = !busy && !pending2 && !!view && rows.length > 0;
       const run2 = import_react57.default.useCallback(async (wf) => {
         if (!view || busy)
           return;
@@ -88502,7 +88431,7 @@ var init_WorkflowsPanel = __esm({
         }
       }, { isActive: active });
       use_input_default((input, key) => {
-        if (!pending)
+        if (!pending2)
           return;
         if (key.escape) {
           setPending(null);
@@ -88511,7 +88440,7 @@ var init_WorkflowsPanel = __esm({
           return;
         }
         if (key.return) {
-          void submitReply(pending, reply2);
+          void submitReply(pending2, reply2);
           return;
         }
         if (key.backspace || key.delete) {
@@ -88520,7 +88449,7 @@ var init_WorkflowsPanel = __esm({
         }
         if (input && !key.ctrl && !key.meta)
           setReply((r2) => r2 + input);
-      }, { isActive: !busy && !!pending });
+      }, { isActive: !busy && !!pending2 });
       const termWidth = process.stdout.columns ?? 80;
       const descWidth = Math.max(16, termWidth - NAME_COL3 - SCOPE_COL2 - TRIG_COL - 12);
       const slice = rows.slice(scroll.visible.start, scroll.visible.end);
@@ -88530,7 +88459,7 @@ var init_WorkflowsPanel = __esm({
         const absoluteIndex = scroll.visible.start + i2;
         const focused = absoluteIndex === scroll.cursor;
         return (0, import_jsx_runtime29.jsxs)(Box_default, { children: [(0, import_jsx_runtime29.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime29.jsx)(Text, { color: wf.enabled ? Colors.active : void 0, dimColor: !wf.enabled, children: wf.enabled ? "\u25CF " : "\u25CB " }), (0, import_jsx_runtime29.jsx)(Box_default, { width: NAME_COL3, children: (0, import_jsx_runtime29.jsx)(Text, { bold: focused, children: truncate3(wf.name, NAME_COL3 - 2) }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: SCOPE_COL2, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: wf.scope }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: TRIG_COL, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, wrap: "truncate", children: wf.triggers }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, wrap: "truncate", children: oneLine(wf.description) }) })] }, wf.name);
-      }), scroll.canScrollDown ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: `  \u2193 ${rows.length - scroll.visible.end} more below` }) : null, pending ? (0, import_jsx_runtime29.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: Colors.active, paddingX: 1, children: [(0, import_jsx_runtime29.jsxs)(Text, { color: Colors.active, children: ["\u23F8 Workflow waiting \xB7 ", pending.label] }), pending.prompt ? (0, import_jsx_runtime29.jsx)(Text, { wrap: "wrap", children: oneLine(pending.prompt).slice(0, 280) }) : null, (0, import_jsx_runtime29.jsxs)(Box_default, { marginTop: 1, children: [(0, import_jsx_runtime29.jsx)(Text, { children: "reply \u203A " }), (0, import_jsx_runtime29.jsx)(Text, { children: reply2 || " " })] }), (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: "Enter send \xB7 Esc cancel" })] }) : null, status ? (0, import_jsx_runtime29.jsx)(Box_default, { marginTop: 1, children: (0, import_jsx_runtime29.jsx)(Text, { wrap: "truncate-end", children: status }) }) : null] });
+      }), scroll.canScrollDown ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: `  \u2193 ${rows.length - scroll.visible.end} more below` }) : null, pending2 ? (0, import_jsx_runtime29.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: Colors.active, paddingX: 1, children: [(0, import_jsx_runtime29.jsxs)(Text, { color: Colors.active, children: ["\u23F8 Workflow waiting \xB7 ", pending2.label] }), pending2.prompt ? (0, import_jsx_runtime29.jsx)(Text, { wrap: "wrap", children: oneLine(pending2.prompt).slice(0, 280) }) : null, (0, import_jsx_runtime29.jsxs)(Box_default, { marginTop: 1, children: [(0, import_jsx_runtime29.jsx)(Text, { children: "reply \u203A " }), (0, import_jsx_runtime29.jsx)(Text, { children: reply2 || " " })] }), (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: "Enter send \xB7 Esc cancel" })] }) : null, status ? (0, import_jsx_runtime29.jsx)(Box_default, { marginTop: 1, children: (0, import_jsx_runtime29.jsx)(Text, { wrap: "truncate-end", children: status }) }) : null] });
     };
   }
 });
@@ -89122,6 +89051,7 @@ var init_SessionView = __esm({
         setYolo(false);
         turn.queueRef.current = [];
         turn.setQueueCount(0);
+        turn.setPriority(null);
         if (typeof session.reset === "function") {
           void session.reset().then(() => {
             if (notice)
@@ -91173,10 +91103,10 @@ var require_segments = __commonJS({
       const segs = getSegmentsFromString(data, Utils.isKanjiModeEnabled());
       const nodes = buildNodes(segs);
       const graph = buildGraph(nodes, version);
-      const path62 = dijkstra.find_path(graph.map, "start", "end");
+      const path60 = dijkstra.find_path(graph.map, "start", "end");
       const optimizedSegs = [];
-      for (let i2 = 1; i2 < path62.length - 1; i2++) {
-        optimizedSegs.push(graph.table[path62[i2]].node);
+      for (let i2 = 1; i2 < path60.length - 1; i2++) {
+        optimizedSegs.push(graph.table[path60[i2]].node);
       }
       return exports.fromArray(mergeSegments(optimizedSegs));
     };
@@ -93628,7 +93558,7 @@ var require_png2 = __commonJS({
       });
       png.pack();
     };
-    exports.renderToFile = function renderToFile(path62, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path60, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
@@ -93639,7 +93569,7 @@ var require_png2 = __commonJS({
         called = true;
         cb.apply(null, args);
       };
-      const stream = fs45.createWriteStream(path62);
+      const stream = fs45.createWriteStream(path60);
       stream.on("error", done);
       stream.on("close", done);
       exports.renderToFileStream(stream, qrData, options);
@@ -93701,14 +93631,14 @@ var require_utf8 = __commonJS({
       }
       return output;
     };
-    exports.renderToFile = function renderToFile(path62, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path60, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
       }
       const fs45 = __require("fs");
       const utf8 = exports.render(qrData, options);
-      fs45.writeFile(path62, utf8, cb);
+      fs45.writeFile(path60, utf8, cb);
     };
   }
 });
@@ -93829,7 +93759,7 @@ var require_svg_tag = __commonJS({
       return str2;
     }
     function qrToPath(data, size, margin) {
-      let path62 = "";
+      let path60 = "";
       let moveBy = 0;
       let newRow = false;
       let lineLength = 0;
@@ -93840,19 +93770,19 @@ var require_svg_tag = __commonJS({
         if (data[i2]) {
           lineLength++;
           if (!(i2 > 0 && col > 0 && data[i2 - 1])) {
-            path62 += newRow ? svgCmd("M", col + margin, 0.5 + row + margin) : svgCmd("m", moveBy, 0);
+            path60 += newRow ? svgCmd("M", col + margin, 0.5 + row + margin) : svgCmd("m", moveBy, 0);
             moveBy = 0;
             newRow = false;
           }
           if (!(col + 1 < size && data[i2 + 1])) {
-            path62 += svgCmd("h", lineLength);
+            path60 += svgCmd("h", lineLength);
             lineLength = 0;
           }
         } else {
           moveBy++;
         }
       }
-      return path62;
+      return path60;
     }
     exports.render = function render2(qrData, options, cb) {
       const opts = Utils.getOptions(options);
@@ -93860,10 +93790,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 path62 = "<path " + getColorAttrib(opts.color.dark, "stroke") + ' d="' + qrToPath(data, size, opts.margin) + '"/>';
+      const path60 = "<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 + path62 + "</svg>\n";
+      const svgTag = '<svg xmlns="http://www.w3.org/2000/svg" ' + width + viewBox + ' shape-rendering="crispEdges">' + bg + path60 + "</svg>\n";
       if (typeof cb === "function") {
         cb(null, svgTag);
       }
@@ -93877,7 +93807,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(path62, qrData, options, cb) {
+    exports.renderToFile = function renderToFile(path60, qrData, options, cb) {
       if (typeof cb === "undefined") {
         cb = options;
         options = void 0;
@@ -93885,7 +93815,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(path62, xmlStr, cb);
+      fs45.writeFile(path60, xmlStr, cb);
     };
   }
 });
@@ -94043,8 +93973,8 @@ var require_server = __commonJS({
         cb
       };
     }
-    function getTypeFromFilename(path62) {
-      return path62.slice((path62.lastIndexOf(".") - 1 >>> 0) + 2).toLowerCase();
+    function getTypeFromFilename(path60) {
+      return path60.slice((path60.lastIndexOf(".") - 1 >>> 0) + 2).toLowerCase();
     }
     function getRendererFromType(type) {
       switch (type) {
@@ -94108,17 +94038,17 @@ var require_server = __commonJS({
       const renderer2 = getRendererFromType(params.opts.type);
       return render2(renderer2.renderToBuffer, text, params);
     };
-    exports.toFile = function toFile3(path62, text, opts, cb) {
-      if (typeof path62 !== "string" || !(typeof text === "string" || typeof text === "object")) {
+    exports.toFile = function toFile3(path60, text, opts, cb) {
+      if (typeof path60 !== "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(path62);
+      const type = params.opts.type || getTypeFromFilename(path60);
       const renderer2 = getRendererFromType(type);
-      const renderToFile = renderer2.renderToFile.bind(null, path62);
+      const renderToFile = renderer2.renderToFile.bind(null, path60);
       return render2(renderToFile, text, params);
     };
     exports.toFileStream = function toFileStream(stream, text, opts) {
@@ -94938,14 +94868,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 path62 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
+        let path60 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
         if (origin[origin.length - 1] === "/") {
           origin = origin.slice(0, origin.length - 1);
         }
-        if (path62 && path62[0] !== "/") {
-          path62 = `/${path62}`;
+        if (path60 && path60[0] !== "/") {
+          path60 = `/${path60}`;
         }
-        return new URL(`${origin}${path62}`);
+        return new URL(`${origin}${path60}`);
       }
       if (!isHttpOrHttpsPrefixed(url2.origin || url2.protocol)) {
         throw new InvalidArgumentError("Invalid URL protocol: the URL must start with `http:` or `https:`.");
@@ -95395,39 +95325,39 @@ var require_diagnostics = __commonJS({
       });
       diagnosticsChannel.channel("undici:client:sendHeaders").subscribe((evt) => {
         const {
-          request: { method, path: path62, origin }
+          request: { method, path: path60, origin }
         } = evt;
-        debuglog("sending request to %s %s/%s", method, origin, path62);
+        debuglog("sending request to %s %s/%s", method, origin, path60);
       });
       diagnosticsChannel.channel("undici:request:headers").subscribe((evt) => {
         const {
-          request: { method, path: path62, origin },
+          request: { method, path: path60, origin },
           response: { statusCode }
         } = evt;
         debuglog(
           "received response to %s %s/%s - HTTP %d",
           method,
           origin,
-          path62,
+          path60,
           statusCode
         );
       });
       diagnosticsChannel.channel("undici:request:trailers").subscribe((evt) => {
         const {
-          request: { method, path: path62, origin }
+          request: { method, path: path60, origin }
         } = evt;
-        debuglog("trailers received from %s %s/%s", method, origin, path62);
+        debuglog("trailers received from %s %s/%s", method, origin, path60);
       });
       diagnosticsChannel.channel("undici:request:error").subscribe((evt) => {
         const {
-          request: { method, path: path62, origin },
+          request: { method, path: path60, origin },
           error: error2
         } = evt;
         debuglog(
           "request to %s %s/%s errored - %s",
           method,
           origin,
-          path62,
+          path60,
           error2.message
         );
       });
@@ -95476,9 +95406,9 @@ var require_diagnostics = __commonJS({
         });
         diagnosticsChannel.channel("undici:client:sendHeaders").subscribe((evt) => {
           const {
-            request: { method, path: path62, origin }
+            request: { method, path: path60, origin }
           } = evt;
-          debuglog("sending request to %s %s/%s", method, origin, path62);
+          debuglog("sending request to %s %s/%s", method, origin, path60);
         });
       }
       diagnosticsChannel.channel("undici:websocket:open").subscribe((evt) => {
@@ -95540,7 +95470,7 @@ var require_request = __commonJS({
     var kHandler = /* @__PURE__ */ Symbol("handler");
     var Request4 = class {
       constructor(origin, {
-        path: path62,
+        path: path60,
         method,
         body,
         headers,
@@ -95555,11 +95485,11 @@ var require_request = __commonJS({
         expectContinue,
         servername
       }, handler) {
-        if (typeof path62 !== "string") {
+        if (typeof path60 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path62[0] !== "/" && !(path62.startsWith("http://") || path62.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path60[0] !== "/" && !(path60.startsWith("http://") || path60.startsWith("https://")) && method !== "CONNECT") {
           throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
-        } else if (invalidPathRegex.test(path62)) {
+        } else if (invalidPathRegex.test(path60)) {
           throw new InvalidArgumentError("invalid request path");
         }
         if (typeof method !== "string") {
@@ -95625,7 +95555,7 @@ var require_request = __commonJS({
         this.completed = false;
         this.aborted = false;
         this.upgrade = upgrade || null;
-        this.path = query ? buildURL(path62, query) : path62;
+        this.path = query ? buildURL(path60, query) : path60;
         this.origin = origin;
         this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
         this.blocking = blocking == null ? false : blocking;
@@ -100163,7 +100093,7 @@ var require_client_h1 = __commonJS({
       return method !== "GET" && method !== "HEAD" && method !== "OPTIONS" && method !== "TRACE" && method !== "CONNECT";
     }
     function writeH1(client, request) {
-      const { method, path: path62, host, upgrade, blocking, reset } = request;
+      const { method, path: path60, 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)) {
@@ -100229,7 +100159,7 @@ var require_client_h1 = __commonJS({
       if (blocking) {
         socket[kBlocking] = true;
       }
-      let header = `${method} ${path62} HTTP/1.1\r
+      let header = `${method} ${path60} HTTP/1.1\r
 `;
       if (typeof host === "string") {
         header += `host: ${host}\r
@@ -100754,7 +100684,7 @@ var require_client_h2 = __commonJS({
     }
     function writeH2(client, request) {
       const session = client[kHTTP2Session];
-      const { method, path: path62, host, upgrade, expectContinue, signal, headers: reqHeaders } = request;
+      const { method, path: path60, host, upgrade, expectContinue, signal, headers: reqHeaders } = request;
       let { body } = request;
       if (upgrade) {
         util.errorRequest(client, request, new Error("Upgrade not supported for H2"));
@@ -100821,7 +100751,7 @@ var require_client_h2 = __commonJS({
         });
         return true;
       }
-      headers[HTTP2_HEADER_PATH] = path62;
+      headers[HTTP2_HEADER_PATH] = path60;
       headers[HTTP2_HEADER_SCHEME] = "https";
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
       if (body && typeof body.read === "function") {
@@ -101173,9 +101103,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 path62 = search ? `${pathname}${search}` : pathname;
+        const path60 = search ? `${pathname}${search}` : pathname;
         this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
-        this.opts.path = path62;
+        this.opts.path = path60;
         this.opts.origin = origin;
         this.opts.maxRedirections = 0;
         this.opts.query = null;
@@ -101926,8 +101856,8 @@ var require_pool_base = __commonJS({
       }
       get [kPending]() {
         let ret = this[kQueued];
-        for (const { [kPending]: pending } of this[kClients]) {
-          ret += pending;
+        for (const { [kPending]: pending2 } of this[kClients]) {
+          ret += pending2;
         }
         return ret;
       }
@@ -102400,10 +102330,10 @@ var require_proxy_agent = __commonJS({
         };
         const {
           origin,
-          path: path62 = "/",
+          path: path60 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path62;
+        opts.path = origin + path60;
         if (!("host" in headers) && !("Host" in headers)) {
           const { host } = new URL3(origin);
           headers.host = host;
@@ -104311,20 +104241,20 @@ var require_mock_utils = __commonJS({
       }
       return true;
     }
-    function safeUrl(path62) {
-      if (typeof path62 !== "string") {
-        return path62;
+    function safeUrl(path60) {
+      if (typeof path60 !== "string") {
+        return path60;
       }
-      const pathSegments = path62.split("?");
+      const pathSegments = path60.split("?");
       if (pathSegments.length !== 2) {
-        return path62;
+        return path60;
       }
       const qp = new URLSearchParams(pathSegments.pop());
       qp.sort();
       return [...pathSegments, qp.toString()].join("?");
     }
-    function matchKey(mockDispatch2, { path: path62, method, body, headers }) {
-      const pathMatch = matchValue(mockDispatch2.path, path62);
+    function matchKey(mockDispatch2, { path: path60, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path60);
       const methodMatch = matchValue(mockDispatch2.method, method);
       const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true;
       const headersMatch = matchHeaders(mockDispatch2, headers);
@@ -104346,7 +104276,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: path62 }) => matchValue(safeUrl(path62), resolvedPath));
+      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path60 }) => matchValue(safeUrl(path60), resolvedPath));
       if (matchedMockDispatches.length === 0) {
         throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`);
       }
@@ -104384,9 +104314,9 @@ var require_mock_utils = __commonJS({
       }
     }
     function buildKey(opts) {
-      const { path: path62, method, body, headers, query } = opts;
+      const { path: path60, method, body, headers, query } = opts;
       return {
-        path: path62,
+        path: path60,
         method,
         body,
         headers,
@@ -104844,10 +104774,10 @@ var require_pending_interceptors_formatter = __commonJS({
       }
       format(pendingInterceptors) {
         const withPrettyHeaders = pendingInterceptors.map(
-          ({ method, path: path62, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
+          ({ method, path: path60, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path62,
+            Path: path60,
             "Status code": statusCode,
             Persistent: persist ? PERSISTENT : NOT_PERSISTENT,
             Invocations: timesInvoked,
@@ -104971,18 +104901,18 @@ var require_mock_agent = __commonJS({
       }
       pendingInterceptors() {
         const mockAgentClients = this[kClients];
-        return Array.from(mockAgentClients.entries()).flatMap(([origin, scope]) => scope[kDispatches].map((dispatch3) => ({ ...dispatch3, origin }))).filter(({ pending }) => pending);
+        return Array.from(mockAgentClients.entries()).flatMap(([origin, scope]) => scope[kDispatches].map((dispatch3) => ({ ...dispatch3, origin }))).filter(({ pending: pending2 }) => pending2);
       }
       assertNoPendingInterceptors({ pendingInterceptorsFormatter = new PendingInterceptorsFormatter() } = {}) {
-        const pending = this.pendingInterceptors();
-        if (pending.length === 0) {
+        const pending2 = this.pendingInterceptors();
+        if (pending2.length === 0) {
           return;
         }
-        const pluralizer = new Pluralizer("interceptor", "interceptors").pluralize(pending.length);
+        const pluralizer = new Pluralizer("interceptor", "interceptors").pluralize(pending2.length);
         throw new UndiciError(`
 ${pluralizer.count} ${pluralizer.noun} ${pluralizer.is} pending:
 
-${pendingInterceptorsFormatter.format(pending)}
+${pendingInterceptorsFormatter.format(pending2)}
 `.trim());
       }
     };
@@ -109686,9 +109616,9 @@ var require_util7 = __commonJS({
         }
       }
     }
-    function validateCookiePath(path62) {
-      for (let i2 = 0; i2 < path62.length; ++i2) {
-        const code = path62.charCodeAt(i2);
+    function validateCookiePath(path60) {
+      for (let i2 = 0; i2 < path60.length; ++i2) {
+        const code = path60.charCodeAt(i2);
         if (code < 32 || // exclude CTLs (0-31)
         code === 127 || // DEL
         code === 59) {
@@ -112348,11 +112278,11 @@ var require_undici = __commonJS({
           if (typeof opts.path !== "string") {
             throw new InvalidArgumentError("invalid opts.path");
           }
-          let path62 = opts.path;
+          let path60 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path62 = `/${path62}`;
+            path60 = `/${path60}`;
           }
-          url2 = new URL(util.parseOrigin(url2).origin + path62);
+          url2 = new URL(util.parseOrigin(url2).origin + path60);
         } else {
           if (!opts) {
             opts = typeof url2 === "object" ? url2 : {};
@@ -113177,6 +113107,8 @@ function verifyTool(deps) {
         }
         const cap = failedAttemptCount(journal) >= MAX_FAILED_ATTEMPTS;
         if (cap) {
+          if (recovered)
+            journal.state = "rolled_back";
           await escalate(deps, ctx, journal, result.message);
         } else {
           await writeJournal(deps.moxxyDir, journal);
@@ -114653,99 +114585,7 @@ async function defaultPrompt() {
     rl.close();
   }
 }
-
-// ../plugin-memory/dist/parse.js
-var FRONTMATTER_FENCE2 = "---";
-var OPENING_FENCE_LF = FRONTMATTER_FENCE2 + "\n";
-var OPENING_FENCE_CRLF = FRONTMATTER_FENCE2 + "\r\n";
-function parseMdFile(content) {
-  if (!content.startsWith(OPENING_FENCE_LF) && !content.startsWith(OPENING_FENCE_CRLF)) {
-    return { frontmatter: {}, body: content };
-  }
-  const fenceLen = content.startsWith(OPENING_FENCE_CRLF) ? OPENING_FENCE_CRLF.length : OPENING_FENCE_LF.length;
-  const rest = content.slice(fenceLen);
-  const m3 = /\r?\n---(?:\r?\n|$)/.exec(rest);
-  if (!m3)
-    return { frontmatter: {}, body: content };
-  return {
-    frontmatter: parseFrontmatter2(rest.slice(0, m3.index)),
-    body: rest.slice(m3.index + m3[0].length)
-  };
-}
-function parseFrontmatter2(text) {
-  const result = {};
-  const lines = text.split(/\r?\n/);
-  for (let i2 = 0; i2 < lines.length; i2++) {
-    const trimmed = (lines[i2] ?? "").trim();
-    if (!trimmed || trimmed.startsWith("#"))
-      continue;
-    const colon = trimmed.indexOf(":");
-    if (colon === -1)
-      continue;
-    const key = trimmed.slice(0, colon).trim();
-    const raw = trimmed.slice(colon + 1).trim();
-    if (raw === "" && i2 + 1 < lines.length && /^\s*-\s/.test(lines[i2 + 1] ?? "")) {
-      const items = [];
-      while (i2 + 1 < lines.length && /^\s*-\s/.test(lines[i2 + 1] ?? "")) {
-        i2 += 1;
-        items.push(parseScalar2((lines[i2] ?? "").replace(/^\s*-\s*/, "").trim()));
-      }
-      result[key] = items;
-      continue;
-    }
-    result[key] = parseScalar2(raw);
-  }
-  return result;
-}
-function parseScalar2(v3) {
-  if (!v3)
-    return "";
-  if (v3.startsWith("[") && v3.endsWith("]")) {
-    const inner = v3.slice(1, -1).trim();
-    if (!inner)
-      return [];
-    return inner.split(",").map((s2) => stripQuotes2(s2.trim()));
-  }
-  if (v3 === "true")
-    return true;
-  if (v3 === "false")
-    return false;
-  if (/^-?\d+$/.test(v3))
-    return Number(v3);
-  return stripQuotes2(v3);
-}
-function stripQuotes2(s2) {
-  if (s2.length >= 2 && (s2.startsWith('"') && s2.endsWith('"') || s2.startsWith("'") && s2.endsWith("'"))) {
-    return s2.slice(1, -1);
-  }
-  return s2;
-}
-function renderFrontmatter(frontmatter) {
-  const out = ["---"];
-  for (const [k3, v3] of Object.entries(frontmatter)) {
-    if (v3 === void 0 || v3 === null)
-      continue;
-    out.push(`${k3}: ${renderValue(v3)}`);
-  }
-  out.push("---");
-  return out.join("\n");
-}
-function renderValue(v3) {
-  if (v3 === null || v3 === void 0)
-    return "";
-  if (typeof v3 === "string") {
-    return needsQuoting(v3) ? `"${v3.replace(/"/g, '\\"')}"` : v3;
-  }
-  if (typeof v3 === "boolean" || typeof v3 === "number")
-    return String(v3);
-  if (Array.isArray(v3)) {
-    return `[${v3.map((x4) => renderValue(x4)).join(", ")}]`;
-  }
-  return JSON.stringify(v3);
-}
-function needsQuoting(s2) {
-  return s2.includes(":") || s2.includes("#") || s2.includes('"') || s2.startsWith(" ") || s2.endsWith(" ");
-}
+var parseMdFile = parseFrontmatterFile;
 
 // ../plugin-memory/dist/tfidf.js
 var TfIdfEmbedder = class {
@@ -114907,6 +114747,7 @@ var EmbeddingIndex = class _EmbeddingIndex {
   dim;
   cache = /* @__PURE__ */ new Map();
   dirty = false;
+  loaded = false;
   constructor(dir, embedderName, dim3) {
     this.dir = dir;
     this.embedderName = embedderName;
@@ -114919,9 +114760,12 @@ var EmbeddingIndex = class _EmbeddingIndex {
     return path3.join(this.dir, INDEX_FILE);
   }
   async load() {
+    if (this.loaded)
+      return;
     try {
       const raw = await promises.readFile(this.filePath, "utf8");
       const parsed = JSON.parse(raw);
+      this.loaded = true;
       if (parsed.version !== INDEX_VERSION)
         return;
       if (parsed.embedder !== this.embedderName)
@@ -114934,6 +114778,7 @@ var EmbeddingIndex = class _EmbeddingIndex {
     } catch (err) {
       if (!isEnoent2(err))
         throw err;
+      this.loaded = true;
     }
   }
   /**
@@ -115011,7 +114856,6 @@ function isEnoent3(err) {
   return err instanceof Error && "code" in err && err.code === "ENOENT";
 }
 async function listEntries(dir, filterType) {
-  const entries = [];
   let names;
   try {
     names = await promises.readdir(dir, { withFileTypes: true });
@@ -115020,28 +114864,23 @@ async function listEntries(dir, filterType) {
       return [];
     throw err;
   }
-  for (const dirent of names) {
-    if (!dirent.isFile())
-      continue;
-    if (!dirent.name.endsWith(".md"))
-      continue;
-    if (dirent.name === "MEMORY.md")
-      continue;
+  const candidates = names.filter((d2) => d2.isFile() && d2.name.endsWith(".md") && d2.name !== "MEMORY.md");
+  const parsed = await Promise.all(candidates.map(async (dirent) => {
     const filePath = path3.join(dir, dirent.name);
     const raw = await promises.readFile(filePath, "utf8");
-    const parsed = parseMdFile(raw);
-    const result = memoryFrontmatterSchema.safeParse(parsed.frontmatter);
+    const md = parseMdFile(raw);
+    const result = memoryFrontmatterSchema.safeParse(md.frontmatter);
     if (!result.success)
-      continue;
+      return null;
     if (filterType && result.data.type !== filterType)
-      continue;
-    entries.push({
+      return null;
+    return {
       frontmatter: result.data,
-      body: parsed.body.trim(),
+      body: md.body.trim(),
       path: filePath
-    });
-  }
-  return entries;
+    };
+  }));
+  return parsed.filter((e3) => e3 !== null);
 }
 async function readEntry(filePath) {
   try {
@@ -115419,6 +115258,7 @@ async function consolidateMemory(store, provider, opts = {}) {
   const all = await store.list();
   const plan = planConsolidation(all, { tag: opts.tag });
   const byName = new Map(all.map((e3) => [e3.frontmatter.name, e3]));
+  const produced = /* @__PURE__ */ new Set();
   const outcomes = [];
   for (const cluster of plan.clusters) {
     const members = cluster.members.map((n2) => byName.get(n2)).filter((e3) => Boolean(e3));
@@ -115450,7 +115290,7 @@ body: ${m3.body}`).join("\n\n");
     const extracted = extractJson(response);
     const parsed = consolidatedSchema.parse(extracted);
     const clusterNames = new Set(cluster.members);
-    if (byName.has(parsed.name) && !clusterNames.has(parsed.name)) {
+    if ((byName.has(parsed.name) || produced.has(parsed.name)) && !clusterNames.has(parsed.name)) {
       outcomes.push({
         key: cluster.key,
         merged: cluster.members,
@@ -115466,6 +115306,7 @@ body: ${m3.body}`).join("\n\n");
       body: parsed.body,
       ...parsed.tags ? { tags: parsed.tags } : {}
     });
+    produced.add(parsed.name);
     for (const member of members) {
       if (member.frontmatter.name !== parsed.name) {
         await store.forget(member.frontmatter.name);
@@ -115485,7 +115326,7 @@ function extractJson(text) {
   const candidate = fenced ? fenced[1] : text;
   const start = candidate.indexOf("{");
   const end = candidate.lastIndexOf("}");
-  if (start === -1 || end === -1)
+  if (start === -1 || end <= start)
     throw new Error("consolidate: model returned no JSON object");
   return JSON.parse(candidate.slice(start, end + 1));
 }
@@ -115694,13 +115535,13 @@ function buildSessionConfigApplier(session, initial, builtins = [], disabledPack
   );
   return async (next) => {
     const applied = [];
-    const pending = [];
+    const pending2 = [];
     if (next.mode !== last.mode) {
       try {
         if (next.mode) session.modes.setActive(next.mode);
         applied.push("mode");
       } catch (err) {
-        pending.push(`mode (${err instanceof Error ? err.message : String(err)})`);
+        pending2.push(`mode (${err instanceof Error ? err.message : String(err)})`);
       }
     }
     if (next.compactor !== last.compactor) {
@@ -115708,7 +115549,7 @@ function buildSessionConfigApplier(session, initial, builtins = [], disabledPack
         if (next.compactor) session.compactors.setActive(next.compactor);
         applied.push("compactor");
       } catch (err) {
-        pending.push(`compactor (${err instanceof Error ? err.message : String(err)})`);
+        pending2.push(`compactor (${err instanceof Error ? err.message : String(err)})`);
       }
     }
     if (next.context?.caching !== last.context?.caching || next.context?.cacheStrategy !== last.context?.cacheStrategy) {
@@ -115717,7 +115558,7 @@ function buildSessionConfigApplier(session, initial, builtins = [], disabledPack
         else session.cacheStrategies.setActive(next.context?.cacheStrategy ?? "stable-prefix");
         applied.push("cacheStrategy");
       } catch (err) {
-        pending.push(`cacheStrategy (${err instanceof Error ? err.message : String(err)})`);
+        pending2.push(`cacheStrategy (${err instanceof Error ? err.message : String(err)})`);
       }
     }
     if (next.context?.elision !== last.context?.elision) {
@@ -115733,14 +115574,14 @@ function buildSessionConfigApplier(session, initial, builtins = [], disabledPack
       applied.push("reasoning");
     }
     if (next.hookTimeoutMs !== last.hookTimeoutMs) {
-      pending.push("hookTimeoutMs (restart required)");
+      pending2.push("hookTimeoutMs (restart required)");
     }
     if (providerChanged(last, next)) {
-      pending.push("provider.* (restart required)");
+      pending2.push("provider.* (restart required)");
     }
     const toggles = await applyPluginToggles(session, builtinsByName, last, next);
     for (const t2 of toggles.applied) applied.push(`plugins[${t2.name}].enabled=${t2.enabled}`);
-    for (const p3 of toggles.pending) pending.push(p3);
+    for (const p3 of toggles.pending) pending2.push(p3);
     if (disabledPackages) {
       for (const [name, settings] of Object.entries(next.plugins ?? {})) {
         if (settings?.enabled === false) disabledPackages.add(name);
@@ -115748,19 +115589,19 @@ function buildSessionConfigApplier(session, initial, builtins = [], disabledPack
       }
     }
     if (!shallowEqual(last.embeddings, next.embeddings)) {
-      pending.push("embeddings.* (restart required to rebuild memory embedder)");
+      pending2.push("embeddings.* (restart required to rebuild memory embedder)");
     }
     if (!shallowEqual(last.channels, next.channels)) {
-      pending.push("channels.* (applies on next `moxxy <channel>` invocation)");
+      pending2.push("channels.* (applies on next `moxxy <channel>` invocation)");
     }
     if (!shallowEqual(last.skills, next.skills)) {
-      pending.push("skills.* (restart to rediscover)");
+      pending2.push("skills.* (restart to rediscover)");
     }
     if (!shallowEqual(last.permissions, next.permissions)) {
-      pending.push("permissions.* (restart to reload policy)");
+      pending2.push("permissions.* (restart to reload policy)");
     }
     last = next;
-    return { applied, pending };
+    return { applied, pending: pending2 };
   };
 }
 async function applyPluginToggles(session, builtinsByName, last, next) {
@@ -115770,7 +115611,7 @@ async function applyPluginToggles(session, builtinsByName, last, next) {
     ...Object.keys(next.plugins ?? {})
   ]);
   const applied = [];
-  const pending = [];
+  const pending2 = [];
   const loaded = new Set(session.pluginHost.list().map((p3) => p3.name));
   for (const name of allNames) {
     const wasEnabled = effectiveEnabled(last, name);
@@ -115790,10 +115631,10 @@ async function applyPluginToggles(session, builtinsByName, last, next) {
         applied.push({ name, enabled: true });
       } catch (err) {
         if (err instanceof PluginRequirementError) {
-          pending.push(`plugins[${name}].enabled=true (${err.message})`);
+          pending2.push(`plugins[${name}].enabled=true (${err.message})`);
           continue;
         }
-        pending.push(`plugins[${name}].enabled=true (${err instanceof Error ? err.message : String(err)})`);
+        pending2.push(`plugins[${name}].enabled=true (${err instanceof Error ? err.message : String(err)})`);
       }
     } else {
       if (!loaded.has(name)) continue;
@@ -115801,11 +115642,11 @@ async function applyPluginToggles(session, builtinsByName, last, next) {
         await session.pluginHost.unload(name);
         applied.push({ name, enabled: false });
       } catch (err) {
-        pending.push(`plugins[${name}].enabled=false (${err instanceof Error ? err.message : String(err)})`);
+        pending2.push(`plugins[${name}].enabled=false (${err instanceof Error ? err.message : String(err)})`);
       }
     }
   }
-  return { applied, pending };
+  return { applied, pending: pending2 };
 }
 function effectiveEnabled(cfg, name) {
   const entry = cfg.plugins?.[name];
@@ -116308,13 +116149,13 @@ var MultipartBody = class {
   }
 };
 var fileFromPathWarned = false;
-async function fileFromPath3(path62, ...args) {
+async function fileFromPath3(path60, ...args) {
   const { fileFromPath: _fileFromPath } = await Promise.resolve().then(() => (init_fileFromPath(), fileFromPath_exports));
   if (!fileFromPathWarned) {
-    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path62)}) instead`);
+    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path60)}) instead`);
     fileFromPathWarned = true;
   }
-  return await _fileFromPath(path62, ...args);
+  return await _fileFromPath(path60, ...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 });
@@ -117037,29 +116878,29 @@ var APIClient = class {
   defaultIdempotencyKey() {
     return `stainless-node-retry-${uuid4()}`;
   }
-  get(path62, opts) {
-    return this.methodRequest("get", path62, opts);
+  get(path60, opts) {
+    return this.methodRequest("get", path60, opts);
   }
-  post(path62, opts) {
-    return this.methodRequest("post", path62, opts);
+  post(path60, opts) {
+    return this.methodRequest("post", path60, opts);
   }
-  patch(path62, opts) {
-    return this.methodRequest("patch", path62, opts);
+  patch(path60, opts) {
+    return this.methodRequest("patch", path60, opts);
   }
-  put(path62, opts) {
-    return this.methodRequest("put", path62, opts);
+  put(path60, opts) {
+    return this.methodRequest("put", path60, opts);
   }
-  delete(path62, opts) {
-    return this.methodRequest("delete", path62, opts);
+  delete(path60, opts) {
+    return this.methodRequest("delete", path60, opts);
   }
-  methodRequest(method, path62, opts) {
+  methodRequest(method, path60, 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: path62, ...opts2, body };
+      return { method, path: path60, ...opts2, body };
     }));
   }
-  getAPIList(path62, Page3, opts) {
-    return this.requestAPIList(Page3, { method: "get", path: path62, ...opts });
+  getAPIList(path60, Page3, opts) {
+    return this.requestAPIList(Page3, { method: "get", path: path60, ...opts });
   }
   calculateContentLength(body) {
     if (typeof body === "string") {
@@ -117078,10 +116919,10 @@ var APIClient = class {
   }
   buildRequest(inputOptions, { retryCount = 0 } = {}) {
     const options = { ...inputOptions };
-    const { method, path: path62, query, headers = {} } = options;
+    const { method, path: path60, 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(path62, query);
+    const url2 = this.buildURL(path60, query);
     if ("timeout" in options)
       validatePositiveInteger("timeout", options.timeout);
     options.timeout = options.timeout ?? this.timeout;
@@ -117205,8 +117046,8 @@ var APIClient = class {
     const request = this.makeRequest(options, null);
     return new PagePromise(this, request, Page3);
   }
-  buildURL(path62, query) {
-    const url2 = isAbsoluteURL(path62) ? new URL(path62) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path62.startsWith("/") ? path62.slice(1) : path62));
+  buildURL(path60, query) {
+    const url2 = isAbsoluteURL(path60) ? new URL(path60) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path60.startsWith("/") ? path60.slice(1) : path60));
     const defaultQuery = this.defaultQuery();
     if (!isEmptyObj(defaultQuery)) {
       query = { ...defaultQuery, ...query };
@@ -120408,13 +120249,13 @@ var MultipartBody2 = class {
   }
 };
 var fileFromPathWarned2 = false;
-async function fileFromPath5(path62, ...args) {
+async function fileFromPath5(path60, ...args) {
   const { fileFromPath: _fileFromPath } = await Promise.resolve().then(() => (init_fileFromPath(), fileFromPath_exports));
   if (!fileFromPathWarned2) {
-    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path62)}) instead`);
+    console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path60)}) instead`);
     fileFromPathWarned2 = true;
   }
-  return await _fileFromPath(path62, ...args);
+  return await _fileFromPath(path60, ...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 });
@@ -121192,29 +121033,29 @@ var APIClient2 = class {
   defaultIdempotencyKey() {
     return `stainless-node-retry-${uuid42()}`;
   }
-  get(path62, opts) {
-    return this.methodRequest("get", path62, opts);
+  get(path60, opts) {
+    return this.methodRequest("get", path60, opts);
   }
-  post(path62, opts) {
-    return this.methodRequest("post", path62, opts);
+  post(path60, opts) {
+    return this.methodRequest("post", path60, opts);
   }
-  patch(path62, opts) {
-    return this.methodRequest("patch", path62, opts);
+  patch(path60, opts) {
+    return this.methodRequest("patch", path60, opts);
   }
-  put(path62, opts) {
-    return this.methodRequest("put", path62, opts);
+  put(path60, opts) {
+    return this.methodRequest("put", path60, opts);
   }
-  delete(path62, opts) {
-    return this.methodRequest("delete", path62, opts);
+  delete(path60, opts) {
+    return this.methodRequest("delete", path60, opts);
   }
-  methodRequest(method, path62, opts) {
+  methodRequest(method, path60, 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: path62, ...opts2, body };
+      return { method, path: path60, ...opts2, body };
     }));
   }
-  getAPIList(path62, Page3, opts) {
-    return this.requestAPIList(Page3, { method: "get", path: path62, ...opts });
+  getAPIList(path60, Page3, opts) {
+    return this.requestAPIList(Page3, { method: "get", path: path60, ...opts });
   }
   calculateContentLength(body) {
     if (typeof body === "string") {
@@ -121233,10 +121074,10 @@ var APIClient2 = class {
   }
   buildRequest(inputOptions, { retryCount = 0 } = {}) {
     const options = { ...inputOptions };
-    const { method, path: path62, query, headers = {} } = options;
+    const { method, path: path60, 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(path62, query);
+    const url2 = this.buildURL(path60, query);
     if ("timeout" in options)
       validatePositiveInteger2("timeout", options.timeout);
     options.timeout = options.timeout ?? this.timeout;
@@ -121352,8 +121193,8 @@ var APIClient2 = class {
     const request = this.makeRequest(options, null);
     return new PagePromise2(this, request, Page3);
   }
-  buildURL(path62, query) {
-    const url2 = isAbsoluteURL2(path62) ? new URL(path62) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path62.startsWith("/") ? path62.slice(1) : path62));
+  buildURL(path60, query) {
+    const url2 = isAbsoluteURL2(path60) ? new URL(path60) : new URL(this.baseURL + (this.baseURL.endsWith("/") && path60.startsWith("/") ? path60.slice(1) : path60));
     const defaultQuery = this.defaultQuery();
     if (!isEmptyObj2(defaultQuery)) {
       query = { ...defaultQuery, ...query };
@@ -126384,7 +126225,7 @@ var OpenAIProvider = class {
       yield { type: "error", ...toFriendlyError(err, { provider: this.name }) };
       return;
     }
-    const pending = /* @__PURE__ */ new Map();
+    const pending2 = /* @__PURE__ */ new Map();
     let stopReason = "end_turn";
     let usageIn = 0;
     let usageOut = 0;
@@ -126416,7 +126257,7 @@ var OpenAIProvider = class {
         if (delta.tool_calls) {
           for (const tcDelta of delta.tool_calls) {
             const idx = tcDelta.index ?? 0;
-            let entry = pending.get(idx);
+            let entry = pending2.get(idx);
             if (!entry) {
               entry = {
                 id: tcDelta.id ?? `call_${idx}`,
@@ -126424,7 +126265,7 @@ var OpenAIProvider = class {
                 argsBuffer: "",
                 emittedStart: false
               };
-              pending.set(idx, entry);
+              pending2.set(idx, entry);
             } else if (tcDelta.id) {
               entry.id = tcDelta.id;
             }
@@ -126448,7 +126289,7 @@ var OpenAIProvider = class {
       yield { type: "error", ...toFriendlyError(err, { provider: this.name }) };
       return;
     }
-    for (const entry of pending.values()) {
+    for (const entry of pending2.values()) {
       let parsed = {};
       if (entry.argsBuffer) {
         try {
@@ -126778,11 +126619,11 @@ function buildAuthUrl(input) {
 }
 async function runAuthorizationCodeFlow(opts) {
   const port = opts.redirectPort ?? 8765;
-  const path62 = opts.redirectPath ?? "/callback";
+  const path60 = opts.redirectPath ?? "/callback";
   const codeVerifier = generateCodeVerifier();
   const codeChallenge = computeCodeChallenge(codeVerifier);
   const state = generateState();
-  const redirectUri = `http://localhost:${port}${path62}`;
+  const redirectUri = `http://localhost:${port}${path60}`;
   const authUrl = buildAuthUrl({
     authUrl: opts.authUrl,
     clientId: opts.clientId,
@@ -126794,7 +126635,7 @@ async function runAuthorizationCodeFlow(opts) {
   });
   const codePromise = waitForCallback({
     port,
-    path: path62,
+    path: path60,
     expectedState: state,
     timeoutMs: opts.timeoutMs ?? 3e5,
     ...opts.signal ? { signal: opts.signal } : {}
@@ -126817,8 +126658,6 @@ async function runAuthorizationCodeFlow(opts) {
     codeVerifier
   });
 }
-
-// ../plugin-oauth/dist/oauth/poll-until.js
 async function pollUntil(fn, opts) {
   const state = { intervalMs: opts.intervalMs };
   const leadingWait = opts.leadingWait ?? true;
@@ -126827,28 +126666,39 @@ async function pollUntil(fn, opts) {
   let first = true;
   while (Date.now() < deadline) {
     if (opts.signal?.aborted)
-      throw new Error(`${label3} aborted`);
+      throw abortedError(label3);
     if (!first || leadingWait) {
       const remaining = deadline - Date.now();
       if (remaining <= 0)
         break;
-      await sleep3(Math.min(state.intervalMs, remaining), opts.signal);
+      await sleep3(Math.min(state.intervalMs, remaining), opts.signal, label3);
     }
     first = false;
     const result = await fn(state);
     if ("done" in result)
       return result.done;
   }
-  throw new Error(`${label3} timed out waiting for completion`);
+  throw new MoxxyError({
+    code: "OAUTH_FLOW_TIMEOUT",
+    message: `${label3} timed out waiting for completion`,
+    context: { label: label3, timeout_ms: opts.timeoutMs }
+  });
 }
-function sleep3(ms, signal) {
+function abortedError(label3) {
+  return new MoxxyError({
+    code: "NETWORK_ABORTED",
+    message: `${label3} aborted`,
+    context: { label: label3 }
+  });
+}
+function sleep3(ms, signal, label3) {
   return new Promise((resolve13, reject) => {
     if (signal?.aborted)
-      return reject(new Error("aborted"));
+      return reject(abortedError(label3));
     const t2 = setTimeout(resolve13, ms);
     const onAbort = () => {
       clearTimeout(t2);
-      reject(new Error("aborted"));
+      reject(abortedError(label3));
     };
     signal?.addEventListener("abort", onAbort, { once: true });
   });
@@ -127152,6 +127002,93 @@ async function acquireFileLock(lockPath, staleMs, pollMs, waitMs) {
 function sleep4(ms) {
   return new Promise((resolve13) => setTimeout(resolve13, ms));
 }
+async function refreshAndStore(vault, spec, stored, retried = false) {
+  if (!stored.tokenSet.refreshToken) {
+    throw spec.noRefreshTokenError();
+  }
+  let refreshed;
+  try {
+    refreshed = await refreshAccessToken({
+      tokenUrl: stored.tokenUrl,
+      clientId: stored.clientId,
+      ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
+      refreshToken: stored.tokenSet.refreshToken
+    });
+  } catch (err) {
+    if (!retried && isAuthRejection(err)) {
+      const latest = await readStoredCreds(vault, spec.provider);
+      if (latest?.tokenSet.refreshToken && latest.tokenSet.refreshToken !== stored.tokenSet.refreshToken) {
+        return refreshAndStore(vault, spec, latest, true);
+      }
+    }
+    const net3 = classifyNetworkError(err, { url: stored.tokenUrl, provider: spec.provider });
+    if (net3)
+      throw net3;
+    throw spec.wrapRefreshFailure(err);
+  }
+  const merged = {
+    ...refreshed,
+    refreshToken: refreshed.refreshToken ?? stored.tokenSet.refreshToken
+  };
+  const extras = spec.resolveExtras(merged, stored.extras);
+  await storeTokenSet(vault, spec.provider, merged, {
+    clientId: stored.clientId,
+    ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
+    tokenUrl: stored.tokenUrl,
+    ...extras ? { extras } : {}
+  });
+  return { tokens: merged, extras: extras ?? stored.extras };
+}
+async function ensureFreshTokens(profile, vault, opts = {}) {
+  const stored = await readStoredCreds(vault, profile.id);
+  if (!stored) {
+    throw new MoxxyError({
+      code: "AUTH_NO_CREDENTIALS",
+      message: `No stored OAuth credentials for "${profile.id}".`,
+      hint: `Run \`moxxy login ${profile.id}\` to sign in.`,
+      context: { provider: profile.id }
+    });
+  }
+  if (!opts.force && !isExpired(stored.tokenSet, opts.skewMs)) {
+    return { tokens: stored.tokenSet, extras: stored.extras };
+  }
+  return withCredentialLock(`oauth-${profile.id}`, async () => {
+    const current = await readStoredCreds(vault, profile.id) ?? stored;
+    const rotatedMeanwhile = current.tokenSet.accessToken !== stored.tokenSet.accessToken;
+    if (!isExpired(current.tokenSet, opts.skewMs) && (!opts.force || rotatedMeanwhile)) {
+      return { tokens: current.tokenSet, extras: current.extras };
+    }
+    return refreshAndStore(vault, profileRefreshSpec(profile), current);
+  });
+}
+function profileRefreshSpec(profile) {
+  return {
+    provider: profile.id,
+    noRefreshTokenError: () => new MoxxyError({
+      code: "AUTH_EXPIRED",
+      message: `OAuth token for "${profile.id}" expired and no refresh_token is stored.`,
+      hint: `Re-run \`moxxy login ${profile.id}\` to sign in again.`,
+      context: { provider: profile.id }
+    }),
+    wrapRefreshFailure: (err) => new MoxxyError({
+      code: "AUTH_EXPIRED",
+      message: `Couldn't refresh the OAuth token for "${profile.id}".`,
+      hint: `Re-run \`moxxy login ${profile.id}\` to sign in again.`,
+      context: { provider: profile.id },
+      cause: err
+    }),
+    resolveExtras: (merged, storedExtras) => {
+      const freshAccountId = profile.extractAccountId?.(merged);
+      const freshExtras = profile.extractExtras?.(merged) ?? {};
+      const mergedExtras = { ...storedExtras, ...freshExtras };
+      if (freshAccountId)
+        mergedExtras.account_id = freshAccountId;
+      return mergedExtras;
+    }
+  };
+}
+
+// ../plugin-oauth/dist/tools.js
 var providerNameField = z$1.string().min(1).max(60).describe('Stable provider key used as the vault namespace (e.g. "google", "github", "notion"). Lowercase letters, digits, dot/dash/underscore only.');
 function buildOauthAuthorizeTool(deps) {
   return defineTool({
@@ -127218,11 +127155,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 path62 = input.redirectPath ?? "/callback";
+          const path60 = input.redirectPath ?? "/callback";
           const url2 = buildAuthUrl({
             authUrl: input.authUrl,
             clientId: input.clientId,
-            redirectUri: `http://localhost:${port}${path62}`,
+            redirectUri: `http://localhost:${port}${path60}`,
             scopes: input.scopes,
             codeChallenge: challenge,
             state,
@@ -127291,7 +127228,8 @@ function buildOauthGetTokenTool(deps) {
         if (!isExpired(current.tokenSet) && (!forceRefresh || rotatedMeanwhile)) {
           return current.tokenSet;
         }
-        return refreshAndStoreCreds(deps.vault, provider, current);
+        const { tokens: tokens2 } = await refreshAndStore(deps.vault, toolRefreshSpec(provider), current);
+        return tokens2;
       });
       return summarizeTokens(provider, tokens, {
         includeAccess: true,
@@ -127312,45 +127250,17 @@ function buildOauthClearTool(deps) {
     }
   });
 }
-async function refreshAndStoreCreds(vault, provider, stored, retried = false) {
-  if (!stored.tokenSet.refreshToken) {
-    throw new MoxxyError({
+function toolRefreshSpec(provider) {
+  return {
+    provider,
+    noRefreshTokenError: () => new MoxxyError({
       code: "AUTH_EXPIRED",
       message: `OAuth token for "${provider}" expired and no refresh_token is stored. Re-run oauth_authorize.`,
       context: { provider }
-    });
-  }
-  let refreshed;
-  try {
-    refreshed = await refreshAccessToken({
-      tokenUrl: stored.tokenUrl,
-      clientId: stored.clientId,
-      ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
-      refreshToken: stored.tokenSet.refreshToken
-    });
-  } catch (err) {
-    if (!retried && isAuthRejection(err)) {
-      const latest = await readStoredCreds(vault, provider);
-      if (latest?.tokenSet.refreshToken && latest.tokenSet.refreshToken !== stored.tokenSet.refreshToken) {
-        return refreshAndStoreCreds(vault, provider, latest, true);
-      }
-    }
-    const net3 = classifyNetworkError(err, { url: stored.tokenUrl, provider });
-    if (net3)
-      throw net3;
-    throw err;
-  }
-  const merged = {
-    ...refreshed,
-    refreshToken: refreshed.refreshToken ?? stored.tokenSet.refreshToken
+    }),
+    wrapRefreshFailure: (err) => err,
+    resolveExtras: (_merged, storedExtras) => Object.keys(storedExtras).length > 0 ? { ...storedExtras } : void 0
   };
-  await storeTokenSet(vault, provider, merged, {
-    clientId: stored.clientId,
-    ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
-    tokenUrl: stored.tokenUrl,
-    ...Object.keys(stored.extras).length > 0 ? { extras: stored.extras } : {}
-  });
-  return merged;
 }
 function summarizeTokens(provider, tokens, opts = {}) {
   return {
@@ -127393,7 +127303,7 @@ async function runOauthLogin(profile, ctx) {
 }
 async function runBrowserFlow(profile, ctx) {
   const port = profile.redirect?.port ?? 8765;
-  const path62 = profile.redirect?.path ?? "/callback";
+  const path60 = profile.redirect?.path ?? "/callback";
   const serviceName = profile.displayName ?? profile.id;
   return runAuthorizationCodeFlow({
     authUrl: profile.authUrl,
@@ -127402,7 +127312,7 @@ async function runBrowserFlow(profile, ctx) {
     ...profile.clientSecret ? { clientSecret: profile.clientSecret } : {},
     scopes: profile.scopes,
     redirectPort: port,
-    redirectPath: path62,
+    redirectPath: path60,
     ...profile.extraAuthParams ? { extraAuthParams: profile.extraAuthParams } : {},
     timeoutMs: DEFAULT_BROWSER_TIMEOUT_MS,
     ...ctx.signal ? { signal: ctx.signal } : {},
@@ -127414,7 +127324,7 @@ If your browser doesn't open automatically, paste this URL:
 
   ${url2}
 
-Waiting for callback on http://localhost:${port}${path62} (5 min timeout)\u2026
+Waiting for callback on http://localhost:${port}${path60} (5 min timeout)\u2026
 
 `);
     }
@@ -127458,80 +127368,6 @@ Polling every ${Math.round(init3.intervalMs / 1e3)}s (${Math.round(init3.expires
     ...ctx.signal ? { signal: ctx.signal } : {}
   });
 }
-async function ensureFreshTokens(profile, vault, opts = {}) {
-  const stored = await readStoredCreds(vault, profile.id);
-  if (!stored) {
-    throw new MoxxyError({
-      code: "AUTH_NO_CREDENTIALS",
-      message: `No stored OAuth credentials for "${profile.id}".`,
-      hint: `Run \`moxxy login ${profile.id}\` to sign in.`,
-      context: { provider: profile.id }
-    });
-  }
-  if (!opts.force && !isExpired(stored.tokenSet, opts.skewMs)) {
-    return { tokens: stored.tokenSet, extras: stored.extras };
-  }
-  return withCredentialLock(`oauth-${profile.id}`, async () => {
-    const current = await readStoredCreds(vault, profile.id) ?? stored;
-    const rotatedMeanwhile = current.tokenSet.accessToken !== stored.tokenSet.accessToken;
-    if (!isExpired(current.tokenSet, opts.skewMs) && (!opts.force || rotatedMeanwhile)) {
-      return { tokens: current.tokenSet, extras: current.extras };
-    }
-    return refreshAndStore(profile, vault, current);
-  });
-}
-async function refreshAndStore(profile, vault, stored, retried = false) {
-  if (!stored.tokenSet.refreshToken) {
-    throw new MoxxyError({
-      code: "AUTH_EXPIRED",
-      message: `OAuth token for "${profile.id}" expired and no refresh_token is stored.`,
-      hint: `Re-run \`moxxy login ${profile.id}\` to sign in again.`,
-      context: { provider: profile.id }
-    });
-  }
-  let refreshed;
-  try {
-    refreshed = await refreshAccessToken({
-      tokenUrl: stored.tokenUrl,
-      clientId: stored.clientId,
-      ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
-      refreshToken: stored.tokenSet.refreshToken
-    });
-  } catch (err) {
-    if (!retried && isAuthRejection(err)) {
-      const latest = await readStoredCreds(vault, profile.id);
-      if (latest?.tokenSet.refreshToken && latest.tokenSet.refreshToken !== stored.tokenSet.refreshToken) {
-        return refreshAndStore(profile, vault, latest, true);
-      }
-    }
-    const net3 = classifyNetworkError(err, { url: stored.tokenUrl, provider: profile.id });
-    if (net3)
-      throw net3;
-    throw new MoxxyError({
-      code: "AUTH_EXPIRED",
-      message: `Couldn't refresh the OAuth token for "${profile.id}".`,
-      hint: `Re-run \`moxxy login ${profile.id}\` to sign in again.`,
-      context: { provider: profile.id },
-      cause: err
-    });
-  }
-  const merged = {
-    ...refreshed,
-    refreshToken: refreshed.refreshToken ?? stored.tokenSet.refreshToken
-  };
-  const freshAccountId = profile.extractAccountId?.(merged);
-  const freshExtras = profile.extractExtras?.(merged) ?? {};
-  const mergedExtras = { ...stored.extras, ...freshExtras };
-  if (freshAccountId)
-    mergedExtras.account_id = freshAccountId;
-  await storeTokenSet(vault, profile.id, merged, {
-    clientId: stored.clientId,
-    ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
-    tokenUrl: stored.tokenUrl,
-    extras: mergedExtras
-  });
-  return { tokens: merged, extras: mergedExtras };
-}
 function openaiDeviceFlow(opts) {
   const initUrl = `${opts.issuer}/api/accounts/deviceauth/usercode`;
   const pollUrl = `${opts.issuer}/api/accounts/deviceauth/token`;
@@ -127553,8 +127389,10 @@ function openaiDeviceFlow(opts) {
         });
       }
       const data = await res.json();
-      const intervalSec = Math.max(typeof data.interval === "string" ? parseInt(data.interval, 10) : data.interval ?? 5, 1);
-      const expiresInSec = typeof data.expires_in === "string" ? parseInt(data.expires_in, 10) : data.expires_in ?? 600;
+      const rawInterval = typeof data.interval === "string" ? parseInt(data.interval, 10) : data.interval;
+      const intervalSec = Math.max(Number.isFinite(rawInterval) ? rawInterval : 5, 1);
+      const rawExpiresIn = typeof data.expires_in === "string" ? parseInt(data.expires_in, 10) : data.expires_in;
+      const expiresInSec = Number.isFinite(rawExpiresIn) ? rawExpiresIn : 600;
       return {
         userCode: data.user_code,
         verificationUri: opts.verificationUri,
@@ -127576,30 +127414,15 @@ function openaiDeviceFlow(opts) {
       });
       if (res.ok) {
         const data = await res.json();
-        const exchangeRes = await fetch(opts.tokenUrl, {
-          method: "POST",
-          headers: { "Content-Type": "application/x-www-form-urlencoded" },
-          body: new URLSearchParams({
-            grant_type: "authorization_code",
+        return {
+          done: await exchangeCodeForToken({
+            tokenUrl: opts.tokenUrl,
             code: data.authorization_code,
-            redirect_uri: exchangeRedirectUri,
-            client_id: clientId,
-            code_verifier: data.code_verifier
-          }).toString()
-        });
-        if (!exchangeRes.ok) {
-          const text2 = await exchangeRes.text().catch(() => "");
-          throw classifyHttpStatus(exchangeRes.status, {
-            url: opts.tokenUrl,
-            body: text2 || exchangeRes.statusText
-          }) ?? new MoxxyError({
-            code: "AUTH_INVALID",
-            message: `Token endpoint returned ${exchangeRes.status}: ${text2 || exchangeRes.statusText}`,
-            context: { status: exchangeRes.status, url: opts.tokenUrl }
-          });
-        }
-        const json = await exchangeRes.json();
-        return { done: parseTokenResponse(json) };
+            redirectUri: exchangeRedirectUri,
+            clientId,
+            codeVerifier: data.code_verifier
+          })
+        };
       }
       if (res.status === 403 || res.status === 404) {
         return { pending: true };
@@ -127841,7 +127664,7 @@ function buildCodexHeaders(tokens, sessionId) {
 }
 
 // ../plugin-provider-openai-codex/dist/codex/sse-event-handler.js
-function handleSseEvent(ev, pending, emitReasoning = false) {
+function handleSseEvent(ev, pending2, emitReasoning = false) {
   const type = ev.type ?? "";
   if (type === "response.output_text.delta" && typeof ev.delta === "string" && ev.delta) {
     return { events: [{ type: "text_delta", delta: ev.delta }] };
@@ -127853,7 +127676,7 @@ function handleSseEvent(ev, pending, emitReasoning = false) {
     return ev.item.encrypted_content ? { events: [{ type: "reasoning_signature", encrypted: ev.item.encrypted_content }] } : {};
   }
   if (type === "response.output_item.added" && ev.item?.type === "function_call") {
-    const id = ev.item.id ?? ev.item.call_id ?? `call_${pending.size}`;
+    const id = ev.item.id ?? ev.item.call_id ?? `call_${pending2.size}`;
     const callId = ev.item.call_id ?? id;
     const name = ev.item.name ?? "";
     const entry = {
@@ -127863,7 +127686,7 @@ function handleSseEvent(ev, pending, emitReasoning = false) {
       args: ev.item.arguments ?? "",
       emittedStart: false
     };
-    pending.set(id, entry);
+    pending2.set(id, entry);
     if (name) {
       entry.emittedStart = true;
       return { events: [{ type: "tool_use_start", id: callId, name }] };
@@ -127872,7 +127695,7 @@ function handleSseEvent(ev, pending, emitReasoning = false) {
   }
   if (type === "response.function_call_arguments.delta") {
     const id = ev.item_id ?? ev.call_id ?? "";
-    const entry = pending.get(id);
+    const entry = pending2.get(id);
     const delta = ev.delta ?? "";
     if (entry && typeof delta === "string") {
       entry.args += delta;
@@ -127890,10 +127713,10 @@ function handleSseEvent(ev, pending, emitReasoning = false) {
   }
   if (type === "response.function_call_arguments.done") {
     const id = ev.item_id ?? ev.call_id ?? "";
-    const entry = pending.get(id);
+    const entry = pending2.get(id);
     if (!entry)
       return {};
-    pending.delete(id);
+    pending2.delete(id);
     if (typeof ev.arguments === "string" && ev.arguments)
       entry.args = ev.arguments;
     let input = {};
@@ -127950,7 +127773,7 @@ async function* consumeResponsesSse(body, signal, emitReasoning = false) {
   const reader = body.getReader();
   const decoder = new TextDecoder("utf-8");
   let buffer = "";
-  const pending = /* @__PURE__ */ new Map();
+  const pending2 = /* @__PURE__ */ new Map();
   let stopReason = "end_turn";
   let usageIn = 0;
   let usageOut = 0;
@@ -127985,7 +127808,7 @@ async function* consumeResponsesSse(body, signal, emitReasoning = false) {
             } catch {
               continue;
             }
-            const result = handleSseEvent(json, pending, emitReasoning);
+            const result = handleSseEvent(json, pending2, emitReasoning);
             if (result.events) {
               for (const ev of result.events) {
                 if (ev.type === "tool_use_end")
@@ -128013,7 +127836,7 @@ async function* consumeResponsesSse(body, signal, emitReasoning = false) {
     }
     if (errored)
       return;
-    for (const entry of pending.values()) {
+    for (const entry of pending2.values()) {
       if (entry.emittedStart) {
         let input = {};
         if (entry.args) {
@@ -128581,11 +128404,14 @@ var claudeCodePlugin = definePlugin({
 // ../plugin-provider-zai/dist/models.js
 var glmModels = [
   // GLM-5 family: coding-first frontier. 5.2 carries a usable 1M context.
-  { id: "glm-5.2", contextWindow: 1e6, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true },
-  { id: "glm-5.1", contextWindow: 2e5, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true },
-  { id: "glm-5", contextWindow: 2e5, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true },
+  // These are reasoning models; the shared OpenAIProvider already streams their
+  // `reasoning_content` deltas, so supportsReasoning gates reasoning_effort +
+  // reasoning-stream surfacing on (without it the capability is dead upstream).
+  { id: "glm-5.2", contextWindow: 1e6, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true, supportsReasoning: true },
+  { id: "glm-5.1", contextWindow: 2e5, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true, supportsReasoning: true },
+  { id: "glm-5", contextWindow: 2e5, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true, supportsReasoning: true },
   // GLM-4.6: prior flagship, 200k context, strong agentic-coding scores.
-  { id: "glm-4.6", contextWindow: 2e5, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true },
+  { id: "glm-4.6", contextWindow: 2e5, maxOutputTokens: 128e3, supportsTools: true, supportsStreaming: true, supportsReasoning: true },
   // GLM-4.5 tier: general (4.5), lightweight (-air), free/fast (-flash).
   { id: "glm-4.5", contextWindow: 131072, maxOutputTokens: 98304, supportsTools: true, supportsStreaming: true },
   { id: "glm-4.5-air", contextWindow: 131072, maxOutputTokens: 98304, supportsTools: true, supportsStreaming: true },
@@ -128666,13 +128492,16 @@ var xaiPlugin = definePlugin({
 
 // ../plugin-provider-google/dist/models.js
 var geminiModels = [
-  // Gemini 3 family: current frontier.
-  { id: "gemini-3-pro", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true },
-  { id: "gemini-3-flash", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true },
-  // Gemini 2.5 family: widely available, strong price/performance.
-  { id: "gemini-2.5-pro", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true, supportsDocuments: true },
-  { id: "gemini-2.5-flash", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true },
-  { id: "gemini-2.5-flash-lite", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true }
+  // Gemini 3 family: current frontier. Reasoning models that natively accept
+  // PDF document input (supportsDocuments) so the desktop ships raw bytes
+  // instead of degrading to extracted text.
+  { id: "gemini-3-pro", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true, supportsDocuments: true, supportsReasoning: true },
+  { id: "gemini-3-flash", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true, supportsDocuments: true, supportsReasoning: true },
+  // Gemini 2.5 family: widely available, strong price/performance. pro/flash
+  // are reasoning models; all three take native PDFs.
+  { id: "gemini-2.5-pro", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true, supportsDocuments: true, supportsReasoning: true },
+  { id: "gemini-2.5-flash", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true, supportsDocuments: true, supportsReasoning: true },
+  { id: "gemini-2.5-flash-lite", contextWindow: 1e6, maxOutputTokens: 65536, supportsTools: true, supportsStreaming: true, supportsImages: true, supportsDocuments: true }
 ];
 
 // ../plugin-provider-google/dist/index.js
@@ -128722,8 +128551,10 @@ var localPlugin = definePlugin({
   version: "0.0.0",
   providers: [localProviderDef]
 });
-var WHISPER_PROVIDER_ID = "openai";
-var DEFAULT_FILENAMES = {
+
+// ../plugin-stt-whisper/dist/audio.js
+var MOXXY_PCM16_24KHZ_MIME = "audio/x-moxxy-pcm16-24khz";
+var WHISPER_FILENAME_BY_MIME = {
   "audio/ogg": "audio.ogg",
   "audio/opus": "audio.opus",
   "audio/mpeg": "audio.mp3",
@@ -128735,6 +128566,59 @@ var DEFAULT_FILENAMES = {
   "audio/mp4": "audio.mp4",
   "audio/flac": "audio.flac"
 };
+function normalizeWhisperUpload(audio, mimeType, filenamePrefix) {
+  const bytes = audio instanceof Uint8Array ? audio : new Uint8Array(audio);
+  const mt3 = mimeType || "audio/wav";
+  if (mt3 === MOXXY_PCM16_24KHZ_MIME) {
+    return {
+      bytes: pcm16MonoToWav(bytes, 24e3),
+      mimeType: "audio/wav",
+      filename: rename(filenamePrefix, "wav") ?? "audio.wav"
+    };
+  }
+  const defaultName = WHISPER_FILENAME_BY_MIME[mt3] ?? "audio.bin";
+  return {
+    bytes,
+    mimeType: mt3,
+    filename: rename(filenamePrefix, extOf(defaultName)) ?? defaultName
+  };
+}
+function rename(prefix, ext) {
+  return prefix ? `${prefix}.${ext}` : void 0;
+}
+function extOf(filename) {
+  const dot = filename.lastIndexOf(".");
+  return dot >= 0 ? filename.slice(dot + 1) : "bin";
+}
+function pcm16MonoToWav(pcm, sampleRate = 24e3) {
+  const data = pcm instanceof Uint8Array ? pcm : new Uint8Array(pcm);
+  const headerBytes = 44;
+  const wav = new Uint8Array(headerBytes + data.byteLength);
+  const view = new DataView(wav.buffer);
+  writeAscii(wav, 0, "RIFF");
+  view.setUint32(4, 36 + data.byteLength, true);
+  writeAscii(wav, 8, "WAVE");
+  writeAscii(wav, 12, "fmt ");
+  view.setUint32(16, 16, true);
+  view.setUint16(20, 1, true);
+  view.setUint16(22, 1, true);
+  view.setUint32(24, sampleRate, true);
+  view.setUint32(28, sampleRate * 2, true);
+  view.setUint16(32, 2, true);
+  view.setUint16(34, 16, true);
+  writeAscii(wav, 36, "data");
+  view.setUint32(40, data.byteLength, true);
+  wav.set(data, headerBytes);
+  return wav;
+}
+function writeAscii(target, offset, value) {
+  for (let i2 = 0; i2 < value.length; i2 += 1) {
+    target[offset + i2] = value.charCodeAt(i2);
+  }
+}
+
+// ../plugin-stt-whisper/dist/whisper.js
+var WHISPER_PROVIDER_ID = "openai";
 var WhisperTranscriber = class {
   name;
   client;
@@ -128750,10 +128634,8 @@ var WhisperTranscriber = class {
     });
   }
   async transcribe(audio, opts = {}) {
-    const bytes = audio instanceof Uint8Array ? audio : new Uint8Array(audio);
-    const mimeType = opts.mimeType ?? "audio/ogg";
-    const filename = DEFAULT_FILENAMES[mimeType] ?? "audio.bin";
-    const file = new File([bytes], filename, { type: mimeType });
+    const upload = normalizeWhisperUpload(audio, opts.mimeType ?? "audio/ogg");
+    const file = new File([upload.bytes], upload.filename, { type: upload.mimeType });
     const language = opts.language ?? this.defaultLanguage;
     if (this.model === "whisper-1") {
       const response2 = await this.run(() => this.client.audio.transcriptions.create({
@@ -128817,71 +128699,6 @@ var WhisperTranscriber = class {
   }
 };
 
-// ../plugin-stt-whisper/dist/audio.js
-var MOXXY_PCM16_24KHZ_MIME = "audio/x-moxxy-pcm16-24khz";
-var WHISPER_FILENAME_BY_MIME = {
-  "audio/ogg": "audio.ogg",
-  "audio/opus": "audio.opus",
-  "audio/mpeg": "audio.mp3",
-  "audio/mp3": "audio.mp3",
-  "audio/wav": "audio.wav",
-  "audio/x-wav": "audio.wav",
-  "audio/webm": "audio.webm",
-  "audio/m4a": "audio.m4a",
-  "audio/mp4": "audio.mp4",
-  "audio/flac": "audio.flac"
-};
-function normalizeWhisperUpload(audio, mimeType, filenamePrefix) {
-  const bytes = audio instanceof Uint8Array ? audio : new Uint8Array(audio);
-  const mt3 = mimeType || "audio/wav";
-  if (mt3 === MOXXY_PCM16_24KHZ_MIME) {
-    return {
-      bytes: pcm16MonoToWav(bytes, 24e3),
-      mimeType: "audio/wav",
-      filename: rename(filenamePrefix, "wav") ?? "audio.wav"
-    };
-  }
-  const defaultName = WHISPER_FILENAME_BY_MIME[mt3] ?? "audio.bin";
-  return {
-    bytes,
-    mimeType: mt3,
-    filename: rename(filenamePrefix, extOf(defaultName)) ?? defaultName
-  };
-}
-function rename(prefix, ext) {
-  return prefix ? `${prefix}.${ext}` : void 0;
-}
-function extOf(filename) {
-  const dot = filename.lastIndexOf(".");
-  return dot >= 0 ? filename.slice(dot + 1) : "bin";
-}
-function pcm16MonoToWav(pcm, sampleRate = 24e3) {
-  const data = pcm instanceof Uint8Array ? pcm : new Uint8Array(pcm);
-  const headerBytes = 44;
-  const wav = new Uint8Array(headerBytes + data.byteLength);
-  const view = new DataView(wav.buffer);
-  writeAscii(wav, 0, "RIFF");
-  view.setUint32(4, 36 + data.byteLength, true);
-  writeAscii(wav, 8, "WAVE");
-  writeAscii(wav, 12, "fmt ");
-  view.setUint32(16, 16, true);
-  view.setUint16(20, 1, true);
-  view.setUint16(22, 1, true);
-  view.setUint32(24, sampleRate, true);
-  view.setUint32(28, sampleRate * 2, true);
-  view.setUint16(32, 2, true);
-  view.setUint16(34, 16, true);
-  writeAscii(wav, 36, "data");
-  view.setUint32(40, data.byteLength, true);
-  wav.set(data, headerBytes);
-  return wav;
-}
-function writeAscii(target, offset, value) {
-  for (let i2 = 0; i2 < value.length; i2 += 1) {
-    target[offset + i2] = value.charCodeAt(i2);
-  }
-}
-
 // ../plugin-stt-whisper/dist/index.js
 function buildWhisperPlugin(opts = {}) {
   const model = opts.model ?? "whisper-1";
@@ -129856,11 +129673,31 @@ var builtinToolsPlugin = definePlugin({
   tools: [...builtinTools]
 });
 var DEFAULT_MODE_NAME = "default";
+var MAX_CONSECUTIVE_RETRIES = 6;
+function retryBackoffMs(attempt) {
+  const base2 = 500;
+  const cap = 3e4;
+  return Math.min(cap, base2 * 2 ** Math.max(0, attempt - 1));
+}
+var sleepImpl2 = (ms, signal) => new Promise((resolve13) => {
+  if (signal.aborted)
+    return resolve13();
+  const timer = setTimeout(() => {
+    signal.removeEventListener("abort", onAbort);
+    resolve13();
+  }, ms);
+  const onAbort = () => {
+    clearTimeout(timer);
+    resolve13();
+  };
+  signal.addEventListener("abort", onAbort, { once: true });
+});
 async function* runDefaultMode(ctx) {
   const maxIterations = ctx.maxIterations ?? 500;
   const detector = createStuckLoopDetector();
   const MAX_REACTIVE_COMPACTIONS = 2;
   let reactiveCompactions = 0;
+  let consecutiveRetries = 0;
   for (let iteration = 1; iteration <= maxIterations; iteration++) {
     if (ctx.signal.aborted) {
       yield await ctx.emit({
@@ -129920,19 +129757,52 @@ async function* runDefaultMode(ctx) {
           continue;
         }
       }
+      if (!error2.retryable) {
+        yield await ctx.emit({
+          type: "error",
+          sessionId: ctx.sessionId,
+          turnId: ctx.turnId,
+          source: "system",
+          kind: "fatal",
+          message: error2.message
+        });
+        return;
+      }
+      consecutiveRetries += 1;
       yield await ctx.emit({
         type: "error",
         sessionId: ctx.sessionId,
         turnId: ctx.turnId,
         source: "system",
-        kind: error2.retryable ? "retryable" : "fatal",
+        kind: "retryable",
         message: error2.message
       });
-      if (!error2.retryable)
+      if (consecutiveRetries >= MAX_CONSECUTIVE_RETRIES) {
+        yield await ctx.emit({
+          type: "error",
+          sessionId: ctx.sessionId,
+          turnId: ctx.turnId,
+          source: "system",
+          kind: "fatal",
+          message: `provider kept returning a retryable error ${consecutiveRetries} times in a row (last: ${error2.message}); giving up rather than hammering the provider.`
+        });
+        return;
+      }
+      await sleepImpl2(retryBackoffMs(consecutiveRetries), ctx.signal);
+      if (ctx.signal.aborted) {
+        yield await ctx.emit({
+          type: "abort",
+          sessionId: ctx.sessionId,
+          turnId: ctx.turnId,
+          source: "system",
+          reason: "signal aborted during retry back-off"
+        });
         return;
+      }
       continue;
     }
     reactiveCompactions = 0;
+    consecutiveRetries = 0;
     if (reasoning) {
       yield await ctx.emit({
         type: "reasoning_message",
@@ -131280,16 +131150,16 @@ var TelegramPermissionResolver = class {
   }
   /** Called by the bot when a permission callback button is clicked. */
   resolvePending(callId, decision) {
-    const pending = this.pending.get(callId);
-    if (!pending)
+    const pending2 = this.pending.get(callId);
+    if (!pending2)
       return false;
     this.pending.delete(callId);
-    pending.resolve(decision);
+    pending2.resolve(decision);
     return true;
   }
   abortAll(reason = "channel closed") {
-    for (const pending of this.pending.values()) {
-      pending.resolve({ mode: "deny", reason });
+    for (const pending2 of this.pending.values()) {
+      pending2.resolve({ mode: "deny", reason });
     }
     this.pending.clear();
   }
@@ -131328,26 +131198,26 @@ var TelegramApprovalResolver = class {
   }
   /** Resolve directly with an option id (no text). */
   resolvePending(id, optionId) {
-    const pending = this.pending.get(id);
-    if (!pending)
+    const pending2 = this.pending.get(id);
+    if (!pending2)
       return false;
     this.pending.delete(id);
-    pending.resolve({ optionId });
+    pending2.resolve({ optionId });
     return true;
   }
   /** Resolve with an option id AND a free-text follow-up. */
   resolvePendingWithText(id, optionId, text) {
-    const pending = this.pending.get(id);
-    if (!pending)
+    const pending2 = this.pending.get(id);
+    if (!pending2)
       return false;
     this.pending.delete(id);
-    pending.resolve({ optionId, text });
+    pending2.resolve({ optionId, text });
     return true;
   }
   abortAll(reason = "channel closed") {
-    for (const pending of this.pending.values()) {
-      pending.resolve({
-        optionId: pending.request.defaultOptionId ?? pending.request.options[0]?.id ?? "cancel",
+    for (const pending2 of this.pending.values()) {
+      pending2.resolve({
+        optionId: pending2.request.defaultOptionId ?? pending2.request.options[0]?.id ?? "cancel",
         text: reason
       });
     }
@@ -131555,17 +131425,100 @@ function previewArgs(input) {
     return truncJson(input);
   }
 }
+function tagStackAt(html, idx, seed = []) {
+  const stack = seed.slice();
+  let i2 = 0;
+  let insideTag = false;
+  let insideEntity = false;
+  while (i2 < idx) {
+    const ch = html[i2];
+    if (ch === "<") {
+      const end = html.indexOf(">", i2);
+      if (end === -1) {
+        insideTag = true;
+        break;
+      }
+      if (end >= idx) {
+        insideTag = true;
+        break;
+      }
+      const raw = html.slice(i2, end + 1);
+      const m3 = /^<\s*(\/?)\s*([a-zA-Z][a-zA-Z0-9]*)/.exec(raw);
+      if (m3) {
+        const closing = m3[1] === "/";
+        const name = m3[2].toLowerCase();
+        if (closing) {
+          for (let s2 = stack.length - 1; s2 >= 0; s2--) {
+            if (stack[s2].name === name) {
+              stack.splice(s2, 1);
+              break;
+            }
+          }
+        } else if (!raw.endsWith("/>")) {
+          stack.push({ name, open: raw });
+        }
+      }
+      i2 = end + 1;
+      continue;
+    }
+    if (ch === "&") {
+      const semi = html.indexOf(";", i2);
+      if (semi !== -1 && semi - i2 <= 12 && /^&[a-zA-Z0-9#]+;$/.test(html.slice(i2, semi + 1))) {
+        if (semi >= idx) {
+          insideEntity = true;
+          break;
+        }
+        i2 = semi + 1;
+        continue;
+      }
+    }
+    i2 += 1;
+  }
+  return { stack, insideTag, insideEntity };
+}
 function splitForTelegram(text, limit2 = TELEGRAM_MESSAGE_LIMIT) {
+  if (text.length <= limit2)
+    return text ? [text] : [];
   const out = [];
+  let carry = [];
   let remaining = text;
   while (remaining.length > limit2) {
-    const cut = remaining.lastIndexOf("\n", limit2);
-    const idx = cut > 0 ? cut : limit2;
-    out.push(remaining.slice(0, idx));
+    const carryLen = carry.reduce((n2, t2) => n2 + t2.open.length, 0);
+    const budget = limit2 - carryLen;
+    let idx = Math.min(budget, remaining.length);
+    const nl = remaining.lastIndexOf("\n", idx);
+    if (nl > 0)
+      idx = nl;
+    let info = tagStackAt(remaining, idx, carry);
+    while ((info.insideTag || info.insideEntity) && idx > 1) {
+      idx -= 1;
+      info = tagStackAt(remaining, idx, carry);
+    }
+    if (info.insideTag || info.insideEntity) {
+      idx = Math.min(budget, remaining.length);
+      while (idx < remaining.length) {
+        const probe = tagStackAt(remaining, idx, carry);
+        if (!probe.insideTag && !probe.insideEntity) {
+          info = probe;
+          break;
+        }
+        idx += 1;
+      }
+      if (idx >= remaining.length)
+        info = tagStackAt(remaining, remaining.length, carry);
+    }
+    if (idx <= 0) {
+      idx = remaining.length;
+      info = tagStackAt(remaining, idx, carry);
+    }
+    const closeTags = info.stack.slice().reverse().map((t2) => `</${t2.name}>`).join("");
+    const head = carry.map((t2) => t2.open).join("") + remaining.slice(0, idx) + closeTags;
+    out.push(head);
+    carry = info.stack;
     remaining = remaining.slice(idx);
   }
   if (remaining)
-    out.push(remaining);
+    out.push(carry.map((t2) => t2.open).join("") + remaining);
   return out;
 }
 
@@ -132287,12 +132240,12 @@ async function handleAppr(ctx, data, state, cb) {
     return;
   const approvalId = data.slice(5, idx);
   const optionId = data.slice(idx + 1);
-  const pending = state.approvalResolver.getPending(approvalId);
-  if (!pending) {
+  const pending2 = state.approvalResolver.getPending(approvalId);
+  if (!pending2) {
     await ctx.answerCallbackQuery({ text: "no pending approval" });
     return;
   }
-  const option = pending.request.options.find((o2) => o2.id === optionId);
+  const option = pending2.request.options.find((o2) => o2.id === optionId);
   if (!option) {
     await ctx.answerCallbackQuery({ text: "unknown option" });
     return;
@@ -132349,7 +132302,7 @@ Run \`${cmd}\` then restart moxxy.`, { parse_mode: "Markdown" });
       session.providers.setActive(providerId, cfg);
     }
     cb.setActiveModelOverride(modelId);
-    void savePreferences({ providerName: providerId, model: modelId });
+    await savePreferences({ providerName: providerId, model: modelId });
     await ctx.answerCallbackQuery({ text: `\u2192 ${providerId}:${modelId}` });
     if (ctx.callbackQuery?.message) {
       try {
@@ -132371,7 +132324,7 @@ async function handleMode(ctx, data, session) {
   }
   try {
     session.modes.setActive(modeName);
-    void savePreferences({ mode: modeName });
+    await savePreferences({ mode: modeName });
     await ctx.answerCallbackQuery({ text: `mode \u2192 ${modeName}` });
     if (ctx.callbackQuery?.message) {
       try {
@@ -132701,7 +132654,6 @@ var TelegramChannel = class {
       yolo: this.yolo,
       busy: this.busy,
       turnController: this.turnController,
-      awaitingApprovalText: this.awaitingApprovalText,
       handle: this.handle
     }, {
       pairing: this.pairing,
@@ -134170,17 +134122,23 @@ 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 = [];
   try {
     for await (const event of ctx.session.runTurn(body.prompt, {
       ...body.model ? { model: body.model } : {},
-      ...body.systemPrompt ? { systemPrompt: body.systemPrompt } : {}
+      ...body.systemPrompt ? { systemPrompt: body.systemPrompt } : {},
+      signal: controller.signal
     })) {
       events.push(event);
     }
   } 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 : "";
@@ -134240,17 +134198,23 @@ 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 = [];
   try {
     for await (const event of ctx.session.runTurn(transcript, {
       ...model ? { model } : {},
-      ...systemPrompt ? { systemPrompt } : {}
+      ...systemPrompt ? { systemPrompt } : {},
+      signal: controller.signal
     })) {
       events.push(event);
     }
   } 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 : "";
@@ -134354,9 +134318,21 @@ var HttpChannel = class {
       }
     });
     this.server = server;
+    let rejectRunning;
+    let resolveRunning;
+    const running = new Promise((resolve13, reject) => {
+      resolveRunning = resolve13;
+      rejectRunning = reject;
+    });
     const listening = new Promise((resolve13, reject) => {
-      server.once("error", reject);
+      const onListenError = (err) => reject(err);
+      server.once("error", onListenError);
       server.listen(this.port, this.host, () => {
+        server.off("error", onListenError);
+        server.on("error", (err) => {
+          this.logger?.warn?.("http server error", { err: String(err) });
+          rejectRunning(err);
+        });
         const addr = server.address();
         this.boundPortValue = typeof addr === "object" && addr ? addr.port : this.port;
         this.logger?.info?.("http channel listening", {
@@ -134368,9 +134344,7 @@ var HttpChannel = class {
       });
     });
     await listening;
-    const running = new Promise((resolve13) => {
-      server.once("close", () => resolve13());
-    });
+    server.once("close", () => resolveRunning());
     return {
       running,
       stop: async () => {
@@ -134448,8 +134422,8 @@ var EventProjector = class {
         if (event.ok && isFileDiffDisplay(display)) {
           return [{ kind: "file-diff", turnId: String(event.turnId), display }];
         }
-        const pending = this.presentCalls.get(String(event.callId));
-        if (!pending)
+        const pending2 = this.presentCalls.get(String(event.callId));
+        if (!pending2)
           return [];
         this.presentCalls.delete(String(event.callId));
         if (!event.ok) {
@@ -134470,7 +134444,7 @@ var EventProjector = class {
             replaces,
             ...name ? { name } : {},
             doc,
-            ...pending.fallbackText ? { fallbackText: pending.fallbackText } : {}
+            ...pending2.fallbackText ? { fallbackText: pending2.fallbackText } : {}
           }
         ];
       }
@@ -135431,15 +135405,33 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
     }
   };
 }
-function connectUnixSocket(socketPath) {
+var DEFAULT_CONNECT_TIMEOUT_MS = 1e4;
+function connectUnixSocket(socketPath, opts = {}) {
+  const timeoutMs = opts.timeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
   return new Promise((resolve13, reject) => {
     const socket = net.connect(socketPath);
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled)
+        return;
+      settled = true;
+      socket.destroy(new Error(`connect timeout after ${timeoutMs}ms: ${socketPath}`));
+      reject(new Error(`connect timeout after ${timeoutMs}ms: ${socketPath}`));
+    }, timeoutMs);
     const onError2 = (err) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
       socket.destroy();
       reject(err);
     };
     socket.once("error", onError2);
     socket.once("connect", () => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
       socket.removeListener("error", onError2);
       resolve13(new NdjsonTransport(socket));
     });
@@ -137757,43 +137749,55 @@ var MobileChannel = class {
     this.host = host;
     host.register();
     host.wire();
-    const localOrigins = advertisedOrigins(this.bindHost, this.port);
-    const server = await startWsBridge(bus, {
-      port: this.port,
-      host: this.bindHost,
-      authToken: this.token,
-      allowedOrigins: localOrigins,
-      // Back-compat ONLY: the QR this channel prints embeds the token as `?t=`
-      // (pairing payload); current apps strip it and authenticate via the
-      // Sec-WebSocket-Protocol bearer entry, but older installed builds still
-      // connect with the token in the WS URL.
-      allowQueryToken: true
-    });
-    this.server = server;
-    this.logger?.info?.("mobile channel listening", { address: server.address });
-    let tunnelUrl = null;
-    const provider = tunnelProviderFor(this.tunnelChoice);
-    if (provider) {
-      try {
-        this.tunnel = await provider.open({ port: this.port, host: this.bindHost });
-        tunnelUrl = this.tunnel.url;
-        server.setAllowedOrigins([...localOrigins, connectUrlOrigin(tunnelUrl)]);
-        this.logger?.info?.("mobile tunnel open", { provider: provider.name, url: tunnelUrl });
-      } catch (err) {
-        this.logger?.warn?.("mobile tunnel failed; using the local URL", {
-          provider: provider.name,
-          err: String(err)
-        });
+    try {
+      const localOrigins = advertisedOrigins(this.bindHost, this.port);
+      const server = await startWsBridge(bus, {
+        port: this.port,
+        host: this.bindHost,
+        authToken: this.token,
+        allowedOrigins: localOrigins,
+        // Back-compat ONLY: the QR this channel prints embeds the token as `?t=`
+        // (pairing payload); current apps strip it and authenticate via the
+        // Sec-WebSocket-Protocol bearer entry, but older installed builds still
+        // connect with the token in the WS URL.
+        allowQueryToken: true
+      });
+      this.server = server;
+      this.logger?.info?.("mobile channel listening", { address: server.address });
+      let tunnelUrl = null;
+      const provider = tunnelProviderFor(this.tunnelChoice);
+      if (provider) {
+        try {
+          this.tunnel = await provider.open({ port: this.port, host: this.bindHost });
+          tunnelUrl = this.tunnel.url;
+          server.setAllowedOrigins([...localOrigins, connectUrlOrigin(tunnelUrl)]);
+          this.logger?.info?.("mobile tunnel open", { provider: provider.name, url: tunnelUrl });
+        } catch (err) {
+          this.logger?.warn?.("mobile tunnel failed; using the local URL", {
+            provider: provider.name,
+            err: String(err)
+          });
+        }
       }
+      const connectUrl = buildConnectUrl({
+        tunnelUrl,
+        localHost: advertisedHost(this.bindHost),
+        port: this.port,
+        token: this.token
+      });
+      const loopbackOnly = !tunnelUrl && isLoopbackHost(this.bindHost);
+      await printConnectInfo(connectUrl, this.token, loopbackOnly ? "Bound to loopback \u2014 this QR only works on THIS machine (e.g. an iOS/Android\n  simulator). For a real phone: opt in to a LAN bind with MOXXY_MOBILE_HOST=0.0.0.0\n  (or channels.mobile.bindHost in moxxy.config.ts), or use a tunnel\n  (channels.mobile.tunnel: 'cloudflared' | 'ngrok', or MOXXY_MOBILE_TUNNEL)." : void 0);
+    } catch (err) {
+      host.dispose();
+      if (this.tunnel) {
+        await this.tunnel.close().catch(() => void 0);
+        this.tunnel = null;
+      }
+      await this.server?.close().catch(() => void 0);
+      this.server = null;
+      this.host = null;
+      throw err;
     }
-    const connectUrl = buildConnectUrl({
-      tunnelUrl,
-      localHost: advertisedHost(this.bindHost),
-      port: this.port,
-      token: this.token
-    });
-    const loopbackOnly = !tunnelUrl && isLoopbackHost(this.bindHost);
-    await printConnectInfo(connectUrl, this.token, loopbackOnly ? "Bound to loopback \u2014 this QR only works on THIS machine (e.g. an iOS/Android\n  simulator). For a real phone: opt in to a LAN bind with MOXXY_MOBILE_HOST=0.0.0.0\n  (or channels.mobile.bindHost in moxxy.config.ts), or use a tunnel\n  (channels.mobile.tunnel: 'cloudflared' | 'ngrok', or MOXXY_MOBILE_TUNNEL)." : void 0);
     let resolveRunning;
     const running = new Promise((resolve13) => {
       resolveRunning = resolve13;
@@ -138700,17 +138704,27 @@ async function createTerminalProcess(cwd2) {
 
 // ../plugin-terminal/dist/terminal.js
 var shared = /* @__PURE__ */ new Map();
-async function getSharedTerminal(cwd2) {
+var pending = /* @__PURE__ */ new Map();
+async function getSharedTerminal(cwd2, create2 = createTerminalProcess) {
   const existing = shared.get(cwd2);
   if (existing && existing.alive)
     return existing;
-  const proc = await createTerminalProcess(cwd2);
-  shared.set(cwd2, proc);
-  proc.onExit(() => {
-    if (shared.get(cwd2) === proc)
-      shared.delete(cwd2);
+  const inFlight = pending.get(cwd2);
+  if (inFlight)
+    return inFlight;
+  const promise = (async () => {
+    const proc = await create2(cwd2);
+    shared.set(cwd2, proc);
+    proc.onExit(() => {
+      if (shared.get(cwd2) === proc)
+        shared.delete(cwd2);
+    });
+    return proc;
+  })().finally(() => {
+    pending.delete(cwd2);
   });
-  return proc;
+  pending.set(cwd2, promise);
+  return promise;
 }
 function closeAllTerminals() {
   for (const proc of shared.values())
@@ -139502,7 +139516,8 @@ function buildProviderAdminPlugin(opts) {
             });
           }
           const def = buildProviderDef(entry);
-          const wasRegistered = providerRegistry.list().some((p3) => p3.name === entry.name);
+          const prevDef = providerRegistry.list().find((p3) => p3.name === entry.name);
+          const wasRegistered = prevDef !== void 0;
           if (wasRegistered)
             providerRegistry.replace(def);
           else
@@ -139510,7 +139525,10 @@ function buildProviderAdminPlugin(opts) {
           try {
             await upsertStoredProvider(entry, configPath);
           } catch (err) {
-            providerRegistry.unregister(entry.name);
+            if (wasRegistered && prevDef)
+              providerRegistry.replace(prevDef);
+            else
+              providerRegistry.unregister(entry.name);
             throw err;
           }
           const vaultKeyName2 = providerApiKeyName(entry);
@@ -139738,6 +139756,8 @@ async function compactSession(session) {
     return { kind: "text", text: "nothing to compact: event log is empty" };
   }
   const providerCtxWindow = resolveActiveContextWindow(s2);
+  const provider = safe(() => s2.providers?.getActive()) ?? void 0;
+  const model = provider?.models[0]?.id;
   try {
     const result = await compactor.compact(events, {
       log: s2.log.asReader ? s2.log.asReader() : s2.log,
@@ -139746,12 +139766,21 @@ async function compactSession(session) {
         estimatedTokens: estimateContextTokens$1(s2.log.asReader ? s2.log.asReader() : s2.log),
         reserveForOutput: 0
       },
-      signal: s2.signal ?? new AbortController().signal
+      signal: s2.signal ?? new AbortController().signal,
+      ...provider ? { provider } : {},
+      ...model ? { model } : {}
     });
     if (result.tokensSaved <= 0 || result.summary.trim().length === 0) {
       return { kind: "text", text: "nothing to compact yet" };
     }
-    await s2.log.append(result);
+    const lastEvent = events[events.length - 1];
+    const emittable = {
+      sessionId: s2.id ?? lastEvent?.sessionId,
+      turnId: lastEvent?.turnId,
+      source: "compactor",
+      ...result
+    };
+    await s2.log.append(emittable);
     const compactedEvents = result.replacedRange[1] - result.replacedRange[0] + 1;
     return {
       kind: "text",
@@ -140328,26 +140357,40 @@ function nextFireTime(expr, after, timeZone) {
   const start = new Date(after.getTime() + 6e4);
   start.setSeconds(0, 0);
   const limit2 = new Date(start.getTime() + 366 * 24 * 60 * 6e4);
+  const explicitZone = !!timeZone && timeZone !== "local";
   const cursor = new Date(start);
   while (cursor <= limit2) {
     const parts = decomposeInZone(cursor, timeZone);
     if (!cron.month.values.has(parts.month)) {
-      jumpToNextMonth(cursor, parts, cron.month.values);
+      if (explicitZone) {
+        cursor.setTime(cursor.getTime() + 6e4);
+      } else {
+        jumpToNextMonth(cursor, parts, cron.month.values);
+      }
       continue;
     }
     const domOk = cron.dom.values.has(parts.dom);
     const dowOk = cron.dow.values.has(parts.dow);
     const dayMatches = cron.dom.restricted && cron.dow.restricted ? domOk || dowOk : domOk && dowOk;
     if (!dayMatches) {
-      jumpToNextDay(cursor);
+      if (explicitZone)
+        cursor.setTime(cursor.getTime() + 6e4);
+      else
+        jumpToNextDay(cursor);
       continue;
     }
     if (!cron.hour.values.has(parts.hour)) {
-      jumpToNextHour(cursor);
+      if (explicitZone)
+        cursor.setTime(cursor.getTime() + 6e4);
+      else
+        jumpToNextHour(cursor);
       continue;
     }
     if (!cron.minute.values.has(parts.minute)) {
-      cursor.setMinutes(cursor.getMinutes() + 1, 0, 0);
+      if (explicitZone)
+        cursor.setTime(cursor.getTime() + 6e4);
+      else
+        cursor.setMinutes(cursor.getMinutes() + 1, 0, 0);
       continue;
     }
     return new Date(cursor.getTime());
@@ -140478,6 +140521,76 @@ async function runSchedule(entry, runner, store, inboxOpts = {}) {
   };
 }
 
+// ../plugin-scheduler/dist/skill-sync.js
+function toEntryDraft(skill) {
+  const s2 = skill.frontmatter.schedule;
+  if (!s2)
+    return null;
+  if (!s2.cron && s2.runAt === void 0)
+    return null;
+  if (s2.cron && !isValidCron(s2.cron))
+    return null;
+  const runAt = s2.runAt === void 0 ? void 0 : typeof s2.runAt === "string" ? Date.parse(s2.runAt) : s2.runAt;
+  return {
+    name: skill.frontmatter.name,
+    // The body of the skill IS the prompt — the model that runs at
+    // fire time will receive these instructions verbatim.
+    prompt: skill.body.trim() || skill.frontmatter.description,
+    ...s2.cron ? { cron: s2.cron } : {},
+    ...runAt !== void 0 ? { runAt } : {},
+    ...s2.timeZone ? { timeZone: s2.timeZone } : {},
+    ...s2.channel ? { channel: s2.channel } : {},
+    enabled: s2.enabled ?? true,
+    source: "skill",
+    skillName: skill.frontmatter.name
+  };
+}
+async function syncSkillSchedules(registry, store) {
+  const wanted = /* @__PURE__ */ new Map();
+  for (const skill of registry.list()) {
+    const draft = toEntryDraft(skill);
+    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 };
+}
+
 // ../plugin-scheduler/dist/poller.js
 function isDue(entry, now) {
   if (!entry.enabled)
@@ -140547,6 +140660,15 @@ var SchedulerPoller = class {
   }
   async tickWith(onFired) {
     const now = Date.now();
+    if (this.opts.skills) {
+      try {
+        await syncSkillSchedules(this.opts.skills, this.opts.store);
+      } catch (err) {
+        this.opts.logger?.warn?.("scheduler: skill sync during tick failed", {
+          err: err instanceof Error ? err.message : String(err)
+        });
+      }
+    }
     let schedules;
     try {
       schedules = await this.opts.store.list();
@@ -140577,76 +140699,6 @@ var SchedulerPoller = class {
   }
 };
 
-// ../plugin-scheduler/dist/skill-sync.js
-function toEntryDraft(skill) {
-  const s2 = skill.frontmatter.schedule;
-  if (!s2)
-    return null;
-  if (!s2.cron && s2.runAt === void 0)
-    return null;
-  if (s2.cron && !isValidCron(s2.cron))
-    return null;
-  const runAt = s2.runAt === void 0 ? void 0 : typeof s2.runAt === "string" ? Date.parse(s2.runAt) : s2.runAt;
-  return {
-    name: skill.frontmatter.name,
-    // The body of the skill IS the prompt — the model that runs at
-    // fire time will receive these instructions verbatim.
-    prompt: skill.body.trim() || skill.frontmatter.description,
-    ...s2.cron ? { cron: s2.cron } : {},
-    ...runAt !== void 0 ? { runAt } : {},
-    ...s2.timeZone ? { timeZone: s2.timeZone } : {},
-    ...s2.channel ? { channel: s2.channel } : {},
-    enabled: s2.enabled ?? true,
-    source: "skill",
-    skillName: skill.frontmatter.name
-  };
-}
-async function syncSkillSchedules(registry, store) {
-  const wanted = /* @__PURE__ */ new Map();
-  for (const skill of registry.list()) {
-    const draft = toEntryDraft(skill);
-    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 };
-}
-
 // ../plugin-scheduler/dist/store.js
 init_index_esm();
 var scheduleSourceSchema = z.enum(["manual", "skill", "workflow"]);
@@ -140698,23 +140750,38 @@ function defaultSchedulesFile() {
   return moxxyPath("schedules.json");
 }
 var ScheduleStore = class {
-  file;
-  cache = null;
-  mutex = createMutex();
+  // Generic id-collection store owns the cache, write mutex, RMW `.slice()`
+  // copy, and crash-atomic `{ version: 1, schedules: [...] }` write. A corrupt
+  // or unreadable file resets to empty and is left in place for inspection —
+  // same behavior as before, now via the shared `load` hook.
+  store;
   constructor(opts = {}) {
-    this.file = opts.file ?? defaultSchedulesFile();
+    this.store = createJsonFileStore({
+      file: opts.file ?? defaultSchedulesFile(),
+      itemsKey: "schedules",
+      load: (raw) => {
+        if (raw === null)
+          return [];
+        try {
+          const parsed = fileSchema.safeParse(JSON.parse(raw));
+          return parsed.success ? [...parsed.data.schedules] : [];
+        } catch {
+          return [];
+        }
+      },
+      // Non-ENOENT read errors were previously swallowed to an empty store too.
+      onReadError: () => []
+    });
   }
   /** Force a re-read on the next access. Tests use this. */
   invalidate() {
-    this.cache = null;
+    this.store.invalidate();
   }
   async list() {
-    await this.ensureLoaded();
-    return this.cache.slice();
+    return this.store.read();
   }
   async get(id) {
-    await this.ensureLoaded();
-    return this.cache.find((s2) => s2.id === id) ?? null;
+    return this.store.get(id);
   }
   async create(input) {
     const entry = scheduleEntrySchema.parse({
@@ -140724,7 +140791,7 @@ var ScheduleStore = class {
       enabled: input.enabled ?? true,
       source: input.source ?? "manual"
     });
-    await this.mutate((schedules) => {
+    await this.store.mutate((schedules) => {
       schedules.push(entry);
       return schedules;
     });
@@ -140732,7 +140799,7 @@ var ScheduleStore = class {
   }
   async update(id, patch) {
     let updated = null;
-    await this.mutate((schedules) => {
+    await this.store.mutate((schedules) => {
       const idx = schedules.findIndex((s2) => s2.id === id);
       if (idx < 0)
         return schedules;
@@ -140745,7 +140812,7 @@ var ScheduleStore = class {
   }
   async delete(id) {
     let removed = false;
-    await this.mutate((schedules) => {
+    await this.store.mutate((schedules) => {
       const before = schedules.length;
       const after = schedules.filter((s2) => s2.id !== id);
       removed = after.length < before;
@@ -140760,7 +140827,7 @@ var ScheduleStore = class {
    * untouched.
    */
   async syncSkillSchedule(skillName2, entry) {
-    await this.mutate((schedules) => {
+    await this.store.mutate((schedules) => {
       const filtered = schedules.filter((s2) => !(s2.source === "skill" && s2.skillName === skillName2));
       if (entry) {
         filtered.push(scheduleEntrySchema.parse({ ...entry, source: "skill", skillName: skillName2 }));
@@ -140776,7 +140843,7 @@ var ScheduleStore = class {
    * into the shared poller without a separate timer.
    */
   async syncWorkflowSchedule(workflowName2, entry) {
-    await this.mutate((schedules) => {
+    await this.store.mutate((schedules) => {
       const filtered = schedules.filter((s2) => !(s2.source === "workflow" && s2.workflowName === workflowName2));
       if (entry) {
         filtered.push(scheduleEntrySchema.parse({ ...entry, source: "workflow", workflowName: workflowName2 }));
@@ -140784,38 +140851,6 @@ var ScheduleStore = class {
       return filtered;
     });
   }
-  async ensureLoaded() {
-    if (this.cache)
-      return;
-    try {
-      const raw = await readFile(this.file, "utf8");
-      const parsed = fileSchema.safeParse(JSON.parse(raw));
-      this.cache = parsed.success ? [...parsed.data.schedules] : [];
-    } catch (err) {
-      if (err.code === "ENOENT") {
-        this.cache = [];
-      } else {
-        this.cache = [];
-      }
-    }
-  }
-  /**
-   * Read-modify-write the cached array under the write mutex. The
-   * mutator receives a fresh shallow copy; whatever it returns becomes
-   * the new state. Persists atomically.
-   */
-  async mutate(fn) {
-    await this.mutex.run(async () => {
-      await this.ensureLoaded();
-      const updated = fn(this.cache.slice());
-      this.cache = updated;
-      await this.persist(updated);
-    });
-  }
-  async persist(schedules) {
-    const payload = JSON.stringify({ version: 1, schedules }, null, 2);
-    await writeFileAtomic(this.file, payload);
-  }
 };
 var cronOrTimestamp = z$1.object({
   cron: z$1.string().optional(),
@@ -140967,6 +141002,7 @@ function buildSchedulerPlugin(opts) {
   const poller = new SchedulerPoller({
     store,
     runner: opts.runner,
+    ...opts.skills ? { skills: opts.skills } : {},
     ...opts.intervalMs !== void 0 ? { intervalMs: opts.intervalMs } : {},
     ...opts.inbox ? { inbox: opts.inbox } : {},
     ...opts.logger ? { logger: opts.logger } : {},
@@ -140999,8 +141035,9 @@ function buildSchedulerPlugin(opts) {
       },
       // Re-sync skill-driven schedules whenever a skill_created event
       // lands — covers the "the model just synthesized a new skill
-      // with a schedule" case. Skill replacements/deletes are handled
-      // by the same path because the poller's next tick rescans.
+      // with a schedule" case for an immediate response. Skill edits and
+      // deletes are reconciled by the poller's per-tick re-sync (it is
+      // primed with `opts.skills`).
       onEvent: async (event) => {
         if (event.type !== "skill_created")
           return;
@@ -141222,7 +141259,7 @@ function readHeader(headers, name) {
     return v3[0] ?? null;
   return v3 ?? null;
 }
-function readJsonPath(body, path62) {
+function readJsonPath(body, path60) {
   let parsed;
   try {
     parsed = JSON.parse(body.toString("utf8"));
@@ -141230,7 +141267,7 @@ function readJsonPath(body, path62) {
     return null;
   }
   let cur = parsed;
-  for (const seg of path62.split(".")) {
+  for (const seg of path60.split(".")) {
     if (cur === null || cur === void 0 || typeof cur !== "object")
       return null;
     cur = cur[seg];
@@ -141608,15 +141645,26 @@ function defaultWebhooksFile() {
 var WebhookStore = class {
   file;
   logger;
-  cache = null;
   loadWarningMsg = null;
-  mutex = createMutex();
+  // Generic id-collection store owns the cache, write mutex, RMW `.slice()`
+  // copy, and crash-atomic `{ version: 1, triggers: [...] }` write. Corruption
+  // policy (preserve aside / quarantine / refuse-on-unreadable) stays here in
+  // the `load`/`onReadError` hooks, byte-for-byte as before.
+  store;
   constructor(opts = {}) {
     this.file = opts.file ?? defaultWebhooksFile();
     this.logger = opts.logger;
+    this.store = createJsonFileStore({
+      file: this.file,
+      itemsKey: "triggers",
+      load: (raw) => this.parseFile(raw),
+      onReadError: (err) => {
+        throw new Error(`webhooks store: cannot read ${this.file}: ${err instanceof Error ? err.message : String(err)} \u2014 refusing to load (and write) until the file is readable again`);
+      }
+    });
   }
   invalidate() {
-    this.cache = null;
+    this.store.invalidate();
     this.loadWarningMsg = null;
   }
   /**
@@ -141626,20 +141674,18 @@ var WebhookStore = class {
    * the user learns about it instead of silently losing triggers.
    */
   async loadWarning() {
-    await this.ensureLoaded();
+    await this.store.read();
     return this.loadWarningMsg;
   }
   async list() {
-    await this.ensureLoaded();
-    return this.cache.slice();
+    return this.store.read();
   }
   async get(id) {
-    await this.ensureLoaded();
-    return this.cache.find((t2) => t2.id === id) ?? null;
+    return this.store.get(id);
   }
   async getByName(name) {
-    await this.ensureLoaded();
-    return this.cache.find((t2) => t2.name === name) ?? null;
+    const all = await this.store.read();
+    return all.find((t2) => t2.name === name) ?? null;
   }
   async create(input) {
     const existing = await this.getByName(input.name);
@@ -141652,7 +141698,7 @@ var WebhookStore = class {
       enabled: input.enabled ?? true,
       fireCount: 0
     });
-    await this.mutate((triggers) => {
+    await this.store.mutate((triggers) => {
       triggers.push(entry);
       return triggers;
     });
@@ -141660,7 +141706,7 @@ var WebhookStore = class {
   }
   async update(id, patch) {
     let updated = null;
-    await this.mutate((triggers) => {
+    await this.store.mutate((triggers) => {
       const idx = triggers.findIndex((t2) => t2.id === id);
       if (idx < 0)
         return triggers;
@@ -141673,7 +141719,7 @@ var WebhookStore = class {
   }
   async delete(id) {
     let removed = false;
-    await this.mutate((triggers) => {
+    await this.store.mutate((triggers) => {
       const before = triggers.length;
       const after = triggers.filter((t2) => t2.id !== id);
       removed = after.length < before;
@@ -141684,7 +141730,7 @@ var WebhookStore = class {
   /** Atomic increment + outcome write, used by the dispatcher on every fire. */
   async recordFire(id, outcome) {
     let updated = null;
-    await this.mutate((triggers) => {
+    await this.store.mutate((triggers) => {
       const idx = triggers.findIndex((t2) => t2.id === id);
       if (idx < 0)
         return triggers;
@@ -141702,31 +141748,26 @@ var WebhookStore = class {
     });
     return updated;
   }
-  async ensureLoaded() {
-    if (this.cache)
-      return;
+  /**
+   * Parse + validate the file contents into the trigger array, owning all
+   * corruption policy. Called by the generic store on load with the raw
+   * UTF-8 string, or `null` when the file is absent (a legitimate fresh
+   * start). A present-but-unreadable file is handled upstream by the
+   * generic's `onReadError` hook (which throws to refuse operation).
+   */
+  async parseFile(raw) {
     this.loadWarningMsg = null;
-    let raw;
-    try {
-      raw = await readFile(this.file, "utf8");
-    } catch (err) {
-      if (err.code === "ENOENT") {
-        this.cache = [];
-        return;
-      }
-      throw new Error(`webhooks store: cannot read ${this.file}: ${err instanceof Error ? err.message : String(err)} \u2014 refusing to load (and write) until the file is readable again`);
-    }
+    if (raw === null)
+      return [];
     let json;
     try {
       json = JSON.parse(raw);
     } catch {
-      await this.preserveCorruptFile("is not valid JSON");
-      return;
+      return this.preserveCorruptFile("is not valid JSON");
     }
     const file = looseFileSchema.safeParse(json);
     if (!file.success) {
-      await this.preserveCorruptFile("does not match the expected { version: 1, triggers: [...] } shape");
-      return;
+      return this.preserveCorruptFile("does not match the expected { version: 1, triggers: [...] } shape");
     }
     const valid = [];
     const invalid = [];
@@ -141744,7 +141785,7 @@ var WebhookStore = class {
     });
     if (invalid.length > 0)
       await this.quarantineEntries(invalid);
-    this.cache = valid;
+    return valid;
   }
   /**
    * The file exists but is unparseable/mis-shaped. Rename it aside (rename,
@@ -141762,7 +141803,7 @@ var WebhookStore = class {
       preserved,
       reason
     });
-    this.cache = [];
+    return [];
   }
   /**
    * The file parses but some entries fail validation. Keep the valid ones,
@@ -141785,18 +141826,6 @@ var WebhookStore = class {
       issues: invalid.map((i2) => ({ index: i2.index, issues: i2.issues }))
     });
   }
-  async mutate(fn) {
-    await this.mutex.run(async () => {
-      await this.ensureLoaded();
-      const updated = fn(this.cache.slice());
-      this.cache = updated;
-      await this.persist(updated);
-    });
-  }
-  async persist(triggers) {
-    const payload = JSON.stringify({ version: 1, triggers }, null, 2);
-    await writeFileAtomic(this.file, payload);
-  }
 };
 function timestampSlug() {
   return (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
@@ -144431,8 +144460,8 @@ function formatIssues(error2, raw) {
       const field = rest.join(".");
       return field ? `${where}: ${field} ${msg}` : `${where} ${msg}`;
     }
-    const path62 = iss.path.join(".");
-    return path62 ? `${path62} ${msg}` : `workflow ${msg}`;
+    const path60 = iss.path.join(".");
+    return path60 ? `${path60} ${msg}` : `workflow ${msg}`;
   });
 }
 function validateWorkflow(raw) {
@@ -144644,12 +144673,9 @@ var WorkflowRunStore = class {
   }
   async save(checkpoint) {
     const runId = ulid();
-    await promises.mkdir(this.dir, { recursive: true });
     const file = path3.join(this.dir, `${runId}.json`);
     const payload = { ...checkpoint, runId };
-    const tmp = `${file}.tmp`;
-    await promises.writeFile(tmp, JSON.stringify(payload), "utf8");
-    await promises.rename(tmp, file);
+    await writeFileAtomic(file, JSON.stringify(payload));
     return runId;
   }
   async load(runId) {
@@ -144908,9 +144934,11 @@ function buildRunResult(ctx, status, ok, extra) {
     ...extra
   };
 }
-async function runExecutorLoop(ctx) {
+async function runExecutorLoop(ctx, resumed = false) {
   const { workflow, deps } = ctx;
-  await deps.emit?.("workflow_started", { name: workflow.name, steps: workflow.steps.length });
+  if (!resumed) {
+    await deps.emit?.("workflow_started", { name: workflow.name, steps: workflow.steps.length });
+  }
   const settled = (id) => {
     const s2 = ctx.states.get(id)?.status;
     return s2 === "completed" || s2 === "skipped" || s2 === "failed";
@@ -144980,6 +145008,8 @@ async function runExecutorLoop(ctx) {
     const wave = ready.slice(0, Math.max(1, workflow.concurrency));
     const scope = buildScope(ctx, new Date(ctx.now()).toISOString());
     for (const step of wave) {
+      if (aborted)
+        break;
       const st3 = ctx.states.get(step.id);
       st3.startedAt = ctx.now();
       await deps.emit?.("workflow_step_started", {
@@ -145146,7 +145176,7 @@ ${userMessage.trim()}${FINALIZE_REPLY_SUFFIX}`;
     return buildRunResult(ctx, "failed", false, { error: message });
   }
   await store.remove(runId);
-  return runExecutorLoop(ctx);
+  return runExecutorLoop(ctx, true);
 }
 function sinkOutput(workflow, states) {
   const needed = /* @__PURE__ */ new Set();
@@ -145231,12 +145261,12 @@ async function runNestedWorkflow(step, scope, ctx, opts) {
     trigger: `workflow:${step.workflow}`
   });
   if (result.status === "paused") {
-    return {
-      ok: false,
-      output: result.output,
-      paused: true,
-      ...result.interactionAgentId ? { interactionAgentId: result.interactionAgentId } : {}
-    };
+    if (result.runId) {
+      const store = deps.runStore ?? defaultWorkflowRunStore;
+      await store.remove(result.runId).catch(() => {
+      });
+    }
+    throw new Error(`nested workflow "${step.workflow}" paused for input (awaitInput); awaitInput is not supported inside a nested workflow \u2014 run it as a top-level workflow instead`);
   }
   if (!result.ok)
     throw new Error(result.error ?? `nested workflow "${step.workflow}" failed`);
@@ -146030,6 +146060,18 @@ async function runCmd2(deps, name) {
   }
   const result = await deps.runNow({ name, trigger: "manual" });
   const steps = result.steps.map((s2) => `  ${statusMark(s2.status)} ${s2.id}${s2.error ? ` \u2014 ${s2.error}` : ""}`).join("\n");
+  if (result.status === "paused") {
+    const pending2 = result.pendingStepId ? result.steps.find((s2) => s2.id === result.pendingStepId) : void 0;
+    const ask = (pending2?.output ?? "").trim();
+    const lines = [
+      `\u23F8 workflow "${name}" is awaiting input` + (result.pendingStepId ? ` at step "${result.pendingStepId}"` : ""),
+      steps,
+      "",
+      ask ? `Question: ${truncate7(ask, 1200)}` : "",
+      result.runId ? `Reply to continue it (run id ${result.runId}).` : "Reply to continue it."
+    ].filter((l2) => l2 !== "");
+    return { kind: "text", text: lines.join("\n") };
+  }
   const head = result.ok ? `\u2713 workflow "${name}" completed` : `\u2717 workflow "${name}" failed${result.error ? `: ${result.error}` : ""}`;
   return { kind: "text", text: `${head}
 ${steps}
@@ -146137,22 +146179,24 @@ async function readLastRun(dir, name) {
   } catch {
     return null;
   }
-  const matches = files.filter((f3) => f3.includes(`-${name}-`) && f3.endsWith(".jsonl")).sort();
-  const latest = matches[matches.length - 1];
-  if (!latest)
-    return null;
-  try {
-    const raw = await promises.readFile(path3.join(dir, latest), "utf8");
-    const lines = raw.trim().split("\n").map((l2) => JSON.parse(l2));
-    const run2 = lines.find((l2) => l2.kind === "run");
-    const steps = lines.filter((l2) => l2.kind === "step");
-    const head = `${run2?.ok ? "\u2713" : "\u2717"} ${new Date(Number(run2?.startedAt ?? 0)).toISOString()} (${String(run2?.trigger ?? "?")})`;
-    const stepLines = steps.map((s2) => `  ${statusMark(String(s2.status))} ${String(s2.id)}`).join("\n");
-    return `${head}
+  const candidates = files.filter((f3) => f3.includes(`-${name}-`) && f3.endsWith(".jsonl")).sort().reverse();
+  for (const file of candidates) {
+    try {
+      const raw = await promises.readFile(path3.join(dir, file), "utf8");
+      const lines = raw.trim().split("\n").map((l2) => JSON.parse(l2));
+      const run2 = lines.find((l2) => l2.kind === "run");
+      if (run2?.workflow !== name)
+        continue;
+      const steps = lines.filter((l2) => l2.kind === "step");
+      const head = `${run2.ok ? "\u2713" : "\u2717"} ${new Date(Number(run2.startedAt ?? 0)).toISOString()} (${String(run2.trigger ?? "?")})`;
+      const stepLines = steps.map((s2) => `  ${statusMark(String(s2.status))} ${String(s2.id)}`).join("\n");
+      return `${head}
 ${stepLines}`;
-  } catch {
-    return null;
+    } catch {
+      continue;
+    }
   }
+  return null;
 }
 function truncate7(s2, max) {
   return s2.length > max ? `${s2.slice(0, max)}
@@ -146452,6 +146496,7 @@ function buildWorkflowsIntegration(args) {
         });
       }
     }
+    await startFileWatchers();
   }
   const unsubscribe = session.log.subscribe((event) => {
     if (event.type !== "plugin_event" || event.subtype !== "workflow_completed") return;
@@ -146522,7 +146567,6 @@ function buildWorkflowsIntegration(args) {
     onReady: async () => {
       session.workflows = view;
       await syncSchedules();
-      await startFileWatchers();
       void defaultWorkflowRunStore.sweepStale().then((n2) => {
         if (n2 > 0) logger?.info?.("workflows: swept stale paused-run checkpoints", { count: n2 });
       }).catch(
@@ -147970,7 +148014,7 @@ async function fetchLatest(pkg = DEFAULT_PKG, opts = {}) {
 var CACHE_TTL_MS = 12 * 60 * 60 * 1e3;
 var PKG = "@moxxy/cli";
 function defaultCacheFile() {
-  return path3.join(os5.homedir(), ".moxxy", "update-check.json");
+  return moxxyPath("update-check.json");
 }
 function compareSemver(a2, b3) {
   const parse2 = (s2) => (s2.split("-")[0] ?? "").split(".").map((n2) => Number.parseInt(n2, 10) || 0);
@@ -148259,7 +148303,7 @@ async function collectKey(providerId, controller) {
   }
 }
 function buildProviderAuthContext(vault, opts) {
-  const prompt = opts.promptMode === "stdin" ? stdinLinePrompt : opts.headless ? void 0 : clackPrompt;
+  const prompt = opts.promptMode === "stdin" ? makeStdinLinePrompt(opts.stdin ?? process.stdin) : opts.headless ? void 0 : clackPrompt;
   return {
     headless: opts.headless,
     write: opts.write ?? ((s2) => process.stdout.write(s2)),
@@ -148271,33 +148315,35 @@ function buildProviderAuthContext(vault, opts) {
     }
   };
 }
-var lineReader = null;
-var stdinEnded = false;
-var lineQueue = [];
-var lineWaiters = [];
-function ensureLineReader() {
-  if (lineReader) return;
-  lineReader = createInterface({ input: process.stdin });
-  lineReader.on("line", (line) => {
-    const waiter = lineWaiters.shift();
-    if (waiter) waiter(line);
-    else lineQueue.push(line);
-  });
-  lineReader.on("close", () => {
-    stdinEnded = true;
-    for (const w4 of lineWaiters.splice(0)) w4("");
-  });
-}
-function readStdinLine() {
-  ensureLineReader();
-  const queued = lineQueue.shift();
-  if (queued !== void 0) return Promise.resolve(queued);
-  if (stdinEnded) return Promise.resolve("");
-  return new Promise((resolve13) => lineWaiters.push(resolve13));
-}
-async function stdinLinePrompt(question, opts) {
-  process.stdout.write(encodeLoginPrompt({ question, mask: opts?.mask === true }));
-  return await readStdinLine();
+function makeStdinLinePrompt(input) {
+  let lineReader = null;
+  let stdinEnded = false;
+  const lineQueue = [];
+  const lineWaiters = [];
+  const ensureLineReader = () => {
+    if (lineReader) return;
+    lineReader = createInterface({ input });
+    lineReader.on("line", (line) => {
+      const waiter = lineWaiters.shift();
+      if (waiter) waiter(line);
+      else lineQueue.push(line);
+    });
+    lineReader.on("close", () => {
+      stdinEnded = true;
+      for (const w4 of lineWaiters.splice(0)) w4("");
+    });
+  };
+  const readStdinLine = () => {
+    ensureLineReader();
+    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 async (question, promptOpts) => {
+    process.stdout.write(encodeLoginPrompt({ question, mask: promptOpts?.mask === true }));
+    return await readStdinLine();
+  };
 }
 async function clackPrompt(question, opts) {
   const answer = opts?.mask ? await Ce2({ message: question }) : await Pe2({ message: question });
@@ -149376,7 +149422,10 @@ async function runSelfHostedChannel(name, argv, standalone) {
     ...collectExtraFlags(argv)
   });
   const webHandle = name === "web" ? null : await coAttachWebSurface({ primary: name, session, vault, config });
+  let stopping = false;
   const shutdown = async () => {
+    if (stopping) return;
+    stopping = true;
     await webHandle?.stop("SIGINT").catch(() => void 0);
     await runnerServer?.close().catch(() => void 0);
     await handle2.stop("SIGINT");
@@ -150700,32 +150749,39 @@ async function runScheduleNow(argv) {
     process.stderr.write(colors.red("missing id") + "\n  usage: moxxy schedule run <id>\n");
     return 2;
   }
-  const { session, scheduler: full } = await setupSessionWithConfig({ cwd: process.cwd() });
-  const entry = await full.store.get(id);
-  if (!entry) {
-    process.stderr.write(colors.dim(`no schedule with id ${id}`) + "\n");
-    return 1;
-  }
-  process.stdout.write(`${colors.bold("firing")}   ${entry.name}\u2026
+  const { session, scheduler: full } = await setupSessionWithConfig({
+    cwd: process.cwd(),
+    skipInitHooks: true
+  });
+  try {
+    const entry = await full.store.get(id);
+    if (!entry) {
+      process.stderr.write(colors.dim(`no schedule with id ${id}`) + "\n");
+      return 1;
+    }
+    process.stdout.write(`${colors.bold("firing")}   ${entry.name}\u2026
 `);
-  const outcome = await runSchedule(entry, {
-    runPrompt: async ({ prompt, model }) => {
-      const { runTurn: runTurn2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
-      let text = "";
-      for await (const event of runTurn2(session, prompt, model ? { model } : {})) {
-        if (event.type === "assistant_message") text = event.content;
+    const outcome = await runSchedule(entry, {
+      runPrompt: async ({ prompt, model }) => {
+        const { runTurn: runTurn2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+        let text = "";
+        for await (const event of runTurn2(session, prompt, model ? { model } : {})) {
+          if (event.type === "assistant_message") text = event.content;
+        }
+        return { text };
       }
-      return { text };
-    }
-  }, full.store);
-  const tag2 = outcome.ok ? colors.bold("done") : colors.red("fail");
-  process.stdout.write(
-    `${tag2}     ${colors.dim("inbox: " + (outcome.inboxPath ?? "(none)"))}
+    }, full.store);
+    const tag2 = outcome.ok ? colors.bold("done") : colors.red("fail");
+    process.stdout.write(
+      `${tag2}     ${colors.dim("inbox: " + (outcome.inboxPath ?? "(none)"))}
 ` + (outcome.error ? `         ${colors.red(outcome.error)}
 ` : "") + (outcome.text ? `         ${colors.dim(outcome.text.slice(0, 400))}
 ` : "")
-  );
-  return outcome.ok ? 0 : 1;
+    );
+    return outcome.ok ? 0 : 1;
+  } finally {
+    await session.close("schedule-run").catch(() => void 0);
+  }
 }
 
 // src/commands/schedule.ts
@@ -152562,7 +152618,7 @@ var COMMANDS = {
 };
 async function main() {
   const argv = parseArgv(process.argv.slice(2));
-  await finalizeStagedCoreUpdate(path3.join(os5.homedir(), ".moxxy")).catch(() => void 0);
+  await finalizeStagedCoreUpdate(moxxyHome()).catch(() => void 0);
   const handler = COMMANDS[argv.command];
   if (handler) return handler(argv);
   let isChannel = false;