simplemdg-dev-cli 2.5.0 → 2.7.0

package/dist/commands/cf.command.js

@@ -20,6 +20,9 @@ const process_1 = require("../core/process");
 const repository_1 = require("../core/repository");
 const prompts_2 = require("../core/prompts");
 const tooling_1 = require("../core/tooling");
+const smart_cache_1 = require("../core/cache/smart-cache");
+const cf_target_cache_1 = require("../core/cf/cf-target-cache");
+const cf_target_types_1 = require("../core/cf/cf-target.types");
 function validateRequired(value) {
     return value.trim() ? true : "Value is required";
 }
@@ -907,152 +910,212 @@ async function getCloudFoundryOrganizationsAcrossRegions(options) {
     }
     return fallbackEntries;
 }
+function orgEntryToTarget(entry) {
+    return { region: entry.region, apiEndpoint: entry.apiEndpoint, org: entry.org, space: "", lastRefreshedAt: entry.updatedAt };
+}
+function dedupeTargets(targets) {
+    const seen = new Set();
+    const result = [];
+    for (const target of targets) {
+        const key = (0, cf_target_types_1.cfTargetKey)(target);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        result.push(target);
+    }
+    return result;
+}
+async function switchToCfTarget(target, options) {
+    const apiEndpoint = target.apiEndpoint;
+    if (!apiEndpoint) {
+        throw new Error("Cannot determine CF API endpoint for the selected target.");
+    }
+    const region = target.region || (0, cf_1.inferCloudFoundryRegionFromApiEndpoint)(apiEndpoint);
+    const authenticatedProfile = await ensureCloudFoundryAuthenticatedForApiEndpoint({
+        apiEndpoint,
+        preferredOrg: target.org,
+        preferredSpace: options.space ?? target.space,
+        reason: "switch-target",
+    });
+    const orgExitCode = await (0, cf_1.targetCloudFoundryOrg)(target.org);
+    if (orgExitCode !== 0) {
+        console.log(chalk_1.default.yellow("Cannot switch to this org after automatic authentication."));
+        console.log(chalk_1.default.gray("Run smdg cf login, save the password, then try again."));
+        process.exitCode = orgExitCode;
+        return;
+    }
+    let space = options.space?.trim() || target.space?.trim() || "";
+    if (!space) {
+        const spaces = await (0, cf_1.listCloudFoundrySpaces)().catch(() => []);
+        const currentAfter = await (0, cf_1.readCloudFoundryTarget)();
+        const preferred = currentAfter.space || (spaces.includes("app") ? "app" : spaces[0]);
+        space = spaces.length
+            ? await (0, prompts_2.searchableSelectChoice)({
+                message: "Select CF space",
+                choices: [
+                    ...spaces.filter((s) => s === preferred).map((s) => ({ title: `${s} ${chalk_1.default.gray("suggested")}`, value: s })),
+                    ...spaces.filter((s) => s !== preferred).map((s) => ({ title: s, value: s })),
+                ],
+                validateCustomValue: validateRequired,
+                customValueTitle: (value) => `Use typed CF space: ${value}`,
+            })
+            : await (0, prompts_2.selectFromHistoryOrInput)({ message: "Enter CF space", values: [], initialValue: "app" });
+    }
+    if (space) {
+        const spaceExitCode = await (0, cf_1.targetCloudFoundrySpace)(space);
+        if (spaceExitCode !== 0) {
+            process.exitCode = spaceExitCode;
+            return;
+        }
+    }
+    await (0, cf_target_cache_1.addRecentTarget)({ region, apiEndpoint, org: target.org, space });
+    if (authenticatedProfile?.password) {
+        await (0, cache_1.rememberCloudFoundryLoginProfile)({ ...authenticatedProfile, apiEndpoint, org: target.org, space, updatedAt: new Date().toISOString() });
+    }
+    console.log(chalk_1.default.green("CF target switched."));
+    printTarget(await (0, cf_1.readCloudFoundryTarget)());
+    if (!(await (0, cf_target_cache_1.isFavoriteTarget)({ region, apiEndpoint, org: target.org, space }))) {
+        const favorite = await (0, prompts_1.default)({ type: "confirm", name: "fav", message: "Mark this target as favorite?", initial: false });
+        if (favorite.fav) {
+            await (0, cf_target_cache_1.addFavoriteTarget)({ region, apiEndpoint, org: target.org, space });
+            console.log(chalk_1.default.gray("Added to favorites."));
+        }
+    }
+}
+async function manageFavoriteTargets(favorites) {
+    if (!favorites.length) {
+        console.log(chalk_1.default.gray("No favorites yet. Switch to a target and choose to favorite it."));
+        return;
+    }
+    const selected = await (0, prompts_2.searchableSelectChoice)({
+        message: "Favorites — select one to remove",
+        choices: [
+            ...favorites.map((target, index) => ({ title: `★ ${(0, cf_target_types_1.cfTargetLabel)(target)}`, value: String(index) })),
+            { title: "Cancel", value: "__cancel__" },
+        ],
+        allowCustomValue: false,
+    });
+    if (selected === "__cancel__") {
+        return;
+    }
+    await (0, cf_target_cache_1.removeFavoriteTarget)(favorites[Number(selected)]);
+    console.log(chalk_1.default.green("Removed from favorites."));
+}
+function printTargetSections(favorites, recent, orgEntries, current) {
+    console.log(chalk_1.default.bold("CF Target Switcher"));
+    console.log("");
+    if (favorites.length) {
+        console.log(chalk_1.default.yellow("Favorites"));
+        favorites.forEach((target) => console.log(`  ${chalk_1.default.yellow("★")} ${(0, cf_target_types_1.cfTargetLabel)(target)}`));
+        console.log("");
+    }
+    if (recent.length) {
+        console.log(chalk_1.default.cyan("Recent"));
+        recent.forEach((target) => console.log(`  ${chalk_1.default.gray("◷")} ${(0, cf_target_types_1.cfTargetLabel)(target)}`));
+        console.log("");
+    }
+    console.log(chalk_1.default.gray(`All Targets (${orgEntries.length})`));
+    for (const entry of orgEntries) {
+        const marker = entry.apiEndpoint === current.apiEndpoint && entry.org === current.org ? chalk_1.default.green("*") : " ";
+        console.log(`${marker} ${entry.region} / ${entry.org}`);
+    }
+}
 async function runOrgCommand(options) {
-    const target = await ensureCloudFoundrySessionFromCache();
+    const latestTarget = await (0, cf_1.readCloudFoundryTarget)();
+    const favorites = await (0, cf_target_cache_1.listFavoriteTargets)();
+    const recent = await (0, cf_target_cache_1.listRecentTargets)();
+    // Direct switch via flags.
+    if (options.org?.trim()) {
+        await (0, tooling_1.ensureExternalTool)("cf");
+        const apiEndpoint = options.api?.trim() || latestTarget.apiEndpoint || "";
+        const region = (0, cf_1.inferCloudFoundryRegionFromApiEndpoint)(apiEndpoint || "current");
+        await switchToCfTarget({ region, apiEndpoint, org: options.org.trim(), space: options.space?.trim() || "" }, { space: options.space });
+        return;
+    }
     const action = options.list
         ? "list"
         : options.switch
             ? "switch"
             : await (0, prompts_2.searchableSelectChoice)({
-                message: "What do you want to do with CF org?",
+                message: "CF target switcher",
                 choices: [
-                    { title: "List orgs across regions", value: "list" },
-                    { title: "Switch org across regions", value: "switch" },
+                    { title: "Switch to a target (favorites, recent, all)", value: "switch" },
+                    { title: "Refresh all regions", value: "refresh" },
+                    { title: "List targets", value: "list" },
+                    { title: "Manage favorites", value: "favorites" },
+                    { title: "Show current target", value: "current" },
                 ],
-                validateCustomValue: (value) => {
-                    const normalizedValue = value.trim().toLowerCase();
-                    return normalizedValue === "list" || normalizedValue === "switch"
-                        ? true
-                        : "Type list or switch, or select one option.";
-                },
+                allowCustomValue: false,
             });
-    const organizationEntries = await getCloudFoundryOrganizationsAcrossRegions({
-        api: options.api,
-        refresh: options.refresh,
-    });
-    const organizationRegionCount = new Set(organizationEntries.map((entry) => entry.region)).size;
-    const latestTarget = await (0, cf_1.readCloudFoundryTarget)();
-    if (action === "list") {
+    if (action === "current") {
         printTarget(latestTarget);
-        console.log("");
-        if (!organizationEntries.length) {
-            console.log(chalk_1.default.yellow("No orgs found for current CF user. Run smdg cf login, save the password, then run smdg cf org again."));
-            return;
-        }
-        console.log(chalk_1.default.gray(`Showing ${organizationEntries.length} org(s) across ${organizationRegionCount} region(s).`));
-        console.log("");
-        for (const entry of organizationEntries) {
-            const marker = entry.apiEndpoint === latestTarget.apiEndpoint && entry.org === latestTarget.org ? chalk_1.default.green("*") : " ";
-            console.log(`${marker} ${formatCloudFoundryOrgEntry(entry, latestTarget)}`);
-        }
         return;
     }
-    let selectedEntry;
-    if (options.org?.trim()) {
-        selectedEntry = organizationEntries.find((entry) => {
-            return entry.org === options.org?.trim() && (!options.api?.trim() || entry.apiEndpoint === options.api.trim());
-        }) ?? {
-            apiEndpoint: options.api?.trim() || latestTarget.apiEndpoint || "",
-            region: options.api?.trim()
-                ? (0, cf_1.inferCloudFoundryRegionFromApiEndpoint)(options.api.trim())
-                : (0, cf_1.inferCloudFoundryRegionFromApiEndpoint)(latestTarget.apiEndpoint ?? "current"),
-            org: options.org.trim(),
-            updatedAt: new Date().toISOString(),
-        };
+    if (action === "favorites") {
+        await manageFavoriteTargets(favorites);
+        return;
+    }
+    let orgEntries;
+    if (action === "refresh" || options.refresh) {
+        await (0, tooling_1.ensureExternalTool)("cf");
+        console.log(chalk_1.default.gray("Refreshing CF orgs across regions..."));
+        orgEntries = await getCloudFoundryOrganizationsAcrossRegions({ api: options.api, refresh: true });
+        console.log(chalk_1.default.green(`Refresh completed · ${orgEntries.length} target(s) found.`));
+        console.log("");
     }
     else {
-        if (!organizationEntries.length) {
-            console.log(chalk_1.default.yellow("No orgs were found across regions."));
-            console.log(chalk_1.default.gray("Run smdg cf login and save the password, then run smdg cf org --list --refresh."));
-            return;
-        }
-        const selectedIndex = await (0, prompts_2.searchableSelectChoice)({
-            message: `Search CF org across ${organizationRegionCount} region(s)`,
-            choices: organizationEntries.map((entry, index) => ({
-                title: formatCloudFoundryOrgEntry(entry, latestTarget),
-                value: String(index),
-            })),
-            validateCustomValue: validateRequired,
-            customValueTitle: (value) => `Use typed CF org in current region: ${value}`,
-        });
-        selectedEntry = organizationEntries[Number(selectedIndex)] ?? {
-            apiEndpoint: latestTarget.apiEndpoint ?? "",
-            region: (0, cf_1.inferCloudFoundryRegionFromApiEndpoint)(latestTarget.apiEndpoint ?? "current"),
-            org: selectedIndex,
-            updatedAt: new Date().toISOString(),
-        };
+        const cache = await (0, cache_1.readCache)();
+        orgEntries = cache.cloudFoundry.orgsAcrossRegions ?? [];
     }
-    if (!selectedEntry.apiEndpoint) {
-        throw new Error("Cannot determine CF API endpoint for selected org.");
+    if (action === "list") {
+        printTargetSections(favorites, recent, orgEntries, latestTarget);
+        return;
     }
-    const authenticatedProfile = await ensureCloudFoundryAuthenticatedForApiEndpoint({
-        apiEndpoint: selectedEntry.apiEndpoint,
-        preferredOrg: selectedEntry.org,
-        preferredSpace: options.space,
-        reason: "switch-org",
-    });
-    const orgExitCode = await (0, cf_1.targetCloudFoundryOrg)(selectedEntry.org);
-    if (orgExitCode !== 0) {
-        console.log(chalk_1.default.yellow("Cannot switch to this org after automatic authentication."));
-        console.log(chalk_1.default.gray("Run smdg cf login, save the password, then try again."));
-        process.exitCode = orgExitCode;
+    const allTargets = orgEntries.map(orgEntryToTarget);
+    const recentKeys = new Set(recent.map((target) => (0, cf_target_types_1.cfTargetKey)(target)));
+    const combined = dedupeTargets([...favorites, ...recent, ...allTargets]);
+    if (!combined.length) {
+        console.log(chalk_1.default.yellow("No cached targets yet."));
+        console.log(chalk_1.default.gray("Choose 'Refresh all regions', or run smdg cf login and save the password."));
         return;
     }
-    const spaces = selectedEntry.spaces?.length ? selectedEntry.spaces : await (0, cf_1.listCloudFoundrySpaces)();
-    const currentTargetAfterOrgSwitch = await (0, cf_1.readCloudFoundryTarget)();
-    const preferredSpace = options.space?.trim() || currentTargetAfterOrgSwitch.space || (spaces.includes("app") ? "app" : spaces[0]);
-    const space = options.space?.trim() || await (0, prompts_2.searchableSelectChoice)({
-        message: "Select CF space",
-        choices: [
-            ...spaces
-                .filter((spaceName) => spaceName === preferredSpace)
-                .map((spaceName) => ({ title: `${spaceName} ${spaceName === currentTargetAfterOrgSwitch.space ? chalk_1.default.gray("current") : chalk_1.default.gray("suggested")}`, value: spaceName })),
-            ...spaces
-                .filter((spaceName) => spaceName !== preferredSpace)
-                .map((spaceName) => ({ title: spaceName, value: spaceName })),
-        ],
+    const selectedIndex = await (0, prompts_2.searchableSelectChoice)({
+        message: `Select CF target (${favorites.length} favorite · ${recent.length} recent · ${allTargets.length} all)`,
+        choices: combined.map((target, index) => {
+            const marker = target.isFavorite ? chalk_1.default.yellow("★ ") : recentKeys.has((0, cf_target_types_1.cfTargetKey)(target)) ? chalk_1.default.gray("◷ ") : "  ";
+            return { title: `${marker}${(0, cf_target_types_1.cfTargetLabel)(target)}`, value: String(index) };
+        }),
         validateCustomValue: validateRequired,
-        customValueTitle: (value) => `Use typed CF space: ${value}`,
+        customValueTitle: (value) => `Use typed org in current region: ${value}`,
     });
-    if (space) {
-        const spaceExitCode = await (0, cf_1.targetCloudFoundrySpace)(space);
-        if (spaceExitCode !== 0) {
-            process.exitCode = spaceExitCode;
-            return;
-        }
-    }
-    if (authenticatedProfile?.password) {
-        await (0, cache_1.rememberCloudFoundryLoginProfile)({
-            ...authenticatedProfile,
-            apiEndpoint: selectedEntry.apiEndpoint,
-            org: selectedEntry.org,
-            space,
-            updatedAt: new Date().toISOString(),
-        });
-    }
-    const switchedTarget = await (0, cf_1.readCloudFoundryTarget)();
-    console.log(chalk_1.default.green("CF org/space switched."));
-    printTarget(switchedTarget);
+    const chosen = combined[Number(selectedIndex)] ?? {
+        region: (0, cf_1.inferCloudFoundryRegionFromApiEndpoint)(latestTarget.apiEndpoint ?? "current"),
+        apiEndpoint: latestTarget.apiEndpoint ?? "",
+        org: selectedIndex,
+        space: "",
+    };
+    await (0, tooling_1.ensureExternalTool)("cf");
+    await switchToCfTarget(chosen, { space: options.space });
 }
 async function runAppsCommand(options) {
-    const target = await (0, cf_1.readCloudFoundryTarget)();
-    const targetKey = (0, cf_1.buildCloudFoundryTargetKey)(target);
-    const cache = await (0, cache_1.readCache)();
-    const cachedEntry = cache.cloudFoundry.appListsByTarget[targetKey];
+    const target = await ensureCloudFoundrySessionFromCache();
     printTarget(target);
     console.log("");
-    const shouldUseCache = !options.refresh && Boolean(cachedEntry?.apps.length);
-    const apps = await getAppsWithCache({
-        refresh: options.refresh,
-        startBackgroundRefresh: shouldUseCache,
+    const region = target.apiEndpoint ? (0, cf_1.inferCloudFoundryRegionFromApiEndpoint)(target.apiEndpoint) : "current";
+    const cacheKey = (0, smart_cache_1.buildCfAppsKey)(region, target.org ?? "?", target.space ?? "?");
+    const targetLabel = `${region} / ${target.org ?? "?"} / ${target.space ?? "?"}`;
+    const result = await (0, smart_cache_1.smartRead)({
+        namespace: "cf-apps",
+        key: cacheKey,
+        ttlMs: smart_cache_1.DEFAULT_CACHE_TTL.cfApps,
+        mode: options.refresh ? "network-only" : "stale-while-revalidate",
+        fetcher: cf_1.listCloudFoundryApps,
     });
-    if (shouldUseCache && cachedEntry) {
-        console.log(chalk_1.default.gray(`Using cached cf apps: ${cachedEntry.apps.length} apps, updated at ${cachedEntry.updatedAt}`));
-        console.log(chalk_1.default.gray("Refreshing cf apps cache in background. Use --refresh when you want to wait for fresh data."));
-        console.log("");
-    }
-    else if (options.refresh) {
-        console.log(chalk_1.default.green(`Refreshed cf apps cache for ${targetKey}.`));
+    if (result.fromCache) {
+        console.log(chalk_1.default.gray(`Using cached apps for ${targetLabel} from ${(0, smart_cache_1.formatRelativeTime)(result.updatedAt)}.`));
+        if (result.isRefreshing) {
+            console.log(chalk_1.default.gray("Refreshing apps in background..."));
+        }
         console.log("");
     }
     if (options.select) {
@@ -1060,9 +1123,25 @@ async function runAppsCommand(options) {
         console.log(appName);
         return;
     }
-    for (const app of apps) {
+    for (const app of result.data) {
         console.log([app.name, app.requestedState, app.processes, app.routes].filter(Boolean).join(" | "));
     }
+    // Mirror the smart-cache apps into the legacy per-target cache used by
+    // resolveAppSelection so bind/debug/logs stay in sync.
+    await (0, cache_1.rememberCloudFoundryApps)((0, cf_1.buildCloudFoundryTargetKey)(target), result.data).catch(() => undefined);
+    if (result.refreshPromise) {
+        try {
+            const fresh = await result.refreshPromise;
+            await (0, cache_1.rememberCloudFoundryApps)((0, cf_1.buildCloudFoundryTargetKey)(target), fresh).catch(() => undefined);
+            console.log("");
+            console.log(chalk_1.default.gray("Background refresh completed. Cache updated."));
+        }
+        catch (error) {
+            console.log("");
+            console.log(chalk_1.default.yellow(`Background refresh failed: ${error instanceof Error ? error.message : String(error)}`));
+            console.log(chalk_1.default.gray("Showing cached apps. Run smdg cf login if your session expired."));
+        }
+    }
 }
 async function runAppsCacheRefreshCommand() {
     await refreshAppsCacheForCurrentTarget();