oc-pilot 0.0.0-stage → 0.5.1

package/dist/commands/doctor.js

@@ -0,0 +1,334 @@
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { spawnSync } from "node:child_process";
+import { asBoolean } from "../core/parse.js";
+import { DEFAULT_API_KEY_ENV, isLoopbackUrl, normalizeBaseUrl, } from "../core/engine.js";
+import { detectTestCommand } from "../core/project.js";
+import { parseCommandArgs, resolveContext, withCommon } from "../core/options.js";
+import { VERSION } from "../version.js";
+const OPTIONS = withCommon({});
+const HELP = `Usage:
+  oc-pilot doctor [options]
+
+Checks the local setup without calling a model: Node.js, git, the selected
+engine, credentials, test discovery, and MCP client configuration.
+
+Options:
+  -C, --cwd <dir>       Project directory (default: current)
+      --config <path>   Path to .oc-pilot.json
+      --engine <name>   Check this engine: opencode or openai
+      --base-url <url>  OpenAI-compatible base URL
+      --api-key-env <n> Environment variable that stores the API key
+  -m, --model <id>      Model to verify in the selected engine
+      --strict          Exit 1 on warnings as well as errors
+      --json            Machine-readable report
+  -h, --help            Show this help
+
+Examples:
+  oc-pilot doctor
+  oc-pilot doctor --engine openai --model deepseek-chat
+  oc-pilot doctor --json
+`;
+function major(version) {
+    return Number(version.replace(/^v/, "").split(".")[0]);
+}
+function findExecutable(name) {
+    const path = process.env.PATH;
+    if (!path)
+        return undefined;
+    const extensions = process.platform === "win32" ? [".cmd", ".exe", ".bat", ""] : [""];
+    for (const directory of path.split(process.platform === "win32" ? ";" : ":")) {
+        if (!directory)
+            continue;
+        for (const extension of extensions) {
+            const candidate = join(directory, `${name}${extension}`);
+            if (existsSync(candidate))
+                return candidate;
+        }
+    }
+    return undefined;
+}
+function runVersion(command) {
+    try {
+        const result = spawnSync(command, ["--version"], {
+            encoding: "utf8",
+            timeout: 10_000,
+            shell: process.platform === "win32" && /\.(cmd|bat)$/i.test(command),
+            windowsHide: true,
+        });
+        if (result.status !== 0)
+            return undefined;
+        return (result.stdout || result.stderr).trim().split(/\r?\n/)[0]?.trim() || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function readJson(path) {
+    try {
+        const value = JSON.parse(readFileSync(path, "utf8"));
+        return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function objectAt(root, key) {
+    const value = root?.[key];
+    return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function mcpClients(cwd) {
+    const clients = [];
+    const home = homedir();
+    const projectChecks = [
+        ["Claude Code", join(cwd, ".mcp.json"), ["mcpServers"]],
+        ["Cursor", join(cwd, ".cursor", "mcp.json"), ["mcpServers"]],
+        ["Gemini CLI", join(cwd, ".gemini", "settings.json"), ["mcpServers"]],
+        ["VS Code", join(cwd, ".vscode", "mcp.json"), ["servers"]],
+        ["Generic .agents", join(cwd, ".agents", "mcp.json"), ["mcpServers"]],
+    ];
+    for (const [name, path, keys] of projectChecks) {
+        const root = existsSync(path) ? readJson(path) : undefined;
+        if (keys.some((key) => Boolean(objectAt(root, key)?.["oc-pilot"])))
+            clients.push(name);
+    }
+    const openCodeProject = [join(cwd, "opencode.json"), join(cwd, ".opencode", "opencode.json")];
+    for (const path of openCodeProject) {
+        const root = existsSync(path) ? readJson(path) : undefined;
+        if (objectAt(objectAt(root, "mcp"), "servers")?.["oc-pilot"]) {
+            clients.push("OpenCode");
+            break;
+        }
+    }
+    const zcodeProject = join(cwd, ".zcode", "config.json");
+    const zcodeRoot = existsSync(zcodeProject) ? readJson(zcodeProject) : undefined;
+    if (objectAt(objectAt(zcodeRoot, "mcp"), "servers")?.["oc-pilot"])
+        clients.push("ZCode");
+    if (!clients.includes("ZCode")) {
+        const zcodeGlobal = join(home, ".zcode", "cli", "config.json");
+        const zcodeGlobalRoot = existsSync(zcodeGlobal) ? readJson(zcodeGlobal) : undefined;
+        if (objectAt(objectAt(zcodeGlobalRoot, "mcp"), "servers")?.["oc-pilot"])
+            clients.push("ZCode");
+    }
+    const globalChecks = [
+        ["Claude Code", join(home, ".claude.json"), ["mcpServers"]],
+        ["Gemini CLI", join(home, ".gemini", "settings.json"), ["mcpServers"]],
+        ["Windsurf", join(home, ".codeium", "windsurf", "mcp_config.json"), ["mcpServers"]],
+        ["Generic .agents", join(home, ".agents", "mcp.json"), ["mcpServers"]],
+    ];
+    for (const [name, path, keys] of globalChecks) {
+        if (clients.includes(name))
+            continue;
+        const root = existsSync(path) ? readJson(path) : undefined;
+        if (keys.some((key) => Boolean(objectAt(root, key)?.["oc-pilot"])))
+            clients.push(name);
+    }
+    const codex = join(home, ".codex", "config.toml");
+    if (existsSync(codex)) {
+        try {
+            if (/\[mcp_servers\.oc[_-]pilot\]/.test(readFileSync(codex, "utf8")))
+                clients.push("Codex");
+        }
+        catch {
+            // Ignore an unreadable config.
+        }
+    }
+    return [...new Set(clients)];
+}
+function checkEngine(ctx) {
+    const checks = [];
+    const engine = ctx.config.engine;
+    if (engine === "opencode") {
+        const executable = findExecutable("opencode");
+        if (!executable) {
+            checks.push({
+                id: "engine",
+                status: "error",
+                title: "OpenCode CLI not found",
+                detail: "The default engine runs reviews through OpenCode.",
+                fix: "npm install -g opencode-ai && opencode auth list",
+            });
+        }
+        else {
+            const version = runVersion(executable);
+            checks.push({
+                id: "engine",
+                status: version ? "ok" : "warn",
+                title: version ? `OpenCode ${version}` : "OpenCode found but --version failed",
+                detail: executable,
+                fix: version ? undefined : "Run `opencode --version` manually and check the installation.",
+            });
+        }
+        if (!ctx.config.model) {
+            checks.push({
+                id: "model",
+                status: "info",
+                title: "No explicit model",
+                detail: "OpenCode will use its configured default model. Set --model or model in .oc-pilot.json for reproducibility.",
+            });
+        }
+        else {
+            checks.push({ id: "model", status: "ok", title: `Model: ${ctx.config.model}` });
+        }
+        return checks;
+    }
+    const baseUrl = normalizeBaseUrl(ctx.config.baseUrl);
+    if (!ctx.config.model) {
+        checks.push({
+            id: "model",
+            status: "error",
+            title: "No model for engine=openai",
+            detail: "The OpenAI-compatible engine needs a concrete model name.",
+            fix: "oc-pilot doctor --model deepseek-chat, or set model in .oc-pilot.json",
+        });
+    }
+    else {
+        checks.push({ id: "model", status: "ok", title: `Model: ${ctx.config.model}` });
+    }
+    const envName = ctx.config.apiKeyEnv?.trim() || DEFAULT_API_KEY_ENV;
+    let key = process.env[envName]?.trim();
+    if (!key && envName === DEFAULT_API_KEY_ENV)
+        key = process.env.OPENAI_API_KEY?.trim();
+    if (!key && !isLoopbackUrl(baseUrl)) {
+        checks.push({
+            id: "credentials",
+            status: "error",
+            title: `API key is not set (${envName})`,
+            detail: "Remote OpenAI-compatible endpoints require a bearer token.",
+            fix: `export ${envName}=...  (PowerShell: $env:${envName}="...")`,
+        });
+    }
+    else {
+        checks.push({
+            id: "credentials",
+            status: "ok",
+            title: key ? `API key is set (${envName})` : "Local endpoint without an API key",
+            detail: baseUrl,
+        });
+    }
+    if (baseUrl.startsWith("http://") && !isLoopbackUrl(baseUrl)) {
+        checks.push({
+            id: "transport",
+            status: "warn",
+            title: "Plain HTTP endpoint",
+            detail: "The API key and source code travel unencrypted. Use HTTPS or a trusted tunnel.",
+        });
+    }
+    else {
+        checks.push({ id: "transport", status: "ok", title: `Endpoint: ${baseUrl}` });
+    }
+    return checks;
+}
+function checkGit(cwd) {
+    const version = runVersion("git");
+    if (!version) {
+        return [
+            {
+                id: "git",
+                status: "error",
+                title: "git not found",
+                detail: "Diff collection and fix/test workflows need git.",
+                fix: "Install git and reopen the terminal.",
+            },
+        ];
+    }
+    const inside = spawnSync("git", ["rev-parse", "--is-inside-work-tree"], {
+        cwd,
+        encoding: "utf8",
+        timeout: 10_000,
+        windowsHide: true,
+    });
+    return [
+        { id: "git", status: "ok", title: version },
+        {
+            id: "repository",
+            status: inside.status === 0 && inside.stdout.trim() === "true" ? "ok" : "warn",
+            title: inside.stdout.trim() === "true" ? "Inside a git repository" : "Not a git repository",
+            detail: "review and fix can still work with --diff, but normal diff collection needs git.",
+            fix: inside.stdout.trim() === "true" ? undefined : "git init",
+        },
+    ];
+}
+export async function runDoctor(argv) {
+    const { values } = parseCommandArgs(argv, OPTIONS);
+    if (asBoolean(values, "help")) {
+        process.stdout.write(HELP);
+        return 0;
+    }
+    const ctx = resolveContext(values);
+    const checks = [];
+    const nodeMajor = major(process.versions.node);
+    checks.push({
+        id: "node",
+        status: nodeMajor >= 22 ? "ok" : "error",
+        title: `Node.js v${process.versions.node}`,
+        detail: nodeMajor >= 22 ? undefined : "Node.js 22 or newer is required.",
+        fix: nodeMajor >= 22 ? undefined : "Install Node.js 22+ from https://nodejs.org",
+    });
+    checks.push({
+        id: "config",
+        status: "ok",
+        title: ctx.configPath ? `Config: ${ctx.configPath}` : "Config: built-in defaults",
+        detail: ctx.configPath ? undefined : "Run `oc-pilot init` to create .oc-pilot.json.",
+    });
+    checks.push(...checkEngine(ctx));
+    checks.push(...checkGit(ctx.cwd));
+    const detected = detectTestCommand(ctx.cwd);
+    checks.push({
+        id: "tests",
+        status: detected ? "ok" : "info",
+        title: detected ? `Test command: ${detected.command}` : "Test command not detected",
+        detail: detected ? detected.source : "test-fix and fix --apply may need --command.",
+    });
+    const clients = mcpClients(ctx.cwd);
+    checks.push({
+        id: "mcp",
+        status: clients.length > 0 ? "ok" : "warn",
+        title: clients.length > 0 ? `MCP configured: ${clients.join(", ")}` : "MCP is not configured for a detected client",
+        detail: clients.length > 0 ? undefined : "Optional, but this is how other agents call oc-pilot.",
+        fix: clients.length > 0 ? undefined : "oc-pilot setup --all",
+    });
+    const rules = join(ctx.cwd, ".oc-pilot", "rules.md");
+    checks.push({
+        id: "rules",
+        status: existsSync(rules) ? "ok" : "info",
+        title: existsSync(rules) ? "Project rules found" : "No project rules (optional)",
+        detail: existsSync(rules) ? rules : "Add .oc-pilot/rules.md to teach the reviewer your conventions.",
+    });
+    const summary = {
+        ok: checks.filter((check) => check.status === "ok").length,
+        warn: checks.filter((check) => check.status === "warn").length,
+        error: checks.filter((check) => check.status === "error").length,
+        info: checks.filter((check) => check.status === "info").length,
+    };
+    const report = {
+        version: VERSION,
+        cwd: ctx.cwd,
+        configPath: ctx.configPath ?? null,
+        engine: ctx.config.engine,
+        checks,
+        summary,
+    };
+    if (ctx.flags.json) {
+        process.stdout.write(`${JSON.stringify(report, null, 2)}\n`);
+    }
+    else {
+        process.stdout.write(`oc-pilot doctor ${VERSION}\n\n`);
+        for (const check of checks) {
+            const icon = check.status === "ok" ? "✅" : check.status === "warn" ? "⚠️" : check.status === "error" ? "❌" : "ℹ️";
+            process.stdout.write(`${icon} ${check.title}\n`);
+            if (check.detail)
+                process.stdout.write(`   ${check.detail}\n`);
+            if (check.fix)
+                process.stdout.write(`   fix: ${check.fix}\n`);
+        }
+        process.stdout.write(`\nSummary: ${summary.ok} ok, ${summary.warn} warning(s), ${summary.error} error(s), ${summary.info} note(s).\n`);
+    }
+    if (summary.error > 0)
+        return 1;
+    if (ctx.flags.strict && summary.warn > 0)
+        return 1;
+    return 0;
+}
+//# sourceMappingURL=doctor.js.map

package/dist/commands/doctor.js.map

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

package/dist/commands/fix.js

@@ -0,0 +1,282 @@
+import { writeOutput } from "../core/io.js";
+import { log } from "../core/log.js";
+import { COMMON_HELP, parseCommandArgs, resolveContext, withCommon } from "../core/options.js";
+import { asBoolean, asString, parsePositiveInt } from "../core/parse.js";
+import { applyPatch, checkPatch, extractPatch, patchTargets, revertPatch } from "../core/patch.js";
+import { runShellCommand } from "../core/command.js";
+import { describeDiffSource, loadDiff } from "../core/diff-source.js";
+import { detectProjectType, detectTestCommand } from "../core/project.js";
+import { parseFindings } from "../core/findings.js";
+import { executeRecipeDetailed, githubAnnotations } from "../core/run.js";
+import { scanDiff } from "../core/secrets.js";
+const OPTIONS = withCommon({
+    staged: { type: "boolean" },
+    unstaged: { type: "boolean" },
+    base: { type: "string" },
+    diff: { type: "string" },
+    stdin: { type: "boolean" },
+    "include-untracked": { type: "boolean" },
+    context: { type: "string" },
+    command: { type: "string" },
+    apply: { type: "boolean" },
+    "no-tests": { type: "boolean" },
+    "keep-on-test-failure": { type: "boolean" },
+    rounds: { type: "string" },
+    "no-secret-scan": { type: "boolean" },
+});
+const HELP = `Использование:
+  oc-pilot fix [пути...] [опции]
+
+Просит модель предложить минимальный unified diff, проверяет его через
+git apply --check и по желанию применяет. С --apply и тестами выполняет
+цикл: применить → прогнать тесты → откатить при падении → попробовать снова.
+
+Опции:
+      --apply                применить патч к рабочему дереву
+      --command <cmd>        команда тестов (по умолчанию автоопределение)
+      --no-tests             не запускать тесты после применения
+      --keep-on-test-failure оставить патч, даже если тесты упали
+      --rounds <n>           попыток исправления, 1..5 (по умолчанию 2)
+      --staged               только staged-изменения
+      --unstaged             только unstaged-изменения
+      --base <ref>           diff <ref>...HEAD
+      --diff <file|->        готовый diff
+      --stdin                читать diff из stdin
+      --include-untracked    включить новые файлы
+      --context <text|@file> дополнительный контекст
+      --no-secret-scan       не искать секреты в diff и патче
+${COMMON_HELP}
+
+Примеры:
+  oc-pilot fix
+  oc-pilot fix --apply
+  oc-pilot fix --apply --command "npm test" --rounds 3
+  oc-pilot fix src/wallet.go --apply
+`;
+function failureContext(patch, test) {
+    return [
+        "PREVIOUS_FIX_ATTEMPT failed.",
+        "PATCH:",
+        "```diff",
+        patch,
+        "```",
+        `TEST_COMMAND: ${test.command}`,
+        `TEST_EXIT_CODE: ${test.exitCode}`,
+        "TEST_OUTPUT (tail):",
+        test.output.slice(-20_000),
+    ].join("\n");
+}
+export async function runFix(argv) {
+    const { values, positionals } = parseCommandArgs(argv, OPTIONS);
+    if (asBoolean(values, "help")) {
+        process.stdout.write(HELP);
+        return 0;
+    }
+    const ctx = resolveContext(values);
+    const data = await loadDiff(values, ctx, positionals);
+    if (!data.diff.trim()) {
+        log.info("Изменений нет — исправлять нечего.");
+        return 0;
+    }
+    const apply = asBoolean(values, "apply");
+    const noTests = asBoolean(values, "no-tests");
+    const roundsRaw = asString(values, "rounds");
+    const rounds = roundsRaw ? parsePositiveInt(roundsRaw, "rounds", 5) : 2;
+    const detectedTest = detectTestCommand(ctx.cwd);
+    const testCommand = asString(values, "command") ?? detectedTest?.command;
+    const userContext = asString(values, "context");
+    const baseParts = [
+        "FIX_MODE: propose the smallest safe unified diff that fixes the most important problems in GIT_DIFF.",
+        "Return the normal output schema. Put exactly one ```diff fenced patch under `#### Solution`.",
+        "Only modify files that appear in GIT_DIFF. Do not add secrets, dependencies or generated files.",
+        `DIFF_SOURCE: ${describeDiffSource(data.source)}`,
+        `DIFF_STATS: ${data.stats.files} файл(ов), +${data.stats.additions} / -${data.stats.deletions}`,
+    ];
+    if (data.untracked.length > 0) {
+        baseParts.push(`UNTRACKED_FILES (в diff):\n${data.untracked.map((file) => `- ${file}`).join("\n")}`);
+    }
+    if (userContext?.trim())
+        baseParts.push(`USER_CONTEXT:\n${userContext.trim()}`);
+    const captureCtx = {
+        ...ctx,
+        flags: { ...ctx.flags, json: false, output: undefined },
+    };
+    let lastTest;
+    let lastPatch;
+    let lastAnalysis;
+    for (let round = 1; round <= rounds; round += 1) {
+        const context = lastPatch && lastTest
+            ? [...baseParts, `ROUND: ${round}`, failureContext(lastPatch, lastTest)].join("\n\n")
+            : [...baseParts, `ROUND: ${round}`].join("\n\n");
+        const execution = await executeRecipeDetailed({
+            recipe: "custom",
+            projectType: detectProjectType(ctx.cwd, data.changedFiles),
+            additionalContext: context,
+            diff: data.payloadDiff,
+            secretFindings: data.findings,
+            changedFiles: data.changedFiles,
+            noSecretScan: asBoolean(values, "no-secret-scan"),
+            meta: { source: data.source, fixRound: round },
+        }, captureCtx, { capture: true });
+        if (ctx.flags.dryRun)
+            return execution.exitCode;
+        if (!execution.analysis) {
+            log.warn("Модель не вернула анализ.");
+            return 1;
+        }
+        lastAnalysis = execution.analysis;
+        if (ctx.flags.github) {
+            for (const annotation of githubAnnotations(parseFindings(execution.analysis), ctx.cwd)) {
+                process.stderr.write(`${annotation}\n`);
+            }
+        }
+        const patch = extractPatch(execution.analysis);
+        if (!patch) {
+            log.warn("В ответе нет unified diff. Нужен блок ```diff или diff --git.");
+            return 1;
+        }
+        lastPatch = patch;
+        const allowed = new Set(data.changedFiles);
+        const outside = patchTargets(patch).filter((file) => !allowed.has(file));
+        if (outside.length > 0) {
+            log.warn(`Патч затрагивает файлы вне diff: ${outside.join(", ")}. Применение остановлено.`);
+            return 1;
+        }
+        if (!asBoolean(values, "no-secret-scan")) {
+            const secretScan = scanDiff(patch);
+            if (secretScan.findings.some((finding) => finding.severity === "critical")) {
+                log.warn("Патч содержит потенциальный секрет. Применение остановлено.");
+                return 1;
+            }
+        }
+        const check = await checkPatch(ctx.cwd, patch);
+        if (check.exitCode !== 0) {
+            log.warn(`Патч не применяется: ${check.stderr.trim() || check.stdout.trim() || "git apply --check failed"}`);
+            if (!apply)
+                return 1;
+            lastTest = {
+                command: "git apply --check",
+                exitCode: check.exitCode,
+                timedOut: false,
+                durationMs: 0,
+                output: check.stderr || check.stdout,
+            };
+            continue;
+        }
+        if (!apply) {
+            if (ctx.flags.json) {
+                const payload = {
+                    applied: false,
+                    patch,
+                    check: "ok",
+                    analysis: execution.analysis,
+                    meta: execution.meta,
+                };
+                const path = writeOutput(JSON.stringify(payload, null, 2), ctx.flags.output);
+                if (path)
+                    log.success(`Результат записан: ${path}`);
+            }
+            else {
+                process.stdout.write(`${execution.analysis.trim()}\n\n### Patch (not applied)\n\n\`\`\`diff\n${patch}\n\`\`\`\n`);
+            }
+            return 0;
+        }
+        const applied = await applyPatch(ctx.cwd, patch);
+        if (applied.exitCode !== 0) {
+            log.warn(`Не удалось применить патч: ${applied.stderr.trim() || applied.stdout.trim()}`);
+            return 1;
+        }
+        log.success(`Патч применён (раунд ${round}).`);
+        if (noTests || !testCommand) {
+            if (!noTests)
+                log.warn("Команда тестов не найдена; патч оставлен без проверки.");
+            const payload = {
+                applied: true,
+                patch,
+                tests: null,
+                analysis: execution.analysis,
+                meta: execution.meta,
+            };
+            if (ctx.flags.json) {
+                const path = writeOutput(JSON.stringify(payload, null, 2), ctx.flags.output);
+                if (path)
+                    log.success(`Результат записан: ${path}`);
+            }
+            else {
+                process.stdout.write(`${execution.analysis.trim()}\n\n### Patch (applied)\n\n\`\`\`diff\n${patch}\n\`\`\`\n`);
+            }
+            return 0;
+        }
+        log.step(`Тесты: ${testCommand}`);
+        const test = await runShellCommand(testCommand, ctx.cwd, {
+            timeoutMs: ctx.config.timeoutSeconds * 1000,
+            verbose: ctx.flags.verbose,
+        });
+        lastTest = { command: testCommand, ...test };
+        if (test.exitCode === 0 && !test.timedOut) {
+            log.success(`Тесты прошли (${Math.round(test.durationMs / 1000)} с). Патч оставлен.`);
+            const payload = {
+                applied: true,
+                patch,
+                tests: lastTest,
+                analysis: execution.analysis,
+                meta: execution.meta,
+            };
+            if (ctx.flags.json) {
+                const path = writeOutput(JSON.stringify(payload, null, 2), ctx.flags.output);
+                if (path)
+                    log.success(`Результат записан: ${path}`);
+            }
+            else {
+                process.stdout.write(`${execution.analysis.trim()}\n\n### Patch (applied, tests passed)\n\n\`\`\`diff\n${patch}\n\`\`\`\n`);
+            }
+            return 0;
+        }
+        if (asBoolean(values, "keep-on-test-failure")) {
+            log.warn(`Тесты упали (exit ${test.exitCode}${test.timedOut ? ", timeout" : ""}). Патч оставлен (--keep-on-test-failure).`);
+            const payload = {
+                applied: true,
+                patch,
+                tests: lastTest,
+                analysis: execution.analysis,
+                meta: execution.meta,
+                error: "tests failed; patch kept by request",
+            };
+            if (ctx.flags.json) {
+                const path = writeOutput(JSON.stringify(payload, null, 2), ctx.flags.output);
+                if (path)
+                    log.success(`Результат записан: ${path}`);
+            }
+            else {
+                process.stdout.write(`${execution.analysis.trim()}\n\n### Patch (applied, tests failed, kept)\n\n\`\`\`diff\n${patch}\n\`\`\`\n`);
+            }
+            return 1;
+        }
+        log.warn(`Тесты упали (exit ${test.exitCode}${test.timedOut ? ", timeout" : ""}). Откатываю патч.`);
+        const reverted = await revertPatch(ctx.cwd, patch);
+        if (reverted.exitCode !== 0) {
+            log.error(`Не удалось откатить патч: ${reverted.stderr.trim() || reverted.stdout.trim()}`);
+            return 1;
+        }
+        if (round === rounds)
+            break;
+        log.step(`Повторная попытка ${round + 1}/${rounds} с выводом тестов.`);
+    }
+    if (ctx.flags.json) {
+        const payload = {
+            applied: false,
+            patch: lastPatch ?? null,
+            tests: lastTest ?? null,
+            analysis: lastAnalysis ?? null,
+            error: "fix attempts exhausted; working tree restored",
+        };
+        const path = writeOutput(JSON.stringify(payload, null, 2), ctx.flags.output);
+        if (path)
+            log.success(`Результат записан: ${path}`);
+    }
+    else {
+        log.error(`Не удалось получить зелёные тесты за ${rounds} попыт(и). Рабочее дерево восстановлено.`);
+    }
+    return 1;
+}
+//# sourceMappingURL=fix.js.map

package/dist/commands/fix.js.map

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