mstro-app 0.4.2 → 0.4.4

package/bin/mstro.js

@@ -23,38 +23,16 @@ import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { createInterface } from 'node:readline';
 import { fileURLToPath } from 'node:url';
-import semverGt from 'semver/functions/gt.js';
-import updateNotifier from 'update-notifier';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const CLIENT_ROOT = resolve(__dirname, '..');
 
-// Read package.json for update-notifier
 const pkg = JSON.parse(readFileSync(join(CLIENT_ROOT, 'package.json'), 'utf-8'));
 
-// Check for updates (runs async in background, notifies on next run)
-// update-notifier initializes lastUpdateCheck to Date.now(), which means the
-// first check won't happen until 24h after install. We detect first-run by
-// checking if the configstore has never stored an update result, and if so
-// reset the timestamp to force an immediate background check.
-const notifier = updateNotifier({
-  pkg,
-  updateCheckInterval: 1000 * 60 * 60 * 24  // Check daily
-});
-try {
-  if (notifier.config && !notifier.config.has('update') && !notifier.update) {
-    const lastCheck = notifier.config.get('lastUpdateCheck');
-    // If lastUpdateCheck was just set (within the last 30s), this is a fresh
-    // configstore — reset it to 0 so the library spawns a check immediately.
-    if (lastCheck && (Date.now() - lastCheck) < 30_000) {
-      notifier.config.set('lastUpdateCheck', 0);
-      notifier.check();
-    }
-  }
-} catch {
-  // Non-critical — don't let update check logic crash the CLI
-}
+// Self-update: cache file for registry check results
+const UPDATE_CHECK_FILE = join(homedir(), '.mstro', 'update-check.json');
+const UPDATE_CHECK_INTERVAL = 1000 * 60 * 60; // Re-check hourly
 
 // Capture the user's original working directory before any cwd changes
 const USER_CWD = process.cwd();
@@ -403,32 +381,135 @@ function parseServerUrl(args) {
   return null;
 }
 
