@mrrlin-dev/mcp 0.3.42 → 0.3.46

package/dist/bin.cjs

@@ -20672,12 +20672,18 @@ function browserPaths(homeDir = import_node_os.default.homedir()) {
   const root = import_node_path.default.join(homeDir, ".mrrlin", "browser");
   return { root, browsersPath: import_node_path.default.join(root, "browsers"), profilePath: import_node_path.default.join(root, "profile") };
 }
-function resolvePackageBin(pkg) {
+function resolvePackageBin(pkg, binName) {
   const require2 = moduleRequire();
   const pkgJsonPath = require2.resolve(`${pkg}/package.json`);
   const pkgJson = require2(`${pkg}/package.json`);
   const bin = pkgJson.bin;
-  const rel = typeof bin === "string" ? bin : bin ? Object.values(bin)[0] : void 0;
+  let rel;
+  if (binName && bin && typeof bin !== "string") {
+    rel = bin[binName];
+    if (!rel) throw new Error(`${pkg} has no bin entry named ${binName}`);
+  } else {
+    rel = typeof bin === "string" ? bin : bin ? Object.values(bin)[0] : void 0;
+  }
   if (!rel) throw new Error(`${pkg} has no bin entry to resolve a CLI from`);
   return import_node_path.default.join(import_node_path.default.dirname(pkgJsonPath), rel);
 }
@@ -20691,6 +20697,13 @@ function browserServeArgs(homeDir = import_node_os.default.homedir()) {
     env: { PLAYWRIGHT_BROWSERS_PATH: browsersPath }
   };
 }
+function externalAgentsServeArgs() {
+  return {
+    command: process.execPath,
+    // node
+    args: [resolvePackageBin("@mrrlin-dev/external-agents", "external-agents-mcp")]
+  };
+}
 async function installBrowser(opts = {}) {
   const homeDir = opts.homeDir ?? import_node_os.default.homedir();
   const { browsersPath } = browserPaths(homeDir);
@@ -20747,8 +20760,9 @@ function mrrlinTable(binPath, distribution, serveEnv) {
   }
   return { ...base, startup_timeout_sec: 30 };
 }
-function externalAgentsTable() {
-  return { command: "external-agents-mcp", args: [], startup_timeout_sec: 30 };
+function externalAgentsTable(binPath, distribution) {
+  const base = distribution === "npm" ? { command: "mrrlin-mcp", args: ["external-agents-serve"] } : { command: "node", args: [binPath, "external-agents-serve"] };
+  return { ...base, startup_timeout_sec: 30 };
 }
 function browserTable(binPath, distribution, homeDir) {
   const base = distribution === "npm" ? { command: "mrrlin-mcp", args: ["browser-serve"] } : { command: "node", args: [binPath, "browser-serve"] };
@@ -20773,8 +20787,22 @@ function managedBlocks(options, distribution) {
     },
     {
       id: "external-agents",
-      expected: externalAgentsTable(),
-      blockRe: blockRegex("external-agents")
+      expected: externalAgentsTable(options.binPath, distribution),
+      blockRe: blockRegex("external-agents"),
+      // Match ONLY the exact shape this installer used to write: a bare command, optionally with
+      // empty args / a startup_timeout_sec, and NOTHING else. An extra key means the operator
+      // customized the block — most plausibly a hand-added `env` carrying provider API keys, which
+      // renderBlock() would silently drop on rewrite (it renders strictly from `expected`). Such a
+      // block must fall through to CODEX_CONFIG_CONFLICT so replacing it takes an explicit --force,
+      // rather than losing an operator's credentials during a routine update. We deliberately do
+      // NOT carry the env forward instead: KNOWN_MRRLIN_ENV_KEYS treats any foreign key as
+      // operator-authored and never-preserve, so a carried key would turn the NEXT bare re-run into
+      // a conflict and break idempotency.
+      isLegacyOurs: (actual) => {
+        const legacyKeys = /* @__PURE__ */ new Set(["command", "args", "startup_timeout_sec"]);
+        if (!Object.keys(actual).every((key) => legacyKeys.has(key))) return false;
+        return actual.command === "external-agents-mcp" && (actual.args === void 0 || Array.isArray(actual.args) && actual.args.length === 0);
+      }
     }
   ];
 }
@@ -20917,6 +20945,12 @@ async function installCodex(options) {
         if (action === "noop") action = "env-preserved";
         continue;
       }
