pullfrog 0.1.18 → 0.1.20

package/dist/cli.mjs

@@ -101235,6 +101235,111 @@ function formatMcpToolRef(agentId, toolName) {
 
 // utils/activity.ts
 import { performance as performance2 } from "node:perf_hooks";
+function isMonitorDebugEnabled() {
+  return process.env.ACTIONS_STEP_DEBUG === "true" || process.env.RUNNER_DEBUG === "1" || process.env.LOG_LEVEL === "debug";
+}
+var DEFAULT_ACTIVITY_TIMEOUT_MS = 3e5;
+var AGENT_ACTIVITY_TIMEOUT_MS = 9e5;
+var DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5e3;
+var DEBUG_TS_PREFIX = /^(?:\[\d{4}-\d{2}-\d{2}T[^\]]+\]\s+)?/.source;
+var ACTIVITY_NOISE_PATTERNS = [
+  new RegExp(`${DEBUG_TS_PREFIX}\\[mcp-proxy\\]`),
+  new RegExp(`${DEBUG_TS_PREFIX}\xBB provider error detected`),
+  new RegExp(`${DEBUG_TS_PREFIX}\\[DEBUG\\]\\s+(?:spawn|process) activity `),
+  /^::debug::(?:spawn|process) activity /
+];
+function isActivityNoise(chunk) {
+  const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
+  if (!text.trim()) return true;
+  return text.split("\n").every((line) => {
+    const trimmed = line.trim();
+    if (!trimmed) return true;
+    return ACTIVITY_NOISE_PATTERNS.some((pattern) => pattern.test(trimmed));
+  });
+}
+var _lastActivity = performance2.now();
+function markActivity() {
+  _lastActivity = performance2.now();
+}
+function getIdleMs() {
+  return Math.round(performance2.now() - _lastActivity);
+}
+function wrapWrite(original, onActivity) {
+  const wrapped = (chunk, encodingOrCb, cb) => {
+    if (!isActivityNoise(chunk)) {
+      onActivity();
+    }
+    if (typeof encodingOrCb === "function") {
+      return original(chunk, encodingOrCb);
+    }
+    return original(chunk, encodingOrCb, cb);
+  };
+  return wrapped;
+}
+function startProcessOutputMonitor(ctx) {
+  let timedOut = false;
+  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+  const originalStderrWrite = process.stderr.write.bind(process.stderr);
+  process.stdout.write = wrapWrite(originalStdoutWrite, markActivity);
+  process.stderr.write = wrapWrite(originalStderrWrite, markActivity);
+  const debugBypass = (msg) => {
+    if (!isMonitorDebugEnabled()) return;
+    originalStdoutWrite(`[${(/* @__PURE__ */ new Date()).toISOString()}] [DEBUG] ${msg}
+`);
+  };
+  debugBypass(`process activity monitor started: timeout=${ctx.timeoutMs}ms`);
+  const intervalId = setInterval(() => {
+    const idleMs = getIdleMs();
+    debugBypass(`process activity check: idle=${idleMs}ms / ${ctx.timeoutMs}ms`);
+    if (timedOut || idleMs <= ctx.timeoutMs) return;
+    timedOut = true;
+    ctx.onTimeout(idleMs);
+  }, ctx.checkIntervalMs);
+  function stop() {
+    clearInterval(intervalId);
+    process.stdout.write = originalStdoutWrite;
+    process.stderr.write = originalStderrWrite;
+  }
+  return { stop };
+}
+function createProcessOutputActivityTimeout(ctx) {
+  markActivity();
+  let rejectFn = null;
+  const promise2 = new Promise((_2, reject) => {
+    rejectFn = reject;
+  });
+  let monitor = null;
+  monitor = startProcessOutputMonitor({
+    timeoutMs: ctx.timeoutMs,
+    checkIntervalMs: ctx.checkIntervalMs,
+    onTimeout: (idleMs) => {
+      if (!rejectFn) return;
+      const idleSec = Math.round(idleMs / 1e3);
+      if (monitor) {
+        monitor.stop();
+      }
+      const reject = rejectFn;
+      rejectFn = null;
+      reject(new Error(`activity timeout: no output for ${idleSec}s`));
+    }
+  });
+  return {
+    promise: promise2,
+    // stop() also disarms forceReject so a late safety-net fire can't reject
+    // the promise after the run has already succeeded.
+    stop: () => {
+      monitor?.stop();
+      rejectFn = null;
+    },
+    forceReject: (reason) => {
+      if (!rejectFn) return;
+      monitor?.stop();
+      const reject = rejectFn;
+      rejectFn = null;
+      reject(new Error(reason));
+    }
+  };
+}
 
 // utils/log.ts
 var core = __toESM(require_core(), 1);
