agentera 3.0.0-dev.0 → 3.0.0-dev.2

package/dist/upgrade/runtimeMigration.js

@@ -0,0 +1,484 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { isFile, pathExists, resolvePath } from "../core/paths.js";
+import { resolveSourceRoot } from "../core/sourceRoot.js";
+import { loadRegistry } from "../registries/runtimeAdapterRegistry.js";
+import { codexCopiedHooksAreAgenteraOnly, codexPluginHooksEnabled, retireCodexCopiedHookTrust, } from "../setup/codex.js";
+import { hasManagedMarker, opencodeCommandTemplate, opencodeConfigDir, } from "../setup/doctor.js";
+import { resolveUpdateChannel } from "./channels.js";
+const PYTHON_MANAGED_PATTERNS = [
+    /hooks\/validate_artifact\.py/,
+    /\buv run\b/,
+    /\buvx\b/,
+    /scripts\/agentera/,
+    /\/app\/scripts\/agentera/,
+    /cursor_session_start\.py/,
+    /cursor_pre_tool_use\.py/,
+    /cursor_session_stop\.py/,
+];
+const OPENCODE_COMMAND_NAMES = ["agentera"];
+const OPENCODE_SKILL_NAMES = ["agentera", "hej"];
+const CURSOR_AGENT_MARKER = "<!-- agentera: managed -->";
+export function resolveNpxHookCommands(ctx) {
+    const env = ctx.env ?? process.env;
+    const home = ctx.home ?? env.HOME ?? os.homedir();
+    const sourceRoot = ctx.sourceRoot ?? resolveSourceRoot(env);
+    const channel = resolveUpdateChannel({
+        channel: ctx.channel ?? null,
+        env,
+        home,
+        sourceRoot,
+    });
+    const cliEntrypoint = channel.updateCommand.trim();
+    return {
+        cliEntrypoint,
+        validate: `${cliEntrypoint} hook validate-artifact`,
+        cursorSessionStart: `${cliEntrypoint} hook cursor-session-start`,
+        cursorSessionStop: `${cliEntrypoint} hook session-stop`,
+        cursorPreTool: `${cliEntrypoint} hook cursor-pre-tool-use`,
+    };
+}
+export function textUsesPythonManagedEntrypoint(text) {
+    if (/AGENTERA_HOME\s*=/.test(text)) {
+        return true;
+    }
+    return PYTHON_MANAGED_PATTERNS.some((pattern) => pattern.test(text));
+}
+export function rewireRuntimeText(text, runtime, commands) {
+    let next = text;
+    next = next.replace(/uv run\s+\\?"?\$\{AGENTERA_HOME\}\/hooks\/validate_artifact\.py\\?"?/g, commands.validate);
+    next = next.replace(/uv run\s+\\?"?\$\{PLUGIN_ROOT\}\/hooks\/validate_artifact\.py\\?"?/g, commands.validate);
+    if (next.includes("validate_artifact.py")) {
+        next = next.replace(/["']?[^"'\n]*hooks\/validate_artifact\.py[^"'\n]*["']?/g, `"${commands.validate}"`);
+    }
+    next = next.replace(/["']?[^"'\n]*cursor_session_start\.py[^"'\n]*["']?/g, `"${commands.cursorSessionStart}"`);
+    next = next.replace(/["']?[^"'\n]*cursor_pre_tool_use\.py[^"'\n]*["']?/g, `"${commands.cursorPreTool}"`);
+    next = next.replace(/["']?[^"'\n]*cursor_session_stop\.py[^"'\n]*["']?/g, `"${commands.cursorSessionStop}"`);
+    next = next.replace(/["']?[^"'\n]*\/app\/scripts\/agentera[^"'\n]*["']?/g, `"${commands.cliEntrypoint}"`);
+    next = next.replace(/["']?[^"'\n]*scripts\/agentera[^"'\n]*["']?/g, `"${commands.cliEntrypoint}"`);
+    next = next.replace(/npx -y agentera hook /g, `${commands.cliEntrypoint} hook `);
+    next = next.replace(/npx -y agentera@latest hook /g, `${commands.cliEntrypoint} hook `);
+    if (runtime === "codex") {
+        next = next.replace(/AGENTERA_HOME\s*=\s*"[^"]*"/g, "");
+        next = next.replace(/AGENTERA_HOME\s*=\s*'[^']*'/g, "");
+        next = next.replace(/set\s*=\s*\{\s*,/g, "set = {");
+        next = next.replace(/,\s*,/g, ",");
+        next = next.replace(/,\s*\}/g, " }");
+        next = next.replace(/set\s*=\s*\{\s*\}/g, "set = { }");
+    }
+    return next;
+}
+function needsChannelNpxRewire(text, cliEntrypoint) {
+    if (/npx -y agentera hook /.test(text) && !text.includes(cliEntrypoint)) {
+        return true;
+    }
+    if (/npx -y agentera@latest hook /.test(text) && !text.includes(cliEntrypoint)) {
+        return true;
+    }
+    return false;
+}
+function pushRewireItem(items, runtime, filePath, commands) {
+    const text = fs.readFileSync(filePath, "utf8");
+    const needsBare = needsChannelNpxRewire(text, commands.cliEntrypoint);
+    if (!textUsesPythonManagedEntrypoint(text) && !needsBare) {
+        if (text.includes(commands.cliEntrypoint)) {
+            items.push({
+                status: "noop",
+                action: "rewire-runtime",
+                runtime,
+                source: filePath,
+                message: "runtime config already references npm self-contained entrypoint",
+            });
+        }
+        return;
+    }
+    const newText = rewireRuntimeText(text, runtime, commands);
+    const status = newText === text ? "blocked" : "pending";
+    items.push({
+        status,
+        action: "rewire-runtime",
+        runtime,
+        source: filePath,
+        target: filePath,
+        newText,
+        message: status === "pending"
+            ? "will rewire runtime config from Python managed app-home to npm self-contained entrypoint"
+            : "runtime config uses Python managed paths but could not be rewritten safely",
+    });
+}
+function hasCursorManagedAgentMarker(text) {
+    return text.includes(CURSOR_AGENT_MARKER);
+}
+function copyIfChanged(source, target) {
+    if (!isFile(source)) {
+        return false;
+    }
+    if (isFile(target)) {
+        const before = fs.readFileSync(source);
+        const after = fs.readFileSync(target);
+        if (before.equals(after)) {
+            return false;
+        }
+    }
+    fs.mkdirSync(path.dirname(target), { recursive: true });
+    fs.copyFileSync(source, target);
+    return true;
+}
+function planCodexItems(items, home, commands, force) {
+    const hooksPath = path.join(home, ".codex", "hooks", "codex-hooks.json");
+    const configPath = path.join(home, ".codex", "config.toml");
+    if (isFile(hooksPath)) {
+        pushRewireItem(items, "codex", hooksPath, commands);
+    }
+    if (isFile(configPath)) {
+        pushRewireItem(items, "codex", configPath, commands);
+        let configText = fs.readFileSync(configPath, "utf8");
+        if (isFile(hooksPath)) {
+            configText = fs.readFileSync(configPath, "utf8");
+        }
+        const pluginHooks = codexPluginHooksEnabled(configText);
+        if (pluginHooks && isFile(hooksPath)) {
+            let hooksText;
+            try {
+                hooksText = fs.readFileSync(hooksPath, "utf8");
+            }
+            catch {
+                hooksText = "";
+            }
+            if (codexCopiedHooksAreAgenteraOnly(hooksText)) {
+                items.push({
+                    status: "pending",
+                    action: "retire-hooks",
+                    runtime: "codex",
+                    source: hooksPath,
+                    target: configPath,
+                    message: "will remove Agentera-owned copied Codex hooks because plugin hooks are enabled",
+                });
+            }
+            else if (hooksText.includes("validate_artifact") || hooksText.includes("hook validate-artifact")) {
+                items.push({
+                    status: force ? "pending" : "blocked",
+                    action: "retire-hooks",
+                    runtime: "codex",
+                    source: hooksPath,
+                    target: configPath,
+                    message: "plugin hooks are enabled, but copied hook target needs manual review before retirement",
+                });
+            }
+        }
+    }
+}
+function planCursorItems(items, home, project, sourceRoot, commands) {
+    for (const hooksPath of [
+        path.join(project, ".cursor", "hooks.json"),
+        path.join(home, ".cursor", "hooks.json"),
+    ]) {
+        if (isFile(hooksPath)) {
+            pushRewireItem(items, "cursor", hooksPath, commands);
+        }
+    }
+    const agentsSource = path.join(sourceRoot, ".cursor", "agents");
+    const pluginSource = path.join(sourceRoot, ".cursor-plugin", "plugin.json");
+    for (const root of [project]) {
+        const agentsDir = path.join(root, ".cursor", "agents");
+        if (isFile(pluginSource) && root === project) {
+            const pluginTarget = path.join(root, ".cursor-plugin", "plugin.json");
+            if (!isFile(pluginTarget)) {
+                items.push({
+                    status: "pending",
+                    action: "copy-plugin",
+                    runtime: "cursor",
+                    source: pluginSource,
+                    target: pluginTarget,
+                    message: "will copy managed Cursor plugin manifest",
+                });
+            }
+            else if (!fs.readFileSync(pluginSource).equals(fs.readFileSync(pluginTarget))) {
+                items.push({
+                    status: "pending",
+                    action: "copy-plugin",
+                    runtime: "cursor",
+                    source: pluginSource,
+                    target: pluginTarget,
+                    message: "will refresh managed Cursor plugin manifest",
+                });
+            }
+        }
+        if (pathExists(agentsSource)) {
+            for (const entry of fs.readdirSync(agentsSource)) {
+                if (!entry.endsWith(".md"))
+                    continue;
+                const src = path.join(agentsSource, entry);
+                const dst = path.join(agentsDir, entry);
+                if (!isFile(dst)) {
+                    items.push({
+                        status: "pending",
+                        action: "copy-agent",
+                        runtime: "cursor",
+                        source: src,
+                        target: dst,
+                        message: "will copy managed Cursor capability agent",
+                    });
+                    continue;
+                }
+                const dstText = fs.readFileSync(dst, "utf8");
+                const srcText = fs.readFileSync(src, "utf8");
+                if (hasCursorManagedAgentMarker(dstText) && dstText !== srcText) {
+                    items.push({
+                        status: "pending",
+                        action: "copy-agent",
+                        runtime: "cursor",
+                        source: src,
+                        target: dst,
+                        message: "will refresh stale managed Cursor capability agent",
+                    });
+                }
+            }
+        }
+    }
+}
+function planOpencodeItems(items, home, sourceRoot, env, commands) {
+    const configDir = opencodeConfigDir(home, env);
+    const pluginSource = path.join(sourceRoot, ".opencode", "plugins", "agentera.js");
+    const pluginTarget = path.join(configDir, "plugins", "agentera.js");
+    if (isFile(pluginSource)) {
+        const needsCopy = !isFile(pluginTarget) ||
+            textUsesPythonManagedEntrypoint(fs.readFileSync(pluginTarget, "utf8")) ||
+            needsChannelNpxRewire(fs.readFileSync(pluginTarget, "utf8"), commands.cliEntrypoint);
+        items.push({
+            status: needsCopy ? "pending" : "noop",
+            action: "copy-plugin",
+            runtime: "opencode",
+            source: pluginSource,
+            target: pluginTarget,
+            message: needsCopy
+                ? "will copy current Agentera OpenCode plugin to native plugin path"
+                : "OpenCode plugin already current at native plugin path",
+        });
+    }
+    const commandsSourceDir = path.join(sourceRoot, ".opencode", "commands");
+    const commandsTargetDir = path.join(configDir, "commands");
+    for (const name of OPENCODE_COMMAND_NAMES) {
+        const src = path.join(commandsSourceDir, `${name}.md`);
+        const expected = opencodeCommandTemplate(name);
+        const dst = path.join(commandsTargetDir, `${name}.md`);
+        if (isFile(src)) {
+            const needsCopy = !isFile(dst) || (hasManagedMarker(fs.readFileSync(dst, "utf8")) && fs.readFileSync(dst, "utf8") !== expected);
+            items.push({
+                status: needsCopy ? "pending" : "noop",
+                action: "copy-command",
+                runtime: "opencode",
+                source: src,
+                target: dst,
+                message: needsCopy ? "will sync managed OpenCode command" : "OpenCode managed command already current",
+            });
+        }
+    }
+    const agentsSourceDir = path.join(sourceRoot, ".opencode", "agents");
+    const agentsTargetDir = path.join(configDir, "agents");
+    if (pathExists(agentsSourceDir)) {
+        for (const entry of fs.readdirSync(agentsSourceDir)) {
+            if (!entry.endsWith(".md"))
+                continue;
+            const src = path.join(agentsSourceDir, entry);
+            const dst = path.join(agentsTargetDir, entry);
+            const needsCopy = !isFile(dst) || !fs.readFileSync(src).equals(fs.readFileSync(dst));
+            items.push({
+                status: needsCopy ? "pending" : "noop",
+                action: "copy-agent",
+                runtime: "opencode",
+                source: src,
+                target: dst,
+                message: needsCopy ? "will copy managed OpenCode capability agent" : "OpenCode agent already current",
+            });
+        }
+    }
+    const skillsSourceRoot = path.join(sourceRoot, "skills");
+    const skillsTargetDir = path.join(configDir, "skills");
+    for (const name of OPENCODE_SKILL_NAMES) {
+        const src = path.join(skillsSourceRoot, name);
+        const dst = path.join(skillsTargetDir, name);
+        if (!isFile(path.join(src, "SKILL.md"))) {
+            continue;
+        }
+        if (!pathExists(dst)) {
+            items.push({
+                status: "pending",
+                action: "link-skill",
+                runtime: "opencode",
+                source: src,
+                target: dst,
+                message: "will create OpenCode skill link",
+            });
+            continue;
+        }
+        try {
+            const linkTarget = fs.readlinkSync(dst);
+            if (!linkTarget.includes("agentera") && path.basename(linkTarget) !== name) {
+                items.push({
+                    status: "blocked",
+                    action: "link-skill",
+                    runtime: "opencode",
+                    source: src,
+                    target: dst,
+                    message: "OpenCode skill path is user-owned; manual review required",
+                });
+            }
+            else if (path.resolve(path.dirname(dst), linkTarget) !== path.resolve(src)) {
+                items.push({
+                    status: "pending",
+                    action: "link-skill",
+                    runtime: "opencode",
+                    source: src,
+                    target: dst,
+                    message: "will update stale Agentera-managed OpenCode skill link",
+                });
+            }
+        }
+        catch {
+            items.push({
+                status: "pending",
+                action: "link-skill",
+                runtime: "opencode",
+                source: src,
+                target: dst,
+                message: "will replace non-symlink OpenCode skill path with managed link",
+            });
+        }
+    }
+}
+function walkJsonHookFiles(dir) {
+    if (!pathExists(dir)) {
+        return [];
+    }
+    const out = [];
+    const walk = (current) => {
+        for (const entry of fs.readdirSync(current)) {
+            const full = path.join(current, entry);
+            const st = fs.statSync(full);
+            if (st.isDirectory()) {
+                walk(full);
+            }
+            else if (entry.endsWith(".json")) {
+                out.push(full);
+            }
+        }
+    };
+    walk(dir);
+    return out;
+}
+function planCopilotItems(items, project, commands) {
+    const hooksDir = path.join(project, ".github", "hooks");
+    for (const hookFile of walkJsonHookFiles(hooksDir)) {
+        pushRewireItem(items, "copilot", hookFile, commands);
+    }
+    if (!items.some((item) => item.runtime === "copilot")) {
+        items.push({
+            status: "noop",
+            action: "configure",
+            runtime: "copilot",
+            message: "Copilot uses per-invocation AGENTERA_HOME; Agentera does not write shell startup files",
+        });
+    }
+}
+function planEnvRuntimeNoops(items, runtime, message) {
+    if (!items.some((item) => item.runtime === runtime)) {
+        items.push({ status: "noop", action: "configure", runtime, message });
+    }
+}
+export function planRuntimeMigrationItems(ctx) {
+    const home = resolvePath(ctx.home);
+    const project = resolvePath(ctx.project);
+    const env = ctx.env ?? { ...process.env, HOME: home };
+    const sourceRoot = resolvePath(ctx.sourceRoot ?? resolveSourceRoot(env));
+    const commands = resolveNpxHookCommands({ ...ctx, home, env, sourceRoot });
+    const items = [];
+    planCodexItems(items, home, commands, ctx.force);
+    planCursorItems(items, home, project, sourceRoot, commands);
+    planOpencodeItems(items, home, sourceRoot, env, commands);
+    planCopilotItems(items, project, commands);
+    planEnvRuntimeNoops(items, "claude", "Claude Code plugin installs expose the app home without local config writes; use --update-packages to refresh marketplace surfaces");
+    planEnvRuntimeNoops(items, "cursor-agent", "Cursor Agent CLI inherits workspace Cursor hooks; no separate managed install surface");
+    void loadRegistry();
+    return items;
+}
+export function applyRuntimeMigrationItem(item, commands) {
+    if (item.status !== "pending") {
+        return;
+    }
+    try {
+        switch (item.action) {
+            case "rewire-runtime": {
+                if (!item.target || item.newText === undefined) {
+                    item.status = "failed";
+                    item.message = "rewire-runtime missing target or newText";
+                    return;
+                }
+                fs.writeFileSync(item.target, item.newText, "utf8");
+                item.status = "applied";
+                item.message = "runtime config rewired to npm self-contained entrypoint";
+                break;
+            }
+            case "copy-plugin":
+            case "copy-agent":
+            case "copy-command": {
+                if (!item.source || !item.target) {
+                    item.status = "failed";
+                    item.message = `${item.action} missing source or target`;
+                    return;
+                }
+                copyIfChanged(item.source, item.target);
+                item.status = "applied";
+                item.message = `applied ${item.action}`;
+                break;
+            }
+            case "link-skill": {
+                if (!item.source || !item.target) {
+                    item.status = "failed";
+                    item.message = "link-skill missing source or target";
+                    return;
+                }
+                fs.mkdirSync(path.dirname(item.target), { recursive: true });
+                if (pathExists(item.target)) {
+                    fs.rmSync(item.target, { recursive: true, force: true });
+                }
+                fs.symlinkSync(item.source, item.target);
+                item.status = "applied";
+                item.message = "OpenCode skill link created";
+                break;
+            }
+            case "retire-hooks": {
+                if (!item.source) {
+                    item.status = "failed";
+                    item.message = "retire-hooks missing source";
+                    return;
+                }
+                if (isFile(item.source)) {
+                    fs.rmSync(item.source, { force: true });
+                }
+                if (item.target && isFile(item.target)) {
+                    const configText = fs.readFileSync(item.target, "utf8");
+                    const next = retireCodexCopiedHookTrust(configText, item.source);
+                    fs.writeFileSync(item.target, next, "utf8");
+                }
+                item.status = "applied";
+                item.message = "retired Agentera-owned copied Codex hooks";
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    catch (exc) {
+        item.status = "failed";
+        item.message = `${item.action} failed: ${exc.message}`;
+    }
+}
+export function applyRuntimeMigrationItems(items, ctx) {
+    const commands = resolveNpxHookCommands(ctx);
+    for (const item of items) {
+        applyRuntimeMigrationItem(item, commands);
+    }
+}
+//# sourceMappingURL=runtimeMigration.js.map

package/dist/upgrade/runtimeMigration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtimeMigration.js","sourceRoot":"","sources":["../../src/upgrade/runtimeMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACL,+BAA+B,EAC/B,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAGrD,MAAM,uBAAuB,GAAG;IAC9B,8BAA8B;IAC9B,YAAY;IACZ,SAAS;IACT,mBAAmB;IACnB,0BAA0B;IAC1B,0BAA0B;IAC1B,yBAAyB;IACzB,yBAAyB;CACjB,CAAC;AAEX,MAAM,sBAAsB,GAAG,CAAC,UAAU,CAAU,CAAC;AACrD,MAAM,oBAAoB,GAAG,CAAC,UAAU,EAAE,KAAK,CAAU,CAAC;AAC1D,MAAM,mBAAmB,GAAG,4BAA4B,CAAC;AAUzD,MAAM,UAAU,sBAAsB,CACpC,GAAsE;IAEtE,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACnC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,oBAAoB,CAAC;QACnC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,IAAI;QAC5B,GAAG;QACH,IAAI;QACJ,UAAU;KACX,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO;QACL,aAAa;QACb,QAAQ,EAAE,GAAG,aAAa,yBAAyB;QACnD,kBAAkB,EAAE,GAAG,aAAa,4BAA4B;QAChE,iBAAiB,EAAE,GAAG,aAAa,oBAAoB;QACvD,aAAa,EAAE,GAAG,aAAa,2BAA2B;KAC3D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,IAAY;IAC1D,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,OAAe,EAAE,QAAyB;IACxF,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,uEAAuE,EACvE,QAAQ,CAAC,QAAQ,CAClB,CAAC;IACF,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,qEAAqE,EACrE,QAAQ,CAAC,QAAQ,CAClB,CAAC;IACF,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAC1C,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,yDAAyD,EACzD,IAAI,QAAQ,CAAC,QAAQ,GAAG,CACzB,CAAC;IACJ,CAAC;IACD,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,qDAAqD,EACrD,IAAI,QAAQ,CAAC,kBAAkB,GAAG,CACnC,CAAC;IACF,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,oDAAoD,EACpD,IAAI,QAAQ,CAAC,aAAa,GAAG,CAC9B,CAAC;IACF,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,oDAAoD,EACpD,IAAI,QAAQ,CAAC,iBAAiB,GAAG,CAClC,CAAC;IACF,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,qDAAqD,EAAE,IAAI,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC;IAC1G,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,8CAA8C,EAAE,IAAI,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC;IACnG,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,GAAG,QAAQ,CAAC,aAAa,QAAQ,CAAC,CAAC;IACjF,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE,GAAG,QAAQ,CAAC,aAAa,QAAQ,CAAC,CAAC;IACxF,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;QACxD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;QACxD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;QACpD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACnC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAY,EAAE,aAAqB;IAChE,IAAI,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CACrB,KAA2B,EAC3B,OAAe,EACf,QAAgB,EAChB,QAAyB;IAEzB,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IACtE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACzD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,gBAAgB;gBACxB,OAAO;gBACP,MAAM,EAAE,QAAQ;gBAChB,OAAO,EAAE,iEAAiE;aAC3E,CAAC,CAAC;QACL,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAoB,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACzE,KAAK,CAAC,IAAI,CAAC;QACT,MAAM;QACN,MAAM,EAAE,gBAAgB;QACxB,OAAO;QACP,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,QAAQ;QAChB,OAAO;QACP,OAAO,EACL,MAAM,KAAK,SAAS;YAClB,CAAC,CAAC,0FAA0F;YAC5F,CAAC,CAAC,4EAA4E;KACnF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAY;IAC/C,OAAO,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,aAAa,CAAC,MAAc,EAAE,MAAc;IACnD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CACrB,KAA2B,EAC3B,IAAY,EACZ,QAAyB,EACzB,KAAe;IAEf,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;IACzE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACtB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QACvB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACrD,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YACtB,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,WAAW,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,WAAW,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,IAAI,SAAiB,CAAC;YACtB,IAAI,CAAC;gBACH,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS,GAAG,EAAE,CAAC;YACjB,CAAC;YACD,IAAI,+BAA+B,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/C,KAAK,CAAC,IAAI,CAAC;oBACT,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,cAAc;oBACtB,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,UAAU;oBAClB,OAAO,EAAE,gFAAgF;iBAC1F,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACnG,KAAK,CAAC,IAAI,CAAC;oBACT,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;oBACrC,MAAM,EAAE,cAAc;oBACtB,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,UAAU;oBAClB,OAAO,EACL,wFAAwF;iBAC3F,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CACtB,KAA2B,EAC3B,IAAY,EACZ,OAAe,EACf,UAAkB,EAClB,QAAyB;IAEzB,KAAK,MAAM,SAAS,IAAI;QACtB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,YAAY,CAAC;KACzC,EAAE,CAAC;QACF,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YACtB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;IAC5E,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,YAAY,CAAC,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;YACtE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC1B,KAAK,CAAC,IAAI,CAAC;oBACT,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,aAAa;oBACrB,OAAO,EAAE,QAAQ;oBACjB,MAAM,EAAE,YAAY;oBACpB,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,0CAA0C;iBACpD,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;gBAChF,KAAK,CAAC,IAAI,CAAC;oBACT,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,aAAa;oBACrB,OAAO,EAAE,QAAQ;oBACjB,MAAM,EAAE,YAAY;oBACpB,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,6CAA6C;iBACvD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;gBACjD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAAE,SAAS;gBACrC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;gBAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjB,KAAK,CAAC,IAAI,CAAC;wBACT,MAAM,EAAE,SAAS;wBACjB,MAAM,EAAE,YAAY;wBACpB,OAAO,EAAE,QAAQ;wBACjB,MAAM,EAAE,GAAG;wBACX,MAAM,EAAE,GAAG;wBACX,OAAO,EAAE,2CAA2C;qBACrD,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBACD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC7C,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC7C,IAAI,2BAA2B,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;oBAChE,KAAK,CAAC,IAAI,CAAC;wBACT,MAAM,EAAE,SAAS;wBACjB,MAAM,EAAE,YAAY;wBACpB,OAAO,EAAE,QAAQ;wBACjB,MAAM,EAAE,GAAG;wBACX,MAAM,EAAE,GAAG;wBACX,OAAO,EAAE,oDAAoD;qBAC9D,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,KAA2B,EAC3B,IAAY,EACZ,UAAkB,EAClB,GAAuC,EACvC,QAAyB;IAEzB,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAClF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IACpE,IAAI,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QACzB,MAAM,SAAS,GACb,CAAC,MAAM,CAAC,YAAY,CAAC;YACrB,+BAA+B,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACtE,qBAAqB,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;QACvF,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;YACtC,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE,SAAS;gBAChB,CAAC,CAAC,kEAAkE;gBACpE,CAAC,CAAC,uDAAuD;SAC5D,CAAC,CAAC;IACL,CAAC;IACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC3D,KAAK,MAAM,IAAI,IAAI,sBAAsB,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,IAAI,KAAK,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,IAAI,KAAK,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,QAAQ,CAAC,CAAC;YAChI,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;gBACtC,MAAM,EAAE,cAAc;gBACtB,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,0CAA0C;aACvG,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,SAAS;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAC9C,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;YACrF,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;gBACtC,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,gCAAgC;aACtG,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACxC,SAAS;QACX,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,iCAAiC;aAC3C,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC3E,KAAK,CAAC,IAAI,CAAC;oBACT,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,UAAU;oBACnB,MAAM,EAAE,GAAG;oBACX,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,2DAA2D;iBACrE,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7E,KAAK,CAAC,IAAI,CAAC;oBACT,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,UAAU;oBACnB,MAAM,EAAE,GAAG;oBACX,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,wDAAwD;iBAClE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,KAAK,CAAC,IAAI,CAAC;gBACT,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,gEAAgE;aAC1E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,CAAC,OAAe,EAAQ,EAAE;QACrC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACvC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;gBACrB,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,CAAC;iBAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CACvB,KAA2B,EAC3B,OAAe,EACf,QAAyB;IAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACxD,KAAK,MAAM,QAAQ,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnD,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,EAAE,CAAC;QACtD,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,wFAAwF;SAClG,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,KAA2B,EAAE,OAAe,EAAE,OAAe;IACxF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,GAAqB;IAC7D,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,MAAM,QAAQ,GAAG,sBAAsB,CAAC,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAyB,EAAE,CAAC;IAEvC,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACjD,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC5D,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1D,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3C,mBAAmB,CACjB,KAAK,EACL,QAAQ,EACR,oIAAoI,CACrI,CAAC;IACF,mBAAmB,CACjB,KAAK,EACL,cAAc,EACd,uFAAuF,CACxF,CAAC;IAEF,KAAK,YAAY,EAAE,CAAC;IACpB,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,IAAwB,EAAE,QAAyB;IAC3F,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,gBAAgB,CAAC,CAAC,CAAC;gBACtB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC/C,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;oBACvB,IAAI,CAAC,OAAO,GAAG,0CAA0C,CAAC;oBAC1D,OAAO;gBACT,CAAC;gBACD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBACpD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACxB,IAAI,CAAC,OAAO,GAAG,yDAAyD,CAAC;gBACzE,MAAM;YACR,CAAC;YACD,KAAK,aAAa,CAAC;YACnB,KAAK,YAAY,CAAC;YAClB,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACjC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;oBACvB,IAAI,CAAC,OAAO,GAAG,GAAG,IAAI,CAAC,MAAM,2BAA2B,CAAC;oBACzD,OAAO;gBACT,CAAC;gBACD,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACxB,IAAI,CAAC,OAAO,GAAG,WAAW,IAAI,CAAC,MAAM,EAAE,CAAC;gBACxC,MAAM;YACR,CAAC;YACD,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACjC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;oBACvB,IAAI,CAAC,OAAO,GAAG,qCAAqC,CAAC;oBACrD,OAAO;gBACT,CAAC;gBACD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7D,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC5B,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBACD,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACxB,IAAI,CAAC,OAAO,GAAG,6BAA6B,CAAC;gBAC7C,MAAM;YACR,CAAC;YACD,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACjB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;oBACvB,IAAI,CAAC,OAAO,GAAG,6BAA6B,CAAC;oBAC7C,OAAO;gBACT,CAAC;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBACxB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1C,CAAC;gBACD,IAAI,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvC,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBACxD,MAAM,IAAI,GAAG,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;oBACjE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC9C,CAAC;gBACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACxB,IAAI,CAAC,OAAO,GAAG,2CAA2C,CAAC;gBAC3D,MAAM;YACR,CAAC;YACD;gBACE,MAAM;QACV,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,GAAG,IAAI,CAAC,MAAM,YAAa,GAAa,CAAC,OAAO,EAAE,CAAC;IACpE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,KAA2B,EAC3B,GAAqB;IAErB,MAAM,QAAQ,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,yBAAyB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC"}

package/dist/upgrade/upgradeCommands.js

@@ -10,8 +10,12 @@ export function commandText(parts) {
 /** Channel-aware upgrade preview/apply commands (doctor, prime, orchestrator). */
 export function buildUpgradeCommands(args) {
     const base = args.channel.updateCommand.split(/\s+/).slice(0, 3);
-    const previewParts = [...base, "upgrade", "--project", args.project];
-    const applyParts = [...base, "upgrade", "--project", args.project];
+    const previewParts = [...base, "upgrade"];
+    const applyParts = [...base, "upgrade"];
+    if (!args.cwdDefault) {
+        previewParts.push("--project", args.project);
+        applyParts.push("--project", args.project);
+    }
     if (args.installRoot) {
         previewParts.push("--install-root", args.installRoot);
         applyParts.push("--install-root", args.installRoot);
@@ -22,10 +26,6 @@ export function buildUpgradeCommands(args) {
         previewParts.push("--channel", args.channel.channel);
         applyParts.push("--channel", args.channel.channel);
     }
-    if (args.targetMajor === 3) {
-        previewParts.push("--target-major", "3");
-        applyParts.push("--target-major", "3");
-    }
     if (args.only && args.only.length > 0) {
         for (const phase of args.only) {
             previewParts.push("--only", phase);

package/dist/upgrade/upgradeCommands.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgradeCommands.js","sourceRoot":"","sources":["../../src/upgrade/upgradeCommands.ts"],"names":[],"mappings":"AAaA,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAe;IACzC,OAAO,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,oBAAoB,CAAC,IAA8B;IAIjE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACnE,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,YAAY,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,UAAU,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IACD,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACtC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrD,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,IAAI,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC;QAC3B,YAAY,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QACzC,UAAU,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9B,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACnC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IACD,OAAO;QACL,aAAa,EAAE,WAAW,CAAC,YAAY,CAAC;QACxC,YAAY,EAAE,WAAW,CAAC,UAAU,CAAC;KACtC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"upgradeCommands.js","sourceRoot":"","sources":["../../src/upgrade/upgradeCommands.ts"],"names":[],"mappings":"AAcA,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAe;IACzC,OAAO,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,oBAAoB,CAAC,IAA8B;IAIjE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,EAAE,SAAS,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACrB,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,YAAY,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,UAAU,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IACD,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACtC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrD,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9B,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACnC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IACD,OAAO;QACL,aAAa,EAAE,WAAW,CAAC,YAAY,CAAC;QACxC,YAAY,EAAE,WAAW,CAAC,UAAU,CAAC;KACtC,CAAC;AACJ,CAAC"}