+      if (block.isLegacyOurs?.(existingTable)) {
+        content = replaceBlock(content, block.blockRe, renderBlock(block));
+        action = "replaced";
+        mutated = true;
+        continue;
+      }
       if (!options.force) {
         const err = {
           code: "CODEX_CONFIG_CONFLICT",
@@ -37497,6 +37531,38 @@ var mrrlinSchedulerPendingReasonSchema = external_exports.enum([
   "verification_due",
   "wake_floor_passed"
 ]);
+var mrrlinAutonomousStepSchema = external_exports.enum([
+  "noop",
+  "needs_human",
+  "enqueue_spec_draft",
+  "enqueue_consensus",
+  "auto_approve_spec_and_run",
+  "create_execution_run"
+]);
+var mrrlinAutonomousStepReasonSchema = external_exports.enum([
+  "task_terminal",
+  "active_run_exists",
+  "blocked_by_active",
+  "draft_running",
+  "consensus_running",
+  "spec_missing",
+  "spec_draft_failed",
+  "spec_not_specs_folder",
+  "awaiting_clarification",
+  "consensus_blocked",
+  "consensus_disabled_spec_not_ready",
+  "spec_approval_pending",
+  "non_code_execution_unsupported"
+]);
+var mrrlinAutonomousStepVerdictSchema = external_exports.object({
+  step: mrrlinAutonomousStepSchema,
+  reason: mrrlinAutonomousStepReasonSchema.nullable(),
+  // Additive: when reason is "spec_draft_failed" or "consensus_blocked" (the two reasons that park
+  // a task until a human intervenes), the attempt_count of the async_jobs row that produced that
+  // outcome — so the operator can see "failed x3" and judge whether a retry mechanism is needed.
+  // null for every other reason/step (not applicable), and also null if the job could not be found.
+  failureCount: external_exports.number().int().min(0).nullable()
+});
 var mrrlinSchedulerPendingTaskSchema = external_exports.object({
   dueAt: external_exports.string().datetime(),
   reason: mrrlinSchedulerPendingReasonSchema,
@@ -37506,7 +37572,12 @@ var mrrlinSchedulerPendingTaskSchema = external_exports.object({
   // trigger at all. Consumers must read this instead of re-deriving due-ness by re-parsing `dueAt`
   // against "now" — a task with no trigger has `dueAt === evaluatedAt`, which a naive `dueAt <= now`
   // re-derivation would misclassify as due.
-  due: external_exports.boolean()
+  due: external_exports.boolean(),
+  // Additive: the REAL admission verdict for this row, computed only inside the tick's bounded
+  // per-cycle slice (`resolveSchedulerProjectLimit`). `null` means "not evaluated this cycle" —
+  // the row is a genuine actionable candidate by the cheap classifier, but beyond the bound the
+  // tick actually looks at, so no real verdict exists yet. Never infer readiness from `null`.
+  verdict: mrrlinAutonomousStepVerdictSchema.nullable()
 });
 var mrrlinSchedulerParkedReasonSchema = external_exports.enum([
   "running",
@@ -37522,6 +37593,32 @@ var mrrlinSchedulerParkedTaskSchema = external_exports.object({
   inboxItemId: external_exports.string().nullable(),
   runId: mrrlinExecutionRunIdSchema.nullable()
 });
+var mrrlinInFlightSchedulerEntrySchema = external_exports.discriminatedUnion("kind", [
+  external_exports.object({
+    kind: external_exports.literal("run"),
+    taskId: mrrlinTaskIdSchema,
+    runId: mrrlinExecutionRunIdSchema,
+    status: external_exports.string(),
+    // Additive: the task's own title, resolved server-side from the same task list the handler
+    // already loaded for this request (no extra query). null only when the task itself could not
+    // be found (should not happen for a `run` entry, whose taskId is required, but the wire
+    // contract stays honest about it rather than assuming).
+    taskTitle: external_exports.string().nullable()
+  }),
+  external_exports.object({
+    kind: external_exports.literal("async_job"),
+    taskId: mrrlinTaskIdSchema.nullable(),
+    jobId: external_exports.string(),
+    toolName: external_exports.enum(["draft_task_spec", "run_spec_consensus"]),
+    // Additive: same resolution as the `run` variant above. null when `taskId` is null (a job
+    // genuinely untied to a visible task) or the task could not be found.
+    taskTitle: external_exports.string().nullable()
+  })
+]);
+var mrrlinIneligibleTaskSchema = external_exports.object({
+  task: mrrlinTaskSchema,
+  autonomyLevel: mrrlinAutonomyLevelSchema
+});
 var schedulerPendingTasksResponseSchema = external_exports.object({
   data: external_exports.object({
     evaluatedAt: external_exports.string().datetime(),
@@ -37529,7 +37626,21 @@ var schedulerPendingTasksResponseSchema = external_exports.object({
     parked: external_exports.array(mrrlinSchedulerParkedTaskSchema),
     slots: external_exports.number().int(),
     perProjectLimit: external_exports.number().int().min(1),
-    policy: mrrlinProjectSchedulerPolicySchema
+    policy: mrrlinProjectSchedulerPolicySchema,
+    // Additive (see mrrlinInFlightSchedulerEntrySchema doc): the actual runs/jobs occupying
+    // autonomous capacity right now. `slots` is derived from THIS SAME list server-side, so the
+    // count and the list can never disagree.
+    inFlight: external_exports.array(mrrlinInFlightSchedulerEntrySchema),
+    // Additive: tasks the tick never even considers (autonomyLevel outside
+    // policy.eligibleAutonomyLevels), excluding terminal tasks.
+    ineligible: external_exports.array(mrrlinIneligibleTaskSchema),
+    // Additive: how many non-terminal tasks were excluded from BOTH `pending` and `parked` because
+    // their assignee is set and does not match the project operator (github.operator). A COUNT
+    // only, deliberately — the operator asked not to show a list of other people's tasks, just a
+    // disclosure that some exist, so a misconfigured `github.operator` (e.g. it doesn't match the
+    // person actually running the project) is visible as a large number instead of the autopilot
+    // silently doing nothing.
+    excludedByOwnershipCount: external_exports.number().int().min(0)
   })
 });
 var wakeDirectorRequestSchema = external_exports.object({
@@ -38999,7 +39110,7 @@ function startCodexProbe(deps = {}) {
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.3.42";
+var PKG_VERSION = "0.3.46";
 
 // src/api-base-url.ts
 var DEFAULT_API_BASE_URL = "http://127.0.0.1:8787";
@@ -39292,6 +39403,19 @@ async function collectAgentPoolSnapshot(deps) {
   );
 }
 
+// src/external-agents-bin.ts
+function resolveExternalAgentsCliInvocation(override) {
+  if (override && override.trim()) return { command: override, prefixArgs: [] };
+  try {
+    return {
+      command: "node",
+      prefixArgs: [resolvePackageBin("@mrrlin-dev/external-agents", "external-agents")]
+    };
+  } catch {
+    return { command: "external-agents", prefixArgs: [] };
+  }
+}
+
 // src/agent-pool-loop.ts
 var DEFAULT_INTERVAL_MS2 = 6e4;
 function agentPoolLoopDisabled(env = process.env) {
@@ -39299,7 +39423,7 @@ function agentPoolLoopDisabled(env = process.env) {
 }
 function defaultRunCli(args) {
   const cli = process.env["EXTERNAL_AGENTS_CLI"];
-  const [cmd, baseArgs] = cli ? ["node", [cli, ...args]] : ["external-agents", args];
+  const { command, prefixArgs } = cli ? { command: "node", prefixArgs: [cli] } : resolveExternalAgentsCliInvocation();
   return new Promise((resolve) => {
     let stdout = "";
     let settled = false;
@@ -39310,7 +39434,7 @@ function defaultRunCli(args) {
       }
     };
     try {
-      const child = (0, import_node_child_process5.spawn)(cmd, baseArgs, { stdio: ["ignore", "pipe", "ignore"] });
+      const child = (0, import_node_child_process5.spawn)(command, [...prefixArgs, ...args], { stdio: ["ignore", "pipe", "ignore"] });
       const timer = setTimeout(() => {
         try {
           child.kill("SIGKILL");
@@ -53172,7 +53296,7 @@ var import_node_child_process11 = require("node:child_process");
 function errMessage3(err) {
   return err instanceof Error ? err.message : String(err);
 }
-function runExternalAgents(bin, args, timeoutMs, spawn3) {
+function runExternalAgents(bin, args, label, timeoutMs, spawn3) {
   return new Promise((resolve) => {
     let settled = false;
     const timerRef = { id: void 0 };
@@ -53198,20 +53322,20 @@ function runExternalAgents(bin, args, timeoutMs, spawn3) {
     let stdout = "";
     timerRef.id = setTimeout(() => {
       child.kill("SIGKILL");
-      finish({ code: null, stdout, error: `external-agents ${args[0]} timed out after ${timeoutMs}ms` });
+      finish({ code: null, stdout, error: `external-agents ${label} timed out after ${timeoutMs}ms` });
     }, timeoutMs);
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
     });
     child.stderr?.on("data", () => {
     });
-    child.on("error", (err) => finish({ code: null, stdout, error: `external-agents ${args[0]} error: ${errMessage3(err)}` }));
+    child.on("error", (err) => finish({ code: null, stdout, error: `external-agents ${label} error: ${errMessage3(err)}` }));
     child.on("close", (code) => finish({ code, stdout }));
   });
 }
 async function pickPanel(input, deps) {
   const spawn3 = deps?.spawn ?? import_node_child_process11.spawn;
-  const bin = deps?.externalAgentsBin ?? "external-agents";
+  const { command, prefixArgs } = resolveExternalAgentsCliInvocation(deps?.externalAgentsBin);
   const args = [
     "pick",
     "--tier-prefer",
@@ -53223,7 +53347,7 @@ async function pickPanel(input, deps) {
     "--exclude-providers",
     input.excludeProvider
   ];
-  const r = await runExternalAgents(bin, args, input.timeoutMs, spawn3);
+  const r = await runExternalAgents(command, [...prefixArgs, ...args], "pick", input.timeoutMs, spawn3);
   if (r.error) return { ok: false, error: r.error };
   if (r.code === 3) return { ok: true, agents: [] };
   if (r.code !== 0) return { ok: false, error: `external-agents pick exited ${r.code}` };
@@ -53232,9 +53356,9 @@ async function pickPanel(input, deps) {
 }
 async function dispatchHead(agentId, prompt, timeoutMs, deps) {
   const spawn3 = deps?.spawn ?? import_node_child_process11.spawn;
-  const bin = deps?.externalAgentsBin ?? "external-agents";
+  const { command, prefixArgs } = resolveExternalAgentsCliInvocation(deps?.externalAgentsBin);
   const args = ["dispatch", agentId, "--json", prompt];
-  const r = await runExternalAgents(bin, args, timeoutMs, spawn3);
+  const r = await runExternalAgents(command, [...prefixArgs, ...args], "dispatch", timeoutMs, spawn3);
   if (r.error) return { ok: false, error: r.error };
   const lines2 = r.stdout.split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
   const jsonLine = [...lines2].reverse().find((l) => l[0] === "{");
@@ -55902,6 +56026,12 @@ Usage:
                                 command install-codex wires for the
                                 [mcp_servers.mrrlin-browser] block.
 
+  mrrlin-mcp external-agents-serve
+                                Launch the bundled @mrrlin-dev/external-agents
+                                MCP server (multi-LLM dispatch pool). This is the
+                                command install-codex wires for the
+                                [mcp_servers.external-agents] block.
+
   mrrlin-mcp install-codex      Idempotently register Mrrlin in
   [--force]                     ~/.codex/config.toml (or CODEX_HOME). Adds an
                                 [mcp_servers.mrrlin] block. Development
@@ -56057,6 +56187,12 @@ async function main() {
       process.exitCode = r.status ?? 1;
       return;
     }
+    case "external-agents-serve": {
+      const { command: command2, args } = externalAgentsServeArgs();
+      const r = (0, import_node_child_process13.spawnSync)(command2, args, { stdio: "inherit", env: process.env });
+      process.exitCode = r.status ?? 1;
+      return;
+    }
     case "install-codex": {
       const force = rest.includes("--force");
       const binPath = resolveSelfBinPath();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.3.42",
+  "version": "0.3.46",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"
@@ -21,16 +21,17 @@
     "@types/ws": "^8.18.1",
     "esbuild": "^0.24.0",
     "tsx": "^4.22.3",
+    "@mrrlin/client": "0.0.0",
     "@mrrlin/director-e2e": "0.0.0",
     "@mrrlin/wiki": "0.0.0",
     "@mrrlin/schemas": "0.0.0",
-    "@mrrlin/client": "0.0.0",
     "@mrrlin/codex-client": "0.0.0",
     "@mrrlin/tsconfig": "0.0.0"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
     "@modelcontextprotocol/sdk": "^1.0.0",
+    "@mrrlin-dev/external-agents": "^0.33.1",
     "@playwright/mcp": "0.0.76",
     "playwright-core": "1.61.0-alpha-1781023400000",
     "proper-lockfile": "^4.1.2",