@moxxy/cli 0.5.1 → 0.5.5

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, createMutex, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, zodToJsonSchema, asToolCallId, dispatchToolCall, runSingleShotTurn, bearerTokenMatches, estimateContextTokens, readRequestBody, moxxyPath, defineEmbedder, skillFrontmatterSchema, asSkillId, getInstallHint, moxxyHome, defineTranscriber, summarizeTokensByModel, migrateModeName, createDeferredPermissionResolver, classifyNetworkError, addModelTotals, ISOLATION_RANK, moxxyPackageSchema, defineCommand, createCallbackResolver, autoAllowResolver, asSessionId, defineViewRenderer, DEFAULT_VIEW_TAGS, evaluateToolRule, summarizeSessionTokensFromEvents, asEventId } from '@moxxy/sdk';
+import { z as z$1, defineProvider, definePlugin, defineTool, MoxxyError, writeFileAtomic, asTurnId, defineMode, asPluginId, defineChannel, defineTunnelProvider, createMutex, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, zodToJsonSchema, runSingleShotTurn, bearerTokenMatches, estimateContextTokens, readRequestBody, moxxyPath, defineEmbedder, skillFrontmatterSchema, asSkillId, getInstallHint, moxxyHome, defineTranscriber, summarizeTokensByModel, migrateModeName, createDeferredPermissionResolver, classifyNetworkError, addModelTotals, ISOLATION_RANK, moxxyPackageSchema, defineCommand, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, evaluateToolRule, summarizeSessionTokensFromEvents, asEventId } from '@moxxy/sdk';
 import * as fs37 from 'fs';
 import fs37__default, { existsSync, promises, ReadStream, readFileSync, statSync, readdirSync, mkdirSync, writeFileSync, unlinkSync, watch, createReadStream } from 'fs';
 import * as path3 from 'path';