@@ -101550,137 +101655,6 @@ function formatUsageSummary(entries) {
   ].join("\n");
 }
 
-// utils/activity.ts
-function isMonitorDebugEnabled() {
-  return process.env.ACTIONS_STEP_DEBUG === "true" || process.env.RUNNER_DEBUG === "1" || process.env.LOG_LEVEL === "debug";
-}
-var DEFAULT_ACTIVITY_TIMEOUT_MS = 3e5;
-var DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5e3;
-var DEBUG_TS_PREFIX = /^(?:\[\d{4}-\d{2}-\d{2}T[^\]]+\]\s+)?/.source;
-var ACTIVITY_NOISE_PATTERNS = [
-  new RegExp(`${DEBUG_TS_PREFIX}\\[mcp-proxy\\]`),
-  new RegExp(`${DEBUG_TS_PREFIX}\xBB provider error detected`),
-  new RegExp(`${DEBUG_TS_PREFIX}\\[DEBUG\\]\\s+(?:spawn|process) activity `),
-  /^::debug::(?:spawn|process) activity /
-];
-function isActivityNoise(chunk) {
-  const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
-  if (!text.trim()) return true;
-  return text.split("\n").every((line) => {
-    const trimmed = line.trim();
-    if (!trimmed) return true;
-    return ACTIVITY_NOISE_PATTERNS.some((pattern) => pattern.test(trimmed));
-  });
-}
-var _lastActivity = performance2.now();
-var MAX_TOOL_CALL_SUSPENSION_MS = 15 * 60 * 1e3;
-var _suspendedAt = null;
-var _suspensionTimer = null;
-function markActivity() {
-  _lastActivity = performance2.now();
-}
-function getIdleMs() {
-  if (_suspendedAt !== null) return 0;
-  return Math.round(performance2.now() - _lastActivity);
-}
-function suspendActivity(maxMs = MAX_TOOL_CALL_SUSPENSION_MS) {
-  if (_suspendedAt !== null) return;
-  _suspendedAt = performance2.now();
-  _suspensionTimer = setTimeout(() => {
-    log.warning(`activity watchdog suspended >${Math.round(maxMs / 1e3)}s \u2014 auto-resuming`);
-    resumeActivity();
-  }, maxMs);
-  _suspensionTimer.unref?.();
-}
-function resumeActivity() {
-  if (_suspendedAt === null) return;
-  _suspendedAt = null;
-  if (_suspensionTimer) {
-    clearTimeout(_suspensionTimer);
-    _suspensionTimer = null;
-  }
-  _lastActivity = performance2.now();
-}
-function isActivitySuspended() {
-  return _suspendedAt !== null;
-}
-function wrapWrite(original, onActivity) {
-  const wrapped = (chunk, encodingOrCb, cb) => {
-    if (!isActivityNoise(chunk)) {
-      onActivity();
-    }
-    if (typeof encodingOrCb === "function") {
-      return original(chunk, encodingOrCb);
-    }
-    return original(chunk, encodingOrCb, cb);
-  };
-  return wrapped;
-}
-function startProcessOutputMonitor(ctx) {
-  let timedOut = false;
-  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
-  const originalStderrWrite = process.stderr.write.bind(process.stderr);
-  process.stdout.write = wrapWrite(originalStdoutWrite, markActivity);
-  process.stderr.write = wrapWrite(originalStderrWrite, markActivity);
-  const debugBypass = (msg) => {
-    if (!isMonitorDebugEnabled()) return;
-    originalStdoutWrite(`[${(/* @__PURE__ */ new Date()).toISOString()}] [DEBUG] ${msg}
-`);
-  };
-  debugBypass(`process activity monitor started: timeout=${ctx.timeoutMs}ms`);
-  const intervalId = setInterval(() => {
-    const idleMs = getIdleMs();
-    debugBypass(`process activity check: idle=${idleMs}ms / ${ctx.timeoutMs}ms`);
-    if (timedOut || idleMs <= ctx.timeoutMs) return;
-    timedOut = true;
-    ctx.onTimeout(idleMs);
-  }, ctx.checkIntervalMs);
-  function stop() {
-    clearInterval(intervalId);
-    process.stdout.write = originalStdoutWrite;
-    process.stderr.write = originalStderrWrite;
-  }
-  return { stop };
-}
-function createProcessOutputActivityTimeout(ctx) {
-  markActivity();
-  let rejectFn = null;
-  const promise2 = new Promise((_2, reject) => {
-    rejectFn = reject;
-  });
-  let monitor = null;
-  monitor = startProcessOutputMonitor({
-    timeoutMs: ctx.timeoutMs,
-    checkIntervalMs: ctx.checkIntervalMs,
-    onTimeout: (idleMs) => {
-      if (!rejectFn) return;
-      const idleSec = Math.round(idleMs / 1e3);
-      if (monitor) {
-        monitor.stop();
-      }
-      const reject = rejectFn;
-      rejectFn = null;
-      reject(new Error(`activity timeout: no output for ${idleSec}s`));
-    }
-  });
-  return {
-    promise: promise2,
-    // stop() also disarms forceReject so a late safety-net fire can't reject
-    // the promise after the run has already succeeded.
-    stop: () => {
-      monitor?.stop();
-      rejectFn = null;
-    },
-    forceReject: (reason) => {
-      if (!rejectFn) return;
-      monitor?.stop();
-      const reject = rejectFn;
-      rejectFn = null;
-      reject(new Error(reason));
-    }
-  };
-}
-
 // utils/install.ts
 import { spawnSync } from "node:child_process";
 import { chmodSync, createWriteStream, existsSync as existsSync2, mkdirSync } from "node:fs";
