agentera 0.0.0 → 3.0.0-dev.1

package/dist/upgrade/upgradeOrchestrator.js

@@ -0,0 +1,299 @@
+import os from "node:os";
+import { expanduser, resolvePath } from "../core/paths.js";
+import { resolveDoctorInstallRoot, resolveSourceRootStrict } from "./appModel.js";
+import { MAJOR_BOUNDARY_ITEM_TAG, STATUS_APPLIED, STATUS_MANUAL_REVIEW_NEEDED, STATUS_NO_CHANGES_NEEDED, STATUS_READY_TO_APPLY, UPGRADE_PREVIEW_SCHEMA, classifyInstall, crossMajorBoundaryApplies, previewCrossMajorGuard, } from "./compatibility.js";
+import { classifyUpgradeOutcome, isBlockedUpgradeOutcome, shouldIncludeCrossMajorPlanItems, } from "./versionResolution.js";
+import { resolveUpdateChannel } from "./channels.js";
+import { buildUpgradeCommands } from "./upgradeCommands.js";
+import { MIGRATION_STATUSES, applyMigrationPhases, dryRunMigration, } from "./migrateArtifactsV2ToV3.js";
+const DEFAULT_PHASES = ["detect", "artifacts", "runtime", "cleanup"];
+const MIGRATION_ONLY_PHASES = ["artifacts", "runtime", "cleanup"];
+function emptySummary() {
+    return { pending: 0, applied: 0, noop: 0, blocked: 0, failed: 0, skipped: 0 };
+}
+function aggregateSummary(phases) {
+    const summary = emptySummary();
+    for (const phase of phases) {
+        for (const status of MIGRATION_STATUSES) {
+            summary[status] += phase.summary[status];
+        }
+    }
+    return summary;
+}
+function workflowStatus(summary) {
+    if (summary.blocked > 0)
+        return "blocked";
+    if (summary.failed > 0)
+        return "failed";
+    if (summary.pending > 0)
+        return "pending";
+    if (summary.applied > 0)
+        return "applied";
+    if (summary.skipped > 0 && summary.noop === 0 && summary.applied === 0)
+        return "skipped";
+    return "noop";
+}
+function lifecycleStatusFromWorkflow(workflow, mode) {
+    switch (workflow) {
+        case "pending":
+            return STATUS_READY_TO_APPLY;
+        case "applied":
+            return STATUS_APPLIED;
+        case "noop":
+        case "skipped":
+            return STATUS_NO_CHANGES_NEEDED;
+        case "blocked":
+        case "failed":
+            return STATUS_MANUAL_REVIEW_NEEDED;
+        default:
+            return mode === "apply" ? STATUS_APPLIED : STATUS_NO_CHANGES_NEEDED;
+    }
+}
+function selectedPhases(only) {
+    if (!only || only.length === 0) {
+        return new Set(DEFAULT_PHASES);
+    }
+    const selected = new Set(["detect"]);
+    for (const name of only) {
+        if (MIGRATION_ONLY_PHASES.includes(name)) {
+            selected.add(name);
+        }
+    }
+    return selected;
+}
+function summarizeOrchestratorPhase(name, items, message = "") {
+    const summary = emptySummary();
+    for (const item of items) {
+        summary[item.status] += 1;
+    }
+    let status;
+    if (summary.blocked > 0)
+        status = "blocked";
+    else if (summary.failed > 0)
+        status = "failed";
+    else if (summary.pending > 0)
+        status = "pending";
+    else if (summary.applied > 0)
+        status = "applied";
+    else if (summary.skipped > 0 && summary.noop === 0 && summary.applied === 0)
+        status = "skipped";
+    else
+        status = "noop";
+    return { name, status, summary, items, message };
+}
+function buildDetectPhase(install, crossMajorBoundary, outcome, channel) {
+    const items = [
+        {
+            status: "noop",
+            action: "detect-install",
+            message: `detected ${install.kind.replace(/_/g, " ")} layout`,
+        },
+    ];
+    if (isBlockedUpgradeOutcome(outcome)) {
+        items.push({
+            status: "blocked",
+            action: "downgrade-blocked",
+            message: outcome.message ?? "upgrade blocked",
+        });
+    }
+    else if (crossMajorBoundary && !shouldIncludeCrossMajorPlanItems(channel, outcome)) {
+        items.push({
+            status: "blocked",
+            action: "major-boundary",
+            message: outcome.message ??
+                "v2→v3 migration requires the development channel while stable tracks 2.x; rerun with --channel development after preview",
+        });
+    }
+    else if (outcome.message && outcome.kind !== "up_to_date") {
+        items.push({
+            status: "noop",
+            action: "version-gate",
+            message: outcome.message,
+        });
+    }
+    return summarizeOrchestratorPhase("detect", items);
+}
+function migrationPhaseToOrchestrator(phase) {
+    return {
+        name: phase.name,
+        status: phase.status,
+        summary: phase.summary,
+        items: phase.items,
+        message: phase.message,
+    };
+}
+export function buildUpgradePlan(args) {
+    const sourceRoot = resolveSourceRootStrict();
+    const home = resolvePath(expanduser(args.home ?? os.homedir()));
+    const env = { ...process.env, HOME: home };
+    const project = resolvePath(expanduser(args.project ?? process.cwd()));
+    const [installRoot] = resolveDoctorInstallRoot(args.installRoot ?? null, { home, sourceRoot });
+    const channel = resolveUpdateChannel({
+        channel: args.channel ?? null,
+        env,
+        home,
+        sourceRoot,
+    });
+    const install = classifyInstall({ appHome: installRoot, sourceRoot });
+    const upgradeOutcome = classifyUpgradeOutcome({
+        appHome: installRoot,
+        sourceRoot,
+        install,
+        channel,
+    });
+    const crossMajorBoundary = crossMajorBoundaryApplies(install, sourceRoot);
+    const phaseFilter = selectedPhases(args.only);
+    const runMigration = crossMajorBoundary && shouldIncludeCrossMajorPlanItems(channel, upgradeOutcome);
+    const phases = [];
+    if (phaseFilter.has("detect")) {
+        phases.push(buildDetectPhase(install, crossMajorBoundary, upgradeOutcome, channel));
+    }
+    let migrationPreview = runMigration
+        ? dryRunMigration({ appHome: installRoot, project, home, force: args.force, sourceRoot, channel: args.channel ?? null, env })
+        : null;
+    if (args.yes && migrationPreview) {
+        migrationPreview = applyMigrationPhases({ appHome: installRoot, project, home, force: args.force, sourceRoot, channel: args.channel ?? null, env }, migrationPreview, args.only && args.only.length > 0 ? args.only : MIGRATION_ONLY_PHASES);
+    }
+    if (migrationPreview) {
+        if (phaseFilter.has("artifacts")) {
+            phases.push(migrationPhaseToOrchestrator(migrationPreview.artifacts));
+        }
+        if (phaseFilter.has("runtime")) {
+            phases.push(migrationPhaseToOrchestrator(migrationPreview.runtime));
+        }
+        if (phaseFilter.has("cleanup")) {
+            phases.push(migrationPhaseToOrchestrator(migrationPreview.cleanup));
+        }
+    }
+    else if (crossMajorBoundary) {
+        const guard = previewCrossMajorGuard({
+            appHome: installRoot,
+            sourceRoot,
+            channel: args.channel ?? null,
+            env,
+            home,
+            catalog: null,
+        });
+        for (const guardPhase of guard.phases) {
+            if (guardPhase.name === "detect" || !phaseFilter.has(guardPhase.name)) {
+                continue;
+            }
+            const items = guardPhase.items.map((item) => ({
+                status: "blocked",
+                action: item.verb,
+                message: `${item.name} requires semver forward-major confirmation on the selected channel`,
+            }));
+            phases.push({
+                name: guardPhase.name,
+                status: items.length > 0 ? "blocked" : "noop",
+                summary: { ...emptySummary(), blocked: items.length },
+                items,
+                message: "",
+            });
+        }
+    }
+    const summary = aggregateSummary(phases);
+    const status = workflowStatus(summary);
+    const mode = args.yes ? "apply" : "plan";
+    const lifecycleStatus = lifecycleStatusFromWorkflow(status, mode);
+    const blocked = status === "blocked" || status === "failed";
+    const commands = buildUpgradeCommands({
+        project,
+        installRoot,
+        channel,
+        only: args.only,
+    });
+    return {
+        schemaVersion: UPGRADE_PREVIEW_SCHEMA,
+        mode,
+        status,
+        lifecycleStatus,
+        channel,
+        install,
+        upgradeOutcome,
+        crossMajorBoundary,
+        project,
+        appHome: installRoot,
+        home,
+        phases,
+        summary,
+        dryRunCommand: blocked || lifecycleStatus === STATUS_NO_CHANGES_NEEDED ? null : commands.dryRunCommand,
+        applyCommand: blocked || lifecycleStatus === STATUS_NO_CHANGES_NEEDED ? null : commands.applyCommand,
+    };
+}
+export function validateUpgradeApply(args, plan) {
+    if (args.yes && args.dryRun) {
+        return "--yes and --dry-run are mutually exclusive";
+    }
+    if (!args.yes) {
+        return null;
+    }
+    if (isBlockedUpgradeOutcome(plan.upgradeOutcome)) {
+        return plan.upgradeOutcome.message ?? "upgrade blocked";
+    }
+    if (plan.crossMajorBoundary &&
+        !shouldIncludeCrossMajorPlanItems(plan.channel, plan.upgradeOutcome)) {
+        return ("cross-major v2→v3 migration requires the development channel while stable tracks 2.x; " +
+            "run the same command with --dry-run on --channel development, then apply with --yes");
+    }
+    return null;
+}
+export function renderUpgradePlan(plan) {
+    const lines = [
+        "Agentera upgrade",
+        `lifecycle status: ${plan.lifecycleStatus.replace(/_/g, " ")}`,
+        `mode: ${plan.mode === "plan" ? "preview only; no files were changed" : "applying approved changes"}`,
+        `project: ${plan.project}`,
+        `Agentera directory: ${plan.appHome}`,
+        `channel: ${plan.channel.channel} (distribution major ${plan.channel.distributionMajor})`,
+    ];
+    if (plan.crossMajorBoundary) {
+        lines.push("cross-major boundary: yes");
+        lines.push(`running: ${plan.upgradeOutcome.runningVersion}; latest on channel: ${plan.upgradeOutcome.latestOnChannel}`);
+        if (plan.upgradeOutcome.migrationTargetVersion) {
+            lines.push(`migration target: ${plan.upgradeOutcome.migrationTargetVersion}`);
+        }
+    }
+    for (const phase of plan.phases) {
+        lines.push("");
+        lines.push(`${phase.name}:`);
+        if (phase.message && phase.items.length === 0) {
+            lines.push(`  ${phase.status}: ${phase.message}`);
+        }
+        for (const item of phase.items) {
+            lines.push(`  - ${item.status}: ${item.action}`);
+            if (item.message) {
+                lines.push(`    ${item.message}`);
+            }
+        }
+    }
+    if (plan.mode === "plan" && plan.summary.pending > 0 && plan.applyCommand) {
+        lines.push("");
+        lines.push(`Next: if this preview looks right, apply with: ${plan.applyCommand}`);
+    }
+    return lines.join("\n") + "\n";
+}
+export function upgradeExitCode(plan) {
+    if (plan.summary.blocked > 0 || plan.summary.failed > 0) {
+        return 1;
+    }
+    if (plan.mode === "plan" && plan.summary.pending > 0) {
+        return 1;
+    }
+    return 0;
+}
+export function sortKeysDeep(value) {
+    if (Array.isArray(value)) {
+        return value.map(sortKeysDeep);
+    }
+    if (value && typeof value === "object") {
+        const out = {};
+        for (const key of Object.keys(value).sort()) {
+            out[key] = sortKeysDeep(value[key]);
+        }
+        return out;
+    }
+    return value;
+}
+export { MAJOR_BOUNDARY_ITEM_TAG };
+//# sourceMappingURL=upgradeOrchestrator.js.map

package/dist/upgrade/upgradeOrchestrator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgradeOrchestrator.js","sourceRoot":"","sources":["../../src/upgrade/upgradeOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,2BAA2B,EAC3B,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,yBAAyB,EACzB,sBAAsB,GAEvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,gCAAgC,GAEjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAA8B,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAyB,MAAM,sBAAsB,CAAC;AACnF,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,eAAe,GAKhB,MAAM,6BAA6B,CAAC;AAUrC,MAAM,cAAc,GAAgC,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAClG,MAAM,qBAAqB,GAAgC,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AA2C/F,SAAS,YAAY;IACnB,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;AAChF,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAkC;IAC1D,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;YACxC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,OAA8B;IACpD,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxC,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACzF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,2BAA2B,CAAC,QAAyB,EAAE,IAAsB;IACpF,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,qBAAqB,CAAC;QAC/B,KAAK,SAAS;YACZ,OAAO,cAAc,CAAC;QACxB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS;YACZ,OAAO,wBAAwB,CAAC;QAClC,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,OAAO,2BAA2B,CAAC;QACrC;YACE,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,wBAAwB,CAAC;IACxE,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAoD;IAC1E,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,IAAK,qBAA2C,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,0BAA0B,CACjC,IAAsB,EACtB,KAA2B,EAC3B,OAAO,GAAG,EAAE;IAEZ,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,MAAuB,CAAC;IAC5B,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC;QAAE,MAAM,GAAG,SAAS,CAAC;SACvC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,GAAG,QAAQ,CAAC;SAC1C,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC;QAAE,MAAM,GAAG,SAAS,CAAC;SAC5C,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC;QAAE,MAAM,GAAG,SAAS,CAAC;SAC5C,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,KAAK,CAAC;QAAE,MAAM,GAAG,SAAS,CAAC;;QAC3F,MAAM,GAAG,MAAM,CAAC;IACrB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AACnD,CAAC;AAED,SAAS,gBAAgB,CACvB,OAA8B,EAC9B,kBAA2B,EAC3B,OAAuB,EACvB,OAA8B;IAE9B,MAAM,KAAK,GAAyB;QAClC;YACE,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,gBAAgB;YACxB,OAAO,EAAE,YAAY,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS;SAC9D;KACF,CAAC;IAEF,IAAI,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;QACrC,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,mBAAmB;YAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,iBAAiB;SAC9C,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,kBAAkB,IAAI,CAAC,gCAAgC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;QACrF,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,gBAAgB;YACxB,OAAO,EACL,OAAO,CAAC,OAAO;gBACf,0HAA0H;SAC7H,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC5D,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,cAAc;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,0BAA0B,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,4BAA4B,CAAC,KAAqB;IACzD,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAA6B;IAC5D,MAAM,UAAU,GAAG,uBAAuB,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACvE,MAAM,CAAC,WAAW,CAAC,GAAG,wBAAwB,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/F,MAAM,OAAO,GAAG,oBAAoB,CAAC;QACnC,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;QAC7B,GAAG;QACH,IAAI;QACJ,UAAU;KACX,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;IACtE,MAAM,cAAc,GAAG,sBAAsB,CAAC;QAC5C,OAAO,EAAE,WAAW;QACpB,UAAU;QACV,OAAO;QACP,OAAO;KACR,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,YAAY,GAChB,kBAAkB,IAAI,gCAAgC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAElF,MAAM,MAAM,GAA+B,EAAE,CAAC;IAE9C,IAAI,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,gBAAgB,GAAG,YAAY;QACjC,CAAC,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,GAAG,EAAE,CAAC;QAC7H,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,IAAI,CAAC,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACjC,gBAAgB,GAAG,oBAAoB,CACrC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,GAAG,EAAE,EAC1G,gBAAgB,EAChB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CACtE,CAAC;IACJ,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;SAAM,IAAI,kBAAkB,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,sBAAsB,CAAC;YACnC,OAAO,EAAE,WAAW;YACpB,UAAU;YACV,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;YAC7B,GAAG;YACH,IAAI;YACJ,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACtC,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,IAAwB,CAAC,EAAE,CAAC;gBAC1F,SAAS;YACX,CAAC;YACD,MAAM,KAAK,GAAyB,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAClE,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,qEAAqE;aAC3F,CAAC,CAAC,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,UAAU,CAAC,IAAwB;gBACzC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;gBAC7C,OAAO,EAAE,EAAE,GAAG,YAAY,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE;gBACrD,KAAK;gBACL,OAAO,EAAE,EAAE;aACZ,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACzC,MAAM,eAAe,GAAG,2BAA2B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,QAAQ,CAAC;IAC5D,MAAM,QAAQ,GAAG,oBAAoB,CAAC;QACpC,OAAO;QACP,WAAW;QACX,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;IAEH,OAAO;QACL,aAAa,EAAE,sBAAsB;QACrC,IAAI;QACJ,MAAM;QACN,eAAe;QACf,OAAO;QACP,OAAO;QACP,cAAc;QACd,kBAAkB;QAClB,OAAO;QACP,OAAO,EAAE,WAAW;QACpB,IAAI;QACJ,MAAM;QACN,OAAO;QACP,aAAa,EAAE,OAAO,IAAI,eAAe,KAAK,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa;QACtG,YAAY,EAAE,OAAO,IAAI,eAAe,KAAK,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY;KACrG,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAA6B,EAAE,IAAmB;IACrF,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO,4CAA4C,CAAC;IACtD,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,IAAI,iBAAiB,CAAC;IAC1D,CAAC;IACD,IACE,IAAI,CAAC,kBAAkB;QACvB,CAAC,gCAAgC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,EACpE,CAAC;QACD,OAAO,CACL,wFAAwF;YACxF,qFAAqF,CACtF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAmB;IACnD,MAAM,KAAK,GAAG;QACZ,kBAAkB;QAClB,qBAAqB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;QAC9D,SAAS,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,2BAA2B,EAAE;QACrG,YAAY,IAAI,CAAC,OAAO,EAAE;QAC1B,uBAAuB,IAAI,CAAC,OAAO,EAAE;QACrC,YAAY,IAAI,CAAC,OAAO,CAAC,OAAO,wBAAwB,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG;KAC1F,CAAC;IACF,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACxC,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,CAAC,cAAc,wBAAwB,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC;QACxH,IAAI,IAAI,CAAC,cAAc,CAAC,sBAAsB,EAAE,CAAC;YAC/C,KAAK,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,cAAc,CAAC,sBAAsB,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YACjD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1E,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,kDAAkD,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAmB;IACjD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,GAAG,GAA4B,EAAE,CAAC;QACxC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACvE,GAAG,CAAC,GAAG,CAAC,GAAG,YAAY,CAAE,KAAiC,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/upgrade/versionResolution.js

@@ -0,0 +1,179 @@
+import fs from "node:fs";
+import path from "node:path";
+import { isNpxBundleRoot } from "../core/sourceRoot.js";
+import { classifyResolvedRoot } from "../state/installRoot.js";
+import { doctorRoots, loadSuiteVersion } from "./appModel.js";
+import { loadUpdateChannelsAuthority } from "./channels.js";
+export const IRREVERSIBLE_V2_RETURN = "return to the v2 Python line is permanently unsupported after migrating to v3+";
+let testVersionCatalog = null;
+/** Reset injectable catalog (tests). */
+export function setVersionCatalogForTests(catalog) {
+    testVersionCatalog = catalog;
+}
+export function parseSemverMajor(version) {
+    const match = /^(\d+)/.exec(version.trim());
+    if (!match) {
+        return null;
+    }
+    const major = Number.parseInt(match[1], 10);
+    return Number.isFinite(major) ? major : null;
+}
+function readRegistryVersion(root) {
+    const registryPath = path.join(root, "registry.json");
+    if (!fs.existsSync(registryPath)) {
+        return null;
+    }
+    try {
+        const data = JSON.parse(fs.readFileSync(registryPath, "utf8"));
+        const version = data.skills?.[0]?.version;
+        return typeof version === "string" && version ? version : null;
+    }
+    catch {
+        return null;
+    }
+}
+function readNpmPackageVersion(sourceRoot) {
+    const candidates = [
+        path.join(sourceRoot, "package.json"),
+        path.join(sourceRoot, "..", "package.json"),
+        path.join(sourceRoot, "..", "..", "package.json"),
+    ];
+    for (const candidate of candidates) {
+        if (!fs.existsSync(candidate)) {
+            continue;
+        }
+        try {
+            const data = JSON.parse(fs.readFileSync(candidate, "utf8"));
+            if (typeof data.version === "string" && data.version) {
+                return data.version;
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    return null;
+}
+export function resolveRunningVersion(args) {
+    void args.install;
+    if (isNpxBundleRoot(args.sourceRoot)) {
+        return readRegistryVersion(args.sourceRoot) ?? readNpmPackageVersion(args.sourceRoot) ?? "0.0.0";
+    }
+    const roots = doctorRoots(args.appHome);
+    const expected = loadSuiteVersion(args.sourceRoot);
+    const classification = classifyResolvedRoot(roots.activeBundleRoot, {
+        source: "explicit",
+        expectedVersion: expected,
+    });
+    if (classification.current_version) {
+        return classification.current_version;
+    }
+    if (isNpxBundleRoot(args.sourceRoot)) {
+        return readNpmPackageVersion(args.sourceRoot) ?? expected ?? "0.0.0";
+    }
+    return expected ?? "0.0.0";
+}
+export function loadOfflineLatestDefaults(sourceRoot) {
+    const authority = loadUpdateChannelsAuthority(sourceRoot);
+    const versionResolution = authority.version_resolution;
+    const latestOnChannel = versionResolution?.latest_on_channel;
+    const defaults = latestOnChannel?.offline_defaults;
+    return {
+        stable: defaults?.stable ?? "2.7.6",
+        development: defaults?.development ?? "3.0.0-dev.0",
+    };
+}
+export function resolveLatestOnChannel(channel, sourceRoot, catalog) {
+    const resolved = catalog ?? testVersionCatalog ?? loadOfflineLatestDefaults(sourceRoot);
+    return channel.channel === "development"
+        ? (resolved.development ?? "3.0.0-dev.0")
+        : (resolved.stable ?? "2.7.6");
+}
+export function classifyUpgradeOutcome(args) {
+    const runningVersion = resolveRunningVersion(args);
+    const latestOnChannel = resolveLatestOnChannel(args.channel, args.sourceRoot, args.catalog);
+    const runningMajor = parseSemverMajor(runningVersion) ?? 0;
+    const latestMajor = parseSemverMajor(latestOnChannel) ?? 0;
+    if (args.install.kind === "v3_self_contained_npm") {
+        const runningVersion = resolveRunningVersion(args);
+        const runningMajor = parseSemverMajor(runningVersion) ?? 0;
+        return {
+            kind: "up_to_date",
+            runningVersion,
+            latestOnChannel: runningVersion,
+            runningMajor,
+            latestMajor: runningMajor,
+            migrationTargetVersion: null,
+            allowsMigrationApply: false,
+            message: null,
+        };
+    }
+    const base = {
+        runningVersion,
+        latestOnChannel,
+        runningMajor,
+        latestMajor,
+        migrationTargetVersion: null,
+        allowsMigrationApply: false,
+        message: null,
+    };
+    if (runningMajor >= 3 && latestMajor <= 2) {
+        return {
+            ...base,
+            kind: "blocked_downgrade_to_v2",
+            message: IRREVERSIBLE_V2_RETURN,
+        };
+    }
+    if (args.install.kind === "v2_managed_app_home") {
+        if (args.channel.distributionMajor < 3) {
+            return {
+                ...base,
+                kind: "up_to_date",
+                message: "stable channel tracks the 2.x support line; switch to the development channel to preview v2→v3 migration",
+            };
+        }
+        return {
+            ...base,
+            kind: "migration_to_latest_on_channel",
+            migrationTargetVersion: latestOnChannel,
+            allowsMigrationApply: true,
+            message: `v2 managed app-home will migrate to ${latestOnChannel} on the ${args.channel.channel} channel`,
+        };
+    }
+    if (runningMajor >= 3 &&
+        runningMajor !== args.channel.distributionMajor &&
+        args.channel.distributionMajor < runningMajor) {
+        return {
+            ...base,
+            kind: "channel_line_mismatch",
+            message: `running ${runningVersion} on ${args.channel.channel} channel (latest ${latestOnChannel}); switch channel or align versions`,
+        };
+    }
+    if (runningMajor < latestMajor) {
+        return {
+            ...base,
+            kind: "forward_major_upgrade",
+            migrationTargetVersion: latestOnChannel,
+            allowsMigrationApply: true,
+            message: `running ${runningVersion}; latest on ${args.channel.channel} channel is ${latestOnChannel}`,
+        };
+    }
+    if (runningVersion === latestOnChannel) {
+        return { ...base, kind: "up_to_date" };
+    }
+    return {
+        ...base,
+        kind: "same_major_update",
+        message: `running ${runningVersion}; latest on channel is ${latestOnChannel}`,
+    };
+}
+export function shouldIncludeCrossMajorPlanItems(channel, outcome) {
+    return (outcome.kind === "migration_to_latest_on_channel" &&
+        outcome.allowsMigrationApply &&
+        channel.distributionMajor >= 3);
+}
+export function isBlockedUpgradeOutcome(outcome) {
+    return (outcome.kind === "blocked_downgrade_to_v2" ||
+        outcome.kind === "blocked_downgrade_not_implemented");
+}
+//# sourceMappingURL=versionResolution.js.map

package/dist/upgrade/versionResolution.js.map

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

package/dist/validate/appHomeContract.js

@@ -0,0 +1,150 @@
+import fs from "node:fs";
+import path from "node:path";
+/**
+ * Validate user-facing app-home terminology for release readiness. Faithful TS
+ * port of the text-surface scanning in scripts/validate_app_home_contract.py.
+ *
+ * The CLI-surface scanning (running agentera help/output commands) is wired in
+ * Phase 7 via the `cliInvoker` option once the TS CLI commands exist.
+ */
+export const TEXT_SURFACES = [
+    "README.md",
+    "UPGRADE.md",
+    "references/cli/vocabulary.md",
+    "plugin.json",
+    ".github/plugin/plugin.json",
+    ".codex-plugin/plugin.json",
+    ".opencode/plugins/agentera.js",
+    "skills/agentera/SKILL.md",
+    "skills/agentera/capabilities/hej/instructions.md",
+    "skills/agentera/references/contract.md",
+];
+export const CLI_HELP_COMMANDS = [
+    ["--help"],
+    ["hej", "--help"],
+    ["doctor", "--help"],
+    ["upgrade", "--help"],
+];
+export const CLI_OUTPUT_COMMANDS = [
+    ["hej"],
+    ["hej", "--format", "json"],
+    ["doctor", "--json"],
+    ["upgrade", "--only", "bundle", "--dry-run"],
+    ["upgrade", "--only", "bundle", "--dry-run", "--json"],
+    ["upgrade", "--only", "runtime", "--runtime", "claude", "--dry-run"],
+];
+const FORBIDDEN = [
+    [/\bbundle[- ]root\b/i, "bundle-root wording"],
+    [/\blive bundle\b/i, "live-bundle wording"],
+    [/\bdurable bundle\b.*\bAGENTERA_HOME\b/i, "durable bundle named as AGENTERA_HOME"],
+    [/\bAGENTERA_HOME\b.*\bdurable bundle\b/i, "AGENTERA_HOME named as durable bundle"],
+    [/\bAGENTERA_HOME\b.*\binstall root\b/i, "AGENTERA_HOME named as install root"],
+    [/\binstall root\b.*\bAGENTERA_HOME\b/i, "install root named as AGENTERA_HOME"],
+    [/\bdefault durable root\b/i, "default durable root wording"],
+];
+const RECOVERY_FORBIDDEN = [
+    [/\bAgentera-managed\b/i, "jargon in recovery wording"],
+    [/\bunmanaged (?:user-owned )?directory\b/i, "jargon in recovery wording"],
+    [/\bdeprecated default\b/i, "jargon in recovery wording"],
+    [/\bplatform app-home recovery\b/i, "jargon in recovery wording"],
+    [/\bdry-run preview\b/i, "jargon in recovery wording"],
+    [/\bbundle install\b/i, "jargon in recovery wording"],
+    [/\bmanaged app refresh\b/i, "jargon in recovery wording"],
+    [/\binstalled Agentera app is stale\b/i, "jargon in recovery wording"],
+    [/\bdurable Agentera bundle\b/i, "jargon in recovery wording"],
+    [/\bapp home exists but is not\b/i, "jargon in recovery wording"],
+    [/\buse --force only after reviewing\b/i, "jargon in recovery wording"],
+    [/\bUse platform home\b/i, "jargon in recovery wording"],
+    [/\bForce deprecated home\b/i, "jargon in recovery wording"],
+];
+const INSTALL_ROOT_LABEL_RE = /\binstall root:/i;
+export function isPlainLanguageRuleLine(line) {
+    const lowered = line.toLowerCase();
+    return [
+        "never ask the user",
+        "bad labels",
+        "avoid these prompt labels",
+        "jargon in recovery wording",
+    ].some((marker) => lowered.includes(marker));
+}
+/** Mirror Python str.splitlines(): split on line boundaries, no trailing empty. */
+function splitLines(text) {
+    const parts = text.split(/\r\n|\r|\n/);
+    if (parts.length > 0 && parts[parts.length - 1] === "" && /[\r\n]$/.test(text)) {
+        parts.pop();
+    }
+    return parts;
+}
+export function checkText(surface, text) {
+    const errors = [];
+    splitLines(text).forEach((line, idx) => {
+        const number = idx + 1;
+        for (const [pattern, reason] of FORBIDDEN) {
+            if (pattern.test(line)) {
+                errors.push(`${surface}:${number}: ${reason}: ${line.trim()}`);
+            }
+        }
+        if (!isPlainLanguageRuleLine(line)) {
+            for (const [pattern, reason] of RECOVERY_FORBIDDEN) {
+                if (pattern.test(line)) {
+                    errors.push(`${surface}:${number}: ${reason}: ${line.trim()}`);
+                }
+            }
+        }
+        if (surface.startsWith("agentera ")) {
+            if (INSTALL_ROOT_LABEL_RE.test(line)) {
+                errors.push(`${surface}:${number}: CLI output names app home as install root: ${line.trim()}`);
+            }
+            if (line.includes("installRoot")) {
+                errors.push(`${surface}:${number}: public JSON exposes installRoot instead of appHome: ${line.trim()}`);
+            }
+        }
+    });
+    return errors;
+}
+function readSurface(root, relative) {
+    const p = path.join(root, relative);
+    if (!fs.existsSync(p) || !fs.statSync(p).isFile()) {
+        return null;
+    }
+    return [relative, fs.readFileSync(p, "utf8")];
+}
+/**
+ * Run the help/output CLI surfaces through the provided invoker, returning
+ * (label, combined-output) tuples mirroring the Python helper.
+ */
+export function cliSurfaces(root, invoke, tmpProject) {
+    const surfaces = [];
+    const helpEnv = { ...process.env, AGENTERA_HOME: root };
+    for (const args of CLI_HELP_COMMANDS) {
+        const result = invoke(args, { cwd: root, env: helpEnv });
+        const label = "agentera " + args.join(" ");
+        surfaces.push([label, result.stdout + result.stderr]);
+        if (result.status !== 0) {
+            surfaces.push([label, `help command exited ${result.status}`]);
+        }
+    }
+    const outEnv = { ...process.env, AGENTERA_HOME: root, AGENTERA_BOOTSTRAP_SOURCE_ROOT: root };
+    for (const args of CLI_OUTPUT_COMMANDS) {
+        const result = invoke(args, { cwd: tmpProject, env: outEnv });
+        surfaces.push(["agentera " + args.join(" "), result.stdout + result.stderr]);
+    }
+    return surfaces;
+}
+export function validate(root, opts = {}) {
+    const errors = [];
+    for (const relative of TEXT_SURFACES) {
+        const surface = readSurface(root, relative);
+        if (surface === null) {
+            continue;
+        }
+        errors.push(...checkText(surface[0], surface[1]));
+    }
+    if (opts.cliInvoker && opts.tmpProject) {
+        for (const [surface, text] of cliSurfaces(root, opts.cliInvoker, opts.tmpProject)) {
+            errors.push(...checkText(surface, text));
+        }
+    }
+    return errors;
+}
+//# sourceMappingURL=appHomeContract.js.map

package/dist/validate/appHomeContract.js.map

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