@@ -92262,6 +92262,7 @@ init_dist();
 async function buildSession(args) {
   const userPolicyPath = args.config.permissions?.policyPath ?? path3.join(os5.homedir(), ".moxxy", "permissions.json");
   const permissionEngine = await PermissionEngine.load(userPolicyPath);
+  const effectiveSessionId = args.resumeSessionId ?? args.sessionId;
   let restoredEvents = [];
   if (args.resumeSessionId) {
     try {
@@ -92275,6 +92276,12 @@ async function buildSession(args) {
         cause: err
       });
     }
+  } else if (args.sessionId) {
+    try {
+      restoredEvents = await restoreEvents(args.sessionId);
+    } catch {
+      restoredEvents = [];
+    }
   }
   const userPluginsDir2 = path3.join(os5.homedir(), ".moxxy", "plugins");
   return new Session({
@@ -92290,7 +92297,7 @@ async function buildSession(args) {
     pluginDiscoveryPaths: [userPluginsDir2, path3.join(userPluginsDir2, "node_modules")],
     ...args.isPluginDisabled ? { isPluginDisabled: args.isPluginDisabled } : {},
     ...args.secretResolver ? { secretResolver: args.secretResolver } : {},
-    ...args.resumeSessionId ? { sessionId: args.resumeSessionId } : {},
+    ...effectiveSessionId ? { sessionId: effectiveSessionId } : {},
     // Seed restored events directly into the log so subscribers don't
     // re-fire side effects for historical events. New appends from this
     // point onward fire subscribers normally (and the persistence
@@ -105571,7 +105578,11 @@ async function* runDefaultMode(ctx) {
       continue;
     }
     reactiveCompactions = 0;
-    const stuck = yield* emitRequestsAndDetectStuck(ctx, toolUses, detector);
+    const stuck = yield* emitRequestsAndDetectStuck(ctx, toolUses, detector, {
+      abortedResultMessage: "default mode loop aborted (stuck pattern) before this call ran",
+      nearHint: "against the same target (only volatile args like maxBytes varied)",
+      fatalMessage: ({ toolName, count, how }) => `default mode loop aborted \u2014 detected stuck pattern: tool "${toolName}" called ${count} times ${how}. The model is likely looping on the same call; reset or rephrase.`
+    });
     if (stuck)
       return;
     if (text || stopReason === "end_turn" || toolUses.length === 0) {
@@ -105599,79 +105610,6 @@ async function* runDefaultMode(ctx) {
     message: `default mode loop exceeded maxIterations (${maxIterations})`
   });
 }
-async function* emitRequestsAndDetectStuck(ctx, toolUses, detector) {
-  const emitted = [];
-  for (const t2 of toolUses) {
-    yield await ctx.emit({
-      type: "tool_call_requested",
-      sessionId: ctx.sessionId,
-      turnId: ctx.turnId,
-      source: "model",
-      callId: asToolCallId(t2.id),
-      name: t2.name,
-      input: t2.input
-    });
-    emitted.push(t2);
-    const sig = detector.record(t2.name, t2.input);
-    if (sig.stuck) {
-      for (const r2 of emitted) {
-        yield await ctx.emit({
-          type: "tool_result",
-          sessionId: ctx.sessionId,
-          turnId: ctx.turnId,
-          source: "tool",
-          callId: asToolCallId(r2.id),
-          ok: false,
-          error: { kind: "aborted", message: "default mode loop aborted (stuck pattern) before this call ran" }
-        });
-      }
-      const how = sig.kind === "near" ? "against the same target (only volatile args like maxBytes varied)" : "with identical input";
-      yield await ctx.emit({
-        type: "error",
-        sessionId: ctx.sessionId,
-        turnId: ctx.turnId,
-        source: "system",
-        kind: "fatal",
-        message: `default mode loop aborted \u2014 detected stuck pattern: tool "${t2.name}" called ${sig.count} times ${how}. The model is likely looping on the same call; reset or rephrase.`
-      });
-      return true;
-    }
-  }
-  return false;
-}
-async function* executeToolUses(ctx, toolUses, iteration) {
-  const unresolved = new Set(toolUses.map((t2) => t2.id));
-  for (const t2 of toolUses) {
-    if (ctx.signal.aborted) {
-      for (const orphanId of unresolved) {
-        yield await ctx.emit({
-          type: "tool_result",
-          sessionId: ctx.sessionId,
-          turnId: ctx.turnId,
-          source: "tool",
-          callId: asToolCallId(orphanId),
-          ok: false,
-          error: { kind: "aborted", message: "turn aborted before tool ran" }
-        });
-      }
-      unresolved.clear();
-      yield await ctx.emit({
-        type: "abort",
-        sessionId: ctx.sessionId,
-        turnId: ctx.turnId,
-        source: "system",
-        reason: "signal aborted during tool execution"
-      });
-      return true;
-    }
-    try {
-      yield* dispatchToolCall(ctx, t2, iteration);
-    } finally {
-      unresolved.delete(t2.id);
-    }
-  }
-  return false;
-}
 function buildMessages(ctx) {
   const systemPrompt = buildSystemPromptWithSkills(ctx.systemPrompt, ctx.skills.list());
   return projectMessages(ctx, { ...systemPrompt ? { systemPrompt } : {} });
@@ -105907,7 +105845,22 @@ async function* runGoalMode(ctx) {
       });
       return;
     }
-    const stuck = yield* emitRequestsAndDetectStuck2(ctx, toolUses, detector);
+    const stuck = yield* emitRequestsAndDetectStuck(ctx, toolUses, detector, {
+      abortedResultMessage: "goal mode aborted (stuck pattern) before this call ran",
+      nearHint: "against the same target (only volatile args varied)",
+      extraOnStuck: ({ toolName, count, kind: kind3 }) => [
+        {
+          type: "plugin_event",
+          sessionId: ctx.sessionId,
+          turnId: ctx.turnId,
+          source: "plugin",
+          pluginId: GOAL_PLUGIN_ID,
+          subtype: "goal_stuck",
+          payload: { tool: toolName, count, kind: kind3 }
+        }
+      ],
+      fatalMessage: ({ toolName, count, how }) => `goal mode aborted \u2014 stuck pattern: tool "${toolName}" called ${count} times ${how}. The model is looping on the same call; send another message to redirect it.`
+    });
     if (stuck)
       return;
     if (text || stopReason === "end_turn" || toolUses.length === 0) {
@@ -105945,7 +105898,7 @@ async function* runGoalMode(ctx) {
       continue;
     }
     noop3 = 0;
-    const exited = yield* executeToolUses2(goalCtx, toolUses, iteration);
+    const exited = yield* executeToolUses(goalCtx, toolUses, iteration);
     if (exited)
       return;
     const terminal = detectGoalTerminal(ctx.log.slice(), toolUses);
@@ -106023,88 +105976,6 @@ function composeSystemPrompts(user, layer) {
 
 ${user}`;
 }
-async function* emitRequestsAndDetectStuck2(ctx, toolUses, detector) {
-  const emitted = [];
-  for (const t2 of toolUses) {
-    yield await ctx.emit({
-      type: "tool_call_requested",
-      sessionId: ctx.sessionId,
-      turnId: ctx.turnId,
-      source: "model",
-      callId: asToolCallId(t2.id),
-      name: t2.name,
-      input: t2.input
-    });
-    emitted.push(t2);
-    const sig = detector.record(t2.name, t2.input);
-    if (sig.stuck) {
-      for (const r2 of emitted) {
-        yield await ctx.emit({
-          type: "tool_result",
-          sessionId: ctx.sessionId,
-          turnId: ctx.turnId,
-          source: "tool",
-          callId: asToolCallId(r2.id),
-          ok: false,
-          error: { kind: "aborted", message: "goal mode aborted (stuck pattern) before this call ran" }
-        });
-      }
-      const how = sig.kind === "near" ? "against the same target (only volatile args varied)" : "with identical input";
-      yield await ctx.emit({
-        type: "plugin_event",
-        sessionId: ctx.sessionId,
-        turnId: ctx.turnId,
-        source: "plugin",
-        pluginId: GOAL_PLUGIN_ID,
-        subtype: "goal_stuck",
-        payload: { tool: t2.name, count: sig.count, kind: sig.kind }
-      });
-      yield await ctx.emit({
-        type: "error",
-        sessionId: ctx.sessionId,
-        turnId: ctx.turnId,
-        source: "system",
-        kind: "fatal",
-        message: `goal mode aborted \u2014 stuck pattern: tool "${t2.name}" called ${sig.count} times ${how}. The model is looping on the same call; send another message to redirect it.`
-      });
-      return true;
-    }
-  }
-  return false;
-}
-async function* executeToolUses2(ctx, toolUses, iteration) {
-  const unresolved = new Set(toolUses.map((t2) => t2.id));
-  for (const t2 of toolUses) {
-    if (ctx.signal.aborted) {
-      for (const orphanId of unresolved) {
-        yield await ctx.emit({
-          type: "tool_result",
-          sessionId: ctx.sessionId,
-          turnId: ctx.turnId,
-          source: "tool",
-          callId: asToolCallId(orphanId),
-          ok: false,
-          error: { kind: "aborted", message: "turn aborted before tool ran" }
-        });
-      }
-      unresolved.clear();
-      yield await ctx.emit({
-        type: "abort",
-        sessionId: ctx.sessionId,
-        turnId: ctx.turnId,
-        source: "system",
-        reason: "signal aborted during tool execution"
-      });
-      return true;
-    }
-    try {
-      yield* dispatchToolCall(ctx, t2, iteration);
-    } finally {
-      unresolved.delete(t2.id);
-    }
-  }
-  return false;
-}
 
 // ../mode-goal/dist/index.js
 var goalMode = defineMode({
@@ -111346,28 +111217,54 @@ function buildSubagentsPlugin(opts = {}) {
   });
 }
 buildSubagentsPlugin();
+
+// ../plugin-plugins-admin/dist/shared.js
+var NPM_NAME_RE = /^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
+function assertSafeNpmSpec(spec) {
+  const trimmed = spec.trim();
+  if (trimmed.length === 0) {
+    throw new Error("plugin spec must be a non-empty package name, git spec, or path");
+  }
+  if (trimmed.startsWith("-")) {
+    throw new Error(`refusing plugin spec "${spec}": leading "-" would be parsed by npm as an option, not a package`);
+  }
+  return trimmed;
+}
+function diffSnapshot2(before, after) {
+  const out = {};
+  for (const key of ["tools", "agents", "providers", "modes", "compactors", "channels"]) {
+    const b3 = new Set(before[key]);
+    const added = after[key].filter((n2) => !b3.has(n2));
+    if (added.length > 0)
+      out[key] = added;
+  }
+  return out;
+}
+
+// ../plugin-plugins-admin/dist/install.js
 function userPluginsDir() {
   return moxxyPath("plugins");
 }
-var NPM_NAME_RE = /^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 var VERSION_RE = /^[0-9a-z.~^*<=>-]+$/i;
 async function installPluginPackage(opts) {
+  const spec = assertSafeNpmSpec(opts.packageName);
   const dir = userPluginsDir();
   await ensurePackageJson(dir);
-  const { exitCode, stderr } = await runNpm(["install", "--prefix", dir, "--no-fund", "--no-audit", "--save", opts.packageName], opts.signal);
+  const { exitCode, stderr } = await runNpm(["install", "--prefix", dir, "--no-fund", "--no-audit", "--save", spec], opts.signal);
   if (exitCode !== 0) {
     throw new Error(`npm install failed (exit ${exitCode}): ${truncate9(stderr, 400)}`);
   }
-  return { installed: opts.packageName, dir };
+  return { installed: spec, dir };
 }
 async function removePluginPackage(opts) {
+  const spec = assertSafeNpmSpec(opts.packageName);
   const dir = userPluginsDir();
   await ensurePackageJson(dir);
-  const { exitCode, stderr } = await runNpm(["uninstall", "--prefix", dir, "--no-fund", "--no-audit", "--save", opts.packageName], opts.signal);
+  const { exitCode, stderr } = await runNpm(["uninstall", "--prefix", dir, "--no-fund", "--no-audit", "--save", spec], opts.signal);
   if (exitCode !== 0) {
     throw new Error(`npm uninstall failed (exit ${exitCode}): ${truncate9(stderr, 400)}`);
   }
-  return { removed: opts.packageName, dir };
+  return { removed: spec, dir };
 }
 function buildInstallPluginTool(deps) {
   return defineTool({
@@ -111484,26 +111381,15 @@ function runNpm(args, signal) {
     });
   });
 }
-function diffSnapshot2(before, after) {
-  const out = {};
-  for (const key of ["tools", "agents", "providers", "modes", "compactors", "channels"]) {
-    const b3 = new Set(before[key]);
-    const added = after[key].filter((n2) => !b3.has(n2));
-    if (added.length > 0)
-      out[key] = added;
-  }
-  return out;
-}
 function truncate9(s2, n2) {
   return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
 }
-var NPM_NAME_RE2 = /^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 function buildDisablePluginTool(deps) {
   return defineTool({
     name: "disable_plugin",
     description: "Disable (unplug) a registered moxxy plugin \u2014 a default builtin or an installed one \u2014 by package name. Persists `plugins[<name>].enabled=false` to ~/.moxxy/config.yaml and unloads it from the running session, so its tools / agents / providers / modes / channels disappear immediately and it stays off across restarts. Reverse with enable_plugin. Use when the user wants to turn a plugin off without uninstalling it.",
     inputSchema: z$1.object({
-      packageName: z$1.string().min(1).refine((s2) => NPM_NAME_RE2.test(s2), {
+      packageName: z$1.string().min(1).refine((s2) => NPM_NAME_RE.test(s2), {
         message: "must be a valid moxxy package name (e.g. @moxxy/plugin-browser)"
       }).describe("Plugin package name to disable, e.g. @moxxy/plugin-browser.")
     }),
@@ -111512,7 +111398,7 @@ function buildDisablePluginTool(deps) {
       const before = deps.snapshot();
       await deps.setEnabled(packageName, false);
       const after = deps.snapshot();
-      return { disabled: packageName, unregistered: diffSnapshot3(after, before) };
+      return { disabled: packageName, unregistered: diffSnapshot2(after, before) };
     }
   });
 }
@@ -111521,7 +111407,7 @@ function buildEnablePluginTool(deps) {
     name: "enable_plugin",
     description: "Enable (plug back in) a previously-disabled moxxy plugin by package name. Persists `plugins[<name>].enabled=true` to ~/.moxxy/config.yaml and loads it into the running session (re-registering a default or re-discovering an installed plugin), so its contributions reappear immediately. Reverse with disable_plugin. Use when the user wants to turn a disabled plugin back on.",
     inputSchema: z$1.object({
-      packageName: z$1.string().min(1).refine((s2) => NPM_NAME_RE2.test(s2), {
+      packageName: z$1.string().min(1).refine((s2) => NPM_NAME_RE.test(s2), {
         message: "must be a valid moxxy package name (e.g. @moxxy/plugin-browser)"
       }).describe("Plugin package name to enable, e.g. @moxxy/plugin-browser.")
     }),
@@ -111530,20 +111416,10 @@ function buildEnablePluginTool(deps) {
       const before = deps.snapshot();
       await deps.setEnabled(packageName, true);
       const after = deps.snapshot();
-      return { enabled: packageName, registered: diffSnapshot3(before, after) };
+      return { enabled: packageName, registered: diffSnapshot2(before, after) };
     }
   });
 }
-function diffSnapshot3(before, after) {
-  const out = {};
-  for (const key of ["tools", "agents", "providers", "modes", "compactors", "channels"]) {
-    const b3 = new Set(before[key]);
-    const added = after[key].filter((n2) => !b3.has(n2));
-    if (added.length > 0)
-      out[key] = added;
-  }
-  return out;
-}
 
 // ../plugin-plugins-admin/dist/catalog.js
 var INSTALLABLE_PLUGIN_CATALOG = [
@@ -118322,6 +118198,7 @@ async function setupSessionWithConfig(opts) {
     config,
     resolver: opts.resolver,
     resumeSessionId: opts.resumeSessionId,
+    sessionId: opts.sessionId,
     logger,
     isPluginDisabled: (pkg) => disabledPackages.has(pkg),
     // Surface vault secrets to tool handlers as `ctx.getSecret(name)`. The
@@ -123548,9 +123425,11 @@ async function runServeStatus(except, all) {
   return 0;
 }
 async function runServeForeground(argv, except, all) {
+  const stickySessionId = process.env["MOXXY_SESSION_ID"]?.trim();
   const setup = await bootSessionWithConfig(argv, {
     skipKeyPrompt: true,
-    tolerateNoProvider: true
+    tolerateNoProvider: true,
+    ...stickySessionId ? { sessionId: stickySessionId } : {}
   });
   const { session, vault, config, scheduler, webhooks } = setup;
   const setupHandle = { scheduler, webhooks };