@@ -101880,7 +101854,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.18",
+  version: "0.1.20",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -102218,11 +102192,6 @@ async function spawn3(options) {
         `spawn activity timer: pid=${child.pid} cmd=${options.cmd} timeout=${activityTimeoutMs}ms`
       );
       activityCheckIntervalId = setInterval(() => {
-        if (options.isPausedExternally?.()) {
-          lastActivityTime = performance3.now();
-          log.debug(`spawn activity check: pid=${child.pid} paused externally`);
-          return;
-        }
         const idleMs = performance3.now() - lastActivityTime;
         log.debug(
           `spawn activity check: pid=${child.pid} idle=${Math.round(idleMs)}ms / ${activityTimeoutMs}ms`
@@ -103690,7 +103659,6 @@ async function runClaude(params) {
           }
         } else if (block.type === "tool_use") {
           const toolName = block.name || "unknown";
-          suspendActivity();
           if (params.onToolUse) {
             params.onToolUse({
               toolName,
@@ -103735,7 +103703,6 @@ async function runClaude(params) {
       for (const block of content) {
         if (typeof block === "string") continue;
         if (block.type === "tool_result") {
-          resumeActivity();
           timerFor(label).markToolResult();
           const outputContent = typeof block.content === "string" ? block.content : Array.isArray(block.content) ? block.content.map(
             (entry) => typeof entry === "string" ? entry : typeof entry === "object" && entry !== null && "text" in entry ? String(entry.text) : JSON.stringify(entry)
@@ -103822,9 +103789,10 @@ async function runClaude(params) {
       args: params.args,
       cwd: params.cwd,
       env: params.env,
-      activityTimeout: 3e5,
+      // flat agent idle budget — long synchronous MCP tool calls (issue #760)
+      // sit well under it, so no per-toolcall suspend bracketing is needed.
+      activityTimeout: AGENT_ACTIVITY_TIMEOUT_MS,
       onActivityTimeout: params.onActivityTimeout,
-      isPausedExternally: isActivitySuspended,
       stdio: ["ignore", "pipe", "pipe"],
       // run claude in its own process group so SIGKILL on activity timeout /
       // outer cancellation reaches any subprocesses it spawns (rg, file
@@ -107960,6 +107928,20 @@ function buildSecurityConfig(ctx, model) {
     const slashIndex = model.indexOf("/");
     if (slashIndex > 0) {
       config3.enabled_providers = [model.slice(0, slashIndex).toLowerCase()];
+      if (model.startsWith("openrouter/moonshotai/")) {
+        const modelID = model.slice(slashIndex + 1);
+        config3.provider = {
+          ...config3.provider,
+          openrouter: {
+            npm: "@openrouter/ai-sdk-provider@2.9.0",
+            options: {
+              baseURL: "https://openrouter.ai/api/v1",
+              apiKey: "{env:OPENROUTER_API_KEY}"
+            },
+            models: { [modelID]: {} }
+          }
+        };
+      }
     }
   }
   return JSON.stringify(config3);
@@ -108165,13 +108147,6 @@ async function onToolPart(ctx, part, label, isOrchestrator) {
   const status = part.state.status;
   const toolName = part.tool;
   const toolId = part.callID;
-  if (toolName !== "task") {
-    if (status === "completed" || status === "error") {
-      resumeActivity();
-    } else {
-      suspendActivity();
-    }
-  }
   if (toolName === "task" && status === "running" && isOrchestrator && !ctx.taskDispatchByCallID.has(toolId)) {
     const input = part.state.input ?? {};
     const dispatched = ctx.labeler.recordTaskDispatch(input);
@@ -108419,7 +108394,6 @@ function startInnerActivityWatchdog(params) {
   let fired = false;
   const id = setInterval(() => {
     if (fired) return;
-    if (isActivitySuspended()) return;
     const idleMs = performance6.now() - params.ctx.lastEventAt;
     if (idleMs <= params.timeoutMs) return;
     fired = true;
@@ -108575,13 +108549,13 @@ var opencode = agent({
       const watchdog = startInnerActivityWatchdog({
         ctx: runnerCtx,
         // model-stall budget: how long the orchestrator may stream NO progress
-        // (no token/tool part.updated) before we tear the turn down. tool
-        // execution is excluded via suspend/resumeActivity, so this only bounds
-        // a genuinely silent provider. 120s comfortably exceeds normal inter-
-        // token gaps (incl. extended-thinking pauses) while catching the
-        // observed stalls (model goes quiet ~3-4min in) far sooner than the old
-        // 300s undici cap that this fix removes.
-        timeoutMs: 12e4,
+        // (no token/tool part.updated) before we tear the turn down. opencode's
+        // keepalive/lifecycle events keep the outer process-output monitor
+        // alive even while the model is silent, so this inner timer is the only
+        // stall detector for the v2 SSE path. it shares the flat idle budget so
+        // a long synchronous tool call (no part.updated while it runs) can't
+        // false-positive it.
+        timeoutMs: AGENT_ACTIVITY_TIMEOUT_MS,
         abortController
       });
       const sdkModel = parseModel2(model);
@@ -161960,7 +161934,7 @@ ${instructions.user}` : null,
           }
         }
         activityTimeout = createProcessOutputActivityTimeout({
-          timeoutMs: DEFAULT_ACTIVITY_TIMEOUT_MS,
+          timeoutMs: AGENT_ACTIVITY_TIMEOUT_MS,
           checkIntervalMs: DEFAULT_ACTIVITY_CHECK_INTERVAL_MS
         });
         activityTimeout.promise.catch(() => {
@@ -163005,7 +162979,7 @@ async function run2() {
 }
 
 // cli.ts
-var VERSION10 = "0.1.18";
+var VERSION10 = "0.1.20";
 var bin = basename2(process.argv[1] || "");
 var PROG = bin === "pf" || bin === "pullfrog" ? bin : "pullfrog";
 var rawArgs = process.argv.slice(2);

package/dist/index.js

@@ -99435,6 +99435,111 @@ function formatMcpToolRef(agentId, toolName) {
 
 // utils/activity.ts
 import { performance as performance2 } from "node:perf_hooks";
+function isMonitorDebugEnabled() {
+  return process.env.ACTIONS_STEP_DEBUG === "true" || process.env.RUNNER_DEBUG === "1" || process.env.LOG_LEVEL === "debug";
+}
+var DEFAULT_ACTIVITY_TIMEOUT_MS = 3e5;
+var AGENT_ACTIVITY_TIMEOUT_MS = 9e5;
+var DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5e3;
+var DEBUG_TS_PREFIX = /^(?:\[\d{4}-\d{2}-\d{2}T[^\]]+\]\s+)?/.source;
+var ACTIVITY_NOISE_PATTERNS = [
+  new RegExp(`${DEBUG_TS_PREFIX}\\[mcp-proxy\\]`),
+  new RegExp(`${DEBUG_TS_PREFIX}\xBB provider error detected`),
+  new RegExp(`${DEBUG_TS_PREFIX}\\[DEBUG\\]\\s+(?:spawn|process) activity `),
+  /^::debug::(?:spawn|process) activity /
+];
+function isActivityNoise(chunk) {
+  const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
+  if (!text.trim()) return true;
+  return text.split("\n").every((line) => {
+    const trimmed = line.trim();
+    if (!trimmed) return true;
+    return ACTIVITY_NOISE_PATTERNS.some((pattern) => pattern.test(trimmed));
+  });
+}
+var _lastActivity = performance2.now();
+function markActivity() {
+  _lastActivity = performance2.now();
+}
+function getIdleMs() {
+  return Math.round(performance2.now() - _lastActivity);
+}
+function wrapWrite(original, onActivity) {
+  const wrapped = (chunk, encodingOrCb, cb) => {
+    if (!isActivityNoise(chunk)) {
+      onActivity();
+    }
+    if (typeof encodingOrCb === "function") {
+      return original(chunk, encodingOrCb);
+    }
+    return original(chunk, encodingOrCb, cb);
+  };
+  return wrapped;
+}
+function startProcessOutputMonitor(ctx) {
+  let timedOut = false;
+  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+  const originalStderrWrite = process.stderr.write.bind(process.stderr);
+  process.stdout.write = wrapWrite(originalStdoutWrite, markActivity);
+  process.stderr.write = wrapWrite(originalStderrWrite, markActivity);
+  const debugBypass = (msg) => {
+    if (!isMonitorDebugEnabled()) return;
+    originalStdoutWrite(`[${(/* @__PURE__ */ new Date()).toISOString()}] [DEBUG] ${msg}
+`);
+  };
+  debugBypass(`process activity monitor started: timeout=${ctx.timeoutMs}ms`);
+  const intervalId = setInterval(() => {
+    const idleMs = getIdleMs();
+    debugBypass(`process activity check: idle=${idleMs}ms / ${ctx.timeoutMs}ms`);
+    if (timedOut || idleMs <= ctx.timeoutMs) return;
+    timedOut = true;
+    ctx.onTimeout(idleMs);
+  }, ctx.checkIntervalMs);
+  function stop() {
+    clearInterval(intervalId);
+    process.stdout.write = originalStdoutWrite;
+    process.stderr.write = originalStderrWrite;
+  }
+  return { stop };
+}
+function createProcessOutputActivityTimeout(ctx) {
+  markActivity();
+  let rejectFn = null;
+  const promise2 = new Promise((_, reject) => {
+    rejectFn = reject;
+  });
+  let monitor = null;
+  monitor = startProcessOutputMonitor({
+    timeoutMs: ctx.timeoutMs,
+    checkIntervalMs: ctx.checkIntervalMs,
+    onTimeout: (idleMs) => {
+      if (!rejectFn) return;
+      const idleSec = Math.round(idleMs / 1e3);
+      if (monitor) {
+        monitor.stop();
+      }
+      const reject = rejectFn;
+      rejectFn = null;
+      reject(new Error(`activity timeout: no output for ${idleSec}s`));
+    }
+  });
+  return {
+    promise: promise2,
+    // stop() also disarms forceReject so a late safety-net fire can't reject
+    // the promise after the run has already succeeded.
+    stop: () => {
+      monitor?.stop();
+      rejectFn = null;
+    },
+    forceReject: (reason) => {
+      if (!rejectFn) return;
+      monitor?.stop();
+      const reject = rejectFn;
+      rejectFn = null;
+      reject(new Error(reason));
+    }
+  };
+}
 
 // utils/log.ts
 var core = __toESM(require_core(), 1);
@@ -99750,137 +99855,6 @@ function formatUsageSummary(entries) {
   ].join("\n");
 }
 
-// utils/activity.ts
-function isMonitorDebugEnabled() {
-  return process.env.ACTIONS_STEP_DEBUG === "true" || process.env.RUNNER_DEBUG === "1" || process.env.LOG_LEVEL === "debug";
-}
-var DEFAULT_ACTIVITY_TIMEOUT_MS = 3e5;
-var DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5e3;
-var DEBUG_TS_PREFIX = /^(?:\[\d{4}-\d{2}-\d{2}T[^\]]+\]\s+)?/.source;
-var ACTIVITY_NOISE_PATTERNS = [
-  new RegExp(`${DEBUG_TS_PREFIX}\\[mcp-proxy\\]`),
-  new RegExp(`${DEBUG_TS_PREFIX}\xBB provider error detected`),
-  new RegExp(`${DEBUG_TS_PREFIX}\\[DEBUG\\]\\s+(?:spawn|process) activity `),
-  /^::debug::(?:spawn|process) activity /
-];
-function isActivityNoise(chunk) {
-  const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
-  if (!text.trim()) return true;
-  return text.split("\n").every((line) => {
-    const trimmed = line.trim();
-    if (!trimmed) return true;
-    return ACTIVITY_NOISE_PATTERNS.some((pattern) => pattern.test(trimmed));
-  });
-}
-var _lastActivity = performance2.now();
-var MAX_TOOL_CALL_SUSPENSION_MS = 15 * 60 * 1e3;
-var _suspendedAt = null;
-var _suspensionTimer = null;
-function markActivity() {
-  _lastActivity = performance2.now();
-}
-function getIdleMs() {
-  if (_suspendedAt !== null) return 0;
-  return Math.round(performance2.now() - _lastActivity);
-}
-function suspendActivity(maxMs = MAX_TOOL_CALL_SUSPENSION_MS) {
-  if (_suspendedAt !== null) return;
-  _suspendedAt = performance2.now();
-  _suspensionTimer = setTimeout(() => {
-    log.warning(`activity watchdog suspended >${Math.round(maxMs / 1e3)}s \u2014 auto-resuming`);
-    resumeActivity();
-  }, maxMs);
-  _suspensionTimer.unref?.();
-}
-function resumeActivity() {
-  if (_suspendedAt === null) return;
-  _suspendedAt = null;
-  if (_suspensionTimer) {
-    clearTimeout(_suspensionTimer);
-    _suspensionTimer = null;
-  }
-  _lastActivity = performance2.now();
-}
-function isActivitySuspended() {
-  return _suspendedAt !== null;
-}
-function wrapWrite(original, onActivity) {
-  const wrapped = (chunk, encodingOrCb, cb) => {
-    if (!isActivityNoise(chunk)) {
-      onActivity();
-    }
-    if (typeof encodingOrCb === "function") {
-      return original(chunk, encodingOrCb);
-    }
-    return original(chunk, encodingOrCb, cb);
-  };
-  return wrapped;
-}
-function startProcessOutputMonitor(ctx) {
-  let timedOut = false;
-  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
-  const originalStderrWrite = process.stderr.write.bind(process.stderr);
-  process.stdout.write = wrapWrite(originalStdoutWrite, markActivity);
-  process.stderr.write = wrapWrite(originalStderrWrite, markActivity);
-  const debugBypass = (msg) => {
-    if (!isMonitorDebugEnabled()) return;
-    originalStdoutWrite(`[${(/* @__PURE__ */ new Date()).toISOString()}] [DEBUG] ${msg}
-`);
-  };
-  debugBypass(`process activity monitor started: timeout=${ctx.timeoutMs}ms`);
-  const intervalId = setInterval(() => {
-    const idleMs = getIdleMs();
-    debugBypass(`process activity check: idle=${idleMs}ms / ${ctx.timeoutMs}ms`);
-    if (timedOut || idleMs <= ctx.timeoutMs) return;
-    timedOut = true;
-    ctx.onTimeout(idleMs);
-  }, ctx.checkIntervalMs);
-  function stop() {
-    clearInterval(intervalId);
-    process.stdout.write = originalStdoutWrite;
-    process.stderr.write = originalStderrWrite;
-  }
-  return { stop };
-}
-function createProcessOutputActivityTimeout(ctx) {
-  markActivity();
-  let rejectFn = null;
-  const promise2 = new Promise((_, reject) => {
-    rejectFn = reject;
-  });
-  let monitor = null;
-  monitor = startProcessOutputMonitor({
-    timeoutMs: ctx.timeoutMs,
-    checkIntervalMs: ctx.checkIntervalMs,
-    onTimeout: (idleMs) => {
-      if (!rejectFn) return;
-      const idleSec = Math.round(idleMs / 1e3);
-      if (monitor) {
-        monitor.stop();
-      }
-      const reject = rejectFn;
-      rejectFn = null;
-      reject(new Error(`activity timeout: no output for ${idleSec}s`));
-    }
-  });
-  return {
-    promise: promise2,
-    // stop() also disarms forceReject so a late safety-net fire can't reject
-    // the promise after the run has already succeeded.
-    stop: () => {
-      monitor?.stop();
-      rejectFn = null;
-    },
-    forceReject: (reason) => {
-      if (!rejectFn) return;
-      monitor?.stop();
-      const reject = rejectFn;
-      rejectFn = null;
-      reject(new Error(reason));
-    }
-  };
-}
-
 // utils/install.ts
 import { spawnSync } from "node:child_process";
 import { chmodSync, createWriteStream, existsSync as existsSync2, mkdirSync } from "node:fs";
@@ -100080,7 +100054,7 @@ var import_semver = __toESM(require_semver2(), 1);
 // package.json
 var package_default = {
   name: "pullfrog",
-  version: "0.1.18",
+  version: "0.1.20",
   type: "module",
   bin: {
     pullfrog: "dist/cli.mjs",
@@ -100418,11 +100392,6 @@ async function spawn(options) {
         `spawn activity timer: pid=${child.pid} cmd=${options.cmd} timeout=${activityTimeoutMs}ms`
       );
       activityCheckIntervalId = setInterval(() => {
-        if (options.isPausedExternally?.()) {
-          lastActivityTime = performance3.now();
-          log.debug(`spawn activity check: pid=${child.pid} paused externally`);
-          return;
-        }
         const idleMs = performance3.now() - lastActivityTime;
         log.debug(
           `spawn activity check: pid=${child.pid} idle=${Math.round(idleMs)}ms / ${activityTimeoutMs}ms`
@@ -101890,7 +101859,6 @@ async function runClaude(params) {
           }
         } else if (block.type === "tool_use") {
           const toolName = block.name || "unknown";
-          suspendActivity();
           if (params.onToolUse) {
             params.onToolUse({
               toolName,
@@ -101935,7 +101903,6 @@ async function runClaude(params) {
       for (const block of content) {
         if (typeof block === "string") continue;
         if (block.type === "tool_result") {
-          resumeActivity();
           timerFor(label).markToolResult();
           const outputContent = typeof block.content === "string" ? block.content : Array.isArray(block.content) ? block.content.map(
             (entry) => typeof entry === "string" ? entry : typeof entry === "object" && entry !== null && "text" in entry ? String(entry.text) : JSON.stringify(entry)
@@ -102022,9 +101989,10 @@ async function runClaude(params) {
       args: params.args,
       cwd: params.cwd,
       env: params.env,
-      activityTimeout: 3e5,
+      // flat agent idle budget — long synchronous MCP tool calls (issue #760)
+      // sit well under it, so no per-toolcall suspend bracketing is needed.
+      activityTimeout: AGENT_ACTIVITY_TIMEOUT_MS,
       onActivityTimeout: params.onActivityTimeout,
-      isPausedExternally: isActivitySuspended,
       stdio: ["ignore", "pipe", "pipe"],
       // run claude in its own process group so SIGKILL on activity timeout /
       // outer cancellation reaches any subprocesses it spawns (rg, file
@@ -106202,6 +106170,20 @@ function buildSecurityConfig(ctx, model) {
     const slashIndex = model.indexOf("/");
     if (slashIndex > 0) {
       config3.enabled_providers = [model.slice(0, slashIndex).toLowerCase()];
+      if (model.startsWith("openrouter/moonshotai/")) {
+        const modelID = model.slice(slashIndex + 1);
+        config3.provider = {
+          ...config3.provider,
+          openrouter: {
+            npm: "@openrouter/ai-sdk-provider@2.9.0",
+            options: {
+              baseURL: "https://openrouter.ai/api/v1",
+              apiKey: "{env:OPENROUTER_API_KEY}"
+            },
+            models: { [modelID]: {} }
+          }
+        };
+      }
     }
   }
   return JSON.stringify(config3);
@@ -106407,13 +106389,6 @@ async function onToolPart(ctx, part, label, isOrchestrator) {
   const status = part.state.status;
   const toolName = part.tool;
   const toolId = part.callID;
-  if (toolName !== "task") {
-    if (status === "completed" || status === "error") {
-      resumeActivity();
-    } else {
-      suspendActivity();
-    }
-  }
   if (toolName === "task" && status === "running" && isOrchestrator && !ctx.taskDispatchByCallID.has(toolId)) {
     const input = part.state.input ?? {};
     const dispatched = ctx.labeler.recordTaskDispatch(input);
@@ -106661,7 +106636,6 @@ function startInnerActivityWatchdog(params) {
   let fired = false;
   const id = setInterval(() => {
     if (fired) return;
-    if (isActivitySuspended()) return;
     const idleMs = performance6.now() - params.ctx.lastEventAt;
     if (idleMs <= params.timeoutMs) return;
     fired = true;
@@ -106817,13 +106791,13 @@ var opencode = agent({
       const watchdog = startInnerActivityWatchdog({
         ctx: runnerCtx,
         // model-stall budget: how long the orchestrator may stream NO progress
-        // (no token/tool part.updated) before we tear the turn down. tool
-        // execution is excluded via suspend/resumeActivity, so this only bounds
-        // a genuinely silent provider. 120s comfortably exceeds normal inter-
-        // token gaps (incl. extended-thinking pauses) while catching the
-        // observed stalls (model goes quiet ~3-4min in) far sooner than the old
-        // 300s undici cap that this fix removes.
-        timeoutMs: 12e4,
+        // (no token/tool part.updated) before we tear the turn down. opencode's
+        // keepalive/lifecycle events keep the outer process-output monitor
+        // alive even while the model is silent, so this inner timer is the only
+        // stall detector for the v2 SSE path. it shares the flat idle budget so
+        // a long synchronous tool call (no part.updated while it runs) can't
+        // false-positive it.
+        timeoutMs: AGENT_ACTIVITY_TIMEOUT_MS,
         abortController
       });
       const sdkModel = parseModel2(model);
@@ -160202,7 +160176,7 @@ ${instructions.user}` : null,
           }
         }
         activityTimeout = createProcessOutputActivityTimeout({
-          timeoutMs: DEFAULT_ACTIVITY_TIMEOUT_MS,
+          timeoutMs: AGENT_ACTIVITY_TIMEOUT_MS,
           checkIntervalMs: DEFAULT_ACTIVITY_CHECK_INTERVAL_MS
         });
         activityTimeout.promise.catch(() => {

package/dist/utils/activity.d.ts

@@ -1,4 +1,21 @@
+/**
+ * generic `spawn()` idle default for ordinary short-lived subprocesses (prep
+ * probes, package-manager invocations, dependency installs). these should be
+ * producing output steadily, so a comparatively tight budget catches a wedged
+ * command promptly. the long-silent-tool tolerance the agent harnesses need
+ * lives in AGENT_ACTIVITY_TIMEOUT_MS, applied explicitly at those sites.
+ */
 export declare const DEFAULT_ACTIVITY_TIMEOUT_MS = 300000;
+/**
+ * flat idle budget for the agent activity watchdog (the outer process-output
+ * monitor, the v1 harness spawns, and the v2 inner event-silence watchdog).
+ * sized to exceed the worst-case legitimate silent tool window (issue #760:
+ * `checkout_pr` git fetch+deepen on a large monorepo, ~4-5min) with generous
+ * headroom, so no single in-flight tool call can be mistaken for a stall. a
+ * timeout this generous needs no suspend/resume bracketing — the cost of a
+ * genuinely hung run is only GitHub Actions minutes, not tokens.
+ */
+export declare const AGENT_ACTIVITY_TIMEOUT_MS = 900000;
 export declare const DEFAULT_ACTIVITY_CHECK_INTERVAL_MS = 5000;
 export declare const ACTIVITY_NOISE_PATTERNS: readonly RegExp[];
 export declare function isActivityNoise(chunk: string | Uint8Array): boolean;
@@ -12,44 +29,12 @@ export type ActivityTimeout = {
     /** force the timeout to reject immediately with a custom reason */
     forceReject: (reason: string) => void;
 };
-/**
- * upper bound on how long a single tool call can suspend the activity
- * watchdog. matched against the typical worst-case `checkout_pr`
- * fetch+deepen on a large monorepo (issue #760: 4-5min) plus generous
- * headroom for slower MCP tools, while still bounding the worst case if
- * a tool genuinely hangs and `tool_result` never arrives — auto-resume
- * fires here and the normal idle clock takes over from a fresh baseline.
- */
-export declare const MAX_TOOL_CALL_SUSPENSION_MS: number;
 /**
  * mark activity to reset the no-output timeout.
  * call this whenever the agent emits any event, even if it isn't logged to stdout.
  */
 export declare function markActivity(): void;
-/**
- * get the time since last activity in milliseconds.
- * returns 0 while the watchdog is suspended (issue #760).
- */
+/** get the time since last activity in milliseconds. */
 export declare function getIdleMs(): number;
-/**
- * suspend the activity watchdog while a long-running, in-flight unit of
- * work is happening (e.g. an MCP `tools/call` that synchronously awaits
- * a multi-minute git fetch). bracket calls with `resumeActivity()` from
- * the agent harness's `tool_use` / `tool_result` event handlers.
- *
- * - idempotent: nested suspends are no-ops; the first resume wins.
- * - bounded: auto-resumes after `maxMs` so a buggy tool that never
- *   produces a `tool_result` can't pin the watchdog open forever.
- * - safe: only the *agent harness* (claude.ts / opencode.ts) on explicit,
- *   paired CLI events should call this. NEVER blanket-suspend on internal
- *   noise — that would resurrect issue #12 zombie runs.
- */
-export declare function suspendActivity(maxMs?: number): void;
-/**
- * resume the activity watchdog. resets the idle baseline so a stale
- * idle window before the suspend can't immediately re-fire.
- */
-export declare function resumeActivity(): void;
-export declare function isActivitySuspended(): boolean;
 export declare function createProcessOutputActivityTimeout(ctx: ActivityTimeoutContext): ActivityTimeout;
 export {};

package/dist/utils/subprocess.d.ts

@@ -43,7 +43,6 @@ export interface SpawnOptions {
     timeout?: number;
     activityTimeout?: number;
     onActivityTimeout?: (() => void) | undefined;
-    isPausedExternally?: () => boolean;
     cwd?: string;
     stdio?: ("pipe" | "ignore" | "inherit")[];
     onStdout?: (chunk: string) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pullfrog",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "type": "module",
   "bin": {
     "pullfrog": "dist/cli.mjs",