+/**
+ * Compare two semver strings (x.y.z). Returns 1 if a > b, -1 if a < b, 0 if equal.
+ */
+function compareVersions(a, b) {
+  const pa = a.split('.').map(Number);
+  const pb = b.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    if ((pa[i] || 0) > (pb[i] || 0)) return 1;
+    if ((pa[i] || 0) < (pb[i] || 0)) return -1;
+  }
+  return 0;
+}
+
+/**
+ * Read cached update check result from ~/.mstro/update-check.json
+ */
+function readUpdateCache() {
+  try {
+    if (!existsSync(UPDATE_CHECK_FILE)) return null;
+    return JSON.parse(readFileSync(UPDATE_CHECK_FILE, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Write the update check cache.
+ */
+function writeUpdateCache(latest) {
+  try {
+    const dir = dirname(UPDATE_CHECK_FILE);
+    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+    writeFileSync(UPDATE_CHECK_FILE, JSON.stringify({ latest, checkedAt: Date.now() }));
+  } catch {
+    // Non-fatal
+  }
+}
+
+/**
+ * Fetch the latest published version from the npm registry inline.
+ * Returns the version string, or null on failure/timeout.
+ */
+async function fetchLatestVersion(timeoutMs = 3000) {
+  try {
+    const res = await fetch(`https://registry.npmjs.org/${pkg.name}/latest`, {
+      signal: AbortSignal.timeout(timeoutMs),
+    });
+    if (!res.ok) return null;
+    const { version } = await res.json();
+    if (version) writeUpdateCache(version);
+    return version || null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Determine the update type label from two semver strings.
+ */
+function updateType(current, latest) {
+  const c = current.split('.').map(Number);
+  const l = latest.split('.').map(Number);
+  if (l[0] > c[0]) return 'major';
+  if (l[1] > c[1]) return 'minor';
+  return 'patch';
+}
+
+/**
+ * Resolve the latest available version, using cache when fresh.
+ */
+async function resolveLatestVersion() {
+  const cache = readUpdateCache();
+
+  if (cache?.latest && (Date.now() - cache.checkedAt) < UPDATE_CHECK_INTERVAL) {
+    return cache.latest;
+  }
+
+  // Cache is stale or missing — check the registry inline
+  const fetched = await fetchLatestVersion(3000);
+  if (fetched) return fetched;
+
+  // Network failed — fall back to stale cache
+  return cache?.latest || null;
+}
+
+/**
+ * Install a specific version globally via npm.
+ * Returns { ok, stderr }.
+ */
+function installGlobalVersion(version) {
+  const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  return new Promise((resolve) => {
+    const child = spawn(npmCmd, ['install', '-g', `${pkg.name}@${version}`], {
+      stdio: ['ignore', 'ignore', 'pipe'],
+    });
+    let stderr = '';
+    child.stderr.on('data', (d) => { stderr += d; });
+    child.on('error', () => resolve({ ok: false, stderr: '' }));
+    child.on('exit', (code) => resolve({ ok: code === 0, stderr }));
+  });
+}
+
 /**
  * Auto-update if a new version is available.
- * Installs the update globally and re-execs mstro with the same arguments.
+ * Uses a local cache (refreshed hourly) so most startups add zero latency.
+ * When the cache is stale or missing, does an inline registry fetch (≤3 s).
+ * If a newer version exists, installs it globally and re-execs.
  * Returns true if the process was re-spawned (caller should return).
  */
 async function autoUpdate() {
   try {
-    if (!notifier.update || !semverGt(notifier.update.latest, notifier.update.current)) {
+    const latest = await resolveLatestVersion();
+
+    if (!latest || compareVersions(latest, pkg.version) <= 0) {
       return false;
     }
 
-    const { current, latest, type } = notifier.update;
+    const current = pkg.version;
+    const type = updateType(current, latest);
     log(`\n  Updating mstro: ${colors.dim}${current}${colors.reset} → ${colors.green}${latest}${colors.reset} ${colors.dim}(${type})${colors.reset}`);
 
-    const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+    const installResult = await installGlobalVersion(latest);
 
-    const success = await new Promise((resolve) => {
-      const child = spawn(npmCmd, ['install', '-g', pkg.name], {
-        stdio: ['ignore', 'ignore', 'pipe'],
-      });
-      child.on('error', () => resolve(false));
-      child.on('exit', (code) => resolve(code === 0));
-    });
-
-    if (!success) {
+    if (!installResult.ok) {
       log(`  Update failed — continuing with v${current}`, colors.yellow);
+      if (installResult.stderr) {
+        const reason = installResult.stderr.split('\n').find(l => l.trim()) || '';
+        if (reason) log(`  ${colors.dim}${reason.trim()}${colors.reset}`);
+      }
       log(`  Run manually: ${colors.cyan}npm i -g ${pkg.name}${colors.reset}\n`);
       return false;
     }
@@ -441,7 +522,6 @@ async function autoUpdate() {
       env: { ...process.env, MSTRO_SKIP_UPDATE_CHECK: '1' },
     });
 
-    // Parent ignores SIGINT — child handles it via shared terminal
     process.on('SIGINT', () => {});
     process.on('SIGTERM', () => child.kill('SIGTERM'));
 
@@ -452,7 +532,6 @@ async function autoUpdate() {
 
     return true;
   } catch {
-    // Don't let update logic crash the CLI
     return false;
   }
 }

package/dist/server/cli/headless/claude-invoker-process.d.ts

@@ -0,0 +1,11 @@
+import { type ChildProcess } from 'node:child_process';
+import type { StreamHandlerContext } from './claude-invoker-stream.js';
+import type { ExecutionResult, ResolvedHeadlessConfig } from './types.js';
+export declare function handleSpawnError(error: NodeJS.ErrnoException, config: ResolvedHeadlessConfig, reject: (reason: Error) => void): void;
+export declare function buildClaudeArgs(config: ResolvedHeadlessConfig, prompt: string, hasImageAttachments: boolean, useStreamJson: boolean, mcpConfigPath: string | null): string[];
+/** Spawn the Claude CLI process and register it */
+export declare function spawnAndRegister(config: ResolvedHeadlessConfig, prompt: string, hasImageAttachments: boolean, useStreamJson: boolean, runningProcesses: Map<number, ChildProcess>, perfStart: number): ChildProcess;
+export declare function buildCloseResult(ctx: StreamHandlerContext, stdout: string, stderr: string, code: number | null, signal: NodeJS.Signals | null, sessionCapture: {
+    claudeSessionId?: string;
+}): ExecutionResult;
+//# sourceMappingURL=claude-invoker-process.d.ts.map

package/dist/server/cli/headless/claude-invoker-process.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-invoker-process.d.ts","sourceRoot":"","sources":["../../../../server/cli/headless/claude-invoker-process.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAKvE,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AA0B1E,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,CAAC,cAAc,EAC5B,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,GAC9B,IAAI,CAYN;AAID,wBAAgB,eAAe,CAC7B,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,MAAM,EAAE,CAwCV;AAqBD,mDAAmD;AACnD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,OAAO,EACtB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAC3C,SAAS,EAAE,MAAM,GAChB,YAAY,CAyCd;AAID,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,oBAAoB,EACzB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,EAC7B,cAAc,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,eAAe,CAoBjB"}

package/dist/server/cli/headless/claude-invoker-process.js

@@ -0,0 +1,140 @@
+// Copyright (c) 2025-present Mstro, Inc. All rights reserved.
+// Licensed under the MIT License. See LICENSE file for details.
+import { spawn } from 'node:child_process';
+import { sanitizeEnvForSandbox } from '../../services/sandbox-utils.js';
+import { flushNativeTimeoutBuffers, verboseLog } from './claude-invoker-stream.js';
+import { herror } from './headless-logger.js';
+import { generateMcpConfig } from './mcp-config.js';
+import { buildMultimodalMessage } from './prompt-utils.js';
+// ========== Signal Helpers ==========
+/** Map a Node.js signal name to its numeric value for exit code computation */
+function signalToNumber(signal) {
+    const map = {
+        SIGHUP: 1, SIGINT: 2, SIGQUIT: 3, SIGABRT: 6,
+        SIGKILL: 9, SIGTERM: 15, SIGUSR1: 10, SIGUSR2: 12,
+    };
+    return map[signal];
+}
+// ========== Error Handling ==========
+const SPAWN_ERROR_MAP = {
+    ENOENT: {
+        code: 'CLAUDE_NOT_INSTALLED',
+        message: 'Claude Code is not installed or not in PATH. Please install Claude Code: npm install -g @anthropic-ai/claude-code'
+    },
+    EACCES: {
+        code: 'PERMISSION_DENIED',
+        message: 'Permission denied when running Claude Code. Please check file permissions.'
+    }
+};
+export function handleSpawnError(error, config, reject) {
+    const mapped = error.code ? SPAWN_ERROR_MAP[error.code] : undefined;
+    if (!mapped) {
+        reject(error);
+        return;
+    }
+    const formatted = `[[MSTRO_ERROR:${mapped.code}]] ${mapped.message}`;
+    if (config.outputCallback) {
+        config.outputCallback(`\n${formatted}\n`);
+    }
+    reject(new Error(formatted));
+}
+// ========== Argument Building ==========
+export function buildClaudeArgs(config, prompt, hasImageAttachments, useStreamJson, mcpConfigPath) {
+    const args = ['--print'];
+    if (config.model && config.model !== 'default') {
+        args.push('--model', config.model);
+    }
+    if (useStreamJson) {
+        args.push('--output-format', 'stream-json', '--include-partial-messages', '--verbose');
+    }
+    if (hasImageAttachments) {
+        args.push('--input-format', 'stream-json');
+    }
+    if (config.claudeSessionId) {
+        args.push('--resume', config.claudeSessionId);
+    }
+    else if (config.continueSession) {
+        args.push('--continue');
+    }
+    if (config.disallowedTools && config.disallowedTools.length > 0) {
+        args.push('--disallowedTools', config.disallowedTools.join(','));
+    }
+    if (mcpConfigPath) {
+        args.push('--mcp-config', mcpConfigPath);
+        args.push('--permission-prompt-tool', 'mcp__mstro-bouncer__approval_prompt');
+    }
+    else {
+        args.push('--permission-mode', 'acceptEdits');
+    }
+    // Reduce Edit-without-Read errors by reminding the model
+    args.push('--append-system-prompt', 'IMPORTANT: Always use the Read tool to read a file before using Edit or Write on it. Never edit a file you have not read in this session.');
+    if (!hasImageAttachments) {
+        args.push(prompt);
+    }
+    return args;
+}
+/** Write image attachments to the Claude process stdin as stream-json */
+function writeImageAttachmentsToStdin(claudeProcess, prompt, config) {
+    claudeProcess.stdin.on('error', (err) => {
+        if (config.verbose) {
+            herror('[STDIN] Write error:', err.message);
+        }
+        config.outputCallback?.(`\n[[MSTRO_ERROR:STDIN_WRITE_FAILED]] Failed to send image data to Claude: ${err.message}\n`);
+    });
+    const multimodalMessage = buildMultimodalMessage(prompt, config.imageAttachments);
+    claudeProcess.stdin.write(multimodalMessage);
+    claudeProcess.stdin.end();
+}
+// ========== Process Spawning ==========
+/** Spawn the Claude CLI process and register it */
+export function spawnAndRegister(config, prompt, hasImageAttachments, useStreamJson, runningProcesses, perfStart) {
+    const mcpConfigPath = generateMcpConfig(config.workingDir, config.verbose);
+    if (!mcpConfigPath && config.outputCallback) {
+        config.outputCallback('\n[[MSTRO_ERROR:BOUNCER_UNAVAILABLE]] Security bouncer not available. Running with limited permissions — file edits allowed, but shell commands may be restricted.\n');
+    }
+    const args = buildClaudeArgs(config, prompt, hasImageAttachments, useStreamJson, mcpConfigPath);
+    verboseLog(config.verbose, `[PERF] About to spawn: ${Date.now() - perfStart}ms`, `[PERF] Command: ${config.claudeCommand} ${args.join(' ')}`);
+    const baseEnv = config.sandboxed
+        ? sanitizeEnvForSandbox(process.env, config.workingDir)
+        : { ...process.env };
+    const spawnEnv = config.extraEnv
+        ? { ...baseEnv, ...config.extraEnv }
+        : baseEnv;
+    const claudeProcess = spawn(config.claudeCommand, args, {
+        cwd: config.workingDir,
+        detached: true,
+        env: spawnEnv,
+        stdio: [hasImageAttachments ? 'pipe' : 'ignore', 'pipe', 'pipe']
+    });
+    if (hasImageAttachments && claudeProcess.stdin) {
+        writeImageAttachmentsToStdin(claudeProcess, prompt, config);
+    }
+    if (claudeProcess.pid) {
+        runningProcesses.set(claudeProcess.pid, claudeProcess);
+    }
+    verboseLog(config.verbose, `[PERF] Spawned: ${Date.now() - perfStart}ms`);
+    return claudeProcess;
+}
+// ========== Result Building ==========
+export function buildCloseResult(ctx, stdout, stderr, code, signal, sessionCapture) {
+    const postTimeout = flushNativeTimeoutBuffers(ctx);
+    const resumeBuffered = ctx.resumeAssessmentActive ? (ctx.resumeAssessmentBuffer || undefined) : undefined;
+    const exitCode = code ?? (signal ? 128 + (signalToNumber(signal) ?? 0) : 0);
+    const hasTokenUsage = ctx.apiTokenUsage.inputTokens > 0 || ctx.apiTokenUsage.outputTokens > 0;
+    return {
+        output: stdout,
+        error: stderr || undefined,
+        exitCode,
+        signalName: signal || undefined,
+        assistantResponse: ctx.accumulatedAssistantResponse || undefined,
+        thinkingOutput: ctx.accumulatedThinking || undefined,
+        toolUseHistory: ctx.accumulatedToolUse.length > 0 ? ctx.accumulatedToolUse : undefined,
+        claudeSessionId: sessionCapture.claudeSessionId,
+        nativeTimeoutCount: ctx.nativeTimeoutDetector.timeoutCount || undefined,
+        postTimeoutOutput: postTimeout,
+        resumeBufferedOutput: resumeBuffered,
+        apiTokenUsage: hasTokenUsage ? { ...ctx.apiTokenUsage } : undefined,
+        stopReason: ctx.stopReason,
+    };
+}
+//# sourceMappingURL=claude-invoker-process.js.map

package/dist/server/cli/headless/claude-invoker-process.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-invoker-process.js","sourceRoot":"","sources":["../../../../server/cli/headless/claude-invoker-process.ts"],"names":[],"mappings":"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"}

package/dist/server/cli/headless/claude-invoker-stall.d.ts

@@ -0,0 +1,40 @@
+import type { ChildProcess } from 'node:child_process';
+import { type StallContext } from './stall-assessor.js';
+import type { ResolvedHeadlessConfig } from './types.js';
+export interface StallAssessmentParams {
+    stallCtx: StallContext;
+    config: ResolvedHeadlessConfig;
+    now: number;
+    extensionsGranted: number;
+    maxExtensions: number;
+    toolWatchdogActive?: boolean;
+}
+/** Mutable state for stall detection, shared between the interval callback and the outer function */
+export interface StallState {
+    lastActivityTime: number;
+    stallWarningEmitted: boolean;
+    assessmentInProgress: boolean;
+    extensionsGranted: number;
+    currentKillDeadline: number;
+    nextWarningAfter: number;
+}
+/** Terminate a stalled process: SIGTERM then SIGKILL after 5s */
+export declare function terminateStallProcess(claudeProcess: ChildProcess, interval: ReturnType<typeof setInterval>, config: ResolvedHeadlessConfig, message: string): void;
+/** Run a single stall-check tick */
+export declare function runStallCheckTick(state: StallState, opts: {
+    perfStart: number;
+    stallWarningMs: number;
+    stallHardCapMs: number;
+    maxExtensions: number;
+    stallAssessEnabled: boolean;
+    toolWatchdogActive: boolean;
+    prompt: string;
+    pendingTools: Map<string, string>;
+    lastToolInputSummary: string | undefined;
+    totalToolCalls: number;
+    claudeProcess: ChildProcess;
+    stallCheckInterval: ReturnType<typeof setInterval>;
+    config: ResolvedHeadlessConfig;
+    lastTokenActivityTime: number;
+}): Promise<void>;
+//# sourceMappingURL=claude-invoker-stall.d.ts.map

package/dist/server/cli/headless/claude-invoker-stall.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-invoker-stall.d.ts","sourceRoot":"","sources":["../../../../server/cli/headless/claude-invoker-stall.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,qGAAqG;AACrG,MAAM,WAAW,UAAU;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,iEAAiE;AACjE,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,YAAY,EAC3B,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EACxC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,MAAM,GACd,IAAI,CASN;AA2CD,oCAAoC;AACpC,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE;IACJ,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,YAAY,CAAC;IAC5B,kBAAkB,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IACnD,MAAM,EAAE,sBAAsB,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;CAC/B,GACA,OAAO,CAAC,IAAI,CAAC,CA0Df"}

package/dist/server/cli/headless/claude-invoker-stall.js

@@ -0,0 +1,98 @@
+// Copyright (c) 2025-present Mstro, Inc. All rights reserved.
+// Licensed under the MIT License. See LICENSE file for details.
+import { hlog } from './headless-logger.js';
+import { killProcessGroup } from './runner.js';
+import { assessStall } from './stall-assessor.js';
+/** Terminate a stalled process: SIGTERM then SIGKILL after 5s */
+export function terminateStallProcess(claudeProcess, interval, config, message) {
+    clearInterval(interval);
+    config.outputCallback?.(message);
+    if (claudeProcess.pid)
+        killProcessGroup(claudeProcess.pid, 'SIGTERM');
+    setTimeout(() => {
+        if (!claudeProcess.killed && claudeProcess.pid) {
+            killProcessGroup(claudeProcess.pid, 'SIGKILL');
+        }
+    }, 5000);
+}
+/** Run stall assessment and return updated state if extended, null otherwise */
+async function runStallAssessment(params) {
+    const { stallCtx, config, now, extensionsGranted, maxExtensions, toolWatchdogActive } = params;
+    try {
+        const verdict = await assessStall(stallCtx, config.claudeCommand, config.verbose, toolWatchdogActive);
+        if (verdict.action === 'extend') {
+            const newExtensions = extensionsGranted + 1;
+            const elapsedMin = Math.round(stallCtx.elapsedTotalMs / 60_000);
+            const pendingNames = stallCtx.pendingToolNames ?? new Set();
+            const isAgentTeamsLead = verdict.reason.includes('Agent Teams lead');
+            if (pendingNames.has('Task') || isAgentTeamsLead) {
+                config.outputCallback?.(`\n[[MSTRO_STALL_EXTENDED]] ${isAgentTeamsLead ? 'Teammates still working' : 'Task subagent still running'} (${elapsedMin} min elapsed). ${verdict.reason}.\n`);
+            }
+            else {
+                config.outputCallback?.(`\n[[MSTRO_STALL_EXTENDED]] Process still working (${elapsedMin} min elapsed). ${verdict.reason}. Extension ${newExtensions}/${maxExtensions}.\n`);
+            }
+            if (config.verbose) {
+                hlog(`[STALL] Extended by ${Math.round(verdict.extensionMs / 60_000)} min: ${verdict.reason}`);
+            }
+            return { extensionsGranted: newExtensions, currentKillDeadline: now + verdict.extensionMs };
+        }
+        config.outputCallback?.(`\n[[MSTRO_STALL_CONFIRMED]] Assessment: process likely stalled. ${verdict.reason}.\n`);
+        if (config.verbose) {
+            hlog(`[STALL] Assessment says stalled: ${verdict.reason}`);
+        }
+    }
+    catch (err) {
+        if (config.verbose) {
+            hlog(`[STALL] Assessment error: ${err}`);
+        }
+    }
+    return null;
+}
+/** Run a single stall-check tick */
+export async function runStallCheckTick(state, opts) {
+    const now = Date.now();
+    const silenceMs = now - state.lastActivityTime;
+    const totalElapsed = now - opts.perfStart;
+    const tokenSilenceMs = now - opts.lastTokenActivityTime;
+    if (totalElapsed >= opts.stallHardCapMs) {
+        terminateStallProcess(opts.claudeProcess, opts.stallCheckInterval, opts.config, `\n[[MSTRO_ERROR:EXECUTION_STALLED]] Hard time limit reached (${Math.round(opts.stallHardCapMs / 60000)} min total). Terminating process.\n`);
+        return;
+    }
+    // Token activity pushes the kill deadline forward
+    if (tokenSilenceMs < 60_000 && now < state.currentKillDeadline) {
+        const killMs = opts.config.stallKillMs ?? 1_800_000;
+        state.currentKillDeadline = Math.max(state.currentKillDeadline, now + killMs);
+    }
+    if (now >= state.currentKillDeadline) {
+        terminateStallProcess(opts.claudeProcess, opts.stallCheckInterval, opts.config, `\n[[MSTRO_ERROR:EXECUTION_STALLED]] No output for ${Math.round(silenceMs / 60_000)} minutes. Terminating process.\n`);
+        return;
+    }
+    if (silenceMs < opts.stallWarningMs || state.stallWarningEmitted || now < state.nextWarningAfter || state.assessmentInProgress)
+        return;
+    const stallCtx = {
+        originalPrompt: opts.prompt,
+        silenceMs,
+        lastToolName: opts.pendingTools.size > 0 ? Array.from(opts.pendingTools.values()).pop() : undefined,
+        lastToolInputSummary: opts.lastToolInputSummary,
+        pendingToolCount: opts.pendingTools.size,
+        pendingToolNames: new Set(opts.pendingTools.values()),
+        totalToolCalls: opts.totalToolCalls,
+        elapsedTotalMs: totalElapsed,
+        tokenSilenceMs,
+    };
+    if (opts.stallAssessEnabled && state.extensionsGranted < opts.maxExtensions) {
+        state.assessmentInProgress = true;
+        const result = await runStallAssessment({ stallCtx, config: opts.config, now, extensionsGranted: state.extensionsGranted, maxExtensions: opts.maxExtensions, toolWatchdogActive: opts.toolWatchdogActive });
+        state.assessmentInProgress = false;
+        if (result) {
+            state.extensionsGranted = result.extensionsGranted;
+            state.currentKillDeadline = result.currentKillDeadline;
+            state.nextWarningAfter = now + opts.stallWarningMs;
+            return;
+        }
+    }
+    state.stallWarningEmitted = true;
+    const killIn = Math.round((state.currentKillDeadline - now) / 60_000);
+    opts.config.outputCallback?.(`\n[[MSTRO_ERROR:EXECUTION_STALLED]] No output for ${Math.round(silenceMs / 60_000)} minutes. Will terminate in ${killIn} minutes if no activity.\n`);
+}
+//# sourceMappingURL=claude-invoker-stall.js.map

package/dist/server/cli/headless/claude-invoker-stall.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-invoker-stall.js","sourceRoot":"","sources":["../../../../server/cli/headless/claude-invoker-stall.ts"],"names":[],"mappings":"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"}

package/dist/server/cli/headless/claude-invoker-stream.d.ts

@@ -0,0 +1,44 @@
+import type { NativeTimeoutDetector } from './native-timeout-detector.js';
+import type { ResolvedHeadlessConfig, ToolUseAccumulator } from './types.js';
+type StreamJson = any;
+export interface StreamHandlerContext {
+    config: ResolvedHeadlessConfig;
+    accumulatedAssistantResponse: string;
+    accumulatedThinking: string;
+    accumulatedToolUse: ToolUseAccumulator[];
+    toolInputBuffers: Map<number, {
+        name: string;
+        id: string;
+        inputJson: string;
+        startTime: number;
+    }>;
+    nativeTimeoutDetector: NativeTimeoutDetector;
+    /** When true, assistant text is buffered instead of forwarded to outputCallback.
+     *  Active during resume mode until thinking/tool activity confirms Claude has context. */
+    resumeAssessmentActive: boolean;
+    /** Buffered assistant text during resume assessment */
+    resumeAssessmentBuffer: string;
+    /** Cumulative API token usage from message_start/message_delta events */
+    apiTokenUsage: {
+        inputTokens: number;
+        outputTokens: number;
+    };
+    /** Tracks cumulative output_tokens within the current step (message_delta is cumulative per-step) */
+    currentStepOutputTokens: number;
+    /** Timestamp of the last token usage change (tokens still flowing = process alive) */
+    lastTokenActivityTime: number;
+    /** Claude Code result event stop_reason (e.g., 'end_turn', 'max_tokens') */
+    stopReason?: string;
+}
+/** Log messages when verbose mode is enabled */
+export declare function verboseLog(verbose: boolean | undefined, ...msgs: string[]): void;
+export declare function processStreamEvent(parsed: StreamJson, ctx: StreamHandlerContext): void;
+export declare function processStreamLines(buffer: string, sessionCapture: {
+    claudeSessionId?: string;
+}, ctx: StreamHandlerContext): string;
+/** Flush native timeout detector buffers and return post-timeout output if any */
+export declare function flushNativeTimeoutBuffers(ctx: StreamHandlerContext): string | undefined;
+/** Classify unmatched stderr via Haiku when process exits with error */
+export declare function classifyUnmatchedStderr(stderr: string, errorAlreadySurfaced: boolean, code: number | null, config: ResolvedHeadlessConfig): Promise<void>;
+export {};
+//# sourceMappingURL=claude-invoker-stream.d.ts.map

package/dist/server/cli/headless/claude-invoker-stream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-invoker-stream.d.ts","sourceRoot":"","sources":["../../../../server/cli/headless/claude-invoker-stream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAE1E,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAG7E,KAAK,UAAU,GAAG,GAAG,CAAC;AAEtB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,sBAAsB,CAAC;IAC/B,4BAA4B,EAAE,MAAM,CAAC;IACrC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,kBAAkB,EAAE,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClG,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C;8FAC0F;IAC1F,sBAAsB,EAAE,OAAO,CAAC;IAChC,uDAAuD;IACvD,sBAAsB,EAAE,MAAM,CAAC;IAC/B,yEAAyE;IACzE,aAAa,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,qGAAqG;IACrG,uBAAuB,EAAE,MAAM,CAAC;IAChC,sFAAsF;IACtF,qBAAqB,EAAE,MAAM,CAAC;IAC9B,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,gDAAgD;AAChD,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAIhF;AA8KD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,oBAAoB,GAAG,IAAI,CA2BtF;AA+DD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,cAAc,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5C,GAAG,EAAE,oBAAoB,GACxB,MAAM,CAcR;AAED,kFAAkF;AAClF,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,oBAAoB,GAAG,MAAM,GAAG,SAAS,CAUvF;AAED,wEAAwE;AACxE,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,OAAO,EAC7B,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAWf"}