mstro-app 0.4.29 → 0.4.33

package/dist/server/services/pathUtils.js

@@ -8,6 +8,44 @@
  */
 import { existsSync, lstatSync, realpathSync } from 'node:fs';
 import { dirname, isAbsolute, normalize, relative, resolve } from 'node:path';
+/** Append a trailing separator to a directory path if not already present. */
+function ensureTrailingSep(dir) {
+    return dir.endsWith('/') ? dir : `${dir}/`;
+}
+/** Resolve symlinks for an existing path. Returns the real path if it's a symlink. */
+function resolveExistingSymlink(resolvedPath) {
+    const stat = lstatSync(resolvedPath);
+    if (stat.isSymbolicLink()) {
+        return realpathSync(resolvedPath);
+    }
+    return resolvedPath;
+}
+/**
+ * Validate that the parent directory of a non-existent path hasn't escaped
+ * the working directory via symlink. Returns an error result or null if valid.
+ */
+function validateParentSymlink(resolvedPath, normalizedWorkingDir, targetPath) {
+    const parentDir = dirname(resolvedPath);
+    if (!existsSync(parentDir))
+        return null;
+    const realParent = realpathSync(parentDir);
+    const parentWithSep = ensureTrailingSep(normalizedWorkingDir);
+    if (realParent !== normalizedWorkingDir && !realParent.startsWith(parentWithSep)) {
+        console.error(`[PathUtils] SECURITY: Symlink traversal in parent directory blocked. ` +
+            `Target: "${targetPath}", RealParent: "${realParent}", WorkingDir: "${normalizedWorkingDir}"`);
+        return {
+            valid: false,
+            resolvedPath: '',
+            error: 'Access denied: parent directory resolves outside working directory'
+        };
+    }
+    return null;
+}
+/** Check whether a resolved path is within the working directory boundary. */
+function isPathWithinDir(resolvedPath, normalizedWorkingDir) {
+    return resolvedPath === normalizedWorkingDir ||
+        resolvedPath.startsWith(ensureTrailingSep(normalizedWorkingDir));
+}
 /**
  * Validate that a path is within the allowed working directory.
  * Prevents path traversal attacks using .. or absolute paths.
@@ -21,54 +59,24 @@ export function validatePathWithinWorkingDir(targetPath, workingDir) {
         // Normalize the working directory to get canonical path
         const normalizedWorkingDir = resolve(workingDir);
         // Resolve the target path relative to working directory
-        let resolvedPath;
-        if (isAbsolute(targetPath)) {
-            resolvedPath = resolve(targetPath);
-        }
-        else {
-            resolvedPath = resolve(normalizedWorkingDir, targetPath);
-        }
+        let resolvedPath = isAbsolute(targetPath)
+            ? resolve(targetPath)
+            : resolve(normalizedWorkingDir, targetPath);
         // Normalize to remove any .. or . segments
         resolvedPath = normalize(resolvedPath);
         // Resolve symlinks to prevent symlink-based path traversal.
         // A symlink at /project/link -> /etc/passwd would pass the string
         // check below but actually read outside the working directory.
-        // For existing paths: resolve the full path via realpath.
-        // For new paths (create operations): resolve the parent directory.
         if (existsSync(resolvedPath)) {
-            // If the path itself is a symlink, resolve it to the real target
-            const stat = lstatSync(resolvedPath);
-            if (stat.isSymbolicLink()) {
-                resolvedPath = realpathSync(resolvedPath);
-            }
+            resolvedPath = resolveExistingSymlink(resolvedPath);
         }
         else {
             // Path doesn't exist yet (create operation) — validate the parent
-            const parentDir = dirname(resolvedPath);
-            if (existsSync(parentDir)) {
-                const realParent = realpathSync(parentDir);
-                const parentWithSep = normalizedWorkingDir.endsWith('/')
-                    ? normalizedWorkingDir
-                    : `${normalizedWorkingDir}/`;
-                if (realParent !== normalizedWorkingDir && !realParent.startsWith(parentWithSep)) {
-                    console.error(`[PathUtils] SECURITY: Symlink traversal in parent directory blocked. ` +
-                        `Target: "${targetPath}", RealParent: "${realParent}", WorkingDir: "${normalizedWorkingDir}"`);
-                    return {
-                        valid: false,
-                        resolvedPath: '',
-                        error: 'Access denied: parent directory resolves outside working directory'
-                    };
-                }
-            }
+            const parentError = validateParentSymlink(resolvedPath, normalizedWorkingDir, targetPath);
+            if (parentError)
+                return parentError;
         }
-        // Check if the resolved path starts with the working directory
-        // Add trailing separator to prevent partial matches (e.g., /home/user vs /home/username)
-        const workingDirWithSep = normalizedWorkingDir.endsWith('/')
-            ? normalizedWorkingDir
-            : `${normalizedWorkingDir}/`;
-        const isWithinWorkingDir = resolvedPath === normalizedWorkingDir ||
-            resolvedPath.startsWith(workingDirWithSep);
-        if (!isWithinWorkingDir) {
+        if (!isPathWithinDir(resolvedPath, normalizedWorkingDir)) {
             // Log security violation for monitoring
             console.error(`[PathUtils] SECURITY: Path traversal attempt blocked. ` +
                 `Target: "${targetPath}", Resolved: "${resolvedPath}", WorkingDir: "${normalizedWorkingDir}"`);

package/dist/server/services/pathUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../server/services/pathUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../../server/services/pathUtils.ts"],"names":[],"mappings":"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"}

package/dist/server/services/plan/agent-loader.d.ts

@@ -1,10 +1,26 @@
 /**
  * Load an agent prompt by name with layered resolution.
  *
- * @param agentName - The agent file name without extension (e.g., "review-code")
- * @param variables - Key-value map for {{variable}} substitution
- * @param boardDir  - Optional board directory for board-level overrides
+ * @param agentName  - The agent file name without extension (e.g., "review-code")
+ * @param variables  - Key-value map for {{variable}} substitution
+ * @param boardDir   - Optional board directory for board-level overrides
+ * @param workingDir - Optional working directory for project-level Skill resolution
  * @returns The interpolated prompt string, or null if no agent file found
  */
-export declare function loadAgentPrompt(agentName: string, variables: Record<string, string>, boardDir?: string | null): string | null;
+export declare function loadAgentPrompt(agentName: string, variables: Record<string, string>, boardDir?: string | null, workingDir?: string | null): string | null;
+/**
+ * Load a Skill template body by name, stripping frontmatter.
+ * Looks in {workingDir}/.claude/skills/{skillName}/SKILL.md first,
+ * then falls back to the system agents directory.
+ *
+ * @param skillName  - The skill directory name (e.g., "code-review")
+ * @param workingDir - Working directory for project-level Skill resolution
+ * @returns Raw template body (no frontmatter), or null if not found
+ */
+export declare function loadSkillTemplate(skillName: string, workingDir?: string): string | null;
+/**
+ * Load a Skill template and interpolate variables.
+ * Convenience wrapper combining loadSkillTemplate + interpolation.
+ */
+export declare function loadSkillPrompt(skillName: string, variables: Record<string, string>, workingDir?: string): string | null;
 //# sourceMappingURL=agent-loader.d.ts.map

package/dist/server/services/plan/agent-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loader.d.ts","sourceRoot":"","sources":["../../../../server/services/plan/agent-loader.ts"],"names":[],"mappings":"AAoCA;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GACvB,MAAM,GAAG,IAAI,CAwBf"}
+{"version":3,"file":"agent-loader.d.ts","sourceRoot":"","sources":["../../../../server/services/plan/agent-loader.ts"],"names":[],"mappings":"AAiDA;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GACzB,MAAM,GAAG,IAAI,CAoBf;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsBvF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAIf"}

package/dist/server/services/plan/agent-loader.js

@@ -1,11 +1,12 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
 // Licensed under the MIT License. See LICENSE file for details.
 /**
- * Agent Prompt Loader — loads review agent prompts from markdown files.
+ * Agent Prompt Loader — loads review agent prompts from Skills and markdown files.
  *
  * Resolution order (first match wins):
  *   1. Board-level override:  {boardDir}/agents/{agentName}.md
- *   2. System default:        cli/server/services/plan/agents/{agentName}.md
+ *   2. Project Skill:         {workingDir}/.claude/skills/{agentName}/SKILL.md
+ *   3. System default:        cli/server/services/plan/agents/{agentName}.md
  *
  * Files use YAML frontmatter + markdown body with {{variable}} placeholders.
  * Falls back to null when no file is found (caller should use hardcoded fallback).
@@ -13,6 +14,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { findSkillsDir } from '../../utils/paths.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const SYSTEM_AGENTS_DIR = join(__dirname, 'agents');
 /** Strip YAML frontmatter (--- ... ---) from markdown, returning just the body. */
@@ -30,36 +32,87 @@ function interpolate(template, variables) {
         return key in variables ? variables[key] : match;
     });
 }
+/** Try to load and interpolate a prompt file. Returns null on failure. */
+function tryLoadFile(filePath, variables) {
+    if (!existsSync(filePath))
+        return null;
+    try {
+        const raw = readFileSync(filePath, 'utf-8');
+        return interpolate(stripFrontmatter(raw), variables);
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Load an agent prompt by name with layered resolution.
  *
- * @param agentName - The agent file name without extension (e.g., "review-code")
- * @param variables - Key-value map for {{variable}} substitution
- * @param boardDir  - Optional board directory for board-level overrides
+ * @param agentName  - The agent file name without extension (e.g., "review-code")
+ * @param variables  - Key-value map for {{variable}} substitution
+ * @param boardDir   - Optional board directory for board-level overrides
+ * @param workingDir - Optional working directory for project-level Skill resolution
  * @returns The interpolated prompt string, or null if no agent file found
  */
-export function loadAgentPrompt(agentName, variables, boardDir) {
+export function loadAgentPrompt(agentName, variables, boardDir, workingDir) {
     const fileName = `${agentName}.md`;
     // 1. Board-level override
     if (boardDir) {
-        const boardAgentPath = join(boardDir, 'agents', fileName);
-        if (existsSync(boardAgentPath)) {
-            try {
-                const raw = readFileSync(boardAgentPath, 'utf-8');
-                return interpolate(stripFrontmatter(raw), variables);
+        const result = tryLoadFile(join(boardDir, 'agents', fileName), variables);
+        if (result)
+            return result;
+    }
+    // 2. Project Skill: {workingDir}/.claude/skills/{agentName}/SKILL.md
+    if (workingDir) {
+        const skillsDir = findSkillsDir(workingDir);
+        if (skillsDir) {
+            const result = tryLoadFile(join(skillsDir, agentName, 'SKILL.md'), variables);
+            if (result)
+                return result;
+        }
+    }
+    // 3. System default
+    return tryLoadFile(join(SYSTEM_AGENTS_DIR, fileName), variables);
+}
+/**
+ * Load a Skill template body by name, stripping frontmatter.
+ * Looks in {workingDir}/.claude/skills/{skillName}/SKILL.md first,
+ * then falls back to the system agents directory.
+ *
+ * @param skillName  - The skill directory name (e.g., "code-review")
+ * @param workingDir - Working directory for project-level Skill resolution
+ * @returns Raw template body (no frontmatter), or null if not found
+ */
+export function loadSkillTemplate(skillName, workingDir) {
+    if (workingDir) {
+        const skillsDir = findSkillsDir(workingDir);
+        if (skillsDir) {
+            const path = join(skillsDir, skillName, 'SKILL.md');
+            if (existsSync(path)) {
+                try {
+                    return stripFrontmatter(readFileSync(path, 'utf-8'));
+                }
+                catch { /* fall through */ }
             }
-            catch { /* fall through to system default */ }
         }
     }
-    // 2. System default
-    const systemPath = join(SYSTEM_AGENTS_DIR, fileName);
+    // Fallback: system agents directory
+    const systemPath = join(SYSTEM_AGENTS_DIR, `${skillName}.md`);
     if (existsSync(systemPath)) {
         try {
-            const raw = readFileSync(systemPath, 'utf-8');
-            return interpolate(stripFrontmatter(raw), variables);
+            return stripFrontmatter(readFileSync(systemPath, 'utf-8'));
         }
         catch { /* return null */ }
     }
     return null;
 }
+/**
+ * Load a Skill template and interpolate variables.
+ * Convenience wrapper combining loadSkillTemplate + interpolation.
+ */
+export function loadSkillPrompt(skillName, variables, workingDir) {
+    const template = loadSkillTemplate(skillName, workingDir);
+    if (!template)
+        return null;
+    return interpolate(template, variables);
+}
 //# sourceMappingURL=agent-loader.js.map

package/dist/server/services/plan/agent-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loader.js","sourceRoot":"","sources":["../../../../server/services/plan/agent-loader.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,gEAAgE;AAEhE;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1D,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAEpD,mFAAmF;AACnF,SAAS,gBAAgB,CAAC,OAAe;IACvC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACzC,IAAI,MAAM,KAAK,CAAC,CAAC;QAAE,OAAO,OAAO,CAAC;IAClC,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAC/C,CAAC;AAED,+EAA+E;AAC/E,SAAS,WAAW,CAAC,QAAgB,EAAE,SAAiC;IACtE,OAAO,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;QAC/D,OAAO,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,SAAiB,EACjB,SAAiC,EACjC,QAAwB;IAExB,MAAM,QAAQ,GAAG,GAAG,SAAS,KAAK,CAAC;IAEnC,0BAA0B;IAC1B,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1D,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAClD,OAAO,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC,CAAC,oCAAoC,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IACrD,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"agent-loader.js","sourceRoot":"","sources":["../../../../server/services/plan/agent-loader.ts"],"names":[],"mappings":"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"}

package/dist/server/services/plan/issue-retry.d.ts

@@ -15,13 +15,5 @@ export interface IssueRunnerConfig {
     /** Signal to abort execution — when aborted, kills the running HeadlessRunner */
     abortSignal?: AbortSignal;
 }
-/**
- * Execute a PM issue with retry logic.
- *
- * This wraps HeadlessRunner.run() with the same retry strategies as Chat view:
- * 1. Tool timeout → checkpoint recovery with accumulated results
- * 2. Signal crash → fresh start with preserved tool results
- * 3. Premature completion → resume session with "continue"
- */
 export declare function runIssueWithRetry(config: IssueRunnerConfig): Promise<SessionResult>;
 //# sourceMappingURL=issue-retry.d.ts.map

package/dist/server/services/plan/issue-retry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issue-retry.d.ts","sourceRoot":"","sources":["../../../../server/services/plan/issue-retry.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAuB,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAkCtF,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0DAA0D;IAC1D,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,iFAAiF;IACjF,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CA8FzF"}
+{"version":3,"file":"issue-retry.d.ts","sourceRoot":"","sources":["../../../../server/services/plan/issue-retry.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAuB,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAkCtF,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0DAA0D;IAC1D,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,iFAAiF;IACjF,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAiGD,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CAgCzF"}

package/dist/server/services/plan/issue-retry.js

@@ -28,6 +28,70 @@ const MAX_ACCUMULATED_RESULTS = 50;
  * 2. Signal crash → fresh start with preserved tool results
  * 3. Premature completion → resume session with "continue"
  */
+/** Build the default "aborted" fallback result. */
+function abortedResult(bestResult) {
+    return bestResult ?? {
+        completed: false, needsHandoff: false, totalTokens: 0, sessionId: '',
+        error: 'Execution stopped by user',
+    };
+}
+/** Create a HeadlessRunner configured for the current retry iteration. */
+function createRunner(config, state, useResume, resumeSessionId) {
+    return new HeadlessRunner({
+        workingDir: config.workingDir,
+        directPrompt: state.currentPrompt,
+        stallWarningMs: config.stallWarningMs,
+        stallKillMs: config.stallKillMs,
+        stallHardCapMs: config.stallHardCapMs,
+        stallMaxExtensions: config.stallMaxExtensions,
+        verbose: true,
+        continueSession: useResume,
+        claudeSessionId: resumeSessionId,
+        outputCallback: config.outputCallback,
+        onToolTimeout: (cp) => {
+            state.checkpoint = cp;
+        },
+        extraEnv: config.extraEnv,
+    });
+}
+/** Wire the abort signal to clean up the runner. Returns a cleanup function. */
+function wireAbortSignal(runner, abortSignal) {
+    if (!abortSignal)
+        return null;
+    const abortHandler = () => { runner.cleanup(); };
+    abortSignal.addEventListener('abort', abortHandler, { once: true });
+    return () => abortSignal.removeEventListener('abort', abortHandler);
+}
+/**
+ * Run a single iteration: spawn runner, await result, evaluate retry.
+ * Returns { result, shouldRetry } — caller loops while shouldRetry is true.
+ * Returns null if aborted (caller should return abortedResult).
+ */
+async function runSingleAttempt(config, state) {
+    state.checkpoint = null;
+    const useResume = !!state.lastSessionId;
+    const resumeSessionId = state.lastSessionId;
+    state.lastSessionId = undefined;
+    const runner = createRunner(config, state, useResume, resumeSessionId);
+    if (config.abortSignal?.aborted) {
+        runner.cleanup();
+        return null;
+    }
+    const removeAbortListener = wireAbortSignal(runner, config.abortSignal);
+    const result = await runner.run();
+    removeAbortListener?.();
+    if (config.abortSignal?.aborted)
+        return null;
+    // Track best result for fallback selection
+    if (!state.bestResult || scoreResult(result) > scoreResult(state.bestResult)) {
+        state.bestResult = result;
+    }
+    // Evaluate retry strategies in priority order
+    const shouldRetry = tryToolTimeoutRetry(state, result, config) ||
+        trySignalCrashRetry(state, result, config) ||
+        await tryPrematureCompletionRetry(state, result, config);
+    return { result, shouldRetry };
+}
 export async function runIssueWithRetry(config) {
     const state = {
         currentPrompt: config.prompt,
@@ -40,70 +104,15 @@ export async function runIssueWithRetry(config) {
     };
     let result;
     while (state.retryNumber <= MAX_ISSUE_RETRIES) {
-        // Check abort before starting a new attempt
-        if (config.abortSignal?.aborted) {
-            return state.bestResult ?? {
-                completed: false, needsHandoff: false, totalTokens: 0, sessionId: '',
-                error: 'Execution stopped by user',
-            };
-        }
-        // Clear checkpoint from prior iteration
-        state.checkpoint = null;
-        // Determine resume strategy
-        const useResume = !!state.lastSessionId;
-        const resumeSessionId = state.lastSessionId;
-        state.lastSessionId = undefined;
-        const runner = new HeadlessRunner({
-            workingDir: config.workingDir,
-            directPrompt: state.currentPrompt,
-            stallWarningMs: config.stallWarningMs,
-            stallKillMs: config.stallKillMs,
-            stallHardCapMs: config.stallHardCapMs,
-            stallMaxExtensions: config.stallMaxExtensions,
-            verbose: true,
-            continueSession: useResume,
-            claudeSessionId: resumeSessionId,
-            outputCallback: config.outputCallback,
-            onToolTimeout: (cp) => {
-                state.checkpoint = cp;
-            },
-            extraEnv: config.extraEnv,
-        });
-        // Wire abort signal to kill the runner's processes
-        const abortHandler = () => { runner.cleanup(); };
-        if (config.abortSignal) {
-            if (config.abortSignal.aborted) {
-                runner.cleanup();
-                return state.bestResult ?? {
-                    completed: false, needsHandoff: false, totalTokens: 0, sessionId: '',
-                    error: 'Execution stopped by user',
-                };
-            }
-            config.abortSignal.addEventListener('abort', abortHandler, { once: true });
-        }
-        result = await runner.run();
-        // Clean up abort listener
-        config.abortSignal?.removeEventListener('abort', abortHandler);
-        // If aborted during run, return immediately
-        if (config.abortSignal?.aborted) {
-            return state.bestResult ?? result ?? {
-                completed: false, needsHandoff: false, totalTokens: 0, sessionId: '',
-                error: 'Execution stopped by user',
-            };
-        }
-        // Track best result for fallback selection
-        if (!state.bestResult || scoreResult(result) > scoreResult(state.bestResult)) {
-            state.bestResult = result;
+        if (config.abortSignal?.aborted)
+            return abortedResult(state.bestResult);
+        const attempt = await runSingleAttempt(config, state);
+        if (!attempt) {
+            return state.bestResult ?? result ?? abortedResult(null);
         }
-        // Evaluate retry strategies in priority order
-        if (tryToolTimeoutRetry(state, result, config))
-            continue;
-        if (trySignalCrashRetry(state, result, config))
-            continue;
-        if (await tryPrematureCompletionRetry(state, result, config))
-            continue;
-        // No retry needed — break out
-        break;
+        result = attempt.result;
+        if (!attempt.shouldRetry)
+            break;
     }
     return result ?? state.bestResult ?? {
         completed: false,

package/dist/server/services/plan/issue-retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"issue-retry.js","sourceRoot":"","sources":["../../../../server/services/plan/issue-retry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"issue-retry.js","sourceRoot":"","sources":["../../../../server/services/plan/issue-retry.ts"],"names":[],"mappings":"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"}