agentera 3.0.0-dev.28 → 3.0.0-dev.29

package/dist/runtime/nativeResourceCleanup.js

@@ -0,0 +1,317 @@
+import fs from "node:fs";
+import path from "node:path";
+import { loadYamlMapping } from "../core/yaml.js";
+import { resolveSourceRoot } from "../core/sourceRoot.js";
+import { LIFECYCLE_OPERATION_CONTRACT_RELATIVE_PATH, LIFECYCLE_MANUAL_REVIEW_GUIDANCE, applyLifecycleOperations, createLifecycleOwnershipManifest, emptyLifecycleOwnershipLedger, planLifecycleOperations, validateLifecycleOwnershipLedger, } from "./lifecycleOperations.js";
+import { LIFECYCLE_AUTHORITY_RELATIVE_PATH, NATIVE_RESOURCE_CLEANUP_CONTRACT_RELATIVE_PATH, } from "./lifecycleAuthority.js";
+function isMapping(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function stringList(value) {
+    return Array.isArray(value) && value.every((item) => typeof item === "string") ? value : [];
+}
+function requiredString(value, key) {
+    return typeof value[key] === "string" && value[key].length > 0;
+}
+export function validateNativeResourceCleanupContractData(value) {
+    if (!isMapping(value))
+        return ["native resource cleanup contract must be a YAML object"];
+    const errors = [];
+    if (value.schema_version !== "agentera.nativeResourceCleanup.v1") {
+        errors.push("schema_version must be agentera.nativeResourceCleanup.v1");
+    }
+    if (value.status !== "resource_retirement_contract") {
+        errors.push("status must be resource_retirement_contract");
+    }
+    if (value.decision !== "nksvqmnevm")
+        errors.push("decision must cite firm decision nksvqmnevm");
+    if (value.authority !== LIFECYCLE_AUTHORITY_RELATIVE_PATH) {
+        errors.push(`authority must point to ${LIFECYCLE_AUTHORITY_RELATIVE_PATH}`);
+    }
+    if (value.operation_contract !== LIFECYCLE_OPERATION_CONTRACT_RELATIVE_PATH) {
+        errors.push(`operation_contract must point to ${LIFECYCLE_OPERATION_CONTRACT_RELATIVE_PATH}`);
+    }
+    const policy = isMapping(value.policy) ? value.policy : {};
+    if (policy.host_inventory_exposure !== "evidence_only"
+        || policy.selection !== "native_agentera_resource_only"
+        || policy.preview !== "strictly_read_only"
+        || policy.apply_requires !== "explicit_approval"
+        || policy.ownership !== "matching_whole_resource_ledger_identity_and_fingerprint"
+        || policy.shared_configuration !== "action_required_without_key_level_ownership"
+        || policy.unsupported_platform_result !== "action_required") {
+        errors.push("policy must expose resource-only selection, pure preview, explicit approval, and fail-closed ownership");
+    }
+    const forbidden = stringList(policy.forbidden_ownership_evidence);
+    for (const evidence of ["value_equality", "managed_marker", "resource_name", "file_equality"]) {
+        if (!forbidden.includes(evidence))
+            errors.push(`policy must reject ${evidence} as ownership evidence`);
+    }
+    const hosts = Array.isArray(value.hosts) ? value.hosts : [];
+    const expectedHosts = {
+        codex: "supported",
+        cursor: "supported",
+        opencode: "supported",
+        copilot: "supported_disabled",
+        claude: "retired_historical",
+    };
+    const hostStatuses = new Map();
+    for (const host of hosts) {
+        if (!isMapping(host) || !requiredString(host, "id") || !requiredString(host, "display_name"))
+            continue;
+        if (!(host.support_status === "supported" || host.support_status === "supported_disabled" || host.support_status === "retired_historical"))
+            continue;
+        hostStatuses.set(host.id, host.support_status);
+    }
+    for (const [id, status] of Object.entries(expectedHosts)) {
+        if (hostStatuses.get(id) !== status)
+            errors.push(`hosts must retain ${id} as ${status}`);
+    }
+    const evidence = Array.isArray(value.accepted_host_evidence) ? value.accepted_host_evidence : [];
+    const proofByHost = new Map();
+    for (const item of evidence) {
+        if (isMapping(item) && requiredString(item, "host") && requiredString(item, "proof")) {
+            proofByHost.set(item.host, item.proof);
+        }
+    }
+    for (const host of ["codex", "cursor", "opencode", "copilot"]) {
+        if (!proofByHost.has(host))
+            errors.push(`accepted_host_evidence must retain ${host} proof`);
+    }
+    const resources = Array.isArray(value.resources) ? value.resources : [];
+    if (resources.length !== 2)
+        errors.push("resources must declare the Claude link and Codex descriptor class");
+    const resourceById = new Map();
+    for (const resource of resources) {
+        if (!isMapping(resource) || !requiredString(resource, "id"))
+            continue;
+        resourceById.set(resource.id, resource);
+    }
+    const claude = resourceById.get("claude.agentera-skill-link");
+    if (!claude || claude.host !== "claude" || claude.kind !== "symlink" || claude.intent !== "remove"
+        || claude.destination !== "{home}/.claude/skills/agentera" || claude.ledger_status !== "legacy"
+        || !requiredString(claude, "durable_proof")) {
+        errors.push("Claude cleanup must remain the legacy-ledger Agentera skill symlink removal");
+    }
+    const codex = resourceById.get("codex.agent-descriptor");
+    const descriptors = codex ? stringList(codex.descriptors) : [];
+    const expectedDescriptors = ["status", "vision", "discuss", "research", "plan", "build", "optimize", "audit", "document", "profile", "design", "orchestrate"];
+    if (!codex || codex.host !== "codex" || codex.kind !== "file" || codex.intent !== "remove"
+        || codex.destination !== "{home}/.codex/agents/{descriptor}.toml" || codex.ledger_status !== "managed"
+        || !requiredString(codex, "durable_proof") || descriptors.join(",") !== expectedDescriptors.join(",")) {
+        errors.push("Codex descriptors must be independently ledger-owned native files");
+    }
+    const configuration = Array.isArray(value.configuration_inventory) ? value.configuration_inventory : [];
+    const expectedKeys = [
+        "shell_environment_policy.set.AGENTERA_HOME",
+        "agents.max_depth",
+        "features.multi_agent_v2",
+    ];
+    if (configuration.length !== expectedKeys.length) {
+        errors.push("configuration_inventory must declare every Agentera-written Codex key");
+    }
+    for (const key of expectedKeys) {
+        const unit = configuration.find((item) => isMapping(item) && item.key === key);
+        if (!isMapping(unit) || !requiredString(unit, "id") || unit.host !== "codex" || unit.destination !== "{home}/.codex/config.toml"
+            || unit.durable_proof !== "key-level ownership ledger identity and fingerprint"
+            || unit.ownership_available !== false || unit.result_without_proof !== "action_required") {
+            errors.push(`configuration_inventory must preserve ${key} without key-level ownership`);
+        }
+    }
+    return errors;
+}
+function expandResource(resource, hostSupportStatus) {
+    const descriptorNames = stringList(resource.descriptors);
+    const ids = descriptorNames.length > 0
+        ? descriptorNames.map((name) => `${resource.id}.${name}`)
+        : [resource.id];
+    return ids.map((id, index) => ({
+        id,
+        host: resource.host,
+        hostSupportStatus,
+        kind: resource.kind,
+        destination: descriptorNames.length > 0
+            ? resource.destination.replace("{descriptor}", descriptorNames[index])
+            : resource.destination,
+        ledgerStatus: resource.ledger_status,
+        durableProof: resource.durable_proof,
+        neverTouch: stringList(resource.never_touch),
+        safetyNote: resource.safety_note ?? "",
+    }));
+}
+export function loadNativeResourceCleanupContract(contractPath = path.join(resolveSourceRoot(), NATIVE_RESOURCE_CLEANUP_CONTRACT_RELATIVE_PATH)) {
+    const data = loadYamlMapping(fs.readFileSync(contractPath, "utf8"));
+    const errors = validateNativeResourceCleanupContractData(data);
+    if (errors.length > 0)
+        throw new Error(`Native resource cleanup contract validation failed: ${errors.join("; ")}`);
+    const statuses = new Map(data.hosts.map((host) => [
+        host.id,
+        host.support_status,
+    ]));
+    return {
+        sourcePath: contractPath,
+        resources: data.resources.flatMap((resource) => expandResource(resource, statuses.get(resource.host))),
+        configuration: data.configuration_inventory.map((unit) => ({
+            id: unit.id,
+            host: unit.host,
+            key: unit.key,
+        })),
+    };
+}
+export function nativeResourceCleanupIds(contract = loadNativeResourceCleanupContract()) {
+    return contract.resources.map((resource) => resource.id);
+}
+export function validateNativeResourceCleanupContractRoot(root = resolveSourceRoot()) {
+    const contractPath = path.join(root, NATIVE_RESOURCE_CLEANUP_CONTRACT_RELATIVE_PATH);
+    if (!fs.existsSync(contractPath)) {
+        return [`${NATIVE_RESOURCE_CLEANUP_CONTRACT_RELATIVE_PATH}: missing native resource cleanup contract`];
+    }
+    try {
+        return validateNativeResourceCleanupContractData(loadYamlMapping(fs.readFileSync(contractPath, "utf8"))).map((error) => `${NATIVE_RESOURCE_CLEANUP_CONTRACT_RELATIVE_PATH}: ${error}`);
+    }
+    catch (error) {
+        return [`${NATIVE_RESOURCE_CLEANUP_CONTRACT_RELATIVE_PATH}: could not parse contract: ${error.message}`];
+    }
+}
+function expandHome(template, home) {
+    if (!template.startsWith("{home}/") || template.includes("..")) {
+        throw new Error(`unsafe native resource destination template: ${template}`);
+    }
+    return path.join(path.resolve(home), template.slice("{home}/".length));
+}
+function ledgerDiagnostics(plan, resource) {
+    const ledger = plan.request.ledger ?? emptyLifecycleOwnershipLedger();
+    const planned = plan.operations[0];
+    if (planned?.action === "noop")
+        return [];
+    const records = ledger.records.filter((record) => record.resourceId === resource.id);
+    if (records.length !== 1)
+        return [`${resource.id}: cleanup requires exactly one ownership ledger record`];
+    const record = records[0];
+    if (record.status !== resource.ledgerStatus
+        || record.scope !== "whole"
+        || path.resolve(record.destination) !== path.resolve(plan.request.operations[0].destination)
+        || record.kind !== resource.kind
+        || record.identity === null
+        || record.fingerprint === null) {
+        return [`${resource.id}: cleanup requires matching whole-resource ${resource.ledgerStatus} ledger identity and fingerprint`];
+    }
+    return [];
+}
+function blockedPlan(plan, diagnostics, invalidLedger = false) {
+    const reason = `${diagnostics.join("; ")} ${LIFECYCLE_MANUAL_REVIEW_GUIDANCE}`;
+    return {
+        ...plan,
+        operations: plan.operations.map((operation) => operation.action === "noop" ? operation : {
+            ...operation,
+            ...(invalidLedger ? { state: "ambiguous_ownership", ownership: "ambiguous" } : {}),
+            action: "action_required",
+            reason,
+        }),
+    };
+}
+function configurationUnitsFor(contract, host) {
+    return contract.configuration
+        .filter((unit) => unit.host === host)
+        .map((unit) => ({
+        id: unit.id,
+        hostId: unit.host,
+        key: unit.key,
+        status: "action_required",
+        reason: "no durable key-level ownership ledger identity and fingerprint",
+    }));
+}
+export function previewNativeResourceCleanup(opts) {
+    const contract = opts.contract ?? loadNativeResourceCleanupContract();
+    const resource = contract.resources.find((candidate) => candidate.id === opts.resourceId);
+    if (!resource)
+        throw new Error(`unknown native Agentera resource cleanup id: ${opts.resourceId}`);
+    const operations = [{
+            id: resource.id,
+            destination: expandHome(resource.destination, opts.home),
+            kind: resource.kind,
+            intent: "remove",
+            required: true,
+        }];
+    const suppliedLedger = opts.ledger ?? emptyLifecycleOwnershipLedger();
+    const errors = validateLifecycleOwnershipLedger(suppliedLedger);
+    const plan = planLifecycleOperations({
+        allowedRoots: [path.resolve(opts.home)],
+        operations,
+        manifest: createLifecycleOwnershipManifest(operations),
+        ledger: errors.length === 0 ? suppliedLedger : emptyLifecycleOwnershipLedger(),
+    });
+    const diagnostics = errors.length > 0
+        ? errors.map((error) => `invalid ownership ledger: ${error}`)
+        : ledgerDiagnostics(plan, resource);
+    return {
+        schemaVersion: "agentera.nativeResourceCleanupPreview.v1",
+        mode: "preview",
+        resourceId: resource.id,
+        hostId: resource.host,
+        hostSupportStatus: resource.hostSupportStatus,
+        ledgerStatus: resource.ledgerStatus,
+        approvalRequired: true,
+        ownershipRequirement: "matching_whole_resource_ledger",
+        ledgerAuthorization: diagnostics.length === 0 ? "match_or_absent_noop" : "blocked",
+        ledgerDiagnostics: diagnostics,
+        plan: diagnostics.length === 0 ? plan : blockedPlan(plan, diagnostics, errors.length > 0),
+        configurationUnits: configurationUnitsFor(contract, resource.host),
+        neverTouch: resource.neverTouch.map((entry) => expandHome(entry, opts.home)),
+        safetyNote: resource.safetyNote,
+    };
+}
+function approvalRequiredResult(preview) {
+    const operations = preview.plan.operations.map((operation) => ({
+        ...operation,
+        action: operation.action === "noop" || operation.action === "blocked_unowned" ? operation.action : "action_required",
+        status: operation.action === "noop" ? "noop" : operation.action === "blocked_unowned" ? "blocked_unowned" : "action_required",
+        dependencyCauses: [],
+        reason: operation.action === "noop" || operation.action === "blocked_unowned"
+            ? operation.reason
+            : "explicit cleanup approval is required",
+    }));
+    const summary = {
+        applied: 0,
+        noop: operations.filter((item) => item.status === "noop").length,
+        failed: 0,
+        blocked_unowned: operations.filter((item) => item.status === "blocked_unowned").length,
+        skipped_dependency: 0,
+        action_required: operations.filter((item) => item.status === "action_required").length,
+    };
+    return {
+        schemaVersion: "agentera.lifecycleApplyResult.v1",
+        status: operations.every((item) => item.status === "noop") ? "success" : "non_success",
+        operations,
+        summary,
+        requiredUnmet: operations.filter((item) => item.required && item.status !== "noop").map((item) => item.id),
+        ownershipLedger: preview.plan.request.ledger ?? emptyLifecycleOwnershipLedger(),
+    };
+}
+export function applyNativeResourceCleanup(preview, options) {
+    const resource = preview.plan.request.operations[0];
+    const definition = {
+        id: preview.resourceId,
+        host: preview.hostId,
+        hostSupportStatus: preview.hostSupportStatus,
+        kind: resource.kind,
+        destination: resource.destination,
+        ledgerStatus: preview.ledgerStatus,
+        durableProof: "",
+        neverTouch: [],
+        safetyNote: "",
+    };
+    const diagnostics = ledgerDiagnostics(preview.plan, definition);
+    const authorized = preview.ledgerAuthorization === "match_or_absent_noop" && diagnostics.length === 0;
+    const result = options.approved && authorized
+        ? applyLifecycleOperations(preview.plan, options)
+        : approvalRequiredResult(preview);
+    return {
+        ...result,
+        resourceId: preview.resourceId,
+        hostId: preview.hostId,
+        hostSupportStatus: preview.hostSupportStatus,
+        approval: options.approved ? "approved" : "required",
+        configurationUnits: preview.configurationUnits,
+    };
+}
+//# sourceMappingURL=nativeResourceCleanup.js.map

package/dist/runtime/nativeResourceCleanup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nativeResourceCleanup.js","sourceRoot":"","sources":["../../../../../home/jgabor/git/agentera/packages/cli/src/runtime/nativeResourceCleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EACL,0CAA0C,EAC1C,gCAAgC,EAChC,wBAAwB,EACxB,gCAAgC,EAChC,6BAA6B,EAC7B,uBAAuB,EACvB,gCAAgC,GAQjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,iCAAiC,EACjC,8CAA8C,GAC/C,MAAM,yBAAyB,CAAC;AA+DjC,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9F,CAAC;AAED,SAAS,cAAc,CAAC,KAA8B,EAAE,GAAW;IACjE,OAAO,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,yCAAyC,CAAC,KAAc;IACtE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,wDAAwD,CAAC,CAAC;IACzF,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,CAAC,cAAc,KAAK,mCAAmC,EAAE,CAAC;QACjE,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,8BAA8B,EAAE,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,YAAY;QAAE,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IAChG,IAAI,KAAK,CAAC,SAAS,KAAK,iCAAiC,EAAE,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,2BAA2B,iCAAiC,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,KAAK,CAAC,kBAAkB,KAAK,0CAA0C,EAAE,CAAC;QAC5E,MAAM,CAAC,IAAI,CAAC,oCAAoC,0CAA0C,EAAE,CAAC,CAAC;IAChG,CAAC;IACD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,IACE,MAAM,CAAC,uBAAuB,KAAK,eAAe;WAC/C,MAAM,CAAC,SAAS,KAAK,+BAA+B;WACpD,MAAM,CAAC,OAAO,KAAK,oBAAoB;WACvC,MAAM,CAAC,cAAc,KAAK,mBAAmB;WAC7C,MAAM,CAAC,SAAS,KAAK,yDAAyD;WAC9E,MAAM,CAAC,oBAAoB,KAAK,6CAA6C;WAC7E,MAAM,CAAC,2BAA2B,KAAK,iBAAiB,EAC3D,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,wGAAwG,CAAC,CAAC;IACxH,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAClE,KAAK,MAAM,QAAQ,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC;QAC9F,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,sBAAsB,QAAQ,wBAAwB,CAAC,CAAC;IACzG,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5D,MAAM,aAAa,GAAsC;QACvD,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,WAAW;QACnB,QAAQ,EAAE,WAAW;QACrB,OAAO,EAAE,oBAAoB;QAC7B,MAAM,EAAE,oBAAoB;KAC7B,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,GAAG,EAA6B,CAAC;IAC1D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC;YAAE,SAAS;QACvG,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,KAAK,WAAW,IAAI,IAAI,CAAC,cAAc,KAAK,oBAAoB,IAAI,IAAI,CAAC,cAAc,KAAK,oBAAoB,CAAC;YAAE,SAAS;QACrJ,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAY,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3D,CAAC;IACD,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACzD,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,MAAM;YAAE,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,MAAM,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC9C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YACrF,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAc,EAAE,IAAI,CAAC,KAAe,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,sCAAsC,IAAI,QAAQ,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;IAC7G,MAAM,YAAY,GAAG,IAAI,GAAG,EAAmC,CAAC;IAChE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC;YAAE,SAAS;QACtE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAY,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ;WAC7F,MAAM,CAAC,WAAW,KAAK,gCAAgC,IAAI,MAAM,CAAC,aAAa,KAAK,QAAQ;WAC5F,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,IAAI,CAAC,6EAA6E,CAAC,CAAC;IAC7F,CAAC;IACD,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,MAAM,mBAAmB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC9J,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ;WACrF,KAAK,CAAC,WAAW,KAAK,wCAAwC,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS;WACnG,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACxG,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC;IACxG,MAAM,YAAY,GAAG;QACnB,4CAA4C;QAC5C,kBAAkB;QAClB,yBAAyB;KAC1B,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;IACvF,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QAC/E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,WAAW,KAAK,2BAA2B;eAC3H,IAAI,CAAC,aAAa,KAAK,qDAAqD;eAC5E,IAAI,CAAC,mBAAmB,KAAK,KAAK,IAAI,IAAI,CAAC,oBAAoB,KAAK,iBAAiB,EAAE,CAAC;YAC3F,MAAM,CAAC,IAAI,CAAC,yCAAyC,GAAG,8BAA8B,CAAC,CAAC;QAC1F,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CACrB,QAAiC,EACjC,iBAAoC;IAEpC,MAAM,eAAe,GAAG,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACzD,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC;QACpC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAY,IAAI,IAAI,EAAE,CAAC;QACnE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAY,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7B,EAAE;QACF,IAAI,EAAE,QAAQ,CAAC,IAAc;QAC7B,iBAAiB;QACjB,IAAI,EAAE,QAAQ,CAAC,IAA0B;QACzC,WAAW,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAE,QAAQ,CAAC,WAAsB,CAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,KAAK,CAAE,CAAC;YACnF,CAAC,CAAC,QAAQ,CAAC,WAAqB;QAClC,YAAY,EAAE,QAAQ,CAAC,aAAqC;QAC5D,YAAY,EAAE,QAAQ,CAAC,aAAuB;QAC9C,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC;QAC5C,UAAU,EAAG,QAAQ,CAAC,WAAkC,IAAI,EAAE;KAC/D,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,8CAA8C,CAAC;IAE7F,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,yCAAyC,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAE,IAAI,CAAC,KAAmC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QAC/E,IAAI,CAAC,EAAY;QACjB,IAAI,CAAC,cAAmC;KACzC,CAAC,CAAC,CAAC;IACJ,OAAO;QACL,UAAU,EAAE,YAAY;QACxB,SAAS,EAAG,IAAI,CAAC,SAAuC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC5E,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAc,CAAE,CAAC,CACjE;QACD,aAAa,EAAG,IAAI,CAAC,uBAAqD,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACxF,EAAE,EAAE,IAAI,CAAC,EAAY;YACrB,IAAI,EAAE,IAAI,CAAC,IAAc;YACzB,GAAG,EAAE,IAAI,CAAC,GAAa;SACxB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,QAAQ,GAAG,iCAAiC,EAAE;IACrF,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,yCAAyC,CAAC,IAAI,GAAG,iBAAiB,EAAE;IAClF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,8CAA8C,CAAC,CAAC;IACrF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,8CAA8C,4CAA4C,CAAC,CAAC;IACzG,CAAC;IACD,IAAI,CAAC;QACH,OAAO,yCAAyC,CAC9C,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CACvD,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,8CAA8C,KAAK,KAAK,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,8CAA8C,+BAAgC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IACtH,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB,EAAE,IAAY;IAChD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,gDAAgD,QAAQ,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,iBAAiB,CAAC,IAA4B,EAAE,QAAyC;IAChG,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,6BAA6B,EAAE,CAAC;IACtE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,OAAO,EAAE,MAAM,KAAK,MAAM;QAAE,OAAO,EAAE,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,EAAE,wDAAwD,CAAC,CAAC;IAC1G,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC;IAC3B,IACE,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,YAAY;WACpC,MAAM,CAAC,KAAK,KAAK,OAAO;WACxB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,WAAW,CAAC;WAC1F,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;WAC7B,MAAM,CAAC,QAAQ,KAAK,IAAI;WACxB,MAAM,CAAC,WAAW,KAAK,IAAI,EAC9B,CAAC;QACD,OAAO,CAAC,GAAG,QAAQ,CAAC,EAAE,8CAA8C,QAAQ,CAAC,YAAY,kCAAkC,CAAC,CAAC;IAC/H,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,WAAW,CAClB,IAA4B,EAC5B,WAAqB,EACrB,aAAa,GAAG,KAAK;IAErB,MAAM,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,gCAAgC,EAAE,CAAC;IAC/E,OAAO;QACL,GAAG,IAAI;QACP,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACvF,GAAG,SAAS;YACZ,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,qBAA8B,EAAE,SAAS,EAAE,WAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpG,MAAM,EAAE,iBAAiB;YACzB,MAAM;SACP,CAAC;KACH,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAuC,EACvC,IAAY;IAEZ,OAAO,QAAQ,CAAC,aAAa;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;SACpC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACd,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,MAAM,EAAE,IAAI,CAAC,IAAI;QACjB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,MAAM,EAAE,iBAAiB;QACzB,MAAM,EAAE,gEAAgE;KACzE,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,IAK5C;IACC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,iCAAiC,EAAE,CAAC;IACtE,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1F,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAClG,MAAM,UAAU,GAA6B,CAAC;YAC5C,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC;YACxD,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,IAAI,6BAA6B,EAAE,CAAC;IACtE,MAAM,MAAM,GAAG,gCAAgC,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,uBAAuB,CAAC;QACnC,YAAY,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,UAAU;QACV,QAAQ,EAAE,gCAAgC,CAAC,UAAU,CAAC;QACtD,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,6BAA6B,EAAE;KAC/E,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC;QACnC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,6BAA6B,KAAK,EAAE,CAAC;QAC7D,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,OAAO;QACL,aAAa,EAAE,0CAA0C;QACzD,IAAI,EAAE,SAAS;QACf,UAAU,EAAE,QAAQ,CAAC,EAAE;QACvB,MAAM,EAAE,QAAQ,CAAC,IAAI;QACrB,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,gBAAgB,EAAE,IAAI;QACtB,oBAAoB,EAAE,gCAAgC;QACtD,mBAAmB,EAAE,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS;QAClF,iBAAiB,EAAE,WAAW;QAC9B,IAAI,EAAE,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACzF,kBAAkB,EAAE,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC;QAClE,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAqC;IACnE,MAAM,UAAU,GAAgC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC1F,GAAG,SAAS;QACZ,MAAM,EAAE,SAAS,CAAC,MAAM,KAAK,MAAM,IAAI,SAAS,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB;QACpH,MAAM,EAAE,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB;QAC7H,gBAAgB,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,CAAC,MAAM,KAAK,MAAM,IAAI,SAAS,CAAC,MAAM,KAAK,iBAAiB;YAC3E,CAAC,CAAC,SAAS,CAAC,MAAM;YAClB,CAAC,CAAC,uCAAuC;KAC5C,CAAC,CAAC,CAAC;IACJ,MAAM,OAAO,GAA0B;QACrC,OAAO,EAAE,CAAC;QACV,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM;QAChE,MAAM,EAAE,CAAC;QACT,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,MAAM;QACtF,kBAAkB,EAAE,CAAC;QACrB,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,MAAM;KACvF,CAAC;IACF,OAAO;QACL,aAAa,EAAE,kCAAkC;QACjD,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa;QACtF,UAAU;QACV,OAAO;QACP,aAAa,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1G,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,6BAA6B,EAAE;KAChF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,OAAqC,EACrC,OAAsD;IAEtD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC;IACrD,MAAM,UAAU,GAAoC;QAClD,EAAE,EAAE,OAAO,CAAC,UAAU;QACtB,IAAI,EAAE,OAAO,CAAC,MAAM;QACpB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;KACf,CAAC;IACF,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,KAAK,sBAAsB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC;IACtG,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,IAAI,UAAU;QAC3C,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;QACjD,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACpC,OAAO;QACL,GAAG,MAAM;QACT,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU;QACpD,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;KAC/C,CAAC;AACJ,CAAC"}

package/dist/setup/codex/cli.js

@@ -3,7 +3,6 @@ import path from "node:path";
 import { parseToml } from "../../core/toml.js";
 import { pathExists } from "../../core/paths.js";
 import { DEFAULT_CONFIG_PATH, InstallRootError, resolveInstallRoot } from "./installRoot.js";
-import { planAgentDescriptorChanges, writeAgentDescriptorChanges, defaultAgentsDirForConfig } from "./agents.js";
 import { planChange } from "./state.js";
 function readTextOrNull(p) {
     if (!pathExists(p))
@@ -19,10 +18,8 @@ export function codexMain(argv = [], io = {}) {
     const args = {
         installRoot: null,
         configFile: DEFAULT_CONFIG_PATH,
-        agentsDir: null,
         dryRun: false,
         force: false,
-        enableAgents: false,
     };
     const valueFlag = (a, name) => {
         if (a === name)
@@ -34,24 +31,24 @@ export function codexMain(argv = [], io = {}) {
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i];
         let v;
-        if ((v = valueFlag(a, "--install-root")) !== null) {
+        if (a === "--enable-agents" || a === "--agents-dir" || a.startsWith("--agents-dir=")) {
+            const option = a.startsWith("--agents-dir") ? "--agents-dir" : "--enable-agents";
+            err(`${option} is retired: use the shared skill at ~/.agents/skills/agentera/SKILL.md ` +
+                "and run `npx -y agentera@next prime --context <capability> --format json` for the CLI workflow.");
+            return 2;
+        }
+        else if ((v = valueFlag(a, "--install-root")) !== null) {
             args.installRoot = v === "__NEXT__" ? argv[++i] : v;
         }
         else if ((v = valueFlag(a, "--config-file")) !== null) {
             args.configFile = v === "__NEXT__" ? argv[++i] : v;
         }
-        else if ((v = valueFlag(a, "--agents-dir")) !== null) {
-            args.agentsDir = v === "__NEXT__" ? argv[++i] : v;
-        }
         else if (a === "--dry-run") {
             args.dryRun = true;
         }
         else if (a === "--force") {
             args.force = true;
         }
-        else if (a === "--enable-agents") {
-            args.enableAgents = true;
-        }
         else {
             err(`setup_codex: error: unrecognized arguments: ${a}`);
             return 2;
@@ -90,23 +87,8 @@ export function codexMain(argv = [], io = {}) {
             return 2;
         }
     }
-    // Step 4: plan the AGENTERA_HOME change and runtime-native descriptors.
+    // Step 4: plan the AGENTERA_HOME change.
     const outcome = planChange(currentText, installRoot, { force: args.force });
-    let agentsDir;
-    try {
-        agentsDir = args.agentsDir ?? defaultAgentsDirForConfig(configPath);
-    }
-    catch (errx) {
-        err(`error: ${errx.message}`);
-        return 2;
-    }
-    const descriptorChanges = planAgentDescriptorChanges(installRoot, agentsDir, { force: args.force });
-    const pendingDescriptors = descriptorChanges.filter((c) => c.action === "pending");
-    const blockedDescriptors = descriptorChanges.filter((c) => c.action === "blocked");
-    if (args.enableAgents) {
-        err("--enable-agents is deprecated in Agentera v2; no [agents.*] " +
-            "blocks will be written; runtime-native descriptor files are managed separately.");
-    }
     // Step 5: dispatch on the outcome.
     if (outcome.action === "conflict") {
         err(outcome.message);
@@ -114,13 +96,7 @@ export function codexMain(argv = [], io = {}) {
             err(outcome.diff);
         return 2;
     }
-    if (blockedDescriptors.length > 0) {
-        for (const change of blockedDescriptors) {
-            err(`error: ${change.target}: ${change.message}`);
-        }
-        return 2;
-    }
-    if (outcome.action === "noop" && pendingDescriptors.length === 0) {
+    if (outcome.action === "noop") {
         out(outcome.message);
         return 0;
     }
@@ -131,9 +107,6 @@ export function codexMain(argv = [], io = {}) {
             if (!outcome.diff.endsWith("\n"))
                 out("");
         }
-        for (const change of pendingDescriptors) {
-            out(`${change.message}: ${change.target}`);
-        }
         return 1;
     }
     try {
@@ -141,7 +114,6 @@ export function codexMain(argv = [], io = {}) {
             fs.mkdirSync(path.dirname(configPath), { recursive: true });
             fs.writeFileSync(configPath, outcome.newText, "utf8");
         }
-        writeAgentDescriptorChanges(pendingDescriptors);
     }
     catch (errx) {
         err(`error writing Codex setup targets: ${errx.message}`);
@@ -153,9 +125,6 @@ export function codexMain(argv = [], io = {}) {
     else {
         out(outcome.message);
     }
-    for (const change of pendingDescriptors) {
-        out(`wrote ${change.target}: ${change.message.replaceAll("would ", "")}`);
-    }
     return 0;
 }
 //# sourceMappingURL=cli.js.map

package/dist/setup/codex/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../../../home/jgabor/git/agentera/packages/cli/src/setup/codex/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../../../home/jgabor/git/agentera/packages/cli/src/setup/codex/cli.ts"],"names":[],"mappings":"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"}

package/dist/setup/codex/configToml.js

@@ -4,7 +4,7 @@ import os from "node:os";
 import path from "node:path";
 import { pathExists, resolvePath } from "../../core/paths.js";
 import { parseToml } from "../../core/toml.js";
-import { CODEX_HOOK_COMMAND, CODEX_HOOK_MATCHER, CODEX_HOOK_STATUS_MESSAGE, CODEX_HOOK_TIMEOUT, CODEX_PLUGIN_HOOK_COMMAND, CODEX_PLUGIN_HOOK_SOURCE, CODEX_PLUGIN_ID, DEFAULT_AGENT_LIMITS, MANAGED_KEY, SECTION_NAME, SET_SUBTABLE_NAME, } from "./constants.js";
+import { CODEX_HOOK_COMMAND, CODEX_HOOK_MATCHER, CODEX_HOOK_STATUS_MESSAGE, CODEX_HOOK_TIMEOUT, CODEX_PLUGIN_HOOK_COMMAND, CODEX_PLUGIN_HOOK_SOURCE, CODEX_PLUGIN_ID, MANAGED_KEY, SECTION_NAME, SET_SUBTABLE_NAME, } from "./constants.js";
 /** Python repr() for a scalar, used to display non-string sibling set values. */
 function pyRepr(value) {
     if (value === null || value === undefined)
@@ -155,15 +155,9 @@ export function emitSetInlineTable(pairs) {
     const rendered = entries.map(([key, value]) => `${key} = ${tomlBasicString(value)}`).join(", ");
     return entries.length > 0 ? `{ ${rendered} }` : "{ }";
 }
-export function renderAgentsConfigSection() {
-    return "[agents]\n" + Object.entries(DEFAULT_AGENT_LIMITS).map(([k, v]) => `${k} = ${v}`).join("\n") + "\n";
-}
 export function renderFreshConfig(installRoot) {
     const setValue = emitSetInlineTable({ [MANAGED_KEY]: installRoot });
-    return (`[${SECTION_NAME}]\nset = ${setValue}\n\n` +
-        `${renderAgentsConfigSection()}\n` +
-        `[features.multi_agent_v2]\n` +
-        `max_concurrent_threads_per_session = 6\n`);
+    return `[${SECTION_NAME}]\nset = ${setValue}\n`;
 }
 // ── Codex hook trust hashing ───────────────────────────────────────
 /** Compact canonical JSON: sort_keys=True, separators=(",",":"), ensure_ascii. */
@@ -445,81 +439,6 @@ function removeTableKeyLine(text, table, key) {
         return text;
     return [...linesWithEnds.slice(0, keyIdx), ...linesWithEnds.slice(keyIdx + 1)].join("");
 }
-function codexMultiAgentThreadLimit(parsed) {
-    const agents = parsed.agents;
-    if (agents && typeof agents === "object" && !Array.isArray(agents) && "max_threads" in agents) {
-        const n = Number(agents.max_threads);
-        if (Number.isInteger(n))
-            return n;
-    }
-    const features = parsed.features;
-    if (features && typeof features === "object" && !Array.isArray(features)) {
-        const multi = features.multi_agent_v2;
-        if (multi && typeof multi === "object" && "max_concurrent_threads_per_session" in multi) {
-            const n = Number(multi.max_concurrent_threads_per_session);
-            if (Number.isInteger(n))
-                return n;
-        }
-    }
-    return 6;
-}
-function ensureCodexMultiAgentV2(text, maxThreadsVal) {
-    const parsed = tomlLoadOrEmpty(text);
-    const features = parsed.features;
-    let multi = {};
-    if (features && typeof features === "object" && !Array.isArray(features)) {
-        const m = features.multi_agent_v2;
-        if (m && typeof m === "object" && !Array.isArray(m))
-            multi = m;
-    }
-    if (multi.max_concurrent_threads_per_session === maxThreadsVal)
-        return text;
-    const lines = splitKeepEnds(text).map(rstripEol);
-    const tableIdx = findTableHeaderIndex(lines, "features.multi_agent_v2");
-    const key = "max_concurrent_threads_per_session";
-    const line = `${key} = ${maxThreadsVal}`;
-    if (tableIdx === null)
-        return appendTable(text, "features.multi_agent_v2", [line]);
-    const keyIdx = findTableKeyIndex(lines, tableIdx, key);
-    if (keyIdx === null)
-        return insertTableKeyLine(text, "features.multi_agent_v2", line);
-    return replaceTableKeyLine(text, "features.multi_agent_v2", key, line);
-}
-export function ensureCodexAgentLimits(text) {
-    let parsed = tomlLoadOrEmpty(text);
-    const maxThreadsVal = codexMultiAgentThreadLimit(parsed);
-    text = removeTableKeyLine(text, "agents", "max_threads");
-    parsed = tomlLoadOrEmpty(text);
-    const agents = parsed.agents;
-    const agentsMatches = agents && typeof agents === "object" && !Array.isArray(agents) &&
-        Object.entries(DEFAULT_AGENT_LIMITS).every(([k, v]) => agents[k] === v);
-    if (!agentsMatches) {
-        const lines = splitKeepEnds(text).map(rstripEol);
-        const tableIdx = findTableHeaderIndex(lines, "agents");
-        if (tableIdx === null) {
-            if (agents && typeof agents === "object" && !Array.isArray(agents) && Object.keys(agents).length > 0) {
-                throw new Error("[agents] uses an unsupported inline or child-table-only form");
-            }
-            text = appendTable(text, "agents", Object.entries(DEFAULT_AGENT_LIMITS).map(([k, v]) => `${k} = ${v}`));
-        }
-        else {
-            for (const [key, value] of Object.entries(DEFAULT_AGENT_LIMITS)) {
-                const line = `${key} = ${value}`;
-                const curLines = splitKeepEnds(text).map(rstripEol);
-                const curTableIdx = findTableHeaderIndex(curLines, "agents");
-                if (curTableIdx === null)
-                    throw new Error("[agents] header disappeared during update");
-                if (findTableKeyIndex(curLines, curTableIdx, key) === null) {
-                    text = insertTableKeyLine(text, "agents", line);
-                }
-                else {
-                    text = replaceTableKeyLine(text, "agents", key, line);
-                }
-            }
-        }
-    }
-    return ensureCodexMultiAgentV2(text, maxThreadsVal);
-}
 function hookStateLine(key, trustedHash) {
     return `${tomlBasicString(key)} = { trusted_hash = ${tomlBasicString(trustedHash)}, enabled = true }`;
 }