simplemdg-dev-cli 2.5.0 → 2.6.0

package/README.md

@@ -13,12 +13,35 @@ smdg -V
 
 Some commands rely on external CLIs: `cf` (Cloud Foundry), `cds` (SAP CAP), and `git`. The CLI checks for these **before** running an interactive flow — so you are not asked for credentials only to fail at the end. If a tool is missing, it offers to install it via a detected package manager (`choco`/`brew` for `cf`, `winget`/`choco`/`scoop`/`brew`/`apt-get` for `git`, `npm -g` for `@sap/cds-dk`), or prints the official install link when no manager is available. After installing a tool, open a new terminal so PATH refreshes.
 
+## Smart cache (instant, stale-while-revalidate)
+
+Slow BTP/CF/GitLab lookups are cached under `~/.simplemdg/cache/` and served **cache-first**: the CLI shows the last known result immediately, then refreshes in the background and updates the cache for next time. These resources rarely change second-to-second, so this makes the CLI feel instant.
+
+- `smdg cf apps` prints cached apps right away (e.g. *"Using cached apps for br10 / single-npi-laidon / app from 4 minutes ago."*) and refreshes in the background; `--refresh` forces a live fetch.
+- `smdg gitlab groups` / `smdg gitlab projects` work the same way.
+- `smdg cf org` is a **CF target switcher**: it lists **★ favorites** first, then **◷ recent** targets, then all cached targets — searchable, switchable, and instant (cached-first, no login needed to browse). Switching auto re-logs-in from saved credentials (no repeated password prompts), targets the org/space, and records the target as recent. Choose *Refresh all regions* to rescan. `--list`, `--switch`, `--org`, `--space`, `--api`, `--refresh` still work.
+- A **failed background refresh never wipes the cache** — you keep working from the last good data with a warning.
+- Background refreshes are **deduplicated**: concurrent requests for the same key share one network call.
+- Default TTLs: CF apps 10m, CF env 5m, CF orgs/spaces 6h, CF regions 7d, GitLab groups 6h, GitLab projects 30m. Secrets are never written to plain cache files.
+
+Manage the cache with:
+
+```powershell
+smdg cache             # interactive: status / clear / refresh / open folder
+smdg cache status      # counts + "last updated" per namespace
+smdg cache clear cf    # scopes: all | cf | gitlab | db | target | <namespace>
+smdg cache refresh cf  # invalidate so the next command fetches fresh
+```
+
+DB Studio streams background-refresh events over `GET /api/events` (SSE) so its lists can update silently.
+
 ## Main commands
 
 ```powershell
 smdg i
 smdg cf login
 smdg cf apps
+smdg cache
 smdg cf bind
 smdg cf env
 smdg cf logs
@@ -70,6 +93,16 @@ Studio starts a local web server bound to `127.0.0.1` only (auto-selects a free
 - **read-only** mode blocks all writes/DDL; dangerous SQL (DROP/TRUNCATE/ALTER/DELETE-or-UPDATE-without-WHERE) asks for confirmation
 - clear loading states (skeletons, spinners, status bar) for every async action
 
+IDE-grade workflow:
+
+- **workspace tabs** that drag-to-reorder, pin, and restore on next launch (auto-saved to `~/.simplemdg/db-studio-workspace.json`) — unsaved SQL survives a refresh/restart; right-click a tab for Close / Close Others / Close to Right / Pin / Rename / Duplicate
+- **search highlight** on every list (connections, object tree, saved queries) with debounce, Enter-to-search, Esc-to-clear, and "No results found"
+- **quick-filter SQL preview** in the data grid: **Show SQL** (formatted, dialect-correct, with WHERE/ORDER BY/LIMIT/OFFSET), **Copy**, **Open in SQL Console**
+- **SQL editor**: line numbers, **Run dropdown** (Run Selected / Current Statement / All / Explain), `Ctrl+Enter` runs selected/current, `F5` runs all, server-side **Format**, `Ctrl+S` saves (updates linked file or Save As)
+- **grid editing**: `Ctrl+Z`/`Ctrl+Y` undo/redo of pending edits, `Delete` marks a row, `Enter`/`Tab` confirm-and-move, a sticky **change-summary bar** with **Show Changes** (per-cell old→new review)
+- **command palette** (`Ctrl+Shift+P`), keyboard-shortcut help, and a **Settings** panel (restore-workspace, default row limit/schema, read-only default, query timeout, auto-save delay…) stored in `~/.simplemdg/db-studio-settings.json`
+- **breadcrumbs**, **cell value viewer** (pretty-prints JSON), and **copy helpers** (name / full name / SELECT / INSERT / UPDATE templates)
+
 ### Commands
 
 ```powershell

package/USER_GUIDE.md

@@ -1,5 +1,48 @@
 # SimpleMDG CLI User Guide
 
+## Smart cache
+
+The CLI caches slow BTP/Cloud Foundry/GitLab lookups under `~/.simplemdg/cache/` and serves them **cache-first, then refreshes in the background** (stale-while-revalidate). You see the last known result instantly; fresh data replaces it quietly when the refresh finishes.
+
+What it means in practice:
+
+- `smdg cf apps`, `smdg gitlab groups`, `smdg gitlab projects` show cached results immediately with a note like *"Using cached apps … from 4 minutes ago. Refreshing in background…"*, then update the cache.
+- Add `--refresh` to any of those to force a live fetch and skip the cache.
+- If a refresh fails (e.g. expired CF session, no network), the **old cache is kept** and you get a warning — you can keep working.
+- Concurrent requests for the same data share a single network call (deduplication).
+
+Manage the cache:
+
+```powershell
+smdg cache             # interactive menu
+smdg cache status      # what is cached and how old it is
+smdg cache clear cf    # clear a scope: all | cf | gitlab | db | target
+smdg cache refresh cf  # invalidate so the next command refetches
+```
+
+Default freshness windows (configurable later): CF apps 10 min, CF env 5 min, CF orgs/spaces 6 h, CF regions 7 days, GitLab groups 6 h, GitLab projects 30 min. **Secrets are never stored in plain cache files** — passwords/tokens/DB credentials stay in the existing encrypted stores.
+
+### CF target switcher (`smdg cf org`)
+
+When you work across many regions/orgs, `smdg cf org` is a fast target switcher:
+
+```txt
+CF Target Switcher
+Favorites
+  ★ eu20 / arthrex-qas-simplemdg / app
+Recent
+  ◷ br10 / single-npi-laidon / app
+  ◷ us21 / par-pacific-qas-simplemdg / app
+All Targets (243)
+  ...
+```
+
+- Browsing is **instant** — it reads cached targets and doesn't need a CF login.
+- Type to search; favorites (★) appear first, recent (◷) second, then all cached targets.
+- Switching sets the API endpoint, **auto re-logs-in from your saved credentials** (no repeated password prompts), targets the org and space, and saves the target to *recent*. You're offered to mark it a **favorite**.
+- *Refresh all regions* rescans live; *Manage favorites* removes saved favorites.
+- Favorites/recent are stored under `~/.simplemdg/cache/` and show up in `smdg cache status`; clear them with `smdg cache clear target`.
+
 ## GitLab
 
 Login once:
@@ -53,6 +96,20 @@ The Studio opens on a **Welcome page**. The left side has three collapsible sect
 
 The bottom status bar shows connection state, last query duration, row count, and pending-change count.
 
+### Productivity features
+
+- **Workspace restore** — your open tabs (including unsaved "New Query" content) are auto-saved and restored next time you open the Studio. Toggle this in **Settings**.
+- **Tabs** — drag to reorder, right-click for Close / Close Others / Close to Right / Pin / Rename / Duplicate. `Ctrl+Tab` / `Ctrl+Shift+Tab` switch tabs, `Ctrl+W` closes the active tab.
+- **Command palette** — press `Ctrl+Shift+P` to run any action (new SQL, run, save, import, toggle read-only, settings, …).
+- **SQL editor** — `Ctrl+Enter` runs the selection or the statement at the cursor, `F5` runs the whole tab, the Run ▾ menu offers Run Selected / Current / All / Explain, and **Format** pretty-prints. `Ctrl+S` saves to a `.sql` file (or Save As).
+- **Quick-filter SQL** — in a Data tab, type a `WHERE` and click **Show SQL** to see/copy the exact generated query or open it in a SQL console.
+- **Grid editing** — `Ctrl+Z`/`Ctrl+Y` undo/redo pending edits, `Delete` marks the selected row, `Enter`/`Tab` confirm a cell and move. A change-summary bar shows counts and **Show Changes** lists every old→new value before you save.
+- **Search** — every list highlights matches; press Enter to search, Esc to clear.
+- **Cell viewer** — double-click a result cell to open a viewer that pretty-prints JSON.
+- Press `Ctrl+Shift+P` → **Show Keyboard Shortcuts** for the full list.
+
+Settings, the workspace, saved queries, and history live under `~/.simplemdg/` (`db-studio-settings.json`, `db-studio-workspace.json`, `db-queries/`, `db-query-history.json`).
+
 ### Read-only and dangerous SQL
 
 Toggle **Read-only** in the top bar to block INSERT/UPDATE/DELETE/DROP/TRUNCATE/ALTER/CREATE/GRANT/REVOKE. Even in read/write mode, dangerous statements (DROP, TRUNCATE, ALTER, DELETE/UPDATE without WHERE) require confirmation. A "Production-like" badge appears for prod-looking orgs/apps.

package/dist/commands/cache.command.d.ts

@@ -0,0 +1,2 @@
+import { Command } from "commander";
+export declare function registerCacheCommands(program: Command): void;

package/dist/commands/cache.command.js

@@ -0,0 +1,129 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerCacheCommands = registerCacheCommands;
+const execa_1 = require("execa");
+const chalk_1 = __importDefault(require("chalk"));
+const prompts_1 = require("../core/prompts");
+const smart_cache_1 = require("../core/cache/smart-cache");
+function resolveScopeNamespaces(scope) {
+    if (!scope) {
+        return smart_cache_1.CACHE_SCOPES.all;
+    }
+    const normalized = scope.trim().toLowerCase();
+    if (smart_cache_1.CACHE_SCOPES[normalized]) {
+        return smart_cache_1.CACHE_SCOPES[normalized];
+    }
+    if (smart_cache_1.CACHE_NAMESPACES[normalized]) {
+        return [normalized];
+    }
+    throw new Error(`Unknown cache scope: ${scope}. Use one of: ${Object.keys(smart_cache_1.CACHE_SCOPES).join(", ")} or a namespace.`);
+}
+async function printCacheStatus() {
+    console.log(chalk_1.default.bold("SimpleMDG Cache"));
+    console.log("");
+    const namespaces = Object.keys(smart_cache_1.CACHE_NAMESPACES);
+    const stats = await Promise.all(namespaces.map((namespace) => (0, smart_cache_1.statNamespace)(namespace)));
+    const labelWidth = Math.max(...namespaces.map((namespace) => smart_cache_1.CACHE_NAMESPACES[namespace].length));
+    let total = 0;
+    for (const stat of stats) {
+        const label = smart_cache_1.CACHE_NAMESPACES[stat.namespace].padEnd(labelWidth);
+        total += stat.count;
+        if (!stat.exists || stat.count === 0) {
+            console.log(`${label}  ${chalk_1.default.gray("empty")}`);
+            continue;
+        }
+        const countText = `${stat.count} item${stat.count === 1 ? "" : "s"}`.padEnd(13);
+        console.log(`${label}  ${chalk_1.default.cyan(countText)} ${chalk_1.default.gray(`last updated ${(0, smart_cache_1.formatRelativeTime)(stat.lastUpdatedAt)}`)}`);
+    }
+    console.log("");
+    console.log(chalk_1.default.gray(`${total} cached item(s) total · ${(0, smart_cache_1.getCacheDirectory)()}`));
+}
+async function runClear(scope) {
+    const namespaces = resolveScopeNamespaces(scope);
+    for (const namespace of namespaces) {
+        await (0, smart_cache_1.clearNamespace)(namespace);
+    }
+    console.log(chalk_1.default.green(`Cleared cache: ${scope ?? "all"} (${namespaces.length} namespace(s)).`));
+}
+async function runRefresh(scope) {
+    // "Refresh" invalidates the cache so the next command fetches live data and
+    // repopulates under stale-while-revalidate. This avoids needing a live CF/
+    // GitLab session inside the cache command itself.
+    const namespaces = resolveScopeNamespaces(scope);
+    for (const namespace of namespaces) {
+        await (0, smart_cache_1.clearNamespace)(namespace);
+    }
+    console.log(chalk_1.default.green(`Marked for refresh: ${scope ?? "all"}. The next ${scope ?? ""} command will fetch fresh data.`));
+}
+async function openCacheFolder() {
+    const directory = (0, smart_cache_1.getCacheDirectory)();
+    const command = process.platform === "win32" ? "cmd" : process.platform === "darwin" ? "open" : "xdg-open";
+    const args = process.platform === "win32" ? ["/c", "start", "", directory] : [directory];
+    await (0, execa_1.execa)(command, args, { reject: false, detached: true, stdio: "ignore" }).catch(() => undefined);
+    console.log(chalk_1.default.gray(directory));
+}
+async function runInteractive() {
+    for (;;) {
+        const action = await (0, prompts_1.searchableSelectChoice)({
+            message: "SimpleMDG cache",
+            choices: [
+                { title: "View cache status", value: "status" },
+                { title: "Clear a cache scope", value: "clear" },
+                { title: "Refresh a cache scope", value: "refresh" },
+                { title: "Open cache folder", value: "open" },
+                { title: "Exit", value: "exit" },
+            ],
+            allowCustomValue: false,
+        });
+        if (action === "exit") {
+            return;
+        }
+        if (action === "status") {
+            await printCacheStatus();
+            console.log("");
+            continue;
+        }
+        if (action === "open") {
+            await openCacheFolder();
+            console.log("");
+            continue;
+        }
+        const scope = await (0, prompts_1.searchableSelectChoice)({
+            message: `Select scope to ${action}`,
+            choices: [
+                { title: "All caches", value: "all" },
+                { title: "Cloud Foundry (cf)", value: "cf" },
+                { title: "GitLab", value: "gitlab" },
+                { title: "Database", value: "db" },
+                { title: "CF targets/favorites/recent", value: "target" },
+            ],
+            allowCustomValue: false,
+        });
+        if (action === "clear") {
+            await runClear(scope);
+        }
+        else {
+            await runRefresh(scope);
+        }
+        console.log("");
+    }
+}
+function registerCacheCommands(program) {
+    const cache = program
+        .command("cache")
+        .description("Inspect and manage the SimpleMDG smart cache (cf/gitlab/db)")
+        .action(runInteractive);
+    cache.command("status").description("Show cache status for all namespaces").action(printCacheStatus);
+    cache
+        .command("clear [scope]")
+        .description("Clear cache. Scope: all | cf | gitlab | db | target | <namespace>")
+        .action((scope) => runClear(scope));
+    cache
+        .command("refresh [scope]")
+        .description("Invalidate cache so the next command fetches fresh. Scope: all | cf | gitlab | db | target")
+        .action((scope) => runRefresh(scope));
+}
+//# sourceMappingURL=cache.command.js.map

package/dist/commands/cache.command.js.map

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

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();