@moxxy/cli 0.12.6 → 0.12.7

package/dist/bin.js

@@ -23,13 +23,13 @@ import tty, { ReadStream as ReadStream$1 } from 'tty';
 import { EventEmitter } from 'events';
 import { Buffer as Buffer$1 } from 'buffer';
 import { isFileDiffDisplay as isFileDiffDisplay$1 } from '@moxxy/sdk/tool-display';
-import { readFile, mkdir, open, rm, stat, rename as rename$1, unlink, writeFile } from 'fs/promises';
+import { readFile, mkdir, open, rm, stat, rename as rename$1, unlink, writeFile, access, constants as constants$1 } from 'fs/promises';
 import { spawn, spawnSync } from 'child_process';
 import { deprecate, inspect, styleText } from 'util';
 import { ReadableStream as ReadableStream$1 } from 'stream/web';
 import * as b2 from 'readline';
 import b2__default, { createInterface } from 'readline';
-import net, { isIP } from 'net';
+import net2, { isIP } from 'net';
 import { AsyncLocalStorage } from 'async_hooks';
 import { lookup } from 'dns/promises';
 import { Worker } from 'worker_threads';
@@ -331,20 +331,6 @@ var init_log = __esm({
           }
         }
       }
-      /**
-       * Drop every event from the log. Used by `/new` to start a fresh
-       * session without rebuilding the entire Session object — the
-       * registries, resolvers, and active provider stay; only the
-       * conversation context vanishes. Per-event listeners are NOT
-       * notified (there's no "event removed" event in the schema), but
-       * {@link onClear} subscribers fire — that's how the persistence
-       * sidecar truncates its JSONL (so `--resume` can't resurrect wiped
-       * history) and how the runner broadcasts a reset to attached
-       * mirrors, in lockstep with the wipe.
-       *
-       * Safe to call only when no turn is in flight — callers should abort
-       * their AbortController and await any pending runTurn() first.
-       */
       /**
        * Start this (empty) log at `seq` instead of 0. A mirror primed by a
        * PARTIAL attach replay (`replay: 'none'` / `{ tail }`) calls this with the
@@ -363,6 +349,20 @@ var init_log = __esm({
         this.byType = null;
         this.byTurnId = null;
       }
+      /**
+       * Drop every event from the log. Used by `/new` to start a fresh
+       * session without rebuilding the entire Session object — the
+       * registries, resolvers, and active provider stay; only the
+       * conversation context vanishes. Per-event listeners are NOT
+       * notified (there's no "event removed" event in the schema), but
+       * {@link onClear} subscribers fire — that's how the persistence
+       * sidecar truncates its JSONL (so `--resume` can't resurrect wiped
+       * history) and how the runner broadcasts a reset to attached
+       * mirrors, in lockstep with the wipe.
+       *
+       * Safe to call only when no turn is in flight — callers should abort
+       * their AbortController and await any pending runTurn() first.
+       */
       clear() {
         this.events.length = 0;
         this.byType = null;
@@ -929,6 +929,14 @@ var init_lifecycle = __esm({
       setPlugins(plugins) {
         this.entries = plugins.map((plugin4) => ({ plugin: plugin4, hooks: plugin4.hooks ?? {} }));
       }
+      /**
+       * Whether any registered plugin declares an `onEvent` hook. Lets the
+       * per-event fan-out skip building an AppContext (which clones the whole
+       * `process.env`) when no plugin would consume it — the common case.
+       */
+      hasEventHooks() {
+        return this.entries.some((e3) => typeof e3.hooks.onEvent === "function");
+      }
       async dispatchInit(ctx) {
         for (const e3 of this.entries)
           await this.safe(e3, "onInit", () => e3.hooks.onInit?.(ctx));
@@ -1018,11 +1026,14 @@ async function discoverPlugins(opts) {
       opts.logger.debug("discovery: failed to list packages in root", { root, err: String(err) });
       continue;
     }
-    for (const pkgPath of pkgsDirs) {
+    const uniquePaths = pkgsDirs.filter((pkgPath) => {
       if (seen.has(pkgPath))
-        continue;
+        return false;
       seen.add(pkgPath);
-      const manifest = await readPluginManifest(pkgPath, opts.logger);
+      return true;
+    });
+    const manifests = await Promise.all(uniquePaths.map((pkgPath) => readPluginManifest(pkgPath, opts.logger)));
+    for (const manifest of manifests) {
       if (manifest)
         out.push(manifest);
     }
@@ -1043,22 +1054,19 @@ async function candidateRoots(cwd2) {
 }
 async function listPackageDirs(root) {
   const entries = await promises.readdir(root, { withFileTypes: true }).catch(() => []);
-  const out = [];
-  for (const entry of entries) {
+  const perEntry = await Promise.all(entries.map(async (entry) => {
     if (!entry.isDirectory() && !entry.isSymbolicLink())
-      continue;
+      return [];
     const full = path3.join(root, entry.name);
     if (entry.name.startsWith("@")) {
       const sub = await promises.readdir(full, { withFileTypes: true }).catch(() => []);
-      for (const s2 of sub) {
-        if (s2.isDirectory() || s2.isSymbolicLink())
-          out.push(path3.join(full, s2.name));
-      }
-    } else if (entry.name !== ".bin" && entry.name !== ".pnpm") {
-      out.push(full);
+      return sub.filter((s2) => s2.isDirectory() || s2.isSymbolicLink()).map((s2) => path3.join(full, s2.name));
     }
-  }
-  return out;
+    if (entry.name !== ".bin" && entry.name !== ".pnpm")
+      return [full];
+    return [];
+  }));
+  return perEntry.flat();
 }
 async function readPluginManifest(packagePath, logger) {
   const pkgJsonPath = path3.join(packagePath, "package.json");
@@ -2513,6 +2521,12 @@ var init_skills = __esm({
     };
   }
 });
+function formatZodIssues(error2) {
+  return error2.issues.map((iss) => {
+    const path59 = iss.path.length ? iss.path.join(".") : "(root)";
+    return `${path59}: ${iss.message}`;
+  }).join("; ");
+}
 function emptyLog() {
   return {
     length: 0,
@@ -2566,11 +2580,7 @@ var init_tools2 = __esm({
           throw new Error(`Unknown tool: ${name}`);
         const parseResult = tool.inputSchema.safeParse(input);
         if (!parseResult.success) {
-          const issues = parseResult.error.issues.map((iss) => {
-            const path59 = iss.path.length ? iss.path.join(".") : "(root)";
-            return `${path59}: ${iss.message}`;
-          }).join("; ");
-          throw new Error(`Invalid input for ${name}: ${issues}`);
+          throw new Error(`Invalid input for ${name}: ${formatZodIssues(parseResult.error)}`);
         }
         const parsed = parseResult.data;
         const ctx = {
@@ -2585,8 +2595,13 @@ var init_tools2 = __esm({
           ...this.secretResolver ? { getSecret: this.secretResolver } : {}
         };
         const result = await tool.handler(parsed, ctx);
-        if (tool.outputSchema)
-          return tool.outputSchema.parse(result);
+        if (tool.outputSchema) {
+          const outResult = tool.outputSchema.safeParse(result);
+          if (!outResult.success) {
+            throw new Error(`Tool ${name} produced invalid output: ${formatZodIssues(outResult.error)}`);
+          }
+          return outResult.data;
+        }
         return result;
       }
     };
@@ -2618,6 +2633,9 @@ var init_commands = __esm({
         if (this.commands.has(cmd.name)) {
           throw new Error(`Command already registered: /${cmd.name}`);
         }
+        if (this.aliases.has(cmd.name)) {
+          throw new Error(`Command name already in use as an alias: /${cmd.name}`);
+        }
         this.commands.set(cmd.name, cmd);
         for (const alias of cmd.aliases ?? []) {
           if (this.aliases.has(alias) || this.commands.has(alias)) {
@@ -3401,7 +3419,11 @@ var init_session = __esm({
           ...opts.pluginDiscoveryPaths ? { userPaths: opts.pluginDiscoveryPaths } : {},
           ...opts.isPluginDisabled ? { isDisabled: opts.isPluginDisabled } : {}
         });
-        this.log.subscribe((event) => this.dispatcher.dispatchEvent(event, this.appContext()));
+        this.log.subscribe((event) => {
+          if (!this.dispatcher.hasEventHooks())
+            return;
+          return this.dispatcher.dispatchEvent(event, this.appContext());
+        });
       }
       get signal() {
         return this.controller.signal;
@@ -3599,11 +3621,11 @@ async function writeAtomic(file, filePath) {
   await writeFileAtomic(filePath, JSON.stringify(file, null, 2) + "\n");
 }
 async function mergeUsageStats(delta, filePath = usageStatsPath()) {
+  const keys = Object.keys(delta);
+  if (keys.length === 0)
+    return loadUsageStats(filePath);
   return mergeMutex.run(async () => {
-    const keys = Object.keys(delta);
     const current = await loadUsageStats(filePath);
-    if (keys.length === 0)
-      return current;
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const models = { ...current.models };
     for (const key of keys) {
@@ -39146,11 +39168,11 @@ var require_codegen = __commonJS({
         const rhs = this.rhs === void 0 ? "" : ` = ${this.rhs}`;
         return `${varKind} ${this.name}${rhs};` + _n;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants3) {
         if (!names[this.name.str])
           return;
         if (this.rhs)
-          this.rhs = optimizeExpr(this.rhs, names, constants2);
+          this.rhs = optimizeExpr(this.rhs, names, constants3);
         return this;
       }
       get names() {
@@ -39167,10 +39189,10 @@ var require_codegen = __commonJS({
       render({ _n }) {
         return `${this.lhs} = ${this.rhs};` + _n;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants3) {
         if (this.lhs instanceof code_1.Name && !names[this.lhs.str] && !this.sideEffects)
           return;
-        this.rhs = optimizeExpr(this.rhs, names, constants2);
+        this.rhs = optimizeExpr(this.rhs, names, constants3);
         return this;
       }
       get names() {
@@ -39231,8 +39253,8 @@ var require_codegen = __commonJS({
       optimizeNodes() {
         return `${this.code}` ? this : void 0;
       }
-      optimizeNames(names, constants2) {
-        this.code = optimizeExpr(this.code, names, constants2);
+      optimizeNames(names, constants3) {
+        this.code = optimizeExpr(this.code, names, constants3);
         return this;
       }
       get names() {
@@ -39261,12 +39283,12 @@ var require_codegen = __commonJS({
         }
         return nodes.length > 0 ? this : void 0;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants3) {
         const { nodes } = this;
         let i2 = nodes.length;
         while (i2--) {
           const n2 = nodes[i2];
-          if (n2.optimizeNames(names, constants2))
+          if (n2.optimizeNames(names, constants3))
             continue;
           subtractNames(names, n2.names);
           nodes.splice(i2, 1);
@@ -39319,12 +39341,12 @@ var require_codegen = __commonJS({
           return void 0;
         return this;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants3) {
         var _a3;
-        this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants2);
-        if (!(super.optimizeNames(names, constants2) || this.else))
+        this.else = (_a3 = this.else) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants3);
+        if (!(super.optimizeNames(names, constants3) || this.else))
           return;
-        this.condition = optimizeExpr(this.condition, names, constants2);
+        this.condition = optimizeExpr(this.condition, names, constants3);
         return this;
       }
       get names() {
@@ -39347,10 +39369,10 @@ var require_codegen = __commonJS({
       render(opts) {
         return `for(${this.iteration})` + super.render(opts);
       }
-      optimizeNames(names, constants2) {
-        if (!super.optimizeNames(names, constants2))
+      optimizeNames(names, constants3) {
+        if (!super.optimizeNames(names, constants3))
           return;
-        this.iteration = optimizeExpr(this.iteration, names, constants2);
+        this.iteration = optimizeExpr(this.iteration, names, constants3);
         return this;
       }
       get names() {
@@ -39386,10 +39408,10 @@ var require_codegen = __commonJS({
       render(opts) {
         return `for(${this.varKind} ${this.name} ${this.loop} ${this.iterable})` + super.render(opts);
       }
-      optimizeNames(names, constants2) {
-        if (!super.optimizeNames(names, constants2))
+      optimizeNames(names, constants3) {
+        if (!super.optimizeNames(names, constants3))
           return;
-        this.iterable = optimizeExpr(this.iterable, names, constants2);
+        this.iterable = optimizeExpr(this.iterable, names, constants3);
         return this;
       }
       get names() {
@@ -39431,11 +39453,11 @@ var require_codegen = __commonJS({
         (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNodes();
         return this;
       }
-      optimizeNames(names, constants2) {
+      optimizeNames(names, constants3) {
         var _a3, _b;
-        super.optimizeNames(names, constants2);
-        (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants2);
-        (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants2);
+        super.optimizeNames(names, constants3);
+        (_a3 = this.catch) === null || _a3 === void 0 ? void 0 : _a3.optimizeNames(names, constants3);
+        (_b = this.finally) === null || _b === void 0 ? void 0 : _b.optimizeNames(names, constants3);
         return this;
       }
       get names() {
@@ -39736,7 +39758,7 @@ var require_codegen = __commonJS({
     function addExprNames(names, from) {
       return from instanceof code_1._CodeOrName ? addNames(names, from.names) : names;
     }
-    function optimizeExpr(expr, names, constants2) {
+    function optimizeExpr(expr, names, constants3) {
       if (expr instanceof code_1.Name)
         return replaceName(expr);
       if (!canOptimize(expr))
@@ -39751,14 +39773,14 @@ var require_codegen = __commonJS({
         return items;
       }, []));
       function replaceName(n2) {
-        const c2 = constants2[n2.str];
+        const c2 = constants3[n2.str];
         if (c2 === void 0 || names[n2.str] !== 1)
           return n2;
         delete names[n2.str];
         return c2;
       }
       function canOptimize(e3) {
-        return e3 instanceof code_1._Code && e3._items.some((c2) => c2 instanceof code_1.Name && names[c2.str] === 1 && constants2[c2.str] !== void 0);
+        return e3 instanceof code_1._Code && e3._items.some((c2) => c2 instanceof code_1.Name && names[c2.str] === 1 && constants3[c2.str] !== void 0);
       }
     }
     function subtractNames(names, from) {
@@ -49138,13 +49160,14 @@ async function runMcpCallWithFallback(callPromise, signal, toolName) {
 async function wrapMcpServerTools(opts) {
   const prefix = opts.toolNamePrefix ?? defaultToolNamePrefix;
   const list = await opts.client.listTools();
-  return list.tools.map((descriptor) => wrapOneTool(descriptor, opts.server.name, opts.client, prefix));
+  const resolveClient = () => Promise.resolve(opts.client);
+  return list.tools.map((descriptor) => wrapOneMcpTool(descriptor, opts.server.name, resolveClient, prefix));
 }
 function wrapMcpServerToolsLazy(opts) {
   const prefix = opts.toolNamePrefix ?? defaultToolNamePrefix;
-  return opts.descriptors.map((descriptor) => wrapOneLazyTool(descriptor, opts.server.name, opts.getClient, prefix));
+  return opts.descriptors.map((descriptor) => wrapOneMcpTool(descriptor, opts.server.name, opts.getClient, prefix));
 }
-function wrapOneLazyTool(descriptor, serverName, getClient, prefix) {
+function wrapOneMcpTool(descriptor, serverName, resolveClient, prefix) {
   const wrappedName = prefix(serverName, descriptor.name);
   return defineTool({
     name: wrappedName,
@@ -49155,23 +49178,7 @@ function wrapOneLazyTool(descriptor, serverName, getClient, prefix) {
     handler: async (input, ctx) => {
       if (ctx.signal.aborted)
         throw new Error("aborted");
-      const client = await getClient();
-      if (ctx.signal.aborted)
-        throw new Error("aborted");
-      const result = await runMcpCallWithFallback(client.callTool({ name: descriptor.name, arguments: input }), ctx.signal, wrappedName);
-      return renderResult(result.content, result.isError);
-    }
-  });
-}
-function wrapOneTool(descriptor, serverName, client, prefix) {
-  const wrappedName = prefix(serverName, descriptor.name);
-  return defineTool({
-    name: wrappedName,
-    description: descriptor.description ?? `MCP tool ${descriptor.name} on server ${serverName}`,
-    inputSchema: z.record(z.string(), z.unknown()),
-    inputJsonSchema: descriptor.inputSchema ?? { type: "object" },
-    permission: { action: "prompt" },
-    handler: async (input, ctx) => {
+      const client = await resolveClient();
       if (ctx.signal.aborted)
         throw new Error("aborted");
       const result = await runMcpCallWithFallback(client.callTool({ name: descriptor.name, arguments: input }), ctx.signal, wrappedName);
@@ -49237,27 +49244,23 @@ async function mutateMcpConfig(fn) {
   });
 }
 async function setServerDisabled(name, disabled) {
-  return configMutex.run(async () => {
-    const cfg = await readMcpConfig();
+  return mutateMcpConfig((cfg) => {
     const idx = cfg.servers.findIndex((s2) => s2.name === name);
     if (idx < 0)
-      return null;
+      return { next: cfg, result: null };
     const updated = { ...cfg.servers[idx], disabled };
     const nextServers = [...cfg.servers];
     nextServers[idx] = updated;
-    await writeMcpConfig({ servers: nextServers });
-    return updated;
+    return { next: { servers: nextServers }, result: updated };
   });
 }
 async function removeServerFromConfig(name) {
-  return configMutex.run(async () => {
-    const cfg = await readMcpConfig();
+  return mutateMcpConfig((cfg) => {
     const before = cfg.servers.length;
     const next = cfg.servers.filter((s2) => s2.name !== name);
     if (next.length === before)
-      return false;
-    await writeMcpConfig({ servers: next });
-    return true;
+      return { next: cfg, result: false };
+    return { next: { servers: next }, result: true };
   });
 }
 var configMutex;
@@ -51252,7 +51255,7 @@ var require_react_development = __commonJS({
           var dispatcher = resolveDispatcher();
           return dispatcher.useCallback(callback, deps);
         }
-        function useMemo9(create2, deps) {
+        function useMemo8(create2, deps) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useMemo(create2, deps);
         }
@@ -52024,7 +52027,7 @@ var require_react_development = __commonJS({
         exports.useImperativeHandle = useImperativeHandle;
         exports.useInsertionEffect = useInsertionEffect;
         exports.useLayoutEffect = useLayoutEffect2;
-        exports.useMemo = useMemo9;
+        exports.useMemo = useMemo8;
         exports.useReducer = useReducer2;
         exports.useRef = useRef9;
         exports.useState = useState17;
@@ -88230,18 +88233,18 @@ var init_ToolsPanel = __esm({
         return (0, import_jsx_runtime26.jsx)(Modal, { title: "Tools", subtitle: "none registered", ...onClose ? { onClose } : {}, children: (0, import_jsx_runtime26.jsx)(Text, { dimColor: true, children: "(no tools registered)" }) });
       }
       const slice = filtered.slice(scroll.visible.start, scroll.visible.end);
+      const termWidth = process.stdout.columns ?? 80;
+      const descWidth = Math.max(20, termWidth - NAME_COL2 - BADGE_COL - 12);
       const subtitle = filtered.length === 0 ? `0 of ${sorted.length}  \xB7  no tools in this filter` : `${scroll.cursor + 1} of ${filtered.length}  \xB7  ${filtered.length} shown`;
       const hints = "\u2191\u2193 navigate \xB7 PgUp/PgDn fast \xB7 g/G top/bottom";
       return (0, import_jsx_runtime26.jsxs)(Modal, { title: "Tools", subtitle, hints, tabs, activeTabId: activeTab, onTabChange: (id) => setActiveTab(id), ...onClose ? { onClose } : {}, children: [filtered.length === 0 ? (0, import_jsx_runtime26.jsx)(Text, { dimColor: true, children: "(no tools match this filter)" }) : null, scroll.canScrollUp ? (0, import_jsx_runtime26.jsx)(Text, { dimColor: true, children: `  \u2191 ${scroll.offset} more above` }) : null, slice.map((t2, i2) => {
         const absoluteIndex = scroll.visible.start + i2;
         const focused = absoluteIndex === scroll.cursor;
-        return (0, import_jsx_runtime26.jsx)(ToolRow, { tool: t2, focused }, t2.name);
+        return (0, import_jsx_runtime26.jsx)(ToolRow, { tool: t2, focused, descWidth }, t2.name);
       }), scroll.canScrollDown ? (0, import_jsx_runtime26.jsx)(Text, { dimColor: true, children: `  \u2193 ${filtered.length - scroll.visible.end} more below` }) : null] });
     };
-    ToolRow = ({ tool, focused }) => {
+    ToolRow = ({ tool, focused, descWidth }) => {
       const perm = tool.permission?.action ?? "allow";
-      const termWidth = process.stdout.columns ?? 80;
-      const descWidth = Math.max(20, termWidth - NAME_COL2 - BADGE_COL - 12);
       const desc = oneLine(tool.description ?? "");
       return (0, import_jsx_runtime26.jsxs)(Box_default, { children: [(0, import_jsx_runtime26.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime26.jsx)(Box_default, { width: NAME_COL2, children: (0, import_jsx_runtime26.jsx)(Text, { bold: true, children: truncate3(tool.name, NAME_COL2 - 2) }) }), (0, import_jsx_runtime26.jsx)(Box_default, { width: BADGE_COL, children: (0, import_jsx_runtime26.jsx)(PermissionBadge, { action: perm }) }), (0, import_jsx_runtime26.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime26.jsx)(Text, { dimColor: true, wrap: "truncate", children: desc }) })] });
     };
@@ -89667,8 +89670,7 @@ var init_PermissionEditor = __esm({
           exit();
         }
       });
-      const visible = (0, import_react67.useMemo)(() => rows, [rows]);
-      return (0, import_jsx_runtime38.jsxs)(Box_default, { flexDirection: "column", padding: 1, children: [(0, import_jsx_runtime38.jsxs)(Box_default, { marginBottom: 1, children: [(0, import_jsx_runtime38.jsx)(Text, { bold: true, color: "magenta", children: "moxxy perms editor" }), (0, import_jsx_runtime38.jsxs)(Text, { dimColor: true, children: ["  (", policyPath2, ")"] })] }), visible.length === 0 ? (0, import_jsx_runtime38.jsx)(Text, { dimColor: true, children: "(no rules \u2014 press `a` to add an allow rule, `D` for deny)" }) : visible.map((row, i2) => {
+      return (0, import_jsx_runtime38.jsxs)(Box_default, { flexDirection: "column", padding: 1, children: [(0, import_jsx_runtime38.jsxs)(Box_default, { marginBottom: 1, children: [(0, import_jsx_runtime38.jsx)(Text, { bold: true, color: "magenta", children: "moxxy perms editor" }), (0, import_jsx_runtime38.jsxs)(Text, { dimColor: true, children: ["  (", policyPath2, ")"] })] }), rows.length === 0 ? (0, import_jsx_runtime38.jsx)(Text, { dimColor: true, children: "(no rules \u2014 press `a` to add an allow rule, `D` for deny)" }) : rows.map((row, i2) => {
         const focused = i2 === cursor;
         return (0, import_jsx_runtime38.jsxs)(Box_default, { children: [(0, import_jsx_runtime38.jsx)(Text, { color: focused ? "cyan" : void 0, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime38.jsx)(Text, { color: row.kind === "allow" ? "green" : "red", children: row.kind.padEnd(5) }), (0, import_jsx_runtime38.jsxs)(Text, { children: ["  ", row.name] }), row.reason ? (0, import_jsx_runtime38.jsxs)(Text, { dimColor: true, children: ["  \u2014 ", row.reason] }) : null] }, `${row.kind}:${row.name}:${i2}`);
       }), (0, import_jsx_runtime38.jsx)(Box_default, { marginTop: 1, children: mode.kind === "add" ? (0, import_jsx_runtime38.jsxs)(Text, { children: ["new ", mode.bucket, " rule: ", (0, import_jsx_runtime38.jsx)(Text, { color: "cyan", children: mode.buffer }), (0, import_jsx_runtime38.jsx)(Text, { dimColor: true, children: " (enter to confirm, esc to cancel)" })] }) : mode.kind === "confirm-delete" ? (0, import_jsx_runtime38.jsxs)(Text, { color: "yellow", children: ["delete `", mode.row.name, "` (", mode.row.kind, ")? [y/N]"] }) : mode.kind === "message" ? (0, import_jsx_runtime38.jsxs)(Text, { color: "green", children: [mode.text, "  (press any key)"] }) : (0, import_jsx_runtime38.jsxs)(Text, { dimColor: true, children: ["\u2191/\u2193 move \xB7 space/enter flip \xB7 a add allow \xB7 D add deny \xB7 d delete \xB7 q quit", dirty ? (0, import_jsx_runtime38.jsxs)(Text, { color: "green", children: ["  \xB7 ", status] }) : null] }) })] });
@@ -92096,7 +92098,7 @@ var require_crc = __commonJS({
 // ../../node_modules/.pnpm/pngjs@5.0.0/node_modules/pngjs/lib/parser.js
 var require_parser2 = __commonJS({
   "../../node_modules/.pnpm/pngjs@5.0.0/node_modules/pngjs/lib/parser.js"(exports, module) {
-    var constants2 = require_constants5();
+    var constants3 = require_constants5();
     var CrcCalculator = require_crc();
     var Parser = module.exports = function(options, dependencies) {
       this._options = options;
@@ -92107,12 +92109,12 @@ var require_parser2 = __commonJS({
       this._palette = [];
       this._colorType = 0;
       this._chunks = {};
-      this._chunks[constants2.TYPE_IHDR] = this._handleIHDR.bind(this);
-      this._chunks[constants2.TYPE_IEND] = this._handleIEND.bind(this);
-      this._chunks[constants2.TYPE_IDAT] = this._handleIDAT.bind(this);
-      this._chunks[constants2.TYPE_PLTE] = this._handlePLTE.bind(this);
-      this._chunks[constants2.TYPE_tRNS] = this._handleTRNS.bind(this);
-      this._chunks[constants2.TYPE_gAMA] = this._handleGAMA.bind(this);
+      this._chunks[constants3.TYPE_IHDR] = this._handleIHDR.bind(this);
+      this._chunks[constants3.TYPE_IEND] = this._handleIEND.bind(this);
+      this._chunks[constants3.TYPE_IDAT] = this._handleIDAT.bind(this);
+      this._chunks[constants3.TYPE_PLTE] = this._handlePLTE.bind(this);
+      this._chunks[constants3.TYPE_tRNS] = this._handleTRNS.bind(this);
+      this._chunks[constants3.TYPE_gAMA] = this._handleGAMA.bind(this);
       this.read = dependencies.read;
       this.error = dependencies.error;
       this.metadata = dependencies.metadata;
@@ -92127,10 +92129,10 @@ var require_parser2 = __commonJS({
       };
     };
     Parser.prototype.start = function() {
-      this.read(constants2.PNG_SIGNATURE.length, this._parseSignature.bind(this));
+      this.read(constants3.PNG_SIGNATURE.length, this._parseSignature.bind(this));
     };
     Parser.prototype._parseSignature = function(data) {
-      let signature = constants2.PNG_SIGNATURE;
+      let signature = constants3.PNG_SIGNATURE;
       for (let i2 = 0; i2 < signature.length; i2++) {
         if (data[i2] !== signature[i2]) {
           this.error(new Error("Invalid file signature"));
@@ -92147,7 +92149,7 @@ var require_parser2 = __commonJS({
         name += String.fromCharCode(data[i2]);
       }
       let ancillary = Boolean(data[4] & 32);
-      if (!this._hasIHDR && type !== constants2.TYPE_IHDR) {
+      if (!this._hasIHDR && type !== constants3.TYPE_IHDR) {
         this.error(new Error("Expected IHDR on beggining"));
         return;
       }
@@ -92195,7 +92197,7 @@ var require_parser2 = __commonJS({
         this.error(new Error("Unsupported bit depth " + depth));
         return;
       }
-      if (!(colorType in constants2.COLORTYPE_TO_BPP_MAP)) {
+      if (!(colorType in constants3.COLORTYPE_TO_BPP_MAP)) {
         this.error(new Error("Unsupported color type"));
         return;
       }
@@ -92212,16 +92214,16 @@ var require_parser2 = __commonJS({
         return;
       }
       this._colorType = colorType;
-      let bpp = constants2.COLORTYPE_TO_BPP_MAP[this._colorType];
+      let bpp = constants3.COLORTYPE_TO_BPP_MAP[this._colorType];
       this._hasIHDR = true;
       this.metadata({
         width,
         height,
         depth,
         interlace: Boolean(interlace),
-        palette: Boolean(colorType & constants2.COLORTYPE_PALETTE),
-        color: Boolean(colorType & constants2.COLORTYPE_COLOR),
-        alpha: Boolean(colorType & constants2.COLORTYPE_ALPHA),
+        palette: Boolean(colorType & constants3.COLORTYPE_PALETTE),
+        color: Boolean(colorType & constants3.COLORTYPE_COLOR),
+        alpha: Boolean(colorType & constants3.COLORTYPE_ALPHA),
         bpp,
         colorType
       });
@@ -92245,7 +92247,7 @@ var require_parser2 = __commonJS({
     };
     Parser.prototype._parseTRNS = function(data) {
       this._crc.write(data);
-      if (this._colorType === constants2.COLORTYPE_PALETTE_COLOR) {
+      if (this._colorType === constants3.COLORTYPE_PALETTE_COLOR) {
         if (this._palette.length === 0) {
           this.error(new Error("Transparency chunk must be after palette"));
           return;
@@ -92259,10 +92261,10 @@ var require_parser2 = __commonJS({
         }
         this.palette(this._palette);
       }
-      if (this._colorType === constants2.COLORTYPE_GRAYSCALE) {
+      if (this._colorType === constants3.COLORTYPE_GRAYSCALE) {
         this.transColor([data.readUInt16BE(0)]);
       }
-      if (this._colorType === constants2.COLORTYPE_COLOR) {
+      if (this._colorType === constants3.COLORTYPE_COLOR) {
         this.transColor([
           data.readUInt16BE(0),
           data.readUInt16BE(2),
@@ -92276,7 +92278,7 @@ var require_parser2 = __commonJS({
     };
     Parser.prototype._parseGAMA = function(data) {
       this._crc.write(data);
-      this.gamma(data.readUInt32BE(0) / constants2.GAMMA_DIVISION);
+      this.gamma(data.readUInt32BE(0) / constants3.GAMMA_DIVISION);
       this._handleChunkEnd();
     };
     Parser.prototype._handleIDAT = function(length) {
@@ -92288,7 +92290,7 @@ var require_parser2 = __commonJS({
     };
     Parser.prototype._parseIDAT = function(length, data) {
       this._crc.write(data);
-      if (this._colorType === constants2.COLORTYPE_PALETTE_COLOR && this._palette.length === 0) {
+      if (this._colorType === constants3.COLORTYPE_PALETTE_COLOR && this._palette.length === 0) {
         throw new Error("Expected palette not found");
       }
       this.inflateData(data);
@@ -92768,9 +92770,9 @@ var require_parser_async = __commonJS({
 // ../../node_modules/.pnpm/pngjs@5.0.0/node_modules/pngjs/lib/bitpacker.js
 var require_bitpacker = __commonJS({
   "../../node_modules/.pnpm/pngjs@5.0.0/node_modules/pngjs/lib/bitpacker.js"(exports, module) {
-    var constants2 = require_constants5();
+    var constants3 = require_constants5();
     module.exports = function(dataIn, width, height, options) {
-      let outHasAlpha = [constants2.COLORTYPE_COLOR_ALPHA, constants2.COLORTYPE_ALPHA].indexOf(
+      let outHasAlpha = [constants3.COLORTYPE_COLOR_ALPHA, constants3.COLORTYPE_ALPHA].indexOf(
         options.colorType
       ) !== -1;
       if (options.colorType === options.inputColorType) {
@@ -92790,11 +92792,11 @@ var require_bitpacker = __commonJS({
       }
       let data = options.bitDepth !== 16 ? dataIn : new Uint16Array(dataIn.buffer);
       let maxValue = 255;
-      let inBpp = constants2.COLORTYPE_TO_BPP_MAP[options.inputColorType];
+      let inBpp = constants3.COLORTYPE_TO_BPP_MAP[options.inputColorType];
       if (inBpp === 4 && !options.inputHasAlpha) {
         inBpp = 3;
       }
-      let outBpp = constants2.COLORTYPE_TO_BPP_MAP[options.colorType];
+      let outBpp = constants3.COLORTYPE_TO_BPP_MAP[options.colorType];
       if (options.bitDepth === 16) {
         maxValue = 65535;
         outBpp *= 2;
@@ -92818,24 +92820,24 @@ var require_bitpacker = __commonJS({
         let blue;
         let alpha = maxValue;
         switch (options.inputColorType) {
-          case constants2.COLORTYPE_COLOR_ALPHA:
+          case constants3.COLORTYPE_COLOR_ALPHA:
             alpha = data[inIndex + 3];
             red = data[inIndex];
             green = data[inIndex + 1];
             blue = data[inIndex + 2];
             break;
-          case constants2.COLORTYPE_COLOR:
+          case constants3.COLORTYPE_COLOR:
             red = data[inIndex];
             green = data[inIndex + 1];
             blue = data[inIndex + 2];
             break;
-          case constants2.COLORTYPE_ALPHA:
+          case constants3.COLORTYPE_ALPHA:
             alpha = data[inIndex + 1];
             red = data[inIndex];
             green = red;
             blue = red;
             break;
-          case constants2.COLORTYPE_GRAYSCALE:
+          case constants3.COLORTYPE_GRAYSCALE:
             red = data[inIndex];
             green = red;
             blue = red;
@@ -92868,8 +92870,8 @@ var require_bitpacker = __commonJS({
         for (let x4 = 0; x4 < width; x4++) {
           let rgba = getRGBA();
           switch (options.colorType) {
-            case constants2.COLORTYPE_COLOR_ALPHA:
-            case constants2.COLORTYPE_COLOR:
+            case constants3.COLORTYPE_COLOR_ALPHA:
+            case constants3.COLORTYPE_COLOR:
               if (options.bitDepth === 8) {
                 outData[outIndex] = rgba.red;
                 outData[outIndex + 1] = rgba.green;
@@ -92886,8 +92888,8 @@ var require_bitpacker = __commonJS({
                 }
               }
               break;
-            case constants2.COLORTYPE_ALPHA:
-            case constants2.COLORTYPE_GRAYSCALE: {
+            case constants3.COLORTYPE_ALPHA:
+            case constants3.COLORTYPE_GRAYSCALE: {
               let grayscale = (rgba.red + rgba.green + rgba.blue) / 3;
               if (options.bitDepth === 8) {
                 outData[outIndex] = grayscale;
@@ -93058,7 +93060,7 @@ var require_filter_pack = __commonJS({
 // ../../node_modules/.pnpm/pngjs@5.0.0/node_modules/pngjs/lib/packer.js
 var require_packer = __commonJS({
   "../../node_modules/.pnpm/pngjs@5.0.0/node_modules/pngjs/lib/packer.js"(exports, module) {
-    var constants2 = require_constants5();
+    var constants3 = require_constants5();
     var CrcStream = require_crc();
     var bitPacker = require_bitpacker();
     var filter = require_filter_pack();
@@ -93071,23 +93073,23 @@ var require_packer = __commonJS({
       options.inputHasAlpha = options.inputHasAlpha != null ? options.inputHasAlpha : true;
       options.deflateFactory = options.deflateFactory || zlib2.createDeflate;
       options.bitDepth = options.bitDepth || 8;
-      options.colorType = typeof options.colorType === "number" ? options.colorType : constants2.COLORTYPE_COLOR_ALPHA;
-      options.inputColorType = typeof options.inputColorType === "number" ? options.inputColorType : constants2.COLORTYPE_COLOR_ALPHA;
+      options.colorType = typeof options.colorType === "number" ? options.colorType : constants3.COLORTYPE_COLOR_ALPHA;
+      options.inputColorType = typeof options.inputColorType === "number" ? options.inputColorType : constants3.COLORTYPE_COLOR_ALPHA;
       if ([
-        constants2.COLORTYPE_GRAYSCALE,
-        constants2.COLORTYPE_COLOR,
-        constants2.COLORTYPE_COLOR_ALPHA,
-        constants2.COLORTYPE_ALPHA
+        constants3.COLORTYPE_GRAYSCALE,
+        constants3.COLORTYPE_COLOR,
+        constants3.COLORTYPE_COLOR_ALPHA,
+        constants3.COLORTYPE_ALPHA
       ].indexOf(options.colorType) === -1) {
         throw new Error(
           "option color type:" + options.colorType + " is not supported at present"
         );
       }
       if ([
-        constants2.COLORTYPE_GRAYSCALE,
-        constants2.COLORTYPE_COLOR,
-        constants2.COLORTYPE_COLOR_ALPHA,
-        constants2.COLORTYPE_ALPHA
+        constants3.COLORTYPE_GRAYSCALE,
+        constants3.COLORTYPE_COLOR,
+        constants3.COLORTYPE_COLOR_ALPHA,
+        constants3.COLORTYPE_ALPHA
       ].indexOf(options.inputColorType) === -1) {
         throw new Error(
           "option input color type:" + options.inputColorType + " is not supported at present"
@@ -93111,7 +93113,7 @@ var require_packer = __commonJS({
     };
     Packer.prototype.filterData = function(data, width, height) {
       let packedData = bitPacker(data, width, height, this._options);
-      let bpp = constants2.COLORTYPE_TO_BPP_MAP[this._options.colorType];
+      let bpp = constants3.COLORTYPE_TO_BPP_MAP[this._options.colorType];
       let filteredData = filter(packedData, width, height, this._options, bpp);
       return filteredData;
     };
@@ -93131,8 +93133,8 @@ var require_packer = __commonJS({
     };
     Packer.prototype.packGAMA = function(gamma) {
       let buf = Buffer.alloc(4);
-      buf.writeUInt32BE(Math.floor(gamma * constants2.GAMMA_DIVISION), 0);
-      return this._packChunk(constants2.TYPE_gAMA, buf);
+      buf.writeUInt32BE(Math.floor(gamma * constants3.GAMMA_DIVISION), 0);
+      return this._packChunk(constants3.TYPE_gAMA, buf);
     };
     Packer.prototype.packIHDR = function(width, height) {
       let buf = Buffer.alloc(13);
@@ -93143,13 +93145,13 @@ var require_packer = __commonJS({
       buf[10] = 0;
       buf[11] = 0;
       buf[12] = 0;
-      return this._packChunk(constants2.TYPE_IHDR, buf);
+      return this._packChunk(constants3.TYPE_IHDR, buf);
     };
     Packer.prototype.packIDAT = function(data) {
-      return this._packChunk(constants2.TYPE_IDAT, data);
+      return this._packChunk(constants3.TYPE_IDAT, data);
     };
     Packer.prototype.packIEND = function() {
-      return this._packChunk(constants2.TYPE_IEND, null);
+      return this._packChunk(constants3.TYPE_IEND, null);
     };
   }
 });
@@ -93159,7 +93161,7 @@ var require_packer_async = __commonJS({
   "../../node_modules/.pnpm/pngjs@5.0.0/node_modules/pngjs/lib/packer-async.js"(exports, module) {
     var util = __require("util");
     var Stream5 = __require("stream");
-    var constants2 = require_constants5();
+    var constants3 = require_constants5();
     var Packer = require_packer();
     var PackerAsync = module.exports = function(opt) {
       Stream5.call(this);
@@ -93170,7 +93172,7 @@ var require_packer_async = __commonJS({
     };
     util.inherits(PackerAsync, Stream5);
     PackerAsync.prototype.pack = function(data, width, height, gamma) {
-      this.emit("data", Buffer.from(constants2.PNG_SIGNATURE));
+      this.emit("data", Buffer.from(constants3.PNG_SIGNATURE));
       this.emit("data", this._packer.packIHDR(width, height));
       if (gamma) {
         this.emit("data", this._packer.packGAMA(gamma));
@@ -93486,7 +93488,7 @@ var require_packer_sync = __commonJS({
     if (!zlib2.deflateSync) {
       hasSyncZlib = false;
     }
-    var constants2 = require_constants5();
+    var constants3 = require_constants5();
     var Packer = require_packer();
     module.exports = function(metaData, opt) {
       if (!hasSyncZlib) {
@@ -93497,7 +93499,7 @@ var require_packer_sync = __commonJS({
       let options = opt || {};
       let packer = new Packer(options);
       let chunks = [];
-      chunks.push(Buffer.from(constants2.PNG_SIGNATURE));
+      chunks.push(Buffer.from(constants3.PNG_SIGNATURE));
       chunks.push(packer.packIHDR(metaData.width, metaData.height));
       if (metaData.gamma) {
         chunks.push(packer.packGAMA(metaData.gamma));
@@ -99716,7 +99718,7 @@ var require_client_h1 = __commonJS({
       kResume,
       kHTTPContext
     } = require_symbols();
-    var constants2 = require_constants7();
+    var constants3 = require_constants7();
     var EMPTY_BUF = Buffer.alloc(0);
     var FastBuffer = Buffer[Symbol.species];
     var addListener = util.addListener;
@@ -99788,7 +99790,7 @@ var require_client_h1 = __commonJS({
       constructor(client, socket, { exports: exports2 }) {
         assert(Number.isFinite(client[kMaxHeadersSize]) && client[kMaxHeadersSize] > 0);
         this.llhttp = exports2;
-        this.ptr = this.llhttp.llhttp_alloc(constants2.TYPE.RESPONSE);
+        this.ptr = this.llhttp.llhttp_alloc(constants3.TYPE.RESPONSE);
         this.client = client;
         this.socket = socket;
         this.timeout = null;
@@ -99883,11 +99885,11 @@ var require_client_h1 = __commonJS({
             currentBufferRef = null;
           }
           const offset = llhttp.llhttp_get_error_pos(this.ptr) - currentBufferPtr;
-          if (ret !== constants2.ERROR.OK) {
+          if (ret !== constants3.ERROR.OK) {
             const body = data.subarray(offset);
-            if (ret === constants2.ERROR.PAUSED_UPGRADE) {
+            if (ret === constants3.ERROR.PAUSED_UPGRADE) {
               this.onUpgrade(body);
-            } else if (ret === constants2.ERROR.PAUSED) {
+            } else if (ret === constants3.ERROR.PAUSED) {
               this.paused = true;
               socket.unshift(body);
             } else {
@@ -99910,10 +99912,10 @@ var require_client_h1 = __commonJS({
         } finally {
           currentParser = null;
         }
-        if (ret === constants2.ERROR.OK) {
+        if (ret === constants3.ERROR.OK) {
           return null;
         }
-        if (ret === constants2.ERROR.PAUSED || ret === constants2.ERROR.PAUSED_UPGRADE) {
+        if (ret === constants3.ERROR.PAUSED || ret === constants3.ERROR.PAUSED_UPGRADE) {
           this.paused = true;
           return null;
         }
@@ -99930,7 +99932,7 @@ var require_client_h1 = __commonJS({
           const len = new Uint8Array(llhttp.memory.buffer, ptr).indexOf(0);
           message = "Response does not match the HTTP/1.1 protocol (" + Buffer.from(llhttp.memory.buffer, ptr, len).toString() + ")";
         }
-        return new HTTPParserError(message, constants2.ERROR[ret], data);
+        return new HTTPParserError(message, constants3.ERROR[ret], data);
       }
       destroy() {
         assert(this.ptr != null);
@@ -100101,7 +100103,7 @@ var require_client_h1 = __commonJS({
           socket[kBlocking] = false;
           client[kResume]();
         }
-        return pause ? constants2.ERROR.PAUSED : 0;
+        return pause ? constants3.ERROR.PAUSED : 0;
       }
       onBody(buf) {
         const { client, socket, statusCode, maxResponseSize } = this;
@@ -100123,7 +100125,7 @@ var require_client_h1 = __commonJS({
         }
         this.bytesRead += buf.length;
         if (request.onData(buf) === false) {
-          return constants2.ERROR.PAUSED;
+          return constants3.ERROR.PAUSED;
         }
       }
       onMessageComplete() {
@@ -100158,13 +100160,13 @@ var require_client_h1 = __commonJS({
         if (socket[kWriting]) {
           assert(client[kRunning] === 0);
           util.destroy(socket, new InformationalError("reset"));
-          return constants2.ERROR.PAUSED;
+          return constants3.ERROR.PAUSED;
         } else if (!shouldKeepAlive) {
           util.destroy(socket, new InformationalError("reset"));
-          return constants2.ERROR.PAUSED;
+          return constants3.ERROR.PAUSED;
         } else if (socket[kReset] && client[kRunning] === 0) {
           util.destroy(socket, new InformationalError("reset"));
-          return constants2.ERROR.PAUSED;
+          return constants3.ERROR.PAUSED;
         } else if (client[kPipelining] == null || client[kPipelining] === 1) {
           setImmediate(() => client[kResume]());
         } else {
@@ -114632,11 +114634,8 @@ async function resolveValue(value, vault) {
     return Promise.all(value.map((v3) => resolveValue(v3, vault)));
   }
   if (value && typeof value === "object") {
-    const out = {};
-    for (const [k3, v3] of Object.entries(value)) {
-      out[k3] = await resolveValue(v3, vault);
-    }
-    return out;
+    const pairs = await Promise.all(Object.entries(value).map(async ([k3, v3]) => [k3, await resolveValue(v3, vault)]));
+    return Object.fromEntries(pairs);
   }
   return value;
 }
@@ -115200,6 +115199,15 @@ function rankCosine(entries, vectors, query, limit2) {
   ranked.sort((a2, b3) => b3.score - a2.score);
   return ranked.slice(0, limit2);
 }
+function countOccurrences(haystack, needle) {
+  let n2 = 0;
+  let i2 = haystack.indexOf(needle);
+  while (i2 !== -1) {
+    n2 += 1;
+    i2 = haystack.indexOf(needle, i2 + needle.length);
+  }
+  return n2;
+}
 function entryForEmbedding(entry) {
   return [
     entry.frontmatter.name,
@@ -115216,7 +115224,7 @@ function scoreEntry(entry, tokens) {
   for (const t2 of tokens) {
     if (!t2)
       continue;
-    const matches = haystack.split(t2).length - 1;
+    const matches = countOccurrences(haystack, t2);
     if (matches > 0) {
       score += matches;
       if (entry.frontmatter.name.toLowerCase().includes(t2))
@@ -126446,6 +126454,10 @@ var OpenAIProvider = class {
         req.signal ? { signal: req.signal } : void 0
       );
     } catch (err) {
+      if (req.signal?.aborted) {
+        yield { type: "error", message: "aborted", retryable: false };
+        return;
+      }
       yield { type: "error", ...toFriendlyError(err, { provider: this.name }) };
       return;
     }
@@ -126510,6 +126522,10 @@ var OpenAIProvider = class {
         }
       }
     } catch (err) {
+      if (req.signal?.aborted) {
+        yield { type: "error", message: "aborted", retryable: false };
+        return;
+      }
       yield { type: "error", ...toFriendlyError(err, { provider: this.name }) };
       return;
     }
@@ -126804,8 +126820,8 @@ async function refreshAccessToken(input, fetchImpl2 = fetch) {
   return parseTokenResponse(json);
 }
 function parseTokenResponse(json) {
-  const access = typeof json.access_token === "string" ? json.access_token : null;
-  if (!access) {
+  const access2 = typeof json.access_token === "string" ? json.access_token : null;
+  if (!access2) {
     throw new MoxxyError({
       code: "PROVIDER_UNKNOWN_RESPONSE",
       message: `token response missing access_token: ${JSON.stringify(json).slice(0, 200)}`
@@ -126817,7 +126833,7 @@ function parseTokenResponse(json) {
   const tokenType = typeof json.token_type === "string" ? json.token_type : "Bearer";
   const idToken = typeof json.id_token === "string" ? json.id_token : void 0;
   return {
-    accessToken: access,
+    accessToken: access2,
     ...refresh !== void 0 ? { refreshToken: refresh } : {},
     ...expiresIn != null ? { expiresAt: Date.now() + expiresIn * 1e3 } : {},
     ...scope !== void 0 ? { scope } : {},
@@ -127078,24 +127094,27 @@ async function storeTokenSet(vault, provider, tokens, meta) {
 async function readStoredCreds(vault, provider) {
   validateProvider(provider);
   const base2 = `oauth/${provider}`;
-  const access = await vault.get(`${base2}/access_token`);
-  if (!access)
+  const access2 = await vault.get(`${base2}/access_token`);
+  if (!access2)
     return null;
-  const refresh = await vault.get(`${base2}/refresh_token`);
-  const expiresStr = await vault.get(`${base2}/expires_at`);
-  const scope = await vault.get(`${base2}/scope`);
-  const tokenType = await vault.get(`${base2}/token_type`) ?? "Bearer";
-  const idToken = await vault.get(`${base2}/id_token`);
-  const clientId = await vault.get(`${base2}/client_id`);
-  const clientSecret = await vault.get(`${base2}/client_secret`);
-  const tokenUrl = await vault.get(`${base2}/token_url`);
-  const extrasRaw = await vault.get(`${base2}/extras`);
+  const [refresh, expiresStr, scope, tokenTypeRaw, idToken, clientId, clientSecret, tokenUrl, extrasRaw] = await Promise.all([
+    vault.get(`${base2}/refresh_token`),
+    vault.get(`${base2}/expires_at`),
+    vault.get(`${base2}/scope`),
+    vault.get(`${base2}/token_type`),
+    vault.get(`${base2}/id_token`),
+    vault.get(`${base2}/client_id`),
+    vault.get(`${base2}/client_secret`),
+    vault.get(`${base2}/token_url`),
+    vault.get(`${base2}/extras`)
+  ]);
+  const tokenType = tokenTypeRaw ?? "Bearer";
   if (!clientId || !tokenUrl) {
     return null;
   }
   return {
     tokenSet: {
-      accessToken: access,
+      accessToken: access2,
       ...refresh !== null ? { refreshToken: refresh } : {},
       ...expiresStr !== null ? { expiresAt: Number.parseInt(expiresStr, 10) } : {},
       ...scope !== null ? { scope } : {},
@@ -127886,6 +127905,17 @@ function buildCodexHeaders(tokens, sessionId) {
   return headers;
 }
 
+// ../plugin-provider-openai-codex/dist/codex/stream-types.js
+function parseToolArgs(args) {
+  if (!args)
+    return {};
+  try {
+    return JSON.parse(args);
+  } catch {
+    return { _rawPartial: args };
+  }
+}
+
 // ../plugin-provider-openai-codex/dist/codex/sse-event-handler.js
 function handleSseEvent(ev, pending2, emitReasoning = false) {
   const type = ev.type ?? "";
@@ -127942,14 +127972,7 @@ function handleSseEvent(ev, pending2, emitReasoning = false) {
     pending2.delete(id);
     if (typeof ev.arguments === "string" && ev.arguments)
       entry.args = ev.arguments;
-    let input = {};
-    if (entry.args) {
-      try {
-        input = JSON.parse(entry.args);
-      } catch {
-        input = { _rawPartial: entry.args };
-      }
-    }
+    const input = parseToolArgs(entry.args);
     const outId = entry.callId || entry.id;
     const events = [];
     if (!entry.emittedStart && entry.name) {
@@ -128014,12 +128037,13 @@ async function* consumeResponsesSse(body, signal, emitReasoning = false) {
         if (done)
           break;
         buffer += decoder.decode(value, { stream: true });
-        buffer = buffer.replace(/\r\n/g, "\n");
-        let sep3;
-        while ((sep3 = buffer.indexOf("\n\n")) !== -1) {
-          const frame = buffer.slice(0, sep3);
-          buffer = buffer.slice(sep3 + 2);
-          for (const line of frame.split("\n")) {
+        let m3;
+        const sepRe = /\r?\n\r?\n/g;
+        while ((m3 = sepRe.exec(buffer)) !== null) {
+          const frame = buffer.slice(0, m3.index);
+          buffer = buffer.slice(m3.index + m3[0].length);
+          sepRe.lastIndex = 0;
+          for (const line of frame.split(/\r?\n/)) {
             if (!line.startsWith("data:"))
               continue;
             const payload = line.slice(5).trimStart();
@@ -128061,16 +128085,8 @@ async function* consumeResponsesSse(body, signal, emitReasoning = false) {
       return;
     for (const entry of pending2.values()) {
       if (entry.emittedStart) {
-        let input = {};
-        if (entry.args) {
-          try {
-            input = JSON.parse(entry.args);
-          } catch {
-            input = { _rawPartial: entry.args };
-          }
-        }
         sawToolCall = true;
-        yield { type: "tool_use_end", id: entry.callId || entry.id, input };
+        yield { type: "tool_use_end", id: entry.callId || entry.id, input: parseToolArgs(entry.args) };
       }
     }
     if (stopReason === "end_turn" && sawToolCall) {
@@ -129736,11 +129752,11 @@ var SUMMARY_CHARS = 1500;
 var recallTool = defineTool({
   name: "recall",
   description: 'Retrieve earlier content that was elided from context to save tokens. Pass the `callId` shown in an "[output elided \u2014 recall(...)]" stub to get a tool result back, or a `seq` / `turnId` to recall an earlier message or whole turn. Set `summarize: true` for a truncated preview instead of the full text. Only call this when you actually need the detail \u2014 the recent context is always present verbatim.',
-  inputSchema: z.object({
-    callId: z.string().optional().describe("The callId from an elided tool-result stub."),
-    seq: z.number().int().nonnegative().optional().describe("Event sequence number to recall."),
-    turnId: z.string().optional().describe("Recall every message from this turn."),
-    summarize: z.boolean().optional().describe("Return a truncated preview instead of the full content.")
+  inputSchema: z$1.object({
+    callId: z$1.string().optional().describe("The callId from an elided tool-result stub."),
+    seq: z$1.number().int().nonnegative().optional().describe("Event sequence number to recall."),
+    turnId: z$1.string().optional().describe("Recall every message from this turn."),
+    summarize: z$1.boolean().optional().describe("Return a truncated preview instead of the full content.")
   }),
   permission: { action: "allow" },
   isolation: {
@@ -130432,7 +130448,8 @@ async function* runGoalMode(ctx) {
     const exited = yield* executeToolUses(goalCtx, toolUses, iteration);
     if (exited)
       return;
-    const terminal = detectGoalTerminal(ctx.log.slice(), toolUses);
+    const hasGoalTool = toolUses.some((t2) => t2.name === GOAL_COMPLETE_TOOL || t2.name === GOAL_ABANDON_TOOL);
+    const terminal = hasGoalTool ? detectGoalTerminal(ctx.log.slice(), toolUses) : null;
     if (terminal?.kind === "complete") {
       yield await ctx.emit({
         type: "plugin_event",
@@ -132768,7 +132785,10 @@ async function handleVoiceMessage(ctx, state, deps, cb) {
   const fetcher = cb.fetchAudio ?? ((u2) => fetch(u2));
   const response = await fetcher(url2);
   if (!response.ok) {
-    deps.logger?.warn("telegram voice download failed", { status: "ok=false" });
+    deps.logger?.warn("telegram voice download failed", {
+      ...response.status !== void 0 ? { status: response.status } : {},
+      ...response.statusText ? { statusText: response.statusText } : {}
+    });
     await ctx.reply("Failed to download the voice note from Telegram.");
     return;
   }
@@ -134377,7 +134397,7 @@ async function driveTurn(session, prompt, runOptions, res) {
   } finally {
     res.off("close", onClose);
   }
-  const finalAssistant = events.findLast?.((e3) => e3.type === "assistant_message");
+  const finalAssistant = events.findLast((e3) => e3.type === "assistant_message");
   const assistant = finalAssistant && finalAssistant.type === "assistant_message" ? finalAssistant.content : "";
   return { events, assistant };
 }
@@ -135547,6 +135567,31 @@ var JsonRpcPeer = class {
     this.closeHandlers.length = 0;
   }
 };
+function platformSocket(name, posixPath, platform2 = process.platform) {
+  if (platform2 === "win32") {
+    return `\\\\.\\pipe\\moxxy-${name.replace(/[^A-Za-z0-9_-]/g, "_")}`;
+  }
+  return posixPath;
+}
+function runnerSocketPath() {
+  const override = process.env.MOXXY_RUNNER_SOCKET;
+  if (override)
+    return override;
+  return platformSocket("serve", path3__default.join(os5__default.homedir(), ".moxxy", "serve.sock"));
+}
+function isRunnerUp(socketPath = runnerSocketPath()) {
+  return new Promise((resolve12) => {
+    const socket = net2.connect(socketPath);
+    const finish = (up) => {
+      socket.destroy();
+      resolve12(up);
+    };
+    socket.once("connect", () => finish(true));
+    socket.once("error", () => finish(false));
+  });
+}
+
+// ../runner/dist/unix-socket.js
 var stderrLogger = {
   warn: (msg, meta) => process.stderr.write(`[moxxy-runner] WARN ${msg} ${meta ? JSON.stringify(meta) : ""}
 `),
@@ -135568,10 +135613,11 @@ var NdjsonTransport = class {
   }
   onData(chunk) {
     this.buffer += chunk;
-    let newline = this.buffer.indexOf("\n");
+    let start = 0;
+    let newline = this.buffer.indexOf("\n", start);
     while (newline >= 0) {
-      const line = this.buffer.slice(0, newline);
-      this.buffer = this.buffer.slice(newline + 1);
+      const line = this.buffer.slice(start, newline);
+      start = newline + 1;
       if (line.trim().length > 0) {
         let parsed;
         try {
@@ -135582,8 +135628,9 @@ var NdjsonTransport = class {
         if (parsed !== void 0)
           this.frameHandler?.(parsed);
       }
-      newline = this.buffer.indexOf("\n");
+      newline = this.buffer.indexOf("\n", start);
     }
+    this.buffer = start > 0 ? this.buffer.slice(start) : this.buffer;
   }
   emitClose(err) {
     if (this.closedEmitted)
@@ -135615,7 +135662,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
     warnWindowsPipeAclOnce(logger, socketPath);
   }
   const connectionHandlers = [];
-  const server = net.createServer((socket) => {
+  const server = net2.createServer((socket) => {
     const transport = new NdjsonTransport(socket);
     for (const handler of connectionHandlers)
       handler(transport);
@@ -135661,7 +135708,7 @@ var DEFAULT_CONNECT_TIMEOUT_MS = 1e4;
 function connectUnixSocket(socketPath, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
   return new Promise((resolve12, reject) => {
-    const socket = net.connect(socketPath);
+    const socket = net2.connect(socketPath);
     let settled = false;
     const timer = setTimeout(() => {
       if (settled)
@@ -135717,15 +135764,7 @@ function warnWindowsPipeAclOnce(logger, pipePath) {
 async function reclaimStaleSocket(socketPath) {
   if (!fs28__default.existsSync(socketPath))
     return;
-  const alive = await new Promise((resolve12) => {
-    const probe = net.connect(socketPath);
-    const finish = (up) => {
-      probe.destroy();
-      resolve12(up);
-    };
-    probe.once("connect", () => finish(true));
-    probe.once("error", () => finish(false));
-  });
+  const alive = await isRunnerUp(socketPath);
   if (!alive) {
     try {
       fs28__default.unlinkSync(socketPath);
@@ -135733,29 +135772,6 @@ async function reclaimStaleSocket(socketPath) {
     }
   }
 }
-function platformSocket(name, posixPath, platform2 = process.platform) {
-  if (platform2 === "win32") {
-    return `\\\\.\\pipe\\moxxy-${name.replace(/[^A-Za-z0-9_-]/g, "_")}`;
-  }
-  return posixPath;
-}
-function runnerSocketPath() {
-  const override = process.env.MOXXY_RUNNER_SOCKET;
-  if (override)
-    return override;
-  return platformSocket("serve", path3__default.join(os5__default.homedir(), ".moxxy", "serve.sock"));
-}
-function isRunnerUp(socketPath = runnerSocketPath()) {
-  return new Promise((resolve12) => {
-    const socket = net.connect(socketPath);
-    const finish = (up) => {
-      socket.destroy();
-      resolve12(up);
-    };
-    socket.once("connect", () => finish(true));
-    socket.once("error", () => finish(false));
-  });
-}
 
 // ../runner/dist/server.js
 init_dist();
@@ -139028,8 +139044,12 @@ function buildTerminalSurface() {
       const proc = await getSharedTerminal(ctx.cwd);
       const dataSubs = /* @__PURE__ */ new Set();
       const emit2 = (payload) => {
-        for (const cb of dataSubs)
-          cb(payload);
+        for (const cb of dataSubs) {
+          try {
+            cb(payload);
+          } catch {
+          }
+        }
       };
       const unsubData = proc.onData((data) => emit2({ type: "data", data }));
       const unsubExit = proc.onExit((code) => emit2({ type: "exit", code }));
@@ -140356,21 +140376,7 @@ var keyTool = defineTool({
   async handler({ key, modifiers }, ctx) {
     ensureDarwin("computer_key");
     const mods = modifiers ?? [];
-    const usingClause = mods.length > 0 ? ` using {${mods.map(modifierClause).join(", ")}}` : "";
-    let script;
-    const lower2 = key.toLowerCase();
-    if (lower2 in KEY_CODES) {
-      script = `tell application "System Events" to key code ${KEY_CODES[lower2]}${usingClause}`;
-    } else if (key.length === 1) {
-      const literal3 = `"${key.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
-      script = `tell application "System Events" to keystroke ${literal3}${usingClause}`;
-    } else {
-      throw new MoxxyError({
-        code: "TOOL_ERROR",
-        message: `unknown key "${key}". Use a single character or one of: ${Object.keys(KEY_CODES).join(", ")}.`,
-        context: { tool: "computer_key", key }
-      });
-    }
+    const script = buildKeyScript(key, mods);
     const proc = await runProcess("osascript", ["-e", script], {
       ...ctx.signal ? { signal: ctx.signal } : {},
       timeoutMs: 1e4
@@ -140385,6 +140391,22 @@ var keyTool = defineTool({
     return { ok: true, key, modifiers: mods };
   }
 });
+function buildKeyScript(key, modifiers) {
+  const usingClause = modifiers.length > 0 ? ` using {${modifiers.map(modifierClause).join(", ")}}` : "";
+  const lower2 = key.toLowerCase();
+  if (lower2 in KEY_CODES) {
+    return `tell application "System Events" to key code ${KEY_CODES[lower2]}${usingClause}`;
+  }
+  if (key.length === 1) {
+    const literal3 = `"${key.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+    return `tell application "System Events" to keystroke ${literal3}${usingClause}`;
+  }
+  throw new MoxxyError({
+    code: "TOOL_ERROR",
+    message: `unknown key "${key}". Use a single character or one of: ${Object.keys(KEY_CODES).join(", ")}.`,
+    context: { tool: "computer_key", key }
+  });
+}
 function modifierClause(m3) {
   switch (m3) {
     case "cmd":
@@ -140687,6 +140709,24 @@ function nextFireTime(expr, after, timeZone) {
   }
   return null;
 }
+var formatterCache = /* @__PURE__ */ new Map();
+function formatterFor(timeZone) {
+  let fmt2 = formatterCache.get(timeZone);
+  if (!fmt2) {
+    fmt2 = new Intl.DateTimeFormat("en-US", {
+      timeZone,
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      weekday: "short",
+      hour: "2-digit",
+      minute: "2-digit",
+      hour12: false
+    });
+    formatterCache.set(timeZone, fmt2);
+  }
+  return fmt2;
+}
 function decomposeInZone(d2, timeZone) {
   if (!timeZone || timeZone === "local") {
     return {
@@ -140698,16 +140738,7 @@ function decomposeInZone(d2, timeZone) {
       minute: d2.getMinutes()
     };
   }
-  const fmt2 = new Intl.DateTimeFormat("en-US", {
-    timeZone,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    weekday: "short",
-    hour: "2-digit",
-    minute: "2-digit",
-    hour12: false
-  });
+  const fmt2 = formatterFor(timeZone);
   const parts = {};
   for (const part of fmt2.formatToParts(d2))
     parts[part.type] = part.value;
@@ -143821,11 +143852,9 @@ async function runTask() {
   }
 }
 `;
-var DEFAULT_ENV = ["PATH", "HOME", "USER", "SHELL", "LANG", "LC_ALL", "TERM"];
 var KILL_GRACE_MS = 2e3;
 function createSubprocessIsolator(opts = {}) {
   const defaultTimeMs = opts.defaultTimeMs ?? 6e4;
-  const envAllowlist = opts.defaultEnvAllowlist ?? DEFAULT_ENV;
   const nodePath = opts.nodePath ?? process.execPath;
   return {
     name: "subprocess",
@@ -143839,13 +143868,7 @@ function createSubprocessIsolator(opts = {}) {
         throw new Error(`[security:subprocess] ${verdict.reason}`);
       }
       const timeMs = caps.timeMs ?? defaultTimeMs;
-      const allowedEnv = caps.env ?? envAllowlist;
-      const env3 = {};
-      for (const key of allowedEnv) {
-        const v3 = process.env[key];
-        if (v3 !== void 0)
-          env3[key] = v3;
-      }
+      const env3 = buildBrokerEnv({ env: caps.env ?? opts.defaultEnvAllowlist }, void 0);
       const child = spawn(nodePath, ["--input-type=module", "-e", SHIM_SOURCE2], {
         cwd: call.cwd,
         env: env3,
@@ -144861,6 +144884,29 @@ async function loadDir2(dir, scope, logger) {
   }
   return out;
 }
+
+// ../plugin-workflows/dist/format.js
+function slugify2(name) {
+  return name.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60);
+}
+function triggerSummary(on) {
+  if (!on)
+    return "on-demand";
+  const parts = [];
+  if (on.schedule?.cron)
+    parts.push(`cron(${on.schedule.cron})`);
+  if (on.schedule?.runAt)
+    parts.push("runAt");
+  if (on.afterWorkflow)
+    parts.push(`after(${[on.afterWorkflow].flat().join(",")})`);
+  if (on.fileChanged)
+    parts.push("fileChanged");
+  if (on.webhook)
+    parts.push(`webhook(${on.webhook})`);
+  return parts.length > 0 ? parts.join(" + ") : "on-demand";
+}
+
+// ../plugin-workflows/dist/store.js
 var WorkflowStore = class {
   byName = /* @__PURE__ */ new Map();
   opts;
@@ -144982,9 +145028,6 @@ async function uniqueFilename2(dir, base2) {
   }
   return candidate;
 }
-function slugify2(name) {
-  return name.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60);
-}
 async function exists3(p3) {
   try {
     await promises.access(p3);
@@ -146282,22 +146325,6 @@ function validateTool(deps) {
     }
   });
 }
-function triggerSummary(on) {
-  if (!on)
-    return "on-demand";
-  const parts = [];
-  if (on.schedule?.cron)
-    parts.push(`cron(${on.schedule.cron})`);
-  if (on.schedule?.runAt)
-    parts.push("runAt");
-  if (on.afterWorkflow)
-    parts.push(`after(${[on.afterWorkflow].flat().join(",")})`);
-  if (on.fileChanged)
-    parts.push("fileChanged");
-  if (on.webhook)
-    parts.push(`webhook(${on.webhook})`);
-  return parts.length > 0 ? parts.join(" + ") : "on-demand";
-}
 var HELP = [
   "Usage: /workflows <subcommand>",
   "  list                 show all workflows (\u25CF enabled / \u25CB disabled)",
@@ -146367,7 +146394,7 @@ async function listCmd(deps) {
   }
   const rows = [...all].sort((a2, b3) => a2.workflow.name.localeCompare(b3.workflow.name)).map((w4) => {
     const mark = w4.workflow.enabled ? "\u25CF" : "\u25CB";
-    const trig = triggerSummary2(w4.workflow.on);
+    const trig = triggerSummary(w4.workflow.on);
     return `  ${mark} ${w4.workflow.name}  [${w4.scope}]  ${w4.workflow.steps.length} steps  ${trig}
       ${w4.workflow.description}`;
   });
@@ -146441,7 +146468,7 @@ async function validateCmd(deps, name) {
 async function newCmd2(deps, name) {
   if (!name)
     return { kind: "error", message: "usage: /workflows new <name>" };
-  const slug = slugify3(name);
+  const slug = slugify2(name);
   if (!/^[a-z0-9][a-z0-9-]*$/i.test(slug))
     return { kind: "error", message: `"${name}" is not a valid workflow name.` };
   const dir = deps.userDir ?? defaultUserWorkflowsDir();
@@ -146484,22 +146511,6 @@ async function rmCmd(deps, name) {
 function statusMark(status) {
   return status === "completed" ? "\u2713" : status === "skipped" ? "\u2013" : status === "failed" ? "\u2717" : "\xB7";
 }
-function triggerSummary2(on) {
-  if (!on)
-    return "on-demand";
-  const parts = [];
-  if (on.schedule?.cron)
-    parts.push(`cron(${on.schedule.cron})`);
-  if (on.schedule?.runAt)
-    parts.push("runAt");
-  if (on.afterWorkflow)
-    parts.push(`after(${[on.afterWorkflow].flat().join(",")})`);
-  if (on.fileChanged)
-    parts.push("fileChanged");
-  if (on.webhook)
-    parts.push(`webhook(${on.webhook})`);
-  return parts.length > 0 ? parts.join("+") : "on-demand";
-}
 async function readLastRun(dir, name) {
   if (!dir)
     return null;
@@ -146513,7 +146524,7 @@ async function readLastRun(dir, name) {
   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 lines = raw.trim().split("\n").filter((l2) => !l2.startsWith('{"kind":"output"')).map((l2) => JSON.parse(l2));
       const run2 = lines.find((l2) => l2.kind === "run");
       if (run2?.workflow !== name)
         continue;
@@ -146532,9 +146543,6 @@ function truncate7(s2, max) {
   return s2.length > max ? `${s2.slice(0, max)}
 \u2026 (truncated)` : s2;
 }
-function slugify3(name) {
-  return name.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60);
-}
 function starterTemplate(slug) {
   return `# Workflow: ${slug}
 # A DAG of steps. Each step has exactly one action: skill | prompt | tool | workflow.
@@ -146735,7 +146743,7 @@ function buildWorkflowsIntegration(args) {
       enabled: w4.workflow.enabled,
       scope: w4.scope,
       steps: w4.workflow.steps.length,
-      triggers: triggerSummary3(w4.workflow.on)
+      triggers: triggerSummary2(w4.workflow.on)
     })),
     setEnabled: async (name, enabled) => {
       await store.setEnabled(name, enabled);
@@ -147023,7 +147031,7 @@ function safeActiveProvider(session) {
     return null;
   }
 }
-function triggerSummary3(on) {
+function triggerSummary2(on) {
   if (!on) return "on-demand";
   const parts = [];
   if (on.schedule?.cron) parts.push(`cron(${on.schedule.cron})`);
@@ -150433,7 +150441,7 @@ function cliBin() {
 }
 async function fileExists(p3) {
   try {
-    await readFile(p3);
+    await access(p3, constants$1.F_OK);
     return true;
   } catch {
     return false;