brew-tui 0.2.0 → 0.3.1

package/build/index.js

@@ -1,25 +1,25 @@
 import {
+  DATA_DIR,
+  LICENSE_PATH,
+  PROFILES_DIR,
   appendEntry,
   clearHistory,
   detectAction,
+  ensureDataDirs,
   loadHistory
-} from "./chunk-UBHTQL7T.js";
+} from "./chunk-65YZJX2E.js";
 import {
-  PROFILES_DIR,
-  activate,
-  deactivate,
-  ensureDataDirs,
   fetchWithTimeout,
-  loadLicense,
-  requirePro,
+  getLocale,
+  logger,
   t,
   tp,
-  useLicenseStore,
   useLocaleStore
-} from "./chunk-KXDTKY3E.js";
+} from "./chunk-PTLSNG2N.js";
 
 // src/index.tsx
 import { createInterface } from "readline/promises";
+import { rm as rm3 } from "fs/promises";
 import { render } from "ink";
 
 // src/app.tsx
@@ -51,15 +51,14 @@ var VIEWS = [
 ];
 var useNavigationStore = create((set, get) => ({
   currentView: "dashboard",
-  previousView: null,
   selectedPackage: null,
+  selectedPackageType: null,
   viewHistory: [],
   navigate: (view) => {
     const { currentView, viewHistory } = get();
     if (view === currentView) return;
     set({
       currentView: view,
-      previousView: currentView,
       viewHistory: [...viewHistory.slice(-19), currentView]
     });
   },
@@ -69,11 +68,10 @@ var useNavigationStore = create((set, get) => ({
     const prev = viewHistory[viewHistory.length - 1];
     set({
       currentView: prev,
-      previousView: get().currentView,
       viewHistory: viewHistory.slice(0, -1)
     });
   },
-  selectPackage: (name) => set({ selectedPackage: name })
+  selectPackage: (name, type = null) => set({ selectedPackage: name, selectedPackageType: type })
 }));
 function getNextView(current) {
   const idx = VIEWS.indexOf(current);
@@ -95,6 +93,24 @@ function isProView(viewId) {
   return PRO_VIEWS.has(viewId);
 }
 
+// src/utils/colors.ts
+var COLORS = {
+  success: "#22C55E",
+  error: "#EF4444",
+  warning: "#F59E0B",
+  info: "#06B6D4",
+  brand: "#FF6B2B",
+  muted: "#9CA3AF",
+  text: "#F9FAFB",
+  textSecondary: "#6B7280",
+  teal: "#2DD4BF",
+  sky: "#38BDF8",
+  gold: "#FFD700",
+  purple: "#A855F7",
+  blue: "#3B82F6",
+  border: "#4B5563"
+};
+
 // src/utils/gradient.tsx
 import React, { useMemo } from "react";
 import { Text } from "ink";
@@ -194,6 +210,7 @@ var TAB_VIEWS = [
   "installed",
   "search",
   "outdated",
+  "package-info",
   "services",
   "doctor",
   "profiles",
@@ -210,13 +227,13 @@ function Header() {
       /* @__PURE__ */ jsx2(GradientText, { colors: GRADIENTS.gold, children: brew }),
       /* @__PURE__ */ jsx2(GradientText, { colors: ["#B8860B", "#8B6914", "#6B4F10"], children: LOGO_TUI[i] })
     ] }, i)) }),
-    /* @__PURE__ */ jsx2(Box, { borderStyle: "single", borderBottom: true, borderLeft: false, borderRight: false, borderTop: false, borderColor: "#FFD700", paddingX: 1, flexWrap: "wrap", children: TAB_VIEWS.map((view, i) => {
+    /* @__PURE__ */ jsx2(Box, { borderStyle: "single", borderBottom: true, borderLeft: false, borderRight: false, borderTop: false, borderColor: COLORS.gold, paddingX: 1, flexWrap: "wrap", children: TAB_VIEWS.map((view, i) => {
       const key = VIEW_KEYS[view];
       const viewLabel = t(VIEW_LABEL_KEYS[view]);
       const label = key ? `${key}:${viewLabel}` : viewLabel;
       const isPro = isProView(view);
       return /* @__PURE__ */ jsxs(React2.Fragment, { children: [
-        i > 0 && /* @__PURE__ */ jsxs(Text2, { color: "#4B5563", children: [
+        i > 0 && /* @__PURE__ */ jsxs(Text2, { color: COLORS.border, children: [
           " ",
           "\u2502",
           " "
@@ -225,12 +242,12 @@ function Header() {
           Text2,
           {
             bold: view === currentView,
-            color: view === currentView ? "#22C55E" : "#6B7280",
+            color: view === currentView ? COLORS.success : COLORS.textSecondary,
             underline: view === currentView,
             children: view === currentView ? `\u25CF ${label}` : label
           }
         ),
-        isPro && /* @__PURE__ */ jsxs(Text2, { color: "#FF6B2B", bold: true, children: [
+        isPro && /* @__PURE__ */ jsxs(Text2, { color: COLORS.brand, bold: true, children: [
           " ",
           t("pro_badge")
         ] })
@@ -258,22 +275,22 @@ var VIEW_HINT_DEFS = {
   account: [["d", "hint_deactivate"], ["q", "hint_quit"]]
 };
 function HintItem({ def }) {
-  if (def.length === 1) return /* @__PURE__ */ jsx3(Text3, { color: "#FFD700", dimColor: true, children: t(def[0]) });
+  if (def.length === 1) return /* @__PURE__ */ jsx3(Text3, { color: COLORS.gold, dimColor: true, children: t(def[0]) });
   return /* @__PURE__ */ jsxs2(Fragment2, { children: [
-    /* @__PURE__ */ jsx3(Text3, { color: "#F9FAFB", bold: true, children: def[0] }),
-    /* @__PURE__ */ jsx3(Text3, { color: "#6B7280", children: ":" }),
-    /* @__PURE__ */ jsx3(Text3, { color: "#FFD700", dimColor: true, children: t(def[1]) })
+    /* @__PURE__ */ jsx3(Text3, { color: COLORS.text, bold: true, children: def[0] }),
+    /* @__PURE__ */ jsx3(Text3, { color: COLORS.textSecondary, children: ":" }),
+    /* @__PURE__ */ jsx3(Text3, { color: COLORS.gold, dimColor: true, children: t(def[1]) })
   ] });
 }
 function Footer() {
   const currentView = useNavigationStore((s) => s.currentView);
   const locale = useLocaleStore((s) => s.locale);
   const defs = VIEW_HINT_DEFS[currentView] ?? [];
-  return /* @__PURE__ */ jsxs2(Box2, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: "#FFD700", paddingX: 1, flexWrap: "wrap", children: [
+  return /* @__PURE__ */ jsxs2(Box2, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: COLORS.gold, paddingX: 1, flexWrap: "wrap", children: [
     defs.map((def, i) => {
       const key = def.length === 1 ? def[0] : `${def[0]}:${def[1]}`;
       return /* @__PURE__ */ jsxs2(React3.Fragment, { children: [
-        i > 0 && /* @__PURE__ */ jsxs2(Text3, { color: "#4B5563", children: [
+        i > 0 && /* @__PURE__ */ jsxs2(Text3, { color: COLORS.border, children: [
           " ",
           "\u2502",
           " "
@@ -281,14 +298,14 @@ function Footer() {
         /* @__PURE__ */ jsx3(HintItem, { def })
       ] }, key);
     }),
-    /* @__PURE__ */ jsxs2(Text3, { color: "#4B5563", children: [
+    /* @__PURE__ */ jsxs2(Text3, { color: COLORS.border, children: [
       " ",
       "\u2502",
       " "
     ] }),
-    /* @__PURE__ */ jsx3(Text3, { color: "#F9FAFB", bold: true, children: "L" }),
-    /* @__PURE__ */ jsx3(Text3, { color: "#6B7280", children: ":" }),
-    /* @__PURE__ */ jsxs2(Text3, { color: "#FFD700", dimColor: true, children: [
+    /* @__PURE__ */ jsx3(Text3, { color: COLORS.text, bold: true, children: "L" }),
+    /* @__PURE__ */ jsx3(Text3, { color: COLORS.textSecondary, children: ":" }),
+    /* @__PURE__ */ jsxs2(Text3, { color: COLORS.gold, dimColor: true, children: [
       t("hint_lang"),
       "(",
       locale,
@@ -307,12 +324,469 @@ function AppLayout({ children }) {
   ] });
 }
 
+// src/stores/license-store.ts
+import { create as create2 } from "zustand";
+
+// src/lib/license/license-manager.ts
+import { readFile as readFile2, writeFile as writeFile2, rename, rm } from "fs/promises";
+import { createCipheriv, createDecipheriv, randomBytes, scryptSync } from "crypto";
+
+// src/lib/license/polar-api.ts
+import { randomUUID } from "crypto";
+import { readFile, writeFile, mkdir } from "fs/promises";
+import { join } from "path";
+import { homedir } from "os";
+var BASE_URL = "https://api.polar.sh/v1/customer-portal/license-keys";
+var POLAR_ORGANIZATION_ID = "b8f245c0-d116-4457-92fb-1bda47139f82";
+var DATA_DIR2 = join(homedir(), ".brew-tui");
+var MACHINE_ID_PATH = join(DATA_DIR2, "machine-id");
+async function getMachineId() {
+  try {
+    const id2 = (await readFile(MACHINE_ID_PATH, "utf-8")).trim();
+    if (id2) return id2;
+  } catch {
+  }
+  const id = randomUUID();
+  await mkdir(DATA_DIR2, { recursive: true, mode: 448 });
+  await writeFile(MACHINE_ID_PATH, id, { encoding: "utf-8", mode: 384 });
+  return id;
+}
+function validateApiUrl(url) {
+  const parsed = new URL(url);
+  if (parsed.protocol !== "https:") {
+    throw new Error("HTTPS required for license API");
+  }
+  if (!parsed.hostname.endsWith("polar.sh")) {
+    throw new Error("Invalid API host");
+  }
+}
+async function post(endpoint, body, expectEmpty = false) {
+  const url = `${BASE_URL}/${endpoint}`;
+  validateApiUrl(url);
+  const res = await fetchWithTimeout(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body)
+  }, 15e3);
+  if (!res.ok) {
+    let message = `Request failed with status ${res.status}`;
+    try {
+      const errBody = await res.json();
+      if (typeof errBody.detail === "string") message = errBody.detail;
+      else if (typeof errBody.error === "string") message = errBody.error;
+      else if (typeof errBody.message === "string") message = errBody.message;
+    } catch {
+    }
+    throw new Error(message);
+  }
+  if (expectEmpty || res.status === 204) return void 0;
+  return res.json();
+}
+async function activateLicense(key) {
+  const machineId = await getMachineId();
+  const activation = await post("activate", {
+    key,
+    organization_id: POLAR_ORGANIZATION_ID,
+    label: machineId
+    // SEG-004: Use machine UUID instead of hostname
+  });
+  if (!activation || typeof activation.id !== "string" || !activation.license_key) {
+    throw new Error("Invalid activation response: missing required fields");
+  }
+  let customerEmail = "";
+  let customerName = "";
+  try {
+    const validated = await post("validate", {
+      key,
+      organization_id: POLAR_ORGANIZATION_ID,
+      activation_id: activation.id
+    });
+    customerEmail = validated.customer?.email ?? "";
+    customerName = validated.customer?.name ?? "";
+  } catch {
+  }
+  return {
+    activated: true,
+    error: null,
+    instance: { id: activation.id },
+    license_key: {
+      id: 0,
+      status: activation.license_key.status,
+      key,
+      activation_limit: 0,
+      activations_count: 0,
+      expires_at: activation.license_key.expires_at
+    },
+    meta: { customer_email: customerEmail, customer_name: customerName }
+  };
+}
+async function validateLicense(key, instanceId) {
+  const res = await post("validate", {
+    key,
+    organization_id: POLAR_ORGANIZATION_ID,
+    activation_id: instanceId
+  });
+  if (!res || typeof res.id !== "string" || typeof res.status !== "string" || !res.customer) {
+    throw new Error("Invalid validation response: missing required fields");
+  }
+  const notExpired = res.expires_at === null || new Date(res.expires_at) > /* @__PURE__ */ new Date();
+  const valid = res.status === "granted" && notExpired;
+  return {
+    valid,
+    error: valid ? null : `License ${res.status}`,
+    license_key: {
+      id: 0,
+      status: res.status,
+      key,
+      expires_at: res.expires_at
+    },
+    instance: { id: instanceId }
+  };
+}
+async function deactivateLicense(key, instanceId) {
+  await post(
+    "deactivate",
+    { key, organization_id: POLAR_ORGANIZATION_ID, activation_id: instanceId },
+    true
+  );
+}
+
+// src/lib/license/license-manager.ts
+var REVALIDATION_INTERVAL_MS = 24 * 60 * 60 * 1e3;
+var GRACE_PERIOD_MS = 7 * 24 * 60 * 60 * 1e3;
+var ACTIVATION_COOLDOWN_MS = 3e4;
+var MAX_ATTEMPTS = 5;
+var LOCKOUT_MS = 15 * 60 * 1e3;
+var tracker = {
+  attempts: 0,
+  lastAttempt: 0,
+  lockedUntil: 0
+};
+function checkRateLimit() {
+  const now = Date.now();
+  if (now < tracker.lockedUntil) {
+    const remaining = Math.ceil((tracker.lockedUntil - now) / 6e4);
+    throw new Error(t("cli_rateLimited", { minutes: remaining }));
+  }
+  if (now - tracker.lastAttempt < ACTIVATION_COOLDOWN_MS) {
+    throw new Error(t("cli_cooldown"));
+  }
+}
+function recordAttempt(success) {
+  const now = Date.now();
+  tracker.lastAttempt = now;
+  if (success) {
+    tracker.attempts = 0;
+    return;
+  }
+  tracker.attempts++;
+  if (tracker.attempts >= MAX_ATTEMPTS) {
+    tracker.lockedUntil = now + LOCKOUT_MS;
+    tracker.attempts = 0;
+  }
+}
+var ENCRYPTION_SECRET = "brew-tui-license-aes256gcm-v1";
+var SCRYPT_SALT = "brew-tui-salt-v1";
+var _derivedKey = null;
+function deriveEncryptionKey() {
+  if (!_derivedKey) _derivedKey = scryptSync(ENCRYPTION_SECRET, SCRYPT_SALT, 32);
+  return _derivedKey;
+}
+function encryptLicenseData(data) {
+  const key = deriveEncryptionKey();
+  const iv = randomBytes(12);
+  const cipher = createCipheriv("aes-256-gcm", key, iv);
+  const plaintext = JSON.stringify(data);
+  const ciphertext = Buffer.concat([cipher.update(plaintext, "utf-8"), cipher.final()]);
+  const tag = cipher.getAuthTag();
+  return {
+    encrypted: ciphertext.toString("base64"),
+    iv: iv.toString("base64"),
+    tag: tag.toString("base64")
+  };
+}
+function decryptLicenseData(encrypted, iv, tag) {
+  const key = deriveEncryptionKey();
+  const decipher = createDecipheriv(
+    "aes-256-gcm",
+    key,
+    Buffer.from(iv, "base64")
+  );
+  decipher.setAuthTag(Buffer.from(tag, "base64"));
+  const plaintext = Buffer.concat([
+    decipher.update(Buffer.from(encrypted, "base64")),
+    decipher.final()
+  ]);
+  return JSON.parse(plaintext.toString("utf-8"));
+}
+function isLicenseFile(obj) {
+  return typeof obj === "object" && obj !== null && obj.version === 1;
+}
+function isEncryptedLicenseFile(obj) {
+  if (!isLicenseFile(obj)) return false;
+  const record = obj;
+  return typeof record.encrypted === "string" && typeof record.iv === "string" && typeof record.tag === "string";
+}
+async function getMachineId2() {
+  try {
+    const { readFile: readMachineId } = await import("fs/promises");
+    const { join: join3 } = await import("path");
+    const { homedir: homedir2 } = await import("os");
+    const machineIdPath = join3(homedir2(), ".brew-tui", "machine-id");
+    return (await readMachineId(machineIdPath, "utf-8")).trim() || null;
+  } catch {
+    return null;
+  }
+}
+async function loadLicense() {
+  try {
+    const raw = await readFile2(LICENSE_PATH, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (!isLicenseFile(parsed)) {
+      throw new Error("Invalid license data format");
+    }
+    const file = parsed;
+    if (file.version !== 1) {
+      throw new Error("Unsupported data version");
+    }
+    if (isEncryptedLicenseFile(file)) {
+      const data = decryptLicenseData(file.encrypted, file.iv, file.tag);
+      const fileRecord = file;
+      if (fileRecord.machineId) {
+        const currentMachineId = await getMachineId2();
+        if (currentMachineId && fileRecord.machineId !== currentMachineId) {
+          throw new Error("License was activated on a different machine");
+        }
+      }
+      return data;
+    }
+    if (file.license) {
+      const data = file.license;
+      await saveLicense(data);
+      return data;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+async function saveLicense(data) {
+  await ensureDataDirs();
+  const { encrypted, iv, tag } = encryptLicenseData(data);
+  const machineId = await getMachineId2();
+  const file = { version: 1, encrypted, iv, tag };
+  if (machineId) file.machineId = machineId;
+  const tmpPath = LICENSE_PATH + ".tmp";
+  await writeFile2(tmpPath, JSON.stringify(file, null, 2), { encoding: "utf-8", mode: 384 });
+  await rename(tmpPath, LICENSE_PATH);
+}
+async function clearLicense() {
+  try {
+    await rm(LICENSE_PATH);
+  } catch {
+  }
+}
+function isExpired(license) {
+  if (!license.expiresAt) return false;
+  return new Date(license.expiresAt).getTime() < Date.now();
+}
+function needsRevalidation(license) {
+  const lastValidated = new Date(license.lastValidatedAt).getTime();
+  if (isNaN(lastValidated)) return true;
+  return Date.now() - lastValidated > REVALIDATION_INTERVAL_MS;
+}
+function isWithinGracePeriod(license) {
+  const lastValidated = new Date(license.lastValidatedAt).getTime();
+  if (isNaN(lastValidated)) return false;
+  return Date.now() - lastValidated < GRACE_PERIOD_MS;
+}
+function getDegradationLevel(license) {
+  const lastValidated = new Date(license.lastValidatedAt).getTime();
+  if (isNaN(lastValidated)) return "expired";
+  const elapsed = Date.now() - lastValidated;
+  if (elapsed < 0) return "none";
+  const days = elapsed / (24 * 60 * 60 * 1e3);
+  if (days <= 7) return "none";
+  if (days <= 14) return "warning";
+  if (days <= 30) return "limited";
+  return "expired";
+}
+function validateLicenseKey(key) {
+  if (key.length < 10 || key.length > 100) {
+    throw new Error("Invalid license key format");
+  }
+  if (!/^[\w-]+$/.test(key)) {
+    throw new Error("Invalid license key format");
+  }
+}
+async function activate(key) {
+  validateLicenseKey(key);
+  checkRateLimit();
+  let success = false;
+  try {
+    const res = await activateLicense(key);
+    if (!res.activated) {
+      throw new Error(res.error ?? "Activation failed");
+    }
+    const license = {
+      key,
+      instanceId: res.instance.id,
+      status: "active",
+      customerEmail: res.meta.customer_email,
+      customerName: res.meta.customer_name,
+      plan: "pro",
+      activatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      expiresAt: res.license_key.expires_at,
+      lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    await saveLicense(license);
+    success = true;
+    return license;
+  } finally {
+    recordAttempt(success);
+  }
+}
+function isNetworkError(err) {
+  const msg = err instanceof Error ? err.message : String(err);
+  return /fetch failed|ECONNREFUSED|ENOTFOUND|ETIMEDOUT|network|timeout|abort/i.test(msg);
+}
+async function revalidate(license) {
+  try {
+    const res = await validateLicense(license.key, license.instanceId);
+    if (res.valid) {
+      const updated = {
+        ...license,
+        lastValidatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        status: "active",
+        expiresAt: res.license_key.expires_at
+      };
+      await saveLicense(updated);
+      return "valid";
+    }
+    await saveLicense({ ...license, status: "expired" });
+    return "expired";
+  } catch (err) {
+    if (isNetworkError(err)) {
+      return isWithinGracePeriod(license) ? "grace" : "expired";
+    }
+    await saveLicense({ ...license, status: "expired" });
+    return "expired";
+  }
+}
+async function deactivate(license) {
+  let remoteSuccess = false;
+  for (let attempt = 0; attempt < 3; attempt++) {
+    try {
+      await deactivateLicense(license.key, license.instanceId);
+      remoteSuccess = true;
+      break;
+    } catch {
+      if (attempt < 2) await new Promise((r) => setTimeout(r, 1e3));
+    }
+  }
+  await clearLicense();
+  return { remoteSuccess };
+}
+
+// src/lib/license/anti-tamper.ts
+var _originalIsPro = null;
+var _originalGetState = null;
+var _storeApi = null;
+function initStoreIntegrity(store) {
+  _storeApi = store;
+  _originalIsPro = store.getState().isPro;
+  _originalGetState = store.getState;
+}
+
+// src/stores/license-store.ts
+var REVALIDATION_CHECK_MS = 60 * 60 * 1e3;
+var _revalidatingPromise = null;
+var _revalidationInterval = null;
+async function doRevalidation(license, set) {
+  const result = await revalidate(license);
+  if (result === "expired") {
+    set({ status: "expired", license: { ...license, status: "expired" }, degradation: "expired" });
+  } else {
+    const updated = await loadLicense();
+    const effective = updated ?? license;
+    set({ license: effective, degradation: getDegradationLevel(effective) });
+  }
+}
+var useLicenseStore = create2((set, get) => ({
+  status: "validating",
+  license: null,
+  error: null,
+  degradation: "none",
+  initialize: async () => {
+    initStoreIntegrity(useLicenseStore);
+    await ensureDataDirs();
+    const license = await loadLicense();
+    if (!license) {
+      set({ status: "free", license: null, degradation: "none" });
+      return;
+    }
+    if (isExpired(license)) {
+      set({ status: "expired", license, degradation: "expired" });
+      return;
+    }
+    const level = getDegradationLevel(license);
+    if (level === "expired") {
+      set({ status: "expired", license, degradation: "expired" });
+      return;
+    }
+    set({ status: "pro", license, degradation: level });
+    if (needsRevalidation(license)) {
+      if (!_revalidatingPromise) {
+        _revalidatingPromise = doRevalidation(license, set).finally(() => {
+          _revalidatingPromise = null;
+        });
+      }
+      await _revalidatingPromise;
+    }
+    if (_revalidationInterval) clearInterval(_revalidationInterval);
+    _revalidationInterval = setInterval(() => {
+      const current = get().license;
+      if (!current || get().status !== "pro") return;
+      if (!needsRevalidation(current)) return;
+      if (_revalidatingPromise) return;
+      _revalidatingPromise = doRevalidation(current, set).finally(() => {
+        _revalidatingPromise = null;
+      });
+    }, REVALIDATION_CHECK_MS);
+    _revalidationInterval.unref();
+  },
+  activate: async (key) => {
+    set({ error: null });
+    try {
+      const license = await activate(key);
+      set({ status: "pro", license, degradation: "none" });
+      return true;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      set({ error: msg });
+      return false;
+    }
+  },
+  deactivate: async () => {
+    const { license } = get();
+    if (license) {
+      const { remoteSuccess } = await deactivate(license);
+      if (!remoteSuccess) {
+        set({ status: "free", license: null, degradation: "none", error: "License removed locally but server deactivation failed. It may remain active remotely." });
+        return;
+      }
+    }
+    set({ status: "free", license: null, degradation: "none", error: null });
+  },
+  isPro: () => get().status === "pro"
+}));
+
 // src/hooks/use-keyboard.ts
 import { useInput } from "ink";
 
 // src/stores/modal-store.ts
-import { create as create2 } from "zustand";
-var useModalStore = create2((set) => ({
+import { create as create3 } from "zustand";
+var useModalStore = create3((set) => ({
   _count: 0,
   isOpen: false,
   openModal: () => set((s) => {
@@ -390,37 +864,37 @@ function UpgradePrompt({ viewId }) {
     Box4,
     {
       borderStyle: "double",
-      borderColor: "#FF6B2B",
+      borderColor: COLORS.brand,
       paddingX: 3,
       paddingY: 2,
       flexDirection: "column",
       alignItems: "center",
       width: "80%",
       children: [
-        /* @__PURE__ */ jsxs4(Text4, { bold: true, color: "#FF6B2B", children: [
+        /* @__PURE__ */ jsxs4(Text4, { bold: true, color: COLORS.brand, children: [
           "\u2B50",
           " ",
           t("upgrade_proFeature", { title })
         ] }),
         /* @__PURE__ */ jsx5(Text4, { children: " " }),
-        /* @__PURE__ */ jsx5(Text4, { color: "#F9FAFB", wrap: "wrap", children: t(keys.desc) }),
+        /* @__PURE__ */ jsx5(Text4, { color: COLORS.text, wrap: "wrap", children: t(keys.desc) }),
         /* @__PURE__ */ jsx5(Text4, { children: " " }),
         /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", alignItems: "center", children: [
-          /* @__PURE__ */ jsx5(Text4, { color: "#06B6D4", bold: true, children: t("upgrade_pricing") }),
+          /* @__PURE__ */ jsx5(Text4, { color: COLORS.info, bold: true, children: t("upgrade_pricing") }),
           /* @__PURE__ */ jsx5(Text4, { children: " " }),
-          /* @__PURE__ */ jsx5(Text4, { color: "#9CA3AF", children: t("upgrade_buyAt") }),
-          /* @__PURE__ */ jsxs4(Text4, { color: "#38BDF8", bold: true, children: [
+          /* @__PURE__ */ jsx5(Text4, { color: COLORS.muted, children: t("upgrade_buyAt") }),
+          /* @__PURE__ */ jsxs4(Text4, { color: COLORS.sky, bold: true, children: [
             "  ",
             t("upgrade_buyUrl")
           ] }),
           /* @__PURE__ */ jsx5(Text4, { children: " " }),
-          /* @__PURE__ */ jsx5(Text4, { color: "#9CA3AF", children: t("upgrade_activateWith") }),
-          /* @__PURE__ */ jsxs4(Text4, { color: "#22C55E", bold: true, children: [
+          /* @__PURE__ */ jsx5(Text4, { color: COLORS.muted, children: t("upgrade_activateWith") }),
+          /* @__PURE__ */ jsxs4(Text4, { color: COLORS.success, bold: true, children: [
             "  ",
             t("upgrade_activateCmd")
           ] }),
           /* @__PURE__ */ jsx5(Text4, { children: " " }),
-          /* @__PURE__ */ jsx5(Text4, { color: "#FF6B2B", children: t("upgrade_proLabel") })
+          /* @__PURE__ */ jsx5(Text4, { color: COLORS.brand, children: t("upgrade_proLabel") })
         ] })
       ]
     }
@@ -429,21 +903,29 @@ function UpgradePrompt({ viewId }) {
 
 // src/views/dashboard.tsx
 import { useEffect, useMemo as useMemo2 } from "react";
-import { Box as Box8, Text as Text10 } from "ink";
+import { Box as Box8, Text as Text10, useStdout } from "ink";
 
 // src/stores/brew-store.ts
-import { create as create3 } from "zustand";
+import { create as create4 } from "zustand";
 
 // src/lib/brew-api.ts
 import { spawn as spawn2 } from "child_process";
 
 // src/lib/brew-cli.ts
 import { spawn } from "child_process";
-async function execBrew(args) {
+var DEFAULT_TIMEOUT_MS = 3e4;
+var STREAM_IDLE_TIMEOUT_MS = 5 * 60 * 1e3;
+async function execBrew(args, timeoutMs = DEFAULT_TIMEOUT_MS) {
   return new Promise((resolve, reject) => {
     const proc = spawn("brew", args, { env: { ...process.env, HOMEBREW_NO_AUTO_UPDATE: "1" } });
     let stdout = "";
     let stderr = "";
+    let killed = false;
+    const timer = setTimeout(() => {
+      killed = true;
+      proc.kill();
+      reject(new Error(`brew ${args.join(" ")} timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
     proc.stdout.on("data", (d) => {
       stdout += d.toString();
     });
@@ -451,6 +933,8 @@ async function execBrew(args) {
       stderr += d.toString();
     });
     proc.on("close", (code) => {
+      clearTimeout(timer);
+      if (killed) return;
       if (code === 0) {
         resolve(stdout);
       } else {
@@ -458,6 +942,8 @@ async function execBrew(args) {
       }
     });
     proc.on("error", (err) => {
+      clearTimeout(timer);
+      if (killed) return;
       reject(new Error(`Failed to run brew: ${err.message}`));
     });
   });
@@ -471,7 +957,9 @@ async function* streamBrew(args) {
   const lines = [];
   let done = false;
   let exitError = null;
+  let lastOutputAt = Date.now();
   const push = (chunk) => {
+    lastOutputAt = Date.now();
     buffer += chunk.toString();
     const parts = buffer.split("\n");
     buffer = parts.pop() ?? "";
@@ -497,6 +985,10 @@ async function* streamBrew(args) {
       if (lines.length > 0) {
         yield lines.shift();
       } else if (!done) {
+        if (Date.now() - lastOutputAt > STREAM_IDLE_TIMEOUT_MS) {
+          proc.kill();
+          throw new Error(`brew ${args.join(" ")} timed out: no output for ${STREAM_IDLE_TIMEOUT_MS / 1e3}s`);
+        }
         await new Promise((r) => setTimeout(r, 100));
       }
     }
@@ -608,6 +1100,10 @@ function parseLeavesOutput(raw) {
 }
 
 // src/lib/brew-api.ts
+var PKG_PATTERN = /^[\w@./+-]+$/;
+function validatePackageName(name) {
+  if (!PKG_PATTERN.test(name)) throw new Error("Invalid package name: " + name);
+}
 async function brewUpdate() {
   return new Promise((resolve, reject) => {
     const proc = spawn2("brew", ["update"], { stdio: "ignore" });
@@ -631,9 +1127,20 @@ async function getServices() {
   return parseServicesJson(raw);
 }
 async function getFormulaInfo(name) {
+  validatePackageName(name);
   const raw = await execBrew(["info", "--json=v2", name]);
   return parseFormulaInfoJson(raw);
 }
+async function getCaskInfo(name) {
+  validatePackageName(name);
+  try {
+    const raw = await execBrew(["info", "--json=v2", "--cask", name]);
+    const data = JSON.parse(raw);
+    return data.casks?.[0] ?? null;
+  } catch {
+    return null;
+  }
+}
 async function search(term) {
   const safeTerm = term.replace(/^-+/, "");
   if (!safeTerm) return { formulae: [], casks: [] };
@@ -658,11 +1165,21 @@ async function getLeaves() {
   return parseLeavesOutput(raw);
 }
 async function uninstallPackage(name) {
+  validatePackageName(name);
   return execBrew(["uninstall", name]);
 }
 async function serviceAction(name, action) {
+  validatePackageName(name);
   return execBrew(["services", action, name]);
 }
+async function pinPackage(name) {
+  validatePackageName(name);
+  return execBrew(["pin", name]);
+}
+async function unpinPackage(name) {
+  validatePackageName(name);
+  return execBrew(["unpin", name]);
+}
 function formulaeToListItems(formulae) {
   return formulae.map((f) => {
     const installed = f.installed[0];
@@ -694,6 +1211,10 @@ function casksToListItems(casks) {
 }
 
 // src/stores/brew-store.ts
+var BREW_UPDATE_COOLDOWN_MS = 5 * 60 * 1e3;
+var fetchAllInFlight = null;
+var brewUpdateInFlight = null;
+var lastBrewUpdateStartedAt = 0;
 function setLoading(set, key, value) {
   set((s) => ({ loading: { ...s.loading, [key]: value } }));
 }
@@ -703,7 +1224,7 @@ function setError(set, key, error) {
 function recordFetchTime(set, key) {
   set((s) => ({ lastFetchedAt: { ...s.lastFetchedAt, [key]: Date.now() } }));
 }
-var useBrewStore = create3((set) => ({
+var useBrewStore = create4((set, get) => ({
   formulae: [],
   casks: [],
   outdated: { formulae: [], casks: [] },
@@ -715,7 +1236,8 @@ var useBrewStore = create3((set) => ({
   // Pre-initialize loading flags for keys that fetchAll always triggers so
   // views that check loading.X get a spinner on first render rather than
   // flashing empty/zeroed content for one frame before the fetch starts.
-  loading: { installed: true, outdated: true, services: true, config: true, doctor: false },
+  // SCR-013: Pre-initialize doctor loading to true
+  loading: { installed: true, outdated: true, services: true, config: true, doctor: true },
   errors: {},
   lastFetchedAt: {},
   fetchInstalled: async () => {
@@ -774,9 +1296,7 @@ var useBrewStore = create3((set) => ({
       const result = await getLeaves();
       set({ leaves: result });
     } catch (err) {
-      if (false) {
-        console.error("[brew-store] fetchLeaves failed:", err instanceof Error ? err.message : String(err));
-      }
+      logger.error("fetchLeaves failed", { error: err instanceof Error ? err.message : String(err) });
     } finally {
       recordFetchTime(set, "leaves");
     }
@@ -795,22 +1315,36 @@ var useBrewStore = create3((set) => ({
     }
   },
   fetchAll: async () => {
-    brewUpdate().catch(() => {
-    });
-    const store = useBrewStore.getState();
-    await Promise.all([
+    if (fetchAllInFlight) {
+      return fetchAllInFlight;
+    }
+    const now = Date.now();
+    if (!brewUpdateInFlight && now - lastBrewUpdateStartedAt > BREW_UPDATE_COOLDOWN_MS) {
+      lastBrewUpdateStartedAt = now;
+      brewUpdateInFlight = brewUpdate().catch((err) => {
+        set((s) => ({ errors: { ...s.errors, update: String(err) } }));
+      }).finally(() => {
+        brewUpdateInFlight = null;
+      });
+    }
+    const store = get();
+    fetchAllInFlight = Promise.all([
       store.fetchInstalled(),
       store.fetchOutdated(),
       store.fetchServices(),
       store.fetchConfig(),
-      store.fetchLeaves()
-    ]);
+      store.fetchLeaves(),
+      store.fetchDoctor()
+    ]).then(() => void 0).finally(() => {
+      fetchAllInFlight = null;
+    });
+    return fetchAllInFlight;
   },
   uninstallPackage: async (name) => {
     setLoading(set, "action", true);
     try {
       await uninstallPackage(name);
-      await useBrewStore.getState().fetchInstalled();
+      await get().fetchInstalled();
     } catch (err) {
       setError(set, "action", err instanceof Error ? err.message : String(err));
     } finally {
@@ -821,7 +1355,7 @@ var useBrewStore = create3((set) => ({
     setLoading(set, "service-action", true);
     try {
       await serviceAction(name, action);
-      await useBrewStore.getState().fetchServices();
+      await get().fetchServices();
     } catch (err) {
       setError(set, "service-action", err instanceof Error ? err.message : String(err));
     } finally {
@@ -846,7 +1380,7 @@ function StatCard({ label, value, color = "white" }) {
       minWidth: 16,
       children: [
         /* @__PURE__ */ jsx6(Text5, { bold: true, color, children: value }),
-        /* @__PURE__ */ jsx6(Text5, { color: "#9CA3AF", children: label })
+        /* @__PURE__ */ jsx6(Text5, { color: COLORS.muted, children: label })
       ]
     }
   );
@@ -863,12 +1397,12 @@ function Loading({ message }) {
 function ErrorMessage({ message }) {
   useLocaleStore((s) => s.locale);
   return /* @__PURE__ */ jsxs6(Box6, { paddingY: 1, children: [
-    /* @__PURE__ */ jsxs6(Text6, { color: "#EF4444", bold: true, children: [
+    /* @__PURE__ */ jsxs6(Text6, { color: COLORS.error, bold: true, children: [
       "\u2718",
       " ",
       t("error_prefix")
     ] }),
-    /* @__PURE__ */ jsx7(Text6, { color: "#EF4444", children: message })
+    /* @__PURE__ */ jsx7(Text6, { color: COLORS.error, children: message })
   ] });
 }
 
@@ -876,11 +1410,11 @@ function ErrorMessage({ message }) {
 import { Text as Text7 } from "ink";
 import { jsxs as jsxs7 } from "react/jsx-runtime";
 var BADGE_STYLES = {
-  success: { icon: "\u2714", color: "#22C55E" },
-  warning: { icon: "\u25CF", color: "#F59E0B" },
-  error: { icon: "\u2718", color: "#EF4444" },
-  info: { icon: "\u25C6", color: "#3B82F6" },
-  muted: { icon: "\u25CB", color: "#6B7280" }
+  success: { icon: "\u2714", color: COLORS.success },
+  warning: { icon: "\u25CF", color: COLORS.warning },
+  error: { icon: "\u2718", color: COLORS.error },
+  info: { icon: "\u25C6", color: COLORS.blue },
+  muted: { icon: "\u25CB", color: COLORS.textSecondary }
 };
 function StatusBadge({ label, variant }) {
   const { icon, color } = BADGE_STYLES[variant];
@@ -894,11 +1428,11 @@ function StatusBadge({ label, variant }) {
 // src/components/common/section-header.tsx
 import { Box as Box7, Text as Text8 } from "ink";
 import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
-function SectionHeader({ emoji, title, color = "#FFD700", gradient, count }) {
+function SectionHeader({ emoji, title, color = COLORS.gold, gradient, count }) {
   return /* @__PURE__ */ jsxs8(Box7, { gap: 1, children: [
     /* @__PURE__ */ jsx8(Text8, { children: emoji }),
     gradient ? /* @__PURE__ */ jsx8(GradientText, { colors: gradient, bold: true, children: title }) : /* @__PURE__ */ jsx8(Text8, { bold: true, color, children: title }),
-    count !== void 0 && /* @__PURE__ */ jsxs8(Text8, { color: "#6B7280", children: [
+    count !== void 0 && /* @__PURE__ */ jsxs8(Text8, { color: COLORS.textSecondary, children: [
       "(",
       count,
       ")"
@@ -911,20 +1445,55 @@ import { Text as Text9 } from "ink";
 import { Fragment as Fragment3, jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
 function VersionArrow({ current, latest }) {
   return /* @__PURE__ */ jsxs9(Fragment3, { children: [
-    /* @__PURE__ */ jsx9(Text9, { color: "#EF4444", children: current }),
-    /* @__PURE__ */ jsx9(Text9, { color: "#F59E0B", children: " \u2500\u2500 " }),
-    /* @__PURE__ */ jsx9(Text9, { color: "#FFD700", children: "\u25B6" }),
-    /* @__PURE__ */ jsxs9(Text9, { color: "#2DD4BF", children: [
+    /* @__PURE__ */ jsxs9(Text9, { color: COLORS.muted, children: [
+      t("version_installed"),
+      " "
+    ] }),
+    /* @__PURE__ */ jsx9(Text9, { color: COLORS.error, children: current }),
+    /* @__PURE__ */ jsx9(Text9, { color: COLORS.warning, children: " \u2500\u2500 " }),
+    /* @__PURE__ */ jsx9(Text9, { color: COLORS.gold, children: "\u25B6" }),
+    /* @__PURE__ */ jsxs9(Text9, { color: COLORS.muted, children: [
       " ",
-      latest
-    ] })
+      t("version_available"),
+      " "
+    ] }),
+    /* @__PURE__ */ jsx9(Text9, { color: COLORS.teal, children: latest })
   ] });
 }
 
+// src/utils/format.ts
+function formatBytes(bytes) {
+  if (!isFinite(bytes) || bytes <= 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  const i = Math.min(Math.floor(Math.log(bytes) / Math.log(1024)), units.length - 1);
+  return `${(bytes / Math.pow(1024, i)).toFixed(1)} ${units[i]}`;
+}
+function formatRelativeTime(timestamp) {
+  if (!timestamp || !isFinite(timestamp)) return t("time_justNow");
+  const diff = Date.now() / 1e3 - timestamp;
+  if (diff < 0) return t("time_justNow");
+  if (diff < 60) return t("time_justNow");
+  if (diff < 3600) return t("time_minutesAgo", { n: Math.floor(diff / 60) });
+  if (diff < 86400) return t("time_hoursAgo", { n: Math.floor(diff / 3600) });
+  if (diff < 2592e3) return t("time_daysAgo", { n: Math.floor(diff / 86400) });
+  return t("time_monthsAgo", { n: Math.floor(diff / 2592e3) });
+}
+function formatDate(value) {
+  const date = value instanceof Date ? value : new Date(value);
+  const locale = getLocale();
+  return date.toLocaleDateString(locale === "es" ? "es-ES" : "en-US");
+}
+function truncate(str, maxLen) {
+  if (str.length <= maxLen) return str;
+  return str.slice(0, maxLen - 1) + "\u2026";
+}
+
 // src/views/dashboard.tsx
 import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
 function DashboardView() {
-  const { formulae, casks, outdated, services, config, loading, errors, fetchAll } = useBrewStore();
+  const { formulae, casks, outdated, services, config, loading, errors, lastFetchedAt, fetchAll } = useBrewStore();
+  const { stdout } = useStdout();
+  const columns = stdout?.columns ?? 80;
   useEffect(() => {
     fetchAll();
   }, []);
@@ -937,66 +1506,84 @@ function DashboardView() {
     [services]
   );
   const errorServices = errorServiceList.length;
+  const partialErrors = [
+    errors.outdated ? { label: t("dashboard_outdated"), message: errors.outdated } : null,
+    errors.services ? { label: t("dashboard_services"), message: errors.services } : null,
+    errors.config ? { label: t("dashboard_systemInfo"), message: errors.config } : null
+  ].filter((item) => item !== null);
+  const outdatedValue = loading.outdated ? "..." : errors.outdated ? t("dashboard_statError") : outdated.formulae.length + outdated.casks.length;
+  const servicesValue = loading.services ? "..." : errors.services ? t("dashboard_statError") : `${runningServices}/${services.length}`;
+  const lastUpdated = lastFetchedAt.installed ? formatRelativeTime(lastFetchedAt.installed / 1e3) : null;
   if (loading.installed) return /* @__PURE__ */ jsx10(Loading, { message: t("loading_fetchingBrew") });
   if (errors.installed) return /* @__PURE__ */ jsx10(ErrorMessage, { message: errors.installed });
+  const isNarrow = columns < 60;
   return /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", gap: 2, children: [
     /* @__PURE__ */ jsx10(SectionHeader, { emoji: "\u{1F4CA}", title: t("dashboard_overview"), gradient: GRADIENTS.gold }),
-    /* @__PURE__ */ jsxs10(Box8, { gap: 1, flexWrap: "wrap", children: [
-      /* @__PURE__ */ jsx10(StatCard, { label: t("dashboard_formulae"), value: formulae.length, color: "#06B6D4" }),
-      /* @__PURE__ */ jsx10(StatCard, { label: t("dashboard_casks"), value: casks.length, color: "#A855F7" }),
+    /* @__PURE__ */ jsxs10(Box8, { gap: 1, flexWrap: "wrap", flexDirection: isNarrow ? "column" : "row", children: [
+      /* @__PURE__ */ jsx10(StatCard, { label: t("dashboard_formulae"), value: formulae.length, color: COLORS.info }),
+      /* @__PURE__ */ jsx10(StatCard, { label: t("dashboard_casks"), value: casks.length, color: COLORS.purple }),
       /* @__PURE__ */ jsx10(
         StatCard,
         {
           label: t("dashboard_outdated"),
-          value: outdated.formulae.length + outdated.casks.length,
-          color: outdated.formulae.length + outdated.casks.length > 0 ? "#F59E0B" : "#22C55E"
+          value: outdatedValue,
+          color: typeof outdatedValue === "number" && outdatedValue > 0 ? COLORS.warning : errors.outdated ? COLORS.error : COLORS.success
         }
       ),
       /* @__PURE__ */ jsx10(
         StatCard,
         {
           label: t("dashboard_services"),
-          value: `${runningServices}/${services.length}`,
-          color: errorServices > 0 ? "#EF4444" : "#22C55E"
+          value: servicesValue,
+          color: errors.services || errorServices > 0 ? COLORS.error : COLORS.success
         }
       )
     ] }),
-    config && /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx10(SectionHeader, { emoji: "\u2139\uFE0F", title: t("dashboard_systemInfo"), gradient: ["#F9FAFB", "#9CA3AF"] }),
-      /* @__PURE__ */ jsxs10(Box8, { borderStyle: "round", borderColor: "#3B82F6", paddingX: 2, paddingY: 0, flexDirection: "column", marginTop: 1, children: [
+    lastUpdated && /* @__PURE__ */ jsx10(Text10, { color: COLORS.muted, children: t("dashboard_lastUpdated", { time: lastUpdated }) }),
+    partialErrors.length > 0 && /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", borderStyle: "round", borderColor: COLORS.warning, paddingX: 2, paddingY: 0, children: [
+      /* @__PURE__ */ jsx10(Text10, { color: COLORS.warning, bold: true, children: t("dashboard_partialData") }),
+      partialErrors.map((item) => /* @__PURE__ */ jsxs10(Text10, { color: COLORS.muted, children: [
+        item.label,
+        ": ",
+        item.message
+      ] }, item.label))
+    ] }),
+    config && !errors.config && /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx10(SectionHeader, { emoji: "\u2139\uFE0F", title: t("dashboard_systemInfo"), gradient: [COLORS.text, COLORS.muted] }),
+      /* @__PURE__ */ jsxs10(Box8, { borderStyle: "round", borderColor: COLORS.blue, paddingX: 2, paddingY: 0, flexDirection: "column", marginTop: 1, children: [
         /* @__PURE__ */ jsxs10(Text10, { children: [
-          /* @__PURE__ */ jsx10(Text10, { color: "#9CA3AF", children: t("dashboard_homebrew") }),
+          /* @__PURE__ */ jsx10(Text10, { color: COLORS.muted, children: t("dashboard_homebrew") }),
           " ",
           config.HOMEBREW_VERSION
         ] }),
         /* @__PURE__ */ jsxs10(Text10, { children: [
-          /* @__PURE__ */ jsx10(Text10, { color: "#9CA3AF", children: t("dashboard_prefix") }),
+          /* @__PURE__ */ jsx10(Text10, { color: COLORS.muted, children: t("dashboard_prefix") }),
           "   ",
           config.HOMEBREW_PREFIX
         ] }),
         /* @__PURE__ */ jsxs10(Text10, { children: [
-          /* @__PURE__ */ jsx10(Text10, { color: "#9CA3AF", children: t("dashboard_updated") }),
+          /* @__PURE__ */ jsx10(Text10, { color: COLORS.muted, children: t("dashboard_updated") }),
           "  ",
           config.coreUpdated
         ] })
       ] })
     ] }),
-    outdated.formulae.length > 0 && /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", marginTop: 1, children: [
+    !errors.outdated && outdated.formulae.length > 0 && /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ jsx10(SectionHeader, { emoji: "\u{1F4E6}", title: t("dashboard_outdatedPackages"), gradient: GRADIENTS.fire }),
       /* @__PURE__ */ jsxs10(Box8, { paddingLeft: 2, flexDirection: "column", children: [
         outdated.formulae.slice(0, 10).map((pkg) => /* @__PURE__ */ jsxs10(Box8, { gap: 1, children: [
-          /* @__PURE__ */ jsx10(Text10, { color: "#F9FAFB", children: pkg.name }),
+          /* @__PURE__ */ jsx10(Text10, { color: COLORS.text, children: pkg.name }),
           /* @__PURE__ */ jsx10(VersionArrow, { current: pkg.installed_versions[0] ?? "", latest: pkg.current_version })
         ] }, pkg.name)),
-        outdated.formulae.length > 10 && /* @__PURE__ */ jsx10(Text10, { color: "#6B7280", italic: true, children: t("common_andMore", { count: outdated.formulae.length - 10 }) })
+        outdated.formulae.length > 10 && /* @__PURE__ */ jsx10(Text10, { color: COLORS.textSecondary, italic: true, children: t("common_andMore", { count: outdated.formulae.length - 10 }) })
       ] })
     ] }),
-    errorServices > 0 && /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ jsx10(SectionHeader, { emoji: "\u26A0\uFE0F", title: t("dashboard_serviceErrors"), color: "#EF4444" }),
+    !errors.services && errorServices > 0 && /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", marginTop: 1, children: [
+      /* @__PURE__ */ jsx10(SectionHeader, { emoji: "\u26A0\uFE0F", title: t("dashboard_serviceErrors"), color: COLORS.error }),
       /* @__PURE__ */ jsx10(Box8, { paddingLeft: 2, flexDirection: "column", children: errorServiceList.map((s) => /* @__PURE__ */ jsxs10(Box8, { gap: 1, children: [
         /* @__PURE__ */ jsx10(StatusBadge, { label: t("badge_error"), variant: "error" }),
         /* @__PURE__ */ jsx10(Text10, { children: s.name }),
-        s.exit_code != null && /* @__PURE__ */ jsx10(Text10, { color: "#9CA3AF", children: t("common_exit", { code: s.exit_code }) })
+        s.exit_code != null && /* @__PURE__ */ jsx10(Text10, { color: COLORS.muted, children: t("common_exit", { code: s.exit_code }) })
       ] }, s.name)) })
     ] })
   ] });
@@ -1004,7 +1591,7 @@ function DashboardView() {
 
 // src/views/installed.tsx
 import { useState as useState3, useMemo as useMemo3, useEffect as useEffect5 } from "react";
-import { Box as Box12, Text as Text14, useInput as useInput3, useStdout } from "ink";
+import { Box as Box14, Text as Text16, useInput as useInput3, useStdout as useStdout2 } from "ink";
 
 // src/hooks/use-debounce.ts
 import { useState, useEffect as useEffect2 } from "react";
@@ -1024,8 +1611,9 @@ async function logToHistory(args, success, error) {
   const detected = detectAction(args);
   if (!detected) return;
   try {
-    const { appendEntry: appendEntry2 } = await import("./history-logger-65UF2R6F.js");
-    await appendEntry2(detected.action, detected.packageName, success, error);
+    const isPro = useLicenseStore.getState().isPro();
+    const { appendEntry: appendEntry2 } = await import("./history-logger-2PGYSPFL.js");
+    await appendEntry2(isPro, detected.action, detected.packageName, success, error);
   } catch {
   }
 }
@@ -1094,7 +1682,7 @@ import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 function SearchInput({ defaultValue, onChange, placeholder, isActive = true }) {
   const resolvedPlaceholder = placeholder ?? t("searchInput_placeholder");
   return /* @__PURE__ */ jsxs11(Box9, { children: [
-    /* @__PURE__ */ jsxs11(Text11, { color: "#FFD700", children: [
+    /* @__PURE__ */ jsxs11(Text11, { color: COLORS.gold, children: [
       "\u{1F50D}",
       " "
     ] }),
@@ -1105,7 +1693,7 @@ function SearchInput({ defaultValue, onChange, placeholder, isActive = true }) {
         defaultValue,
         onChange
       }
-    ) : /* @__PURE__ */ jsx11(Text11, { color: "#6B7280", children: defaultValue || placeholder })
+    ) : /* @__PURE__ */ jsx11(Text11, { color: COLORS.textSecondary, children: defaultValue || placeholder })
   ] });
 }
 
@@ -1128,12 +1716,12 @@ function ConfirmDialog({ message, onConfirm, onCancel }) {
     else if (input === "n" || input === "N") onCancel();
     else if (key.escape) onCancel();
   });
-  return /* @__PURE__ */ jsxs12(Box10, { borderStyle: "double", borderColor: "#A855F7", paddingX: 2, paddingY: 1, flexDirection: "column", children: [
-    /* @__PURE__ */ jsx12(Text12, { bold: true, color: "#F9FAFB", children: message }),
+  return /* @__PURE__ */ jsxs12(Box10, { borderStyle: "double", borderColor: COLORS.purple, paddingX: 2, paddingY: 1, flexDirection: "column", children: [
+    /* @__PURE__ */ jsx12(Text12, { bold: true, color: COLORS.text, children: message }),
     /* @__PURE__ */ jsxs12(Box10, { marginTop: 1, children: [
-      /* @__PURE__ */ jsx12(Text12, { color: "#22C55E", children: t("confirm_yes") }),
+      /* @__PURE__ */ jsx12(Text12, { color: COLORS.success, children: t("confirm_yes") }),
       /* @__PURE__ */ jsx12(Text12, { children: " / " }),
-      /* @__PURE__ */ jsx12(Text12, { color: "#EF4444", children: t("confirm_no") })
+      /* @__PURE__ */ jsx12(Text12, { color: COLORS.error, children: t("confirm_no") })
     ] })
   ] });
 }
@@ -1144,43 +1732,44 @@ import { Spinner as Spinner2 } from "@inkjs/ui";
 import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
 function ProgressLog({ lines, isRunning, title, maxVisible = 15 }) {
   const visible = lines.slice(-maxVisible);
-  return /* @__PURE__ */ jsxs13(Box11, { flexDirection: "column", borderStyle: "round", borderColor: "#38BDF8", paddingX: 1, children: [
+  return /* @__PURE__ */ jsxs13(Box11, { flexDirection: "column", borderStyle: "round", borderColor: COLORS.sky, paddingX: 1, children: [
     title && /* @__PURE__ */ jsxs13(Box11, { marginBottom: 1, children: [
       isRunning && /* @__PURE__ */ jsx13(Spinner2, { label: "" }),
-      /* @__PURE__ */ jsxs13(Text13, { bold: true, color: "#38BDF8", children: [
+      /* @__PURE__ */ jsxs13(Text13, { bold: true, color: COLORS.sky, children: [
         " ",
         title
       ] })
     ] }),
-    visible.map((line, i) => /* @__PURE__ */ jsx13(Text13, { color: "#9CA3AF", wrap: "wrap", children: line }, line.slice(0, 30) + (lines.length - visible.length + i))),
-    lines.length === 0 && !isRunning && /* @__PURE__ */ jsx13(Text13, { color: "#6B7280", italic: true, children: t("progress_noOutput") })
+    visible.map((line, i) => /* @__PURE__ */ jsx13(Text13, { color: COLORS.muted, wrap: "wrap", children: line }, lines.length - visible.length + i)),
+    lines.length === 0 && !isRunning && /* @__PURE__ */ jsx13(Text13, { color: COLORS.textSecondary, italic: true, children: t("progress_noOutput") })
   ] });
 }
 
-// src/utils/format.ts
-function formatBytes(bytes) {
-  if (!isFinite(bytes) || bytes <= 0) return "0 B";
-  const units = ["B", "KB", "MB", "GB", "TB"];
-  const i = Math.min(Math.floor(Math.log(bytes) / Math.log(1024)), units.length - 1);
-  return `${(bytes / Math.pow(1024, i)).toFixed(1)} ${units[i]}`;
-}
-function formatRelativeTime(timestamp) {
-  if (!timestamp || !isFinite(timestamp)) return t("time_justNow");
-  const diff = Date.now() / 1e3 - timestamp;
-  if (diff < 0) return t("time_justNow");
-  if (diff < 60) return t("time_justNow");
-  if (diff < 3600) return t("time_minutesAgo", { n: Math.floor(diff / 60) });
-  if (diff < 86400) return t("time_hoursAgo", { n: Math.floor(diff / 3600) });
-  if (diff < 2592e3) return t("time_daysAgo", { n: Math.floor(diff / 86400) });
-  return t("time_monthsAgo", { n: Math.floor(diff / 2592e3) });
+// src/components/common/result-banner.tsx
+import { Box as Box12, Text as Text14 } from "ink";
+import { jsx as jsx14 } from "react/jsx-runtime";
+var STATUS_COLORS = {
+  success: COLORS.success,
+  error: COLORS.error,
+  warning: COLORS.warning,
+  info: COLORS.info
+};
+function ResultBanner({ status, message }) {
+  return /* @__PURE__ */ jsx14(Box12, { borderStyle: "round", borderColor: STATUS_COLORS[status], paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx14(Text14, { color: STATUS_COLORS[status], bold: true, children: message }) });
 }
-function truncate(str, maxLen) {
-  if (str.length <= maxLen) return str;
-  return str.slice(0, maxLen - 1) + "\u2026";
+
+// src/components/common/selectable-row.tsx
+import { Box as Box13, Text as Text15 } from "ink";
+import { jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
+function SelectableRow({ isCurrent, children, gap = 1 }) {
+  return /* @__PURE__ */ jsxs14(Box13, { gap, children: [
+    /* @__PURE__ */ jsx15(Text15, { color: isCurrent ? COLORS.success : COLORS.muted, children: isCurrent ? "\u25B6" : " " }),
+    children
+  ] });
 }
 
 // src/views/installed.tsx
-import { jsx as jsx14, jsxs as jsxs14 } from "react/jsx-runtime";
+import { jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
 function InstalledView() {
   const { formulae, casks, loading, errors, fetchInstalled } = useBrewStore();
   const navigate = useNavigationStore((s) => s.navigate);
@@ -1193,7 +1782,7 @@ function InstalledView() {
   const debouncedFilter = useDebounce(filter, 200);
   const stream = useBrewStream();
   const { openModal, closeModal } = useModalStore();
-  const { stdout } = useStdout();
+  const { stdout } = useStdout2();
   const cols = stdout?.columns ?? 80;
   const nameWidth = Math.floor(cols * 0.35);
   const versionWidth = Math.floor(cols * 0.15);
@@ -1250,18 +1839,18 @@ function InstalledView() {
     } else if (input === "G") {
       setCursor(Math.max(allItems.length - 1, 0));
     } else if (key.return && allItems[cursor]) {
-      selectPackage(allItems[cursor].name);
+      selectPackage(allItems[cursor].name, tab === "formulae" ? "formula" : "cask");
       navigate("package-info");
     } else if (input === "f") {
       setTab((t2) => t2 === "formulae" ? "casks" : "formulae");
       setCursor(0);
     }
   }, { isActive: true });
-  if (loading.installed) return /* @__PURE__ */ jsx14(Loading, { message: t("loading_installed") });
-  if (errors.installed) return /* @__PURE__ */ jsx14(ErrorMessage, { message: errors.installed });
+  if (loading.installed) return /* @__PURE__ */ jsx16(Loading, { message: t("loading_installed") });
+  if (errors.installed) return /* @__PURE__ */ jsx16(ErrorMessage, { message: errors.installed });
   if (stream.isRunning || stream.lines.length > 0) {
-    return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx14(
+    return /* @__PURE__ */ jsxs15(Box14, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx16(
         ProgressLog,
         {
           lines: stream.lines,
@@ -1269,13 +1858,19 @@ function InstalledView() {
           title: t("pkgInfo_uninstalling", { name: "..." })
         }
       ),
-      stream.isRunning && /* @__PURE__ */ jsxs14(Text14, { color: "#6B7280", children: [
+      stream.isRunning && /* @__PURE__ */ jsxs15(Text16, { color: COLORS.textSecondary, children: [
         "esc:",
         t("hint_cancel")
       ] }),
-      !stream.isRunning && /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", marginTop: 1, children: [
-        /* @__PURE__ */ jsx14(Box12, { borderStyle: "round", borderColor: stream.error ? "#EF4444" : "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx14(Text14, { color: stream.error ? "#EF4444" : "#22C55E", bold: true, children: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("pkgInfo_done")}` }) }),
-        /* @__PURE__ */ jsxs14(Text14, { color: "#6B7280", children: [
+      !stream.isRunning && /* @__PURE__ */ jsxs15(Box14, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx16(
+          ResultBanner,
+          {
+            status: stream.error ? "error" : "success",
+            message: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("pkgInfo_done")}`
+          }
+        ),
+        /* @__PURE__ */ jsxs15(Text16, { color: COLORS.textSecondary, children: [
           "esc:",
           t("hint_back")
         ] })
@@ -1285,28 +1880,28 @@ function InstalledView() {
   const MAX_VISIBLE_ROWS = Math.max(5, (stdout?.rows ?? 24) - 8);
   const start = Math.max(0, cursor - Math.floor(MAX_VISIBLE_ROWS / 2));
   const visible = allItems.slice(start, start + MAX_VISIBLE_ROWS);
-  return /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs14(Box12, { marginBottom: 1, gap: 1, children: [
-      /* @__PURE__ */ jsx14(
-        Box12,
+  return /* @__PURE__ */ jsxs15(Box14, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs15(Box14, { marginBottom: 1, gap: 1, children: [
+      /* @__PURE__ */ jsx16(
+        Box14,
         {
           borderStyle: "round",
-          borderColor: tab === "formulae" ? "#06B6D4" : "#6B7280",
+          borderColor: tab === "formulae" ? COLORS.info : COLORS.textSecondary,
           paddingX: 1,
-          children: /* @__PURE__ */ jsxs14(Text14, { bold: tab === "formulae", color: tab === "formulae" ? "#06B6D4" : "#6B7280", children: [
+          children: /* @__PURE__ */ jsxs15(Text16, { bold: tab === "formulae", color: tab === "formulae" ? COLORS.info : COLORS.textSecondary, children: [
             "\u{1F4E6}",
             " ",
             t("installed_formulaeCount", { count: formulae.length })
           ] })
         }
       ),
-      /* @__PURE__ */ jsx14(
-        Box12,
+      /* @__PURE__ */ jsx16(
+        Box14,
         {
           borderStyle: "round",
-          borderColor: tab === "casks" ? "#A855F7" : "#6B7280",
+          borderColor: tab === "casks" ? COLORS.purple : COLORS.textSecondary,
           paddingX: 1,
-          children: /* @__PURE__ */ jsxs14(Text14, { bold: tab === "casks", color: tab === "casks" ? "#A855F7" : "#6B7280", children: [
+          children: /* @__PURE__ */ jsxs15(Text16, { bold: tab === "casks", color: tab === "casks" ? COLORS.purple : COLORS.textSecondary, children: [
             "\u{1F37A}",
             " ",
             t("installed_casksCount", { count: casks.length })
@@ -1314,7 +1909,7 @@ function InstalledView() {
         }
       )
     ] }),
-    confirmUninstall && /* @__PURE__ */ jsx14(
+    confirmUninstall && /* @__PURE__ */ jsx16(
       ConfirmDialog,
       {
         message: t("installed_confirmUninstall", { name: confirmUninstall }),
@@ -1328,49 +1923,48 @@ function InstalledView() {
         onCancel: () => setConfirmUninstall(null)
       }
     ),
-    isSearching && /* @__PURE__ */ jsx14(Box12, { marginBottom: 1, borderStyle: "round", borderColor: "#FFD700", paddingX: 1, children: /* @__PURE__ */ jsx14(SearchInput, { defaultValue: filter, onChange: setFilter, isActive: isSearching }) }),
-    /* @__PURE__ */ jsxs14(Box12, { gap: 1, borderStyle: "single", borderBottom: true, borderTop: false, borderLeft: false, borderRight: false, borderColor: "#4B5563", children: [
-      /* @__PURE__ */ jsxs14(Text14, { color: "#F9FAFB", bold: true, children: [
+    isSearching && /* @__PURE__ */ jsx16(Box14, { marginBottom: 1, borderStyle: "round", borderColor: COLORS.gold, paddingX: 1, children: /* @__PURE__ */ jsx16(SearchInput, { defaultValue: filter, onChange: setFilter, isActive: isSearching }) }),
+    /* @__PURE__ */ jsxs15(Box14, { gap: 1, borderStyle: "single", borderBottom: true, borderTop: false, borderLeft: false, borderRight: false, borderColor: COLORS.border, children: [
+      /* @__PURE__ */ jsxs15(Text16, { color: COLORS.text, bold: true, children: [
         " ",
-        "Package".padEnd(nameWidth)
+        t("installed_col_package").padEnd(nameWidth)
       ] }),
-      /* @__PURE__ */ jsx14(Text14, { color: "#F9FAFB", bold: true, children: "Version".padEnd(versionWidth) }),
-      /* @__PURE__ */ jsx14(Text14, { color: "#F9FAFB", bold: true, children: "Status" })
+      /* @__PURE__ */ jsx16(Text16, { color: COLORS.text, bold: true, children: t("installed_col_version").padEnd(versionWidth) }),
+      /* @__PURE__ */ jsx16(Text16, { color: COLORS.text, bold: true, children: t("installed_col_status") })
     ] }),
-    /* @__PURE__ */ jsxs14(Box12, { flexDirection: "column", children: [
-      visible.length === 0 && /* @__PURE__ */ jsx14(Box12, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ jsx14(Text14, { color: "#6B7280", italic: true, children: t("installed_noPackages") }) }),
-      start > 0 && /* @__PURE__ */ jsxs14(Text14, { color: "#6B7280", dimColor: true, children: [
+    /* @__PURE__ */ jsxs15(Box14, { flexDirection: "column", children: [
+      visible.length === 0 && /* @__PURE__ */ jsx16(Box14, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ jsx16(Text16, { color: COLORS.textSecondary, italic: true, children: t("installed_noPackages") }) }),
+      start > 0 && /* @__PURE__ */ jsxs15(Text16, { color: COLORS.textSecondary, dimColor: true, children: [
         "  ",
         t("scroll_moreAbove", { count: start })
       ] }),
       visible.map((item, i) => {
         const idx = start + i;
         const isCurrent = idx === cursor;
-        return /* @__PURE__ */ jsxs14(Box12, { gap: 1, children: [
-          /* @__PURE__ */ jsx14(Text14, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-          /* @__PURE__ */ jsx14(Text14, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? "#F9FAFB" : "#9CA3AF", children: truncate(item.name, nameWidth).padEnd(nameWidth) }),
-          /* @__PURE__ */ jsx14(Text14, { color: "#2DD4BF", children: item.version.padEnd(versionWidth) }),
-          item.outdated && /* @__PURE__ */ jsx14(StatusBadge, { label: t("badge_outdated"), variant: "warning" }),
-          item.pinned && /* @__PURE__ */ jsx14(StatusBadge, { label: t("badge_pinned"), variant: "info" }),
-          item.kegOnly && /* @__PURE__ */ jsx14(StatusBadge, { label: t("badge_kegOnly"), variant: "muted" }),
-          item.installedAsDependency && /* @__PURE__ */ jsx14(StatusBadge, { label: t("badge_dep"), variant: "muted" }),
-          !item.outdated && !item.pinned && !item.kegOnly && !item.installedAsDependency && /* @__PURE__ */ jsx14(Text14, { color: "#6B7280", dimColor: true, children: truncate(item.desc, 30) })
+        return /* @__PURE__ */ jsxs15(SelectableRow, { isCurrent, children: [
+          /* @__PURE__ */ jsx16(Text16, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? COLORS.text : COLORS.muted, children: truncate(item.name, nameWidth).padEnd(nameWidth) }),
+          /* @__PURE__ */ jsx16(Text16, { color: COLORS.teal, children: item.version.padEnd(versionWidth) }),
+          item.outdated && /* @__PURE__ */ jsx16(StatusBadge, { label: t("badge_outdated"), variant: "warning" }),
+          item.pinned && /* @__PURE__ */ jsx16(StatusBadge, { label: t("badge_pinned"), variant: "info" }),
+          item.kegOnly && /* @__PURE__ */ jsx16(StatusBadge, { label: t("badge_kegOnly"), variant: "muted" }),
+          item.installedAsDependency && /* @__PURE__ */ jsx16(StatusBadge, { label: t("badge_dep"), variant: "muted" }),
+          !item.outdated && !item.pinned && !item.kegOnly && !item.installedAsDependency && /* @__PURE__ */ jsx16(Text16, { color: COLORS.textSecondary, dimColor: true, children: truncate(item.desc, 30) })
         ] }, item.name);
       }),
-      start + MAX_VISIBLE_ROWS < allItems.length && /* @__PURE__ */ jsxs14(Text14, { color: "#6B7280", dimColor: true, children: [
+      start + MAX_VISIBLE_ROWS < allItems.length && /* @__PURE__ */ jsxs15(Text16, { color: COLORS.textSecondary, dimColor: true, children: [
         "  ",
         t("scroll_moreBelow", { count: allItems.length - start - MAX_VISIBLE_ROWS })
       ] })
     ] }),
-    /* @__PURE__ */ jsx14(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx14(Text14, { color: "#F9FAFB", bold: true, children: allItems.length > 0 ? `${cursor + 1}/${allItems.length}` : "0/0" }) })
+    /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(Text16, { color: COLORS.text, bold: true, children: allItems.length > 0 ? `${cursor + 1}/${allItems.length}` : "0/0" }) })
   ] });
 }
 
 // src/views/search.tsx
 import { useState as useState4, useCallback as useCallback2, useEffect as useEffect6, useRef as useRef2 } from "react";
-import { Box as Box13, Text as Text15, useInput as useInput4 } from "ink";
+import { Box as Box15, Text as Text17, useInput as useInput4 } from "ink";
 import { TextInput as TextInput2 } from "@inkjs/ui";
-import { jsx as jsx15, jsxs as jsxs15 } from "react/jsx-runtime";
+import { jsx as jsx17, jsxs as jsxs16 } from "react/jsx-runtime";
 function SearchView() {
   const [query, setQuery] = useState4("");
   const [results, setResults] = useState4(null);
@@ -1394,7 +1988,11 @@ function SearchView() {
     return void 0;
   }, [results]);
   const doSearch = useCallback2(async (term) => {
-    if (term.length < 2) return;
+    if (term.length < 2) {
+      setResults(null);
+      setSearchError(t("search_minChars"));
+      return;
+    }
     setSearching(true);
     setSearchError(null);
     try {
@@ -1403,7 +2001,7 @@ function SearchView() {
       setCursor(0);
     } catch (err) {
       setResults({ formulae: [], casks: [] });
-      setSearchError(err instanceof Error ? err.message : "Search failed");
+      setSearchError(err instanceof Error ? err.message : t("search_failed"));
     } finally {
       setSearching(false);
     }
@@ -1423,6 +2021,12 @@ function SearchView() {
       if (key.escape) stream.cancel();
       return;
     }
+    if (stream.lines.length > 0) {
+      if (key.escape) {
+        stream.clear();
+      }
+      return;
+    }
     if (confirmInstall) return;
     if (key.return && !results) {
       void doSearch(query);
@@ -1447,8 +2051,8 @@ function SearchView() {
     }
   });
   if (stream.isRunning || stream.lines.length > 0) {
-    return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx15(
+    return /* @__PURE__ */ jsxs16(Box15, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx17(
         ProgressLog,
         {
           lines: stream.lines,
@@ -1456,26 +2060,32 @@ function SearchView() {
           title: t("search_installing")
         }
       ),
-      stream.isRunning && /* @__PURE__ */ jsxs15(Text15, { color: "#6B7280", children: [
+      stream.isRunning && /* @__PURE__ */ jsxs16(Text17, { color: COLORS.textSecondary, children: [
         "esc:",
         t("hint_cancel")
       ] }),
-      !stream.isRunning && /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", marginTop: 1, children: [
-        /* @__PURE__ */ jsx15(Box13, { borderStyle: "round", borderColor: stream.error ? "#EF4444" : "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx15(Text15, { color: stream.error ? "#EF4444" : "#22C55E", bold: true, children: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("search_installComplete")}` }) }),
-        /* @__PURE__ */ jsxs15(Text15, { color: "#6B7280", children: [
+      !stream.isRunning && /* @__PURE__ */ jsxs16(Box15, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx17(
+          ResultBanner,
+          {
+            status: stream.error ? "error" : "success",
+            message: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("search_installComplete")}`
+          }
+        ),
+        /* @__PURE__ */ jsxs16(Text17, { color: COLORS.textSecondary, children: [
           "esc:",
-          t("hint_back")
+          t("hint_clear")
         ] })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs15(Box13, { marginBottom: 1, children: [
-      /* @__PURE__ */ jsxs15(Text15, { color: "#FFD700", children: [
+  return /* @__PURE__ */ jsxs16(Box15, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs16(Box15, { marginBottom: 1, children: [
+      /* @__PURE__ */ jsxs16(Text17, { color: COLORS.gold, children: [
         "\u{1F50D}",
         " "
       ] }),
-      !results ? /* @__PURE__ */ jsx15(
+      !results ? /* @__PURE__ */ jsx17(
         TextInput2,
         {
           placeholder: t("search_placeholder"),
@@ -1483,17 +2093,17 @@ function SearchView() {
           onChange: setQuery,
           onSubmit: () => void doSearch(query)
         }
-      ) : /* @__PURE__ */ jsxs15(Text15, { children: [
+      ) : /* @__PURE__ */ jsxs16(Text17, { children: [
         t("search_resultsFor"),
         ' "',
-        /* @__PURE__ */ jsx15(Text15, { bold: true, color: "#F9FAFB", children: query }),
+        /* @__PURE__ */ jsx17(Text17, { bold: true, color: COLORS.text, children: query }),
         '" ',
-        /* @__PURE__ */ jsx15(Text15, { color: "#6B7280", children: t("search_escToClear") })
+        /* @__PURE__ */ jsx17(Text17, { color: COLORS.textSecondary, children: t("search_escToClear") })
       ] })
     ] }),
-    searching && /* @__PURE__ */ jsx15(Loading, { message: t("loading_searching") }),
-    searchError && /* @__PURE__ */ jsx15(Box13, { marginBottom: 1, children: /* @__PURE__ */ jsx15(Text15, { color: "#EF4444", children: searchError }) }),
-    confirmInstall && /* @__PURE__ */ jsx15(
+    searching && /* @__PURE__ */ jsx17(Loading, { message: t("loading_searching") }),
+    searchError && /* @__PURE__ */ jsx17(Box15, { marginBottom: 1, children: /* @__PURE__ */ jsx17(Text17, { color: COLORS.error, children: searchError }) }),
+    confirmInstall && /* @__PURE__ */ jsx17(
       ConfirmDialog,
       {
         message: t("search_confirmInstall", { name: confirmInstall }),
@@ -1506,46 +2116,40 @@ function SearchView() {
         onCancel: () => setConfirmInstall(null)
       }
     ),
-    results && !searching && !confirmInstall && /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-      visibleFormulae.length > 0 && /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", marginBottom: 1, children: [
-        /* @__PURE__ */ jsx15(Text15, { bold: true, color: "#06B6D4", children: t("search_formulaeHeader", { count: results.formulae.length }) }),
+    results && !searching && !confirmInstall && /* @__PURE__ */ jsxs16(Box15, { flexDirection: "column", children: [
+      visibleFormulae.length > 0 && /* @__PURE__ */ jsxs16(Box15, { flexDirection: "column", marginBottom: 1, children: [
+        /* @__PURE__ */ jsx17(Text17, { bold: true, color: COLORS.info, children: t("search_formulaeHeader", { count: results.formulae.length }) }),
         visibleFormulae.map((name, i) => {
           const isCurrent = i === cursor;
-          return /* @__PURE__ */ jsxs15(Box13, { gap: 1, children: [
-            /* @__PURE__ */ jsx15(Text15, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-            /* @__PURE__ */ jsx15(Text15, { bold: isCurrent, inverse: isCurrent, children: name })
-          ] }, name);
+          return /* @__PURE__ */ jsx17(SelectableRow, { isCurrent, children: /* @__PURE__ */ jsx17(Text17, { bold: isCurrent, inverse: isCurrent, children: name }) }, name);
         }),
-        results.formulae.length > MAX_VISIBLE && /* @__PURE__ */ jsxs15(Text15, { color: "#6B7280", dimColor: true, children: [
+        results.formulae.length > MAX_VISIBLE && /* @__PURE__ */ jsxs16(Text17, { color: COLORS.textSecondary, dimColor: true, children: [
           "  ",
           t("scroll_moreBelow", { count: results.formulae.length - MAX_VISIBLE })
         ] })
       ] }),
-      visibleCasks.length > 0 && /* @__PURE__ */ jsxs15(Box13, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsx15(Text15, { bold: true, color: "#A855F7", children: t("search_casksHeader", { count: results.casks.length }) }),
+      visibleCasks.length > 0 && /* @__PURE__ */ jsxs16(Box15, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsx17(Text17, { bold: true, color: COLORS.purple, children: t("search_casksHeader", { count: results.casks.length }) }),
         visibleCasks.map((name, i) => {
           const idx = visibleFormulae.length + i;
           const isCurrent = idx === cursor;
-          return /* @__PURE__ */ jsxs15(Box13, { gap: 1, children: [
-            /* @__PURE__ */ jsx15(Text15, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-            /* @__PURE__ */ jsx15(Text15, { bold: isCurrent, inverse: isCurrent, children: name })
-          ] }, name);
+          return /* @__PURE__ */ jsx17(SelectableRow, { isCurrent, children: /* @__PURE__ */ jsx17(Text17, { bold: isCurrent, inverse: isCurrent, children: name }) }, name);
         }),
-        results.casks.length > MAX_VISIBLE && /* @__PURE__ */ jsxs15(Text15, { color: "#6B7280", dimColor: true, children: [
+        results.casks.length > MAX_VISIBLE && /* @__PURE__ */ jsxs16(Text17, { color: COLORS.textSecondary, dimColor: true, children: [
           "  ",
           t("scroll_moreBelow", { count: results.casks.length - MAX_VISIBLE })
         ] })
       ] }),
-      allVisible.length === 0 && /* @__PURE__ */ jsx15(Box13, { borderStyle: "round", borderColor: "#6B7280", paddingX: 2, children: /* @__PURE__ */ jsx15(Text15, { color: "#6B7280", italic: true, children: t("search_noResults") }) }),
-      /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(Text15, { color: "#F9FAFB", bold: true, children: allVisible.length > 0 ? `${cursor + 1}/${allVisible.length}` : "" }) })
+      allVisible.length === 0 && /* @__PURE__ */ jsx17(Box15, { borderStyle: "round", borderColor: COLORS.textSecondary, paddingX: 2, children: /* @__PURE__ */ jsx17(Text17, { color: COLORS.textSecondary, italic: true, children: t("search_noResults") }) }),
+      /* @__PURE__ */ jsx17(Box15, { marginTop: 1, children: /* @__PURE__ */ jsx17(Text17, { color: COLORS.text, bold: true, children: allVisible.length > 0 ? `${cursor + 1}/${allVisible.length}` : "" }) })
     ] })
   ] });
 }
 
 // src/views/outdated.tsx
 import { useEffect as useEffect7, useRef as useRef3, useState as useState5 } from "react";
-import { Box as Box14, Text as Text16, useInput as useInput5, useStdout as useStdout2 } from "ink";
-import { jsx as jsx16, jsxs as jsxs16 } from "react/jsx-runtime";
+import { Box as Box16, Text as Text18, useInput as useInput5, useStdout as useStdout3 } from "ink";
+import { jsx as jsx18, jsxs as jsxs17 } from "react/jsx-runtime";
 function OutdatedView() {
   const { outdated, loading, errors, fetchOutdated } = useBrewStore();
   const stream = useBrewStream();
@@ -1567,6 +2171,17 @@ function OutdatedView() {
       if (key.escape) stream.cancel();
       return;
     }
+    if (stream.lines.length > 0) {
+      if (key.escape) {
+        stream.clear();
+        return;
+      }
+      if (input === "r") {
+        stream.clear();
+        void fetchOutdated();
+      }
+      return;
+    }
     if (confirmAction) return;
     if (input === "j" || key.downArrow) {
       setCursor((c) => Math.min(c + 1, Math.max(0, allOutdated.length - 1)));
@@ -1578,21 +2193,21 @@ function OutdatedView() {
       setConfirmAction({ type: "all" });
     } else if (input === "p" && allOutdated[cursor]) {
       const pkg = allOutdated[cursor];
-      void execBrew([pkg.pinned ? "unpin" : "pin", pkg.name]).then(() => void fetchOutdated());
+      void (pkg.pinned ? unpinPackage(pkg.name) : pinPackage(pkg.name)).then(() => void fetchOutdated());
       return;
     } else if (input === "r") {
       void fetchOutdated();
     }
   });
-  const { stdout } = useStdout2();
+  const { stdout } = useStdout3();
   const MAX_VISIBLE_ROWS = Math.max(5, (stdout?.rows ?? 24) - 8);
   const start = Math.max(0, cursor - Math.floor(MAX_VISIBLE_ROWS / 2));
   const visible = allOutdated.slice(start, start + MAX_VISIBLE_ROWS);
-  if (loading.outdated) return /* @__PURE__ */ jsx16(Loading, { message: t("loading_outdated") });
-  if (errors.outdated) return /* @__PURE__ */ jsx16(ErrorMessage, { message: errors.outdated });
+  if (loading.outdated) return /* @__PURE__ */ jsx18(Loading, { message: t("loading_outdated") });
+  if (errors.outdated) return /* @__PURE__ */ jsx18(ErrorMessage, { message: errors.outdated });
   if (stream.isRunning || stream.lines.length > 0) {
-    return /* @__PURE__ */ jsxs16(Box14, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx16(
+    return /* @__PURE__ */ jsxs17(Box16, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx18(
         ProgressLog,
         {
           lines: stream.lines,
@@ -1600,33 +2215,35 @@ function OutdatedView() {
           title: t("outdated_upgrading")
         }
       ),
-      stream.isRunning && /* @__PURE__ */ jsxs16(Text16, { color: "#6B7280", children: [
+      stream.isRunning && /* @__PURE__ */ jsxs17(Text18, { color: COLORS.textSecondary, children: [
         "esc:",
         t("hint_cancel")
       ] }),
-      !stream.isRunning && /* @__PURE__ */ jsxs16(Box14, { flexDirection: "column", marginTop: 1, children: [
-        /* @__PURE__ */ jsxs16(Box14, { borderStyle: "round", borderColor: stream.error ? "#EF4444" : "#22C55E", paddingX: 2, paddingY: 0, children: [
-          /* @__PURE__ */ jsx16(Text16, { color: stream.error ? "#EF4444" : "#22C55E", bold: true, children: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("outdated_upgradeComplete")}` }),
-          /* @__PURE__ */ jsxs16(Text16, { color: "#9CA3AF", children: [
+      !stream.isRunning && /* @__PURE__ */ jsxs17(Box16, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsxs17(Box16, { borderStyle: "round", borderColor: stream.error ? COLORS.error : COLORS.success, paddingX: 2, paddingY: 0, children: [
+          /* @__PURE__ */ jsx18(Text18, { color: stream.error ? COLORS.error : COLORS.success, bold: true, children: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("outdated_upgradeComplete")}` }),
+          /* @__PURE__ */ jsxs17(Text18, { color: COLORS.muted, children: [
             " ",
             t("outdated_pressRefresh")
           ] })
         ] }),
-        /* @__PURE__ */ jsxs16(Text16, { color: "#6B7280", children: [
+        /* @__PURE__ */ jsxs17(Text18, { color: COLORS.textSecondary, children: [
           "r:",
           t("hint_refresh"),
           " esc:",
-          t("hint_back")
+          t("hint_clear")
         ] })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs16(Box14, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx16(SectionHeader, { emoji: "\u{1F4E6}", title: t("outdated_title", { count: allOutdated.length }), gradient: GRADIENTS.fire }),
-    confirmAction && /* @__PURE__ */ jsx16(Box14, { marginY: 1, children: /* @__PURE__ */ jsx16(
+  const upgradeAllMessage = confirmAction?.type === "all" ? `${t("outdated_confirmAll", { count: allOutdated.length })}
+${t("outdated_upgradeAllList", { list: allOutdated.map((p) => p.name).join(", ") })}` : "";
+  return /* @__PURE__ */ jsxs17(Box16, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx18(SectionHeader, { emoji: "\u{1F4E6}", title: t("outdated_title", { count: allOutdated.length }), gradient: GRADIENTS.fire }),
+    confirmAction && /* @__PURE__ */ jsx18(Box16, { marginY: 1, children: /* @__PURE__ */ jsx18(
       ConfirmDialog,
       {
-        message: confirmAction.type === "all" ? t("outdated_confirmAll", { count: allOutdated.length }) : t("outdated_confirmSingle", { name: confirmAction.type === "single" ? confirmAction.name : "" }),
+        message: confirmAction.type === "all" ? upgradeAllMessage : t("outdated_confirmSingle", { name: confirmAction.type === "single" ? confirmAction.name : "" }),
         onConfirm: () => {
           hasRefreshed.current = false;
           if (confirmAction.type === "all") {
@@ -1639,31 +2256,26 @@ function OutdatedView() {
         onCancel: () => setConfirmAction(null)
       }
     ) }),
-    allOutdated.length === 0 && !confirmAction && /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx16(Box14, { borderStyle: "round", borderColor: "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs16(Text16, { color: "#22C55E", bold: true, children: [
-      "\u2714",
-      " ",
-      t("outdated_upToDate")
-    ] }) }) }),
-    allOutdated.length > 0 && !confirmAction && /* @__PURE__ */ jsxs16(Box14, { flexDirection: "column", marginTop: 1, children: [
-      start > 0 && /* @__PURE__ */ jsxs16(Text16, { color: "#6B7280", dimColor: true, children: [
+    allOutdated.length === 0 && !confirmAction && /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(ResultBanner, { status: "success", message: `\u2714 ${t("outdated_upToDate")}` }) }),
+    allOutdated.length > 0 && !confirmAction && /* @__PURE__ */ jsxs17(Box16, { flexDirection: "column", marginTop: 1, children: [
+      start > 0 && /* @__PURE__ */ jsxs17(Text18, { color: COLORS.textSecondary, dimColor: true, children: [
         "  ",
         t("scroll_moreAbove", { count: start })
       ] }),
       visible.map((pkg, i) => {
         const idx = start + i;
         const isCurrent = idx === cursor;
-        return /* @__PURE__ */ jsxs16(Box14, { gap: 1, children: [
-          /* @__PURE__ */ jsx16(Text16, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-          /* @__PURE__ */ jsx16(Text16, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? "#F9FAFB" : "#9CA3AF", children: pkg.name }),
-          /* @__PURE__ */ jsx16(VersionArrow, { current: pkg.installed_versions[0] ?? "", latest: pkg.current_version }),
-          pkg.pinned && /* @__PURE__ */ jsx16(StatusBadge, { label: t("outdated_pinned"), variant: "info" })
+        return /* @__PURE__ */ jsxs17(SelectableRow, { isCurrent, children: [
+          /* @__PURE__ */ jsx18(Text18, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? COLORS.text : COLORS.muted, children: pkg.name }),
+          /* @__PURE__ */ jsx18(VersionArrow, { current: pkg.installed_versions[0] ?? "", latest: pkg.current_version }),
+          pkg.pinned && /* @__PURE__ */ jsx18(StatusBadge, { label: t("outdated_pinned"), variant: "info" })
         ] }, pkg.name);
       }),
-      start + MAX_VISIBLE_ROWS < allOutdated.length && /* @__PURE__ */ jsxs16(Text16, { color: "#6B7280", dimColor: true, children: [
+      start + MAX_VISIBLE_ROWS < allOutdated.length && /* @__PURE__ */ jsxs17(Text18, { color: COLORS.textSecondary, dimColor: true, children: [
         "  ",
         t("scroll_moreBelow", { count: allOutdated.length - start - MAX_VISIBLE_ROWS })
       ] }),
-      /* @__PURE__ */ jsx16(Box14, { marginTop: 1, children: /* @__PURE__ */ jsxs16(Text16, { color: "#F9FAFB", bold: true, children: [
+      /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsxs17(Text18, { color: COLORS.text, bold: true, children: [
         cursor + 1,
         "/",
         allOutdated.length
@@ -1674,8 +2286,8 @@ function OutdatedView() {
 
 // src/views/package-info.tsx
 import { useEffect as useEffect8, useRef as useRef4, useState as useState6 } from "react";
-import { Box as Box15, Text as Text17, useInput as useInput6 } from "ink";
-import { Fragment as Fragment4, jsx as jsx17, jsxs as jsxs17 } from "react/jsx-runtime";
+import { Box as Box17, Text as Text19, useInput as useInput6 } from "ink";
+import { Fragment as Fragment4, jsx as jsx19, jsxs as jsxs18 } from "react/jsx-runtime";
 var ACTION_PROGRESS_KEYS = {
   install: "pkgInfo_installing",
   uninstall: "pkgInfo_uninstalling",
@@ -1688,6 +2300,7 @@ var ACTION_CONFIRM_KEYS = {
 };
 function PackageInfoView() {
   const packageName = useNavigationStore((s) => s.selectedPackage);
+  const packageType = useNavigationStore((s) => s.selectedPackageType);
   const [formula, setFormula] = useState6(null);
   const [loading, setLoading2] = useState6(true);
   const [error, setError2] = useState6(null);
@@ -1705,22 +2318,60 @@ function PackageInfoView() {
   useEffect8(() => {
     if (!packageName) return;
     setLoading2(true);
-    getFormulaInfo(packageName).then((f) => {
+    const fetchInfo = async () => {
+      if (packageType === "cask") {
+        const caskInfo = await getCaskInfo(packageName);
+        if (caskInfo && mountedRef.current) {
+          const formulaLike = {
+            name: caskInfo.token,
+            full_name: caskInfo.full_token,
+            tap: "",
+            desc: caskInfo.desc,
+            license: "",
+            homepage: caskInfo.homepage,
+            versions: { stable: caskInfo.version, head: null, bottle: false },
+            dependencies: [],
+            build_dependencies: [],
+            installed: caskInfo.installed ? [{
+              version: caskInfo.installed,
+              used_options: [],
+              built_as_bottle: false,
+              poured_from_bottle: false,
+              time: caskInfo.installed_time ?? 0,
+              runtime_dependencies: [],
+              installed_as_dependency: false,
+              installed_on_request: true
+            }] : [],
+            linked_keg: null,
+            pinned: false,
+            outdated: caskInfo.outdated,
+            deprecated: false,
+            keg_only: false,
+            caveats: null
+          };
+          setFormula(formulaLike);
+          setLoading2(false);
+          return;
+        }
+      }
+      const f = await getFormulaInfo(packageName);
       if (mountedRef.current) {
         setFormula(f);
         setLoading2(false);
       }
-    }).catch((err) => {
+    };
+    fetchInfo().catch((err) => {
       if (mountedRef.current) {
         setError2(err.message);
         setLoading2(false);
       }
     });
-  }, [packageName]);
+  }, [packageName, packageType]);
   useEffect8(() => {
     if (!stream.isRunning && !stream.error && stream.lines.length > 0 && !hasRefreshed.current && packageName) {
       hasRefreshed.current = true;
-      getFormulaInfo(packageName).then((f) => {
+      const refreshFn = packageType === "cask" ? getCaskInfo(packageName).then((c) => c ? { ...c, installed: c.installed ? [{ version: c.installed }] : [] } : null) : getFormulaInfo(packageName);
+      refreshFn.then((f) => {
         if (mountedRef.current) {
           setFormula(f);
         }
@@ -1745,21 +2396,21 @@ function PackageInfoView() {
     }
   });
   if (!packageName) {
-    return /* @__PURE__ */ jsx17(Text17, { color: "#6B7280", italic: true, children: t("pkgInfo_noPackage") });
+    return /* @__PURE__ */ jsx19(Text19, { color: COLORS.textSecondary, italic: true, children: t("pkgInfo_noPackage") });
   }
-  if (loading) return /* @__PURE__ */ jsx17(Loading, { message: t("loading_package", { name: packageName }) });
-  if (error) return /* @__PURE__ */ jsx17(ErrorMessage, { message: error });
-  if (!formula) return /* @__PURE__ */ jsx17(ErrorMessage, { message: t("pkgInfo_notFound") });
+  if (loading) return /* @__PURE__ */ jsx19(Loading, { message: t("loading_package", { name: packageName }) });
+  if (error) return /* @__PURE__ */ jsx19(ErrorMessage, { message: error });
+  if (!formula) return /* @__PURE__ */ jsx19(ErrorMessage, { message: t("pkgInfo_notFound") });
   if (stream.isRunning || stream.lines.length > 0) {
-    return /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx17(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t(ACTION_PROGRESS_KEYS[activeActionRef.current] ?? ACTION_PROGRESS_KEYS["install"], { name: formula.name }) }),
-      stream.isRunning && /* @__PURE__ */ jsxs17(Text17, { color: "#6B7280", children: [
+    return /* @__PURE__ */ jsxs18(Box17, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx19(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t(ACTION_PROGRESS_KEYS[activeActionRef.current] ?? ACTION_PROGRESS_KEYS["install"], { name: formula.name }) }),
+      stream.isRunning && /* @__PURE__ */ jsxs18(Text19, { color: COLORS.textSecondary, children: [
         "esc:",
         t("hint_cancel")
       ] }),
-      !stream.isRunning && /* @__PURE__ */ jsxs17(Fragment4, { children: [
-        /* @__PURE__ */ jsx17(Text17, { color: stream.error ? "#EF4444" : "#22C55E", bold: true, children: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("pkgInfo_done")}` }),
-        /* @__PURE__ */ jsxs17(Text17, { color: "#6B7280", children: [
+      !stream.isRunning && /* @__PURE__ */ jsxs18(Fragment4, { children: [
+        /* @__PURE__ */ jsx19(Text19, { color: stream.error ? COLORS.error : COLORS.success, bold: true, children: stream.error ? `\u2718 ${stream.error}` : `\u2714 ${t("pkgInfo_done")}` }),
+        /* @__PURE__ */ jsxs18(Text19, { color: COLORS.textSecondary, children: [
           "esc:",
           t("hint_back")
         ] })
@@ -1768,8 +2419,8 @@ function PackageInfoView() {
   }
   const installed = formula.installed[0];
   const isInstalled = formula.installed.length > 0;
-  return /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", children: [
-    confirmAction && /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsxs18(Box17, { flexDirection: "column", children: [
+    confirmAction && /* @__PURE__ */ jsx19(
       ConfirmDialog,
       {
         message: t(ACTION_CONFIRM_KEYS[confirmAction], { name: formula.name }),
@@ -1785,72 +2436,72 @@ function PackageInfoView() {
         onCancel: () => setConfirmAction(null)
       }
     ),
-    /* @__PURE__ */ jsxs17(Box15, { gap: 2, marginBottom: 1, children: [
-      /* @__PURE__ */ jsx17(GradientText, { colors: GRADIENTS.gold, bold: true, children: formula.name }),
-      /* @__PURE__ */ jsx17(Text17, { color: "#2DD4BF", children: installed?.version ?? formula.versions.stable }),
-      isInstalled && /* @__PURE__ */ jsx17(StatusBadge, { label: t("badge_installed"), variant: "success" }),
-      formula.outdated && /* @__PURE__ */ jsx17(StatusBadge, { label: t("badge_outdated"), variant: "warning" }),
-      formula.pinned && /* @__PURE__ */ jsx17(StatusBadge, { label: t("badge_pinned"), variant: "info" }),
-      formula.keg_only && /* @__PURE__ */ jsx17(StatusBadge, { label: t("badge_kegOnly"), variant: "muted" }),
-      formula.deprecated && /* @__PURE__ */ jsx17(StatusBadge, { label: t("badge_deprecated"), variant: "error" })
+    /* @__PURE__ */ jsxs18(Box17, { gap: 2, marginBottom: 1, children: [
+      /* @__PURE__ */ jsx19(GradientText, { colors: GRADIENTS.gold, bold: true, children: formula.name }),
+      /* @__PURE__ */ jsx19(Text19, { color: COLORS.teal, children: installed?.version ?? formula.versions.stable }),
+      isInstalled && /* @__PURE__ */ jsx19(StatusBadge, { label: t("badge_installed"), variant: "success" }),
+      formula.outdated && /* @__PURE__ */ jsx19(StatusBadge, { label: t("badge_outdated"), variant: "warning" }),
+      formula.pinned && /* @__PURE__ */ jsx19(StatusBadge, { label: t("badge_pinned"), variant: "info" }),
+      formula.keg_only && /* @__PURE__ */ jsx19(StatusBadge, { label: t("badge_kegOnly"), variant: "muted" }),
+      formula.deprecated && /* @__PURE__ */ jsx19(StatusBadge, { label: t("badge_deprecated"), variant: "error" })
     ] }),
-    /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", gap: 1, children: [
-      /* @__PURE__ */ jsx17(Text17, { children: formula.desc }),
-      /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsx17(SectionHeader, { emoji: "\u{1F4CB}", title: t("pkgInfo_details"), gradient: ["#F9FAFB", "#9CA3AF"] }),
-        /* @__PURE__ */ jsxs17(Box15, { borderStyle: "round", borderColor: "#4B5563", paddingX: 2, flexDirection: "column", children: [
-          /* @__PURE__ */ jsxs17(Text17, { children: [
-            /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: t("pkgInfo_homepage") }),
+    /* @__PURE__ */ jsxs18(Box17, { flexDirection: "column", gap: 1, children: [
+      /* @__PURE__ */ jsx19(Text19, { children: formula.desc }),
+      /* @__PURE__ */ jsxs18(Box17, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsx19(SectionHeader, { emoji: "\u{1F4CB}", title: t("pkgInfo_details"), gradient: [COLORS.text, COLORS.muted] }),
+        /* @__PURE__ */ jsxs18(Box17, { borderStyle: "round", borderColor: COLORS.border, paddingX: 2, flexDirection: "column", children: [
+          /* @__PURE__ */ jsxs18(Text19, { children: [
+            /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: t("pkgInfo_homepage") }),
             " ",
             formula.homepage
           ] }),
-          /* @__PURE__ */ jsxs17(Text17, { children: [
-            /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: t("pkgInfo_license") }),
+          /* @__PURE__ */ jsxs18(Text19, { children: [
+            /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: t("pkgInfo_license") }),
             "  ",
             formula.license
           ] }),
-          /* @__PURE__ */ jsxs17(Text17, { children: [
-            /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: t("pkgInfo_tap") }),
+          /* @__PURE__ */ jsxs18(Text19, { children: [
+            /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: t("pkgInfo_tap") }),
             "      ",
             formula.tap
           ] }),
-          /* @__PURE__ */ jsxs17(Text17, { children: [
-            /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: t("pkgInfo_stable") }),
+          /* @__PURE__ */ jsxs18(Text19, { children: [
+            /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: t("pkgInfo_stable") }),
             "   ",
             formula.versions.stable
           ] }),
-          installed && /* @__PURE__ */ jsxs17(Fragment4, { children: [
-            /* @__PURE__ */ jsxs17(Text17, { children: [
-              /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: t("pkgInfo_installed") }),
+          installed && /* @__PURE__ */ jsxs18(Fragment4, { children: [
+            /* @__PURE__ */ jsxs18(Text19, { children: [
+              /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: t("pkgInfo_installed") }),
               " ",
               installed.version,
               " (",
               formatRelativeTime(installed.time),
               ")"
             ] }),
-            /* @__PURE__ */ jsxs17(Text17, { children: [
-              /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: t("pkgInfo_bottle") }),
+            /* @__PURE__ */ jsxs18(Text19, { children: [
+              /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: t("pkgInfo_bottle") }),
               "    ",
               installed.poured_from_bottle ? t("common_yes") : t("common_no")
             ] }),
-            /* @__PURE__ */ jsxs17(Text17, { children: [
-              /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: t("pkgInfo_onRequest") }),
+            /* @__PURE__ */ jsxs18(Text19, { children: [
+              /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: t("pkgInfo_onRequest") }),
               " ",
               installed.installed_on_request ? t("common_yes") : t("pkgInfo_noDependency")
             ] })
           ] })
         ] })
       ] }),
-      formula.dependencies.length > 0 && /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsx17(SectionHeader, { emoji: "\u{1F517}", title: t("pkgInfo_dependencies", { count: formula.dependencies.length }), gradient: GRADIENTS.ocean }),
-        /* @__PURE__ */ jsx17(Box15, { paddingLeft: 2, flexWrap: "wrap", columnGap: 2, children: formula.dependencies.map((dep) => /* @__PURE__ */ jsx17(Text17, { color: "#9CA3AF", children: dep }, dep)) })
+      formula.dependencies.length > 0 && /* @__PURE__ */ jsxs18(Box17, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsx19(SectionHeader, { emoji: "\u{1F517}", title: t("pkgInfo_dependencies", { count: formula.dependencies.length }), gradient: GRADIENTS.ocean }),
+        /* @__PURE__ */ jsx19(Box17, { paddingLeft: 2, flexWrap: "wrap", columnGap: 2, children: formula.dependencies.map((dep) => /* @__PURE__ */ jsx19(Text19, { color: COLORS.muted, children: dep }, dep)) })
       ] }),
-      formula.caveats && /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsx17(SectionHeader, { emoji: "\u26A0\uFE0F", title: t("pkgInfo_caveats"), color: "#F59E0B" }),
-        /* @__PURE__ */ jsx17(Box15, { borderStyle: "round", borderColor: "#F59E0B", paddingX: 2, children: /* @__PURE__ */ jsx17(Text17, { color: "#F59E0B", children: formula.caveats }) })
+      formula.caveats && /* @__PURE__ */ jsxs18(Box17, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsx19(SectionHeader, { emoji: "\u26A0\uFE0F", title: t("pkgInfo_caveats"), color: COLORS.warning }),
+        /* @__PURE__ */ jsx19(Box17, { borderStyle: "round", borderColor: COLORS.warning, paddingX: 2, children: /* @__PURE__ */ jsx19(Text19, { color: COLORS.warning, children: formula.caveats }) })
       ] })
     ] }),
-    /* @__PURE__ */ jsx17(Box15, { marginTop: 1, children: /* @__PURE__ */ jsxs17(Text17, { color: "#6B7280", children: [
+    /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsxs18(Text19, { color: COLORS.textSecondary, children: [
       isInstalled ? `u:${t("hint_uninstall")}` : `i:${t("hint_install")}`,
       isInstalled && formula.outdated ? ` U:${t("hint_upgrade")}` : "",
       ` esc:${t("hint_back")}`
@@ -1860,8 +2511,8 @@ function PackageInfoView() {
 
 // src/views/services.tsx
 import { useEffect as useEffect9, useState as useState7 } from "react";
-import { Box as Box16, Text as Text18, useInput as useInput7, useStdout as useStdout3 } from "ink";
-import { jsx as jsx18, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Box as Box18, Text as Text20, useInput as useInput7, useStdout as useStdout4 } from "ink";
+import { jsx as jsx20, jsxs as jsxs19 } from "react/jsx-runtime";
 var STATUS_VARIANTS = {
   started: "success",
   stopped: "muted",
@@ -1873,16 +2524,21 @@ function ServicesView() {
   const [cursor, setCursor] = useState7(0);
   const [actionInProgress, setActionInProgress] = useState7(false);
   const [confirmAction, setConfirmAction] = useState7(null);
-  const { stdout } = useStdout3();
+  const [lastError, setLastError] = useState7(null);
+  const { stdout } = useStdout4();
   const cols = stdout?.columns ?? 80;
   const svcNameWidth = Math.floor(cols * 0.35);
   const svcStatusWidth = Math.floor(cols * 0.15);
+  const MAX_VISIBLE_ROWS = Math.max(5, (stdout?.rows ?? 24) - 10);
   useEffect9(() => {
     fetchServices();
   }, []);
   useInput7((input, key) => {
     if (actionInProgress) return;
     if (confirmAction) return;
+    if (lastError) {
+      setLastError(null);
+    }
     if (input === "j" || key.downArrow) {
       setCursor((c) => Math.min(c + 1, Math.max(0, services.length - 1)));
     } else if (input === "k" || key.upArrow) {
@@ -1894,26 +2550,31 @@ function ServicesView() {
     if (!svc) return;
     const doAction = (action) => {
       setActionInProgress(true);
-      void serviceAction2(svc.name, action).finally(() => {
+      void serviceAction2(svc.name, action).catch((err) => {
+        setLastError(err instanceof Error ? err.message : String(err));
+      }).finally(() => {
         setActionInProgress(false);
+        const storeError = useBrewStore.getState().errors["service-action"];
+        if (storeError) setLastError(storeError);
       });
     };
     if (input === "s") doAction("start");
     else if (input === "S") setConfirmAction({ type: "stop", name: svc.name });
     else if (input === "R") setConfirmAction({ type: "restart", name: svc.name });
   });
-  const serviceActionError = useBrewStore((s) => s.errors["service-action"]);
-  if (loading.services) return /* @__PURE__ */ jsx18(Loading, { message: t("loading_services") });
-  if (errors.services) return /* @__PURE__ */ jsx18(ErrorMessage, { message: errors.services });
+  if (loading.services) return /* @__PURE__ */ jsx20(Loading, { message: t("loading_services") });
+  if (errors.services) return /* @__PURE__ */ jsx20(ErrorMessage, { message: errors.services });
   if (services.length === 0) {
-    return /* @__PURE__ */ jsxs18(Box16, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx18(SectionHeader, { emoji: "\u2699\uFE0F", title: t("services_title"), gradient: GRADIENTS.ocean }),
-      /* @__PURE__ */ jsx18(Text18, { color: "#6B7280", italic: true, children: t("services_noServices") })
+    return /* @__PURE__ */ jsxs19(Box18, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx20(SectionHeader, { emoji: "\u2699\uFE0F", title: t("services_title"), gradient: GRADIENTS.ocean }),
+      /* @__PURE__ */ jsx20(Text20, { color: COLORS.textSecondary, italic: true, children: t("services_noServices") })
     ] });
   }
-  return /* @__PURE__ */ jsxs18(Box16, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx18(SectionHeader, { emoji: "\u2699\uFE0F", title: t("services_titleCount", { count: services.length }), gradient: GRADIENTS.ocean }),
-    confirmAction && /* @__PURE__ */ jsx18(Box16, { marginY: 1, children: /* @__PURE__ */ jsx18(
+  const start = Math.max(0, cursor - Math.floor(MAX_VISIBLE_ROWS / 2));
+  const visible = services.slice(start, start + MAX_VISIBLE_ROWS);
+  return /* @__PURE__ */ jsxs19(Box18, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx20(SectionHeader, { emoji: "\u2699\uFE0F", title: t("services_titleCount", { count: services.length }), gradient: GRADIENTS.ocean }),
+    confirmAction && /* @__PURE__ */ jsx20(Box18, { marginY: 1, children: /* @__PURE__ */ jsx20(
       ConfirmDialog,
       {
         message: confirmAction.type === "stop" ? t("services_confirmStop", { name: confirmAction.name }) : t("services_confirmRestart", { name: confirmAction.name }),
@@ -1921,36 +2582,48 @@ function ServicesView() {
           const { type, name } = confirmAction;
           setConfirmAction(null);
           setActionInProgress(true);
-          void serviceAction2(name, type).finally(() => {
+          void serviceAction2(name, type).catch((err) => {
+            setLastError(err instanceof Error ? err.message : String(err));
+          }).finally(() => {
             setActionInProgress(false);
+            const storeError = useBrewStore.getState().errors["service-action"];
+            if (storeError) setLastError(storeError);
           });
         },
         onCancel: () => setConfirmAction(null)
       }
     ) }),
-    /* @__PURE__ */ jsxs18(Box16, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ jsxs18(Box16, { gap: 1, borderStyle: "single", borderBottom: true, borderTop: false, borderLeft: false, borderRight: false, borderColor: "#4B5563", paddingBottom: 0, children: [
-        /* @__PURE__ */ jsxs18(Text18, { bold: true, color: "#F9FAFB", children: [
+    /* @__PURE__ */ jsxs19(Box18, { flexDirection: "column", marginTop: 1, children: [
+      /* @__PURE__ */ jsxs19(Box18, { gap: 1, borderStyle: "single", borderBottom: true, borderTop: false, borderLeft: false, borderRight: false, borderColor: COLORS.border, paddingBottom: 0, children: [
+        /* @__PURE__ */ jsxs19(Text20, { bold: true, color: COLORS.text, children: [
           "  ",
           t("services_name").padEnd(svcNameWidth)
         ] }),
-        /* @__PURE__ */ jsx18(Text18, { bold: true, color: "#F9FAFB", children: t("services_status").padEnd(svcStatusWidth) }),
-        /* @__PURE__ */ jsx18(Text18, { bold: true, color: "#F9FAFB", children: t("services_user") })
+        /* @__PURE__ */ jsx20(Text20, { bold: true, color: COLORS.text, children: t("services_status").padEnd(svcStatusWidth) }),
+        /* @__PURE__ */ jsx20(Text20, { bold: true, color: COLORS.text, children: t("services_user") })
       ] }),
-      services.map((svc, i) => {
-        const isCurrent = i === cursor;
-        return /* @__PURE__ */ jsxs18(Box16, { gap: 1, children: [
-          /* @__PURE__ */ jsx18(Text18, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-          /* @__PURE__ */ jsx18(Text18, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? "#F9FAFB" : "#9CA3AF", children: svc.name.padEnd(svcNameWidth - 2) }),
-          /* @__PURE__ */ jsx18(StatusBadge, { label: svc.status, variant: STATUS_VARIANTS[svc.status] }),
-          /* @__PURE__ */ jsx18(Text18, { color: "#9CA3AF", children: svc.user ?? "-" }),
-          svc.exit_code != null && svc.exit_code !== 0 && /* @__PURE__ */ jsx18(Text18, { color: "#EF4444", children: t("common_exit", { code: svc.exit_code }) })
+      start > 0 && /* @__PURE__ */ jsxs19(Text20, { color: COLORS.textSecondary, dimColor: true, children: [
+        "  ",
+        t("scroll_moreAbove", { count: start })
+      ] }),
+      visible.map((svc, i) => {
+        const idx = start + i;
+        const isCurrent = idx === cursor;
+        return /* @__PURE__ */ jsxs19(SelectableRow, { isCurrent, children: [
+          /* @__PURE__ */ jsx20(Text20, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? COLORS.text : COLORS.muted, children: svc.name.padEnd(svcNameWidth - 2) }),
+          /* @__PURE__ */ jsx20(StatusBadge, { label: svc.status, variant: STATUS_VARIANTS[svc.status] }),
+          /* @__PURE__ */ jsx20(Text20, { color: COLORS.muted, children: svc.user ?? "-" }),
+          svc.exit_code != null && svc.exit_code !== 0 && /* @__PURE__ */ jsx20(Text20, { color: COLORS.error, children: t("common_exit", { code: svc.exit_code }) })
         ] }, svc.name);
-      })
+      }),
+      start + MAX_VISIBLE_ROWS < services.length && /* @__PURE__ */ jsxs19(Text20, { color: COLORS.textSecondary, dimColor: true, children: [
+        "  ",
+        t("scroll_moreBelow", { count: services.length - start - MAX_VISIBLE_ROWS })
+      ] })
     ] }),
-    actionInProgress && /* @__PURE__ */ jsx18(Text18, { color: "#38BDF8", children: t("services_processing") }),
-    serviceActionError && /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx18(Text18, { color: "#EF4444", children: serviceActionError }) }),
-    /* @__PURE__ */ jsx18(Box16, { marginTop: 1, children: /* @__PURE__ */ jsxs18(Text18, { color: "#F9FAFB", bold: true, children: [
+    actionInProgress && /* @__PURE__ */ jsx20(Text20, { color: COLORS.sky, children: t("services_processing") }),
+    lastError && /* @__PURE__ */ jsx20(Box18, { marginTop: 1, children: /* @__PURE__ */ jsx20(Text20, { color: COLORS.error, children: lastError }) }),
+    /* @__PURE__ */ jsx20(Box18, { marginTop: 1, children: /* @__PURE__ */ jsxs19(Text20, { color: COLORS.text, bold: true, children: [
       cursor + 1,
       "/",
       services.length
@@ -1959,56 +2632,61 @@ function ServicesView() {
 }
 
 // src/views/doctor.tsx
-import { useEffect as useEffect10 } from "react";
-import { Box as Box17, Text as Text19, useInput as useInput8 } from "ink";
-import { jsx as jsx19, jsxs as jsxs19 } from "react/jsx-runtime";
+import { useEffect as useEffect10, useRef as useRef5 } from "react";
+import { Box as Box19, Text as Text21, useInput as useInput8 } from "ink";
+import { jsx as jsx21, jsxs as jsxs20 } from "react/jsx-runtime";
 function DoctorView() {
   const { doctorWarnings, doctorClean, loading, errors, fetchDoctor } = useBrewStore();
+  const mountedRef = useRef5(true);
+  useEffect10(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+    };
+  }, []);
   useEffect10(() => {
     fetchDoctor();
   }, []);
   useInput8((input) => {
     if (input === "r") void fetchDoctor();
   });
-  if (loading.doctor) return /* @__PURE__ */ jsx19(Loading, { message: t("loading_doctor") });
-  if (errors.doctor) return /* @__PURE__ */ jsx19(ErrorMessage, { message: errors.doctor });
-  return /* @__PURE__ */ jsxs19(Box17, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx19(SectionHeader, { emoji: "\u{1FA7A}", title: t("doctor_title"), gradient: GRADIENTS.emerald }),
-    /* @__PURE__ */ jsxs19(Box17, { flexDirection: "column", marginTop: 1, children: [
-      doctorClean && /* @__PURE__ */ jsx19(Box17, { borderStyle: "round", borderColor: "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs19(Text19, { color: "#22C55E", bold: true, children: [
-        "\u2714",
-        " ",
-        t("doctor_clean")
-      ] }) }),
-      doctorClean === false && doctorWarnings.length === 0 && /* @__PURE__ */ jsx19(Text19, { color: "#F59E0B", children: t("doctor_warningsNotCaptured") }),
-      doctorWarnings.map((warning, i) => /* @__PURE__ */ jsx19(Box17, { flexDirection: "column", marginBottom: 1, borderStyle: "single", borderColor: "#F59E0B", paddingX: 1, children: warning.split("\n").map((line, j) => /* @__PURE__ */ jsx19(Text19, { color: j === 0 ? "#F59E0B" : "#9CA3AF", children: line }, j)) }, warning.slice(0, 50) + i))
+  if (loading.doctor) return /* @__PURE__ */ jsx21(Loading, { message: t("loading_doctor") });
+  if (errors.doctor) return /* @__PURE__ */ jsx21(ErrorMessage, { message: errors.doctor });
+  return /* @__PURE__ */ jsxs20(Box19, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx21(SectionHeader, { emoji: "\u{1FA7A}", title: t("doctor_title"), gradient: GRADIENTS.emerald }),
+    /* @__PURE__ */ jsxs20(Box19, { flexDirection: "column", marginTop: 1, children: [
+      doctorClean && /* @__PURE__ */ jsx21(ResultBanner, { status: "success", message: `\u2714 ${t("doctor_clean")}` }),
+      doctorClean === false && doctorWarnings.length === 0 && /* @__PURE__ */ jsx21(Text21, { color: COLORS.warning, children: t("doctor_warningsNotCaptured") }),
+      doctorWarnings.map((warning, i) => (
+        // FE-004: Improved React key
+        /* @__PURE__ */ jsx21(Box19, { flexDirection: "column", marginBottom: 1, borderStyle: "single", borderColor: COLORS.warning, paddingX: 1, children: warning.split("\n").map((line, j) => /* @__PURE__ */ jsx21(Text21, { color: j === 0 ? COLORS.warning : COLORS.muted, children: line }, `warning-${i}-${j}-${line.slice(0, 20)}`)) }, `warning-${i}-${warning.slice(0, 20)}`)
+      ))
     ] }),
-    /* @__PURE__ */ jsx19(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx19(Text19, { color: "#F9FAFB", bold: true, children: doctorWarnings.length > 0 ? tp("plural_warnings", doctorWarnings.length) : "" }) })
+    /* @__PURE__ */ jsx21(Box19, { marginTop: 1, children: /* @__PURE__ */ jsx21(Text21, { color: COLORS.text, bold: true, children: doctorWarnings.length > 0 ? tp("plural_warnings", doctorWarnings.length) : "" }) })
   ] });
 }
 
 // src/views/profiles.tsx
-import { useEffect as useEffect11, useRef as useRef5, useState as useState8 } from "react";
-import { Box as Box18, Text as Text20, useInput as useInput9 } from "ink";
-import { TextInput as TextInput3 } from "@inkjs/ui";
+import { useEffect as useEffect11, useRef as useRef6, useState as useState8 } from "react";
+import { Box as Box24, useInput as useInput9 } from "ink";
 
 // src/stores/profile-store.ts
-import { create as create4 } from "zustand";
+import { create as create5 } from "zustand";
 
 // src/lib/profiles/profile-manager.ts
-import { readFile, writeFile, readdir, rm } from "fs/promises";
-import { join, basename } from "path";
+import { readFile as readFile3, writeFile as writeFile3, readdir, rm as rm2, rename as rename2 } from "fs/promises";
+import { join as join2, basename } from "path";
 
 // src/lib/license/watermark.ts
-function getWatermark(license) {
+function getWatermark(license, consent = true) {
+  if (!consent) return "";
   if (!license?.customerEmail) return "";
   return `Licensed to: ${license.customerEmail}`;
 }
 
 // src/lib/profiles/profile-manager.ts
-function proCheck() {
-  const { license, status } = useLicenseStore.getState();
-  requirePro(license, status);
+function proCheck(isPro) {
+  if (!isPro) throw new Error("Pro license required");
 }
 var MAX_PROFILE_NAME_LENGTH = 100;
 function validateProfileName(name) {
@@ -2024,10 +2702,10 @@ function validateProfileName(name) {
 }
 function profilePath(name) {
   validateProfileName(name);
-  return join(PROFILES_DIR, `${basename(name)}.json`);
+  return join2(PROFILES_DIR, `${basename(name)}.json`);
 }
-async function listProfiles() {
-  proCheck();
+async function listProfiles(isPro) {
+  proCheck(isPro);
   await ensureDataDirs();
   try {
     const files = await readdir(PROFILES_DIR);
@@ -2036,9 +2714,9 @@ async function listProfiles() {
     return [];
   }
 }
-async function loadProfile(name) {
-  proCheck();
-  const raw = await readFile(profilePath(name), "utf-8");
+async function loadProfile(isPro, name) {
+  proCheck(isPro);
+  const raw = await readFile3(profilePath(name), "utf-8");
   let file;
   try {
     file = JSON.parse(raw);
@@ -2053,21 +2731,28 @@ async function loadProfile(name) {
   }
   return file.profile;
 }
-async function saveProfile(profile) {
-  proCheck();
+async function saveProfile(isPro, profile) {
+  proCheck(isPro);
   await ensureDataDirs();
+  const filePath = profilePath(profile.name);
+  const tmpPath = filePath + ".tmp";
   const file = { version: 1, profile };
-  await writeFile(profilePath(profile.name), JSON.stringify(file, null, 2), { encoding: "utf-8", mode: 384 });
+  await writeFile3(tmpPath, JSON.stringify(file, null, 2), { encoding: "utf-8", mode: 384 });
+  await rename2(tmpPath, filePath);
 }
-async function deleteProfile(name) {
-  proCheck();
+async function deleteProfile(isPro, name) {
+  proCheck(isPro);
   try {
-    await rm(profilePath(name));
+    await rm2(profilePath(name));
   } catch {
   }
 }
-async function exportCurrentSetup(name, description, license = null) {
-  proCheck();
+async function exportCurrentSetup(isPro, name, description, license = null, consent = true) {
+  proCheck(isPro);
+  const existingNames = await listProfiles(isPro);
+  if (existingNames.includes(name)) {
+    throw new Error("Profile already exists: " + name);
+  }
   const [installed, leaves, tapsRaw] = await Promise.all([
     getInstalled(),
     getLeaves(),
@@ -2084,17 +2769,17 @@ async function exportCurrentSetup(name, description, license = null) {
     formulae: leaves,
     casks,
     taps,
-    exportedBy: getWatermark(license)
-    // Layer 16: Watermark — who exported this profile
+    exportedBy: consent ? getWatermark(license) : ""
+    // SEG-003: Only embed watermark with consent
   };
-  await saveProfile(profile);
+  await saveProfile(isPro, profile);
   return profile;
 }
-async function updateProfile(oldName, newName, newDescription) {
-  proCheck();
-  const profile = await loadProfile(oldName);
+async function updateProfile(isPro, oldName, newName, newDescription) {
+  proCheck(isPro);
+  const profile = await loadProfile(isPro, oldName);
   if (oldName !== newName) {
-    await deleteProfile(oldName);
+    await deleteProfile(isPro, oldName);
   }
   const updated = {
     ...profile,
@@ -2102,12 +2787,12 @@ async function updateProfile(oldName, newName, newDescription) {
     description: newDescription,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  await saveProfile(updated);
+  await saveProfile(isPro, updated);
 }
 var TAP_PATTERN = /^[a-z0-9][-a-z0-9]*\/[a-z0-9][-a-z0-9]*$/;
-var PKG_PATTERN = /^[a-z0-9][-a-z0-9_.@+]*$/;
-async function* importProfile(profile) {
-  proCheck();
+var PKG_PATTERN2 = /^[a-z0-9][-a-z0-9_.@+]*$/;
+async function* importProfile(isPro, profile) {
+  proCheck(isPro);
   const installed = await getInstalled();
   const installedFormulae = new Set(installed.formulae.map((f) => f.name));
   const installedCasks = new Set(installed.casks.filter((c) => c.installed).map((c) => c.token));
@@ -2124,7 +2809,7 @@ async function* importProfile(profile) {
   }
   const missingFormulae = profile.formulae.filter((f) => !installedFormulae.has(f));
   for (const name of missingFormulae) {
-    if (!PKG_PATTERN.test(name)) {
+    if (!PKG_PATTERN2.test(name)) {
       yield `Skipping invalid formula name: ${name}`;
       continue;
     }
@@ -2135,7 +2820,7 @@ async function* importProfile(profile) {
   }
   const missingCasks = profile.casks.filter((c) => !installedCasks.has(c));
   for (const name of missingCasks) {
-    if (!PKG_PATTERN.test(name)) {
+    if (!PKG_PATTERN2.test(name)) {
       yield `Skipping invalid cask name: ${name}`;
       continue;
     }
@@ -2149,20 +2834,23 @@ async function* importProfile(profile) {
 }
 
 // src/stores/profile-store.ts
-var useProfileStore = create4((set) => ({
+function getIsPro() {
+  return useLicenseStore.getState().isPro();
+}
+var useProfileStore = create5((set) => ({
   profileNames: [],
   selectedProfile: null,
   loading: false,
   loadError: null,
   fetchProfiles: async () => {
     set({ loading: true });
-    const names = await listProfiles();
+    const names = await listProfiles(getIsPro());
     set({ profileNames: names, loading: false });
   },
   loadProfile: async (name) => {
     set({ loadError: null });
     try {
-      const profile = await loadProfile(name);
+      const profile = await loadProfile(getIsPro(), name);
       set({ selectedProfile: profile });
     } catch (err) {
       set({ loadError: err instanceof Error ? err.message : String(err) });
@@ -2172,8 +2860,8 @@ var useProfileStore = create4((set) => ({
     set({ loading: true, loadError: null });
     try {
       const license = useLicenseStore.getState().license;
-      await exportCurrentSetup(name, description, license);
-      const names = await listProfiles();
+      await exportCurrentSetup(getIsPro(), name, description, license);
+      const names = await listProfiles(getIsPro());
       set({ profileNames: names, loading: false });
     } catch (err) {
       set({ loading: false, loadError: err instanceof Error ? err.message : String(err) });
@@ -2181,16 +2869,16 @@ var useProfileStore = create4((set) => ({
     }
   },
   deleteProfile: async (name) => {
-    await deleteProfile(name);
-    const names = await listProfiles();
+    await deleteProfile(getIsPro(), name);
+    const names = await listProfiles(getIsPro());
     set({ profileNames: names, selectedProfile: null });
   },
   updateProfile: async (oldName, newName, newDescription) => {
     set({ loadError: null });
     try {
-      await updateProfile(oldName, newName, newDescription);
-      const names = await listProfiles();
-      const updated = await loadProfile(newName);
+      await updateProfile(getIsPro(), oldName, newName, newDescription);
+      const names = await listProfiles(getIsPro());
+      const updated = await loadProfile(getIsPro(), newName);
       set({ profileNames: names, selectedProfile: updated });
     } catch (err) {
       set({ loadError: err instanceof Error ? err.message : String(err) });
@@ -2198,8 +2886,141 @@ var useProfileStore = create4((set) => ({
   }
 }));
 
+// src/views/profiles/profile-list-mode.tsx
+import { Box as Box20, Text as Text22 } from "ink";
+import { jsx as jsx22, jsxs as jsxs21 } from "react/jsx-runtime";
+function ProfileListMode({ profileNames, cursor, confirmDelete, loadError, onConfirmDelete, onCancelDelete }) {
+  return /* @__PURE__ */ jsxs21(Box20, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx22(SectionHeader, { emoji: "\u{1F4C1}", title: t("profiles_title", { count: profileNames.length }), gradient: GRADIENTS.gold }),
+    loadError && /* @__PURE__ */ jsx22(Box20, { marginY: 1, children: /* @__PURE__ */ jsx22(Text22, { color: COLORS.error, children: loadError }) }),
+    confirmDelete && profileNames[cursor] && /* @__PURE__ */ jsx22(Box20, { marginY: 1, children: /* @__PURE__ */ jsx22(
+      ConfirmDialog,
+      {
+        message: t("profiles_confirmDelete", { name: profileNames[cursor] }),
+        onConfirm: onConfirmDelete,
+        onCancel: onCancelDelete
+      }
+    ) }),
+    profileNames.length === 0 && !confirmDelete && /* @__PURE__ */ jsx22(Box20, { marginTop: 1, borderStyle: "round", borderColor: COLORS.textSecondary, paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs21(Box20, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx22(Text22, { color: COLORS.textSecondary, italic: true, children: t("profiles_noProfiles") }),
+      /* @__PURE__ */ jsxs21(Text22, { color: COLORS.muted, children: [
+        t("profiles_press"),
+        " ",
+        /* @__PURE__ */ jsx22(Text22, { color: COLORS.gold, bold: true, children: "n" }),
+        " ",
+        t("profiles_exportHint")
+      ] })
+    ] }) }),
+    profileNames.length > 0 && !confirmDelete && /* @__PURE__ */ jsxs21(Box20, { flexDirection: "column", marginTop: 1, children: [
+      profileNames.map((name, i) => {
+        const isCurrent = i === cursor;
+        return /* @__PURE__ */ jsx22(SelectableRow, { isCurrent, children: /* @__PURE__ */ jsx22(Text22, { bold: isCurrent, inverse: isCurrent, children: name }) }, name);
+      }),
+      /* @__PURE__ */ jsx22(Box20, { marginTop: 1, children: /* @__PURE__ */ jsxs21(Text22, { color: COLORS.text, bold: true, children: [
+        cursor + 1,
+        "/",
+        profileNames.length
+      ] }) })
+    ] })
+  ] });
+}
+
+// src/views/profiles/profile-detail-mode.tsx
+import { Box as Box21, Text as Text23 } from "ink";
+import { jsx as jsx23, jsxs as jsxs22 } from "react/jsx-runtime";
+function ProfileDetailMode({ profile }) {
+  return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx23(Text23, { bold: true, color: COLORS.gold, children: profile.name }),
+    /* @__PURE__ */ jsx23(Text23, { color: COLORS.muted, children: profile.description }),
+    /* @__PURE__ */ jsx23(Text23, { color: COLORS.muted, children: t("profiles_created", { date: formatDate(profile.createdAt) }) }),
+    /* @__PURE__ */ jsxs22(Box21, { marginTop: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsx23(Text23, { bold: true, children: t("profiles_formulaeCount", { count: profile.formulae.length }) }),
+      /* @__PURE__ */ jsxs22(Box21, { paddingLeft: 2, flexDirection: "column", children: [
+        profile.formulae.slice(0, 30).map((f) => /* @__PURE__ */ jsx23(Text23, { color: COLORS.muted, children: f }, f)),
+        profile.formulae.length > 30 && /* @__PURE__ */ jsx23(Text23, { color: COLORS.textSecondary, italic: true, children: t("common_andMore", { count: profile.formulae.length - 30 }) })
+      ] }),
+      /* @__PURE__ */ jsx23(Text23, { bold: true, children: t("profiles_casksCount", { count: profile.casks.length }) }),
+      /* @__PURE__ */ jsx23(Box21, { paddingLeft: 2, flexDirection: "column", children: profile.casks.map((c) => /* @__PURE__ */ jsx23(Text23, { color: COLORS.muted, children: c }, c)) })
+    ] }),
+    /* @__PURE__ */ jsx23(Box21, { marginTop: 1, children: /* @__PURE__ */ jsxs22(Text23, { color: COLORS.textSecondary, children: [
+      "esc:",
+      t("hint_back"),
+      " e:",
+      t("hint_edit"),
+      " i:",
+      t("hint_importProfile")
+    ] }) })
+  ] });
+}
+
+// src/views/profiles/profile-create-flow.tsx
+import { Box as Box22, Text as Text24 } from "ink";
+import { TextInput as TextInput3 } from "@inkjs/ui";
+import { jsx as jsx24, jsxs as jsxs23 } from "react/jsx-runtime";
+function ProfileCreateName({ onSubmit }) {
+  return /* @__PURE__ */ jsxs23(Box22, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx24(Text24, { bold: true, children: t("profiles_createName") }),
+    /* @__PURE__ */ jsx24(
+      TextInput3,
+      {
+        placeholder: t("profiles_namePlaceholder"),
+        onSubmit
+      }
+    )
+  ] });
+}
+function ProfileCreateDesc({ name, loadError, onSubmit }) {
+  return /* @__PURE__ */ jsxs23(Box22, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx24(Text24, { bold: true, children: t("profiles_createDesc", { name }) }),
+    loadError && /* @__PURE__ */ jsxs23(Text24, { color: COLORS.error, children: [
+      t("error_prefix"),
+      loadError
+    ] }),
+    /* @__PURE__ */ jsx24(
+      TextInput3,
+      {
+        placeholder: t("profiles_descPlaceholder"),
+        onSubmit
+      }
+    )
+  ] });
+}
+
+// src/views/profiles/profile-edit-flow.tsx
+import { Box as Box23, Text as Text25 } from "ink";
+import { TextInput as TextInput4 } from "@inkjs/ui";
+import { jsx as jsx25, jsxs as jsxs24 } from "react/jsx-runtime";
+function ProfileEditName({ defaultName, onSubmit }) {
+  return /* @__PURE__ */ jsxs24(Box23, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx25(Text25, { bold: true, children: t("profiles_editName") }),
+    /* @__PURE__ */ jsx25(
+      TextInput4,
+      {
+        defaultValue: defaultName,
+        onSubmit
+      }
+    )
+  ] });
+}
+function ProfileEditDesc({ name, defaultDesc, loadError, onSubmit }) {
+  return /* @__PURE__ */ jsxs24(Box23, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx25(Text25, { bold: true, children: t("profiles_editDesc", { name }) }),
+    loadError && /* @__PURE__ */ jsxs24(Text25, { color: COLORS.error, children: [
+      t("error_prefix"),
+      loadError
+    ] }),
+    /* @__PURE__ */ jsx25(
+      TextInput4,
+      {
+        defaultValue: defaultDesc,
+        onSubmit
+      }
+    )
+  ] });
+}
+
 // src/views/profiles.tsx
-import { jsx as jsx20, jsxs as jsxs20 } from "react/jsx-runtime";
+import { jsx as jsx26, jsxs as jsxs25 } from "react/jsx-runtime";
 function ProfilesView() {
   const { profileNames, selectedProfile, loading, loadError, fetchProfiles, loadProfile: loadProfile2, exportCurrent, deleteProfile: deleteProfile2, updateProfile: updateProfile2 } = useProfileStore();
   const [cursor, setCursor] = useState8(0);
@@ -2210,9 +3031,11 @@ function ProfilesView() {
   const [editDesc, setEditDesc] = useState8("");
   const [importLines, setImportLines] = useState8([]);
   const [importRunning, setImportRunning] = useState8(false);
+  const [importHadError, setImportHadError] = useState8(false);
+  const [importProfile2, setImportProfile] = useState8(null);
   const { openModal, closeModal } = useModalStore();
-  const importGenRef = useRef5(null);
-  const mountedRef = useRef5(true);
+  const importGenRef = useRef6(null);
+  const mountedRef = useRef6(true);
   useEffect11(() => {
     fetchProfiles();
   }, []);
@@ -2225,7 +3048,7 @@ function ProfilesView() {
     };
   }, []);
   useEffect11(() => {
-    if (mode === "detail" || mode === "create-name" || mode === "create-desc" || mode === "importing" || mode === "edit-name" || mode === "edit-desc") {
+    if (mode !== "list") {
       openModal();
       return () => {
         closeModal();
@@ -2249,7 +3072,7 @@ function ProfilesView() {
       return;
     }
     if (input === "i" && profileNames[cursor]) {
-      void startImport(profileNames[cursor]);
+      void prepareImport(profileNames[cursor]);
       return;
     }
     if (input === "j" || key.downArrow) setCursor((c) => Math.min(c + 1, Math.max(0, profileNames.length - 1)));
@@ -2269,13 +3092,26 @@ function ProfilesView() {
   useInput9(() => {
     setMode("list");
   }, { isActive: mode === "importing" && !importRunning });
-  const startImport = async (name) => {
+  const prepareImport = async (name) => {
+    try {
+      const isPro = useLicenseStore.getState().isPro();
+      const profile = await loadProfile(isPro, name);
+      setImportProfile(profile);
+      setMode("confirm-import");
+    } catch (err) {
+      setImportLines([`${t("error_prefix")}${err instanceof Error ? err.message : err}`]);
+      setMode("importing");
+      setImportRunning(false);
+    }
+  };
+  const startImport = async (profile) => {
     setMode("importing");
     setImportLines([]);
     setImportRunning(true);
+    setImportHadError(false);
     try {
-      const profile = await loadProfile(name);
-      const gen = importProfile(profile);
+      const isPro = useLicenseStore.getState().isPro();
+      const gen = importProfile(isPro, profile);
       importGenRef.current = gen;
       for await (const line of gen) {
         if (!mountedRef.current) break;
@@ -2283,6 +3119,7 @@ function ProfilesView() {
       }
     } catch (err) {
       if (mountedRef.current) {
+        setImportHadError(true);
         setImportLines((prev) => [...prev, `${t("error_prefix")}${err instanceof Error ? err.message : err}`]);
       }
     } finally {
@@ -2292,163 +3129,105 @@ function ProfilesView() {
       }
     }
   };
-  if (loading) return /* @__PURE__ */ jsx20(Loading, { message: t("loading_profiles") });
+  if (loading) return /* @__PURE__ */ jsx26(Loading, { message: t("loading_profiles") });
+  if (mode === "confirm-import" && importProfile2) {
+    return /* @__PURE__ */ jsx26(Box24, { flexDirection: "column", children: /* @__PURE__ */ jsx26(
+      ConfirmDialog,
+      {
+        message: t("profiles_importSummary", {
+          formulae: String(importProfile2.formulae.length),
+          casks: String(importProfile2.casks.length)
+        }),
+        onConfirm: () => {
+          const profile = importProfile2;
+          setImportProfile(null);
+          void startImport(profile);
+        },
+        onCancel: () => {
+          setImportProfile(null);
+          setMode("list");
+        }
+      }
+    ) });
+  }
   if (mode === "importing") {
-    return /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(ProgressLog, { lines: importLines, isRunning: importRunning, title: t("profiles_importTitle") }),
-      !importRunning && /* @__PURE__ */ jsx20(Box18, { marginTop: 1, children: /* @__PURE__ */ jsx20(Box18, { borderStyle: "round", borderColor: "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs20(Text20, { color: "#22C55E", bold: true, children: [
-        "\u2714",
-        " ",
-        t("profiles_importComplete")
-      ] }) }) })
+    return /* @__PURE__ */ jsxs25(Box24, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx26(ProgressLog, { lines: importLines, isRunning: importRunning, title: t("profiles_importTitle") }),
+      !importRunning && /* @__PURE__ */ jsx26(Box24, { marginTop: 1, children: /* @__PURE__ */ jsx26(ResultBanner, { status: importHadError ? "error" : "success", message: importHadError ? t("profiles_importPartial") : `\u2714 ${t("profiles_importComplete")}` }) })
     ] });
   }
   if (mode === "create-name") {
-    return /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text20, { bold: true, children: t("profiles_createName") }),
-      /* @__PURE__ */ jsx20(
-        TextInput3,
-        {
-          placeholder: t("profiles_namePlaceholder"),
-          onSubmit: (val) => {
-            setNewName(val);
-            setMode("create-desc");
-          }
-        }
-      )
-    ] });
+    return /* @__PURE__ */ jsx26(ProfileCreateName, { onSubmit: (val) => {
+      setNewName(val);
+      setMode("create-desc");
+    } });
   }
   if (mode === "create-desc") {
-    return /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text20, { bold: true, children: t("profiles_createDesc", { name: newName }) }),
-      loadError && /* @__PURE__ */ jsxs20(Text20, { color: "#EF4444", children: [
-        t("error_prefix"),
-        loadError
-      ] }),
-      /* @__PURE__ */ jsx20(
-        TextInput3,
-        {
-          placeholder: t("profiles_descPlaceholder"),
-          onSubmit: async (val) => {
-            try {
-              await exportCurrent(newName, val);
-            } finally {
-              setMode("list");
-              setNewName("");
-            }
+    return /* @__PURE__ */ jsx26(
+      ProfileCreateDesc,
+      {
+        name: newName,
+        loadError,
+        onSubmit: async (val) => {
+          try {
+            await exportCurrent(newName, val);
+          } finally {
+            setMode("list");
+            setNewName("");
           }
         }
-      )
-    ] });
+      }
+    );
   }
   if (mode === "edit-name") {
-    return /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text20, { bold: true, children: t("profiles_editName") }),
-      /* @__PURE__ */ jsx20(
-        TextInput3,
-        {
-          defaultValue: editName,
-          onSubmit: (val) => {
-            setEditName(val);
-            setMode("edit-desc");
-          }
-        }
-      )
-    ] });
+    return /* @__PURE__ */ jsx26(ProfileEditName, { defaultName: editName, onSubmit: (val) => {
+      setEditName(val);
+      setMode("edit-desc");
+    } });
   }
   if (mode === "edit-desc") {
-    return /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text20, { bold: true, children: t("profiles_editDesc", { name: editName }) }),
-      loadError && /* @__PURE__ */ jsxs20(Text20, { color: "#EF4444", children: [
-        t("error_prefix"),
-        loadError
-      ] }),
-      /* @__PURE__ */ jsx20(
-        TextInput3,
-        {
-          defaultValue: editDesc,
-          onSubmit: async (val) => {
-            if (selectedProfile) {
-              await updateProfile2(selectedProfile.name, editName, val);
-            }
-            setMode("detail");
-            setEditName("");
-            setEditDesc("");
+    return /* @__PURE__ */ jsx26(
+      ProfileEditDesc,
+      {
+        name: editName,
+        defaultDesc: editDesc,
+        loadError,
+        onSubmit: async (val) => {
+          if (selectedProfile) {
+            await updateProfile2(selectedProfile.name, editName, val);
           }
+          setMode("detail");
+          setEditName("");
+          setEditDesc("");
         }
-      )
-    ] });
+      }
+    );
   }
   if (mode === "detail" && selectedProfile) {
-    return /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text20, { bold: true, color: "#FFD700", children: selectedProfile.name }),
-      /* @__PURE__ */ jsx20(Text20, { color: "#9CA3AF", children: selectedProfile.description }),
-      /* @__PURE__ */ jsx20(Text20, { color: "#9CA3AF", children: t("profiles_created", { date: new Date(selectedProfile.createdAt).toLocaleDateString() }) }),
-      /* @__PURE__ */ jsxs20(Box18, { marginTop: 1, flexDirection: "column", children: [
-        /* @__PURE__ */ jsx20(Text20, { bold: true, children: t("profiles_formulaeCount", { count: selectedProfile.formulae.length }) }),
-        /* @__PURE__ */ jsxs20(Box18, { paddingLeft: 2, flexDirection: "column", children: [
-          selectedProfile.formulae.slice(0, 30).map((f) => /* @__PURE__ */ jsx20(Text20, { color: "#9CA3AF", children: f }, f)),
-          selectedProfile.formulae.length > 30 && /* @__PURE__ */ jsx20(Text20, { color: "#6B7280", italic: true, children: t("common_andMore", { count: selectedProfile.formulae.length - 30 }) })
-        ] }),
-        /* @__PURE__ */ jsx20(Text20, { bold: true, children: t("profiles_casksCount", { count: selectedProfile.casks.length }) }),
-        /* @__PURE__ */ jsx20(Box18, { paddingLeft: 2, flexDirection: "column", children: selectedProfile.casks.map((c) => /* @__PURE__ */ jsx20(Text20, { color: "#9CA3AF", children: c }, c)) })
-      ] }),
-      /* @__PURE__ */ jsx20(Box18, { marginTop: 1, children: /* @__PURE__ */ jsxs20(Text20, { color: "#6B7280", children: [
-        "esc:",
-        t("hint_back"),
-        " e:",
-        t("hint_edit"),
-        " i:",
-        t("hint_importProfile")
-      ] }) })
-    ] });
+    return /* @__PURE__ */ jsx26(ProfileDetailMode, { profile: selectedProfile });
   }
-  return /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx20(SectionHeader, { emoji: "\u{1F4C1}", title: t("profiles_title", { count: profileNames.length }), gradient: GRADIENTS.gold }),
-    confirmDelete && profileNames[cursor] && /* @__PURE__ */ jsx20(Box18, { marginY: 1, children: /* @__PURE__ */ jsx20(
-      ConfirmDialog,
-      {
-        message: t("profiles_confirmDelete", { name: profileNames[cursor] }),
-        onConfirm: () => {
-          void deleteProfile2(profileNames[cursor]);
-          setConfirmDelete(false);
-        },
-        onCancel: () => setConfirmDelete(false)
-      }
-    ) }),
-    profileNames.length === 0 && !confirmDelete && /* @__PURE__ */ jsx20(Box18, { marginTop: 1, borderStyle: "round", borderColor: "#6B7280", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text20, { color: "#6B7280", italic: true, children: t("profiles_noProfiles") }),
-      /* @__PURE__ */ jsxs20(Text20, { color: "#9CA3AF", children: [
-        t("profiles_press"),
-        " ",
-        /* @__PURE__ */ jsx20(Text20, { color: "#FFD700", bold: true, children: "n" }),
-        " ",
-        t("profiles_exportHint")
-      ] })
-    ] }) }),
-    profileNames.length > 0 && !confirmDelete && /* @__PURE__ */ jsxs20(Box18, { flexDirection: "column", marginTop: 1, children: [
-      profileNames.map((name, i) => {
-        const isCurrent = i === cursor;
-        return /* @__PURE__ */ jsxs20(Box18, { gap: 1, children: [
-          /* @__PURE__ */ jsx20(Text20, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-          /* @__PURE__ */ jsx20(Text20, { bold: isCurrent, inverse: isCurrent, children: name })
-        ] }, name);
-      }),
-      /* @__PURE__ */ jsx20(Box18, { marginTop: 1, children: /* @__PURE__ */ jsxs20(Text20, { color: "#F9FAFB", bold: true, children: [
-        cursor + 1,
-        "/",
-        profileNames.length
-      ] }) })
-    ] })
-  ] });
+  return /* @__PURE__ */ jsx26(
+    ProfileListMode,
+    {
+      profileNames,
+      cursor,
+      confirmDelete,
+      loadError,
+      onConfirmDelete: () => {
+        void deleteProfile2(profileNames[cursor]);
+        setConfirmDelete(false);
+      },
+      onCancelDelete: () => setConfirmDelete(false)
+    }
+  );
 }
 
 // src/views/smart-cleanup.tsx
-import { useEffect as useEffect12, useRef as useRef6, useState as useState9 } from "react";
-import { Box as Box19, Text as Text21, useInput as useInput10 } from "ink";
+import { useEffect as useEffect12, useRef as useRef7, useState as useState9 } from "react";
+import { Box as Box25, Text as Text26, useInput as useInput10 } from "ink";
 
 // src/stores/cleanup-store.ts
-import { create as create5 } from "zustand";
+import { create as create6 } from "zustand";
 
 // src/lib/cleanup/cleanup-analyzer.ts
 import { execFile } from "child_process";
@@ -2471,9 +3250,8 @@ async function getCellarPath(name) {
     return null;
   }
 }
-async function analyzeCleanup(formulae, leaves) {
-  const { license, status } = useLicenseStore.getState();
-  requirePro(license, status);
+async function analyzeCleanup(isPro, formulae, leaves) {
+  if (!isPro) throw new Error("Pro license required");
   const leavesSet = new Set(leaves);
   const reverseDeps = /* @__PURE__ */ new Map();
   for (const f of formulae) {
@@ -2530,7 +3308,7 @@ async function analyzeCleanup(formulae, leaves) {
 }
 
 // src/stores/cleanup-store.ts
-var useCleanupStore = create5((set, get) => ({
+var useCleanupStore = create6((set, get) => ({
   summary: null,
   selected: /* @__PURE__ */ new Set(),
   loading: false,
@@ -2544,7 +3322,8 @@ var useCleanupStore = create5((set, get) => ({
         await brewState.fetchLeaves();
       }
       const { formulae, leaves } = useBrewStore.getState();
-      const summary = await analyzeCleanup(formulae, leaves);
+      const isPro = useLicenseStore.getState().isPro();
+      const summary = await analyzeCleanup(isPro, formulae, leaves);
       set({ summary, selected: /* @__PURE__ */ new Set(), loading: false });
     } catch (err) {
       set({ error: err instanceof Error ? err.message : String(err), loading: false });
@@ -2564,7 +3343,7 @@ var useCleanupStore = create5((set, get) => ({
 }));
 
 // src/views/smart-cleanup.tsx
-import { jsx as jsx21, jsxs as jsxs21 } from "react/jsx-runtime";
+import { jsx as jsx27, jsxs as jsxs26 } from "react/jsx-runtime";
 function SmartCleanupView() {
   const { summary, selected, loading, error, analyze, toggleSelect, selectAll } = useCleanupStore();
   const [cursor, setCursor] = useState9(0);
@@ -2572,7 +3351,7 @@ function SmartCleanupView() {
   const [confirmForce, setConfirmForce] = useState9(false);
   const [failedNames, setFailedNames] = useState9([]);
   const stream = useBrewStream();
-  const hasRefreshed = useRef6(false);
+  const hasRefreshed = useRef7(false);
   useEffect12(() => {
     analyze();
   }, []);
@@ -2615,34 +3394,26 @@ function SmartCleanupView() {
     if (input === "j" || key.downArrow) setCursor((c) => Math.min(c + 1, Math.max(0, candidates.length - 1)));
     else if (input === "k" || key.upArrow) setCursor((c) => Math.max(c - 1, 0));
   });
-  if (loading) return /* @__PURE__ */ jsx21(Loading, { message: t("loading_cleanup") });
-  if (error) return /* @__PURE__ */ jsx21(ErrorMessage, { message: error });
+  if (loading) return /* @__PURE__ */ jsx27(Loading, { message: t("loading_cleanup") });
+  if (error) return /* @__PURE__ */ jsx27(ErrorMessage, { message: error });
   if (stream.isRunning || stream.lines.length > 0) {
-    return /* @__PURE__ */ jsxs21(Box19, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx21(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t("cleanup_cleaning") }),
-      stream.isRunning && /* @__PURE__ */ jsxs21(Text21, { color: "#6B7280", children: [
+    return /* @__PURE__ */ jsxs26(Box25, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx27(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t("cleanup_cleaning") }),
+      stream.isRunning && /* @__PURE__ */ jsxs26(Text26, { color: COLORS.muted, children: [
         "esc:",
         t("hint_cancel")
       ] }),
-      !stream.isRunning && !stream.error && /* @__PURE__ */ jsx21(Box19, { borderStyle: "round", borderColor: "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs21(Text21, { color: "#22C55E", bold: true, children: [
-        "\u2714",
-        " ",
-        t("cleanup_complete")
-      ] }) }),
-      !stream.isRunning && stream.error && /* @__PURE__ */ jsxs21(Box19, { flexDirection: "column", gap: 1, children: [
-        /* @__PURE__ */ jsx21(Box19, { borderStyle: "round", borderColor: "#EF4444", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs21(Text21, { color: "#EF4444", bold: true, children: [
-          "\u2718",
-          " ",
-          t("cleanup_depError")
-        ] }) }),
-        isDependencyError && failedNames.length > 0 && /* @__PURE__ */ jsxs21(Text21, { color: "#F59E0B", children: [
+      !stream.isRunning && !stream.error && /* @__PURE__ */ jsx27(ResultBanner, { status: "success", message: `\u2714 ${t("cleanup_complete")}` }),
+      !stream.isRunning && stream.error && /* @__PURE__ */ jsxs26(Box25, { flexDirection: "column", gap: 1, children: [
+        /* @__PURE__ */ jsx27(ResultBanner, { status: "error", message: `\u2718 ${t("cleanup_depError")}` }),
+        isDependencyError && failedNames.length > 0 && /* @__PURE__ */ jsxs26(Text26, { color: COLORS.warning, children: [
           "F:",
           t("hint_force"),
           " r:",
           t("hint_refresh")
         ] })
       ] }),
-      confirmForce && /* @__PURE__ */ jsx21(Box19, { marginY: 1, children: /* @__PURE__ */ jsx21(
+      confirmForce && /* @__PURE__ */ jsx27(Box25, { marginY: 1, children: /* @__PURE__ */ jsx27(
         ConfirmDialog,
         {
           message: t("cleanup_confirmForce", { count: failedNames.length }),
@@ -2657,49 +3428,47 @@ function SmartCleanupView() {
       ) })
     ] });
   }
-  return /* @__PURE__ */ jsxs21(Box19, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx21(SectionHeader, { emoji: "\u{1F9F9}", title: t("cleanup_title"), gradient: GRADIENTS.emerald }),
-    summary && /* @__PURE__ */ jsxs21(Box19, { gap: 1, marginY: 1, children: [
-      /* @__PURE__ */ jsx21(StatCard, { label: t("cleanup_orphans"), value: candidates.length, color: candidates.length > 0 ? "#F59E0B" : "#22C55E" }),
-      /* @__PURE__ */ jsx21(StatCard, { label: t("cleanup_reclaimable"), value: summary.totalReclaimableFormatted, color: "#38BDF8" }),
-      /* @__PURE__ */ jsx21(StatCard, { label: t("cleanup_selected"), value: selected.size, color: selected.size > 0 ? "#22C55E" : "#6B7280" })
+  return /* @__PURE__ */ jsxs26(Box25, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx27(SectionHeader, { emoji: "\u{1F9F9}", title: t("cleanup_title"), gradient: GRADIENTS.emerald }),
+    summary && /* @__PURE__ */ jsxs26(Box25, { gap: 1, marginY: 1, children: [
+      /* @__PURE__ */ jsx27(StatCard, { label: t("cleanup_orphans"), value: candidates.length, color: candidates.length > 0 ? COLORS.warning : COLORS.success }),
+      /* @__PURE__ */ jsx27(StatCard, { label: t("cleanup_reclaimable"), value: summary.totalReclaimableFormatted, color: COLORS.sky }),
+      /* @__PURE__ */ jsx27(StatCard, { label: t("cleanup_selected"), value: selected.size, color: selected.size > 0 ? COLORS.success : COLORS.muted })
     ] }),
-    confirmClean && /* @__PURE__ */ jsx21(Box19, { marginY: 1, children: /* @__PURE__ */ jsx21(
-      ConfirmDialog,
-      {
-        message: t("cleanup_confirmUninstall", { count: selected.size }),
-        onConfirm: () => {
-          setConfirmClean(false);
-          hasRefreshed.current = false;
-          const names = Array.from(selected);
-          setFailedNames(names);
-          void stream.run(["uninstall", ...names]);
-        },
-        onCancel: () => setConfirmClean(false)
-      }
-    ) }),
-    candidates.length === 0 && !confirmClean && /* @__PURE__ */ jsx21(Box19, { borderStyle: "round", borderColor: "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs21(Text21, { color: "#22C55E", bold: true, children: [
-      "\u2714",
-      " ",
-      t("cleanup_systemClean")
-    ] }) }),
-    candidates.length > 0 && !confirmClean && /* @__PURE__ */ jsxs21(Box19, { flexDirection: "column", children: [
+    confirmClean && /* @__PURE__ */ jsxs26(Box25, { flexDirection: "column", marginY: 1, gap: 1, children: [
+      /* @__PURE__ */ jsx27(Box25, { borderStyle: "round", borderColor: COLORS.warning, paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx27(Text26, { color: COLORS.warning, children: t("cleanup_warning_system_tools") }) }),
+      /* @__PURE__ */ jsx27(
+        ConfirmDialog,
+        {
+          message: t("cleanup_confirmUninstall", { count: selected.size }),
+          onConfirm: () => {
+            setConfirmClean(false);
+            hasRefreshed.current = false;
+            const names = Array.from(selected);
+            setFailedNames(names);
+            void stream.run(["uninstall", ...names]);
+          },
+          onCancel: () => setConfirmClean(false)
+        }
+      )
+    ] }),
+    candidates.length === 0 && !confirmClean && /* @__PURE__ */ jsx27(ResultBanner, { status: "success", message: `\u2714 ${t("cleanup_systemClean")}` }),
+    candidates.length > 0 && !confirmClean && /* @__PURE__ */ jsxs26(Box25, { flexDirection: "column", children: [
       candidates.map((c, i) => {
         const isCurrent = i === cursor;
         const isSelected = selected.has(c.name);
-        return /* @__PURE__ */ jsxs21(Box19, { gap: 1, children: [
-          /* @__PURE__ */ jsx21(Text21, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-          /* @__PURE__ */ jsx21(Text21, { color: isSelected ? "#22C55E" : "#9CA3AF", children: isSelected ? "\u2611" : "\u2610" }),
-          /* @__PURE__ */ jsx21(Text21, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? "#F9FAFB" : "#9CA3AF", children: c.name }),
-          /* @__PURE__ */ jsx21(Text21, { color: "#F59E0B", children: c.diskUsageFormatted }),
-          /* @__PURE__ */ jsxs21(Text21, { color: "#6B7280", children: [
+        return /* @__PURE__ */ jsxs26(SelectableRow, { isCurrent, children: [
+          /* @__PURE__ */ jsx27(Text26, { color: isSelected ? COLORS.success : COLORS.muted, children: isSelected ? "\u2611" : "\u2610" }),
+          /* @__PURE__ */ jsx27(Text26, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? COLORS.text : COLORS.muted, children: c.name }),
+          /* @__PURE__ */ jsx27(Text26, { color: COLORS.warning, children: c.diskUsageFormatted }),
+          /* @__PURE__ */ jsxs26(Text26, { color: COLORS.textSecondary, children: [
             "[",
             c.reason,
             "]"
           ] })
         ] }, c.name);
       }),
-      /* @__PURE__ */ jsx21(Box19, { marginTop: 1, children: /* @__PURE__ */ jsxs21(Text21, { color: "#F9FAFB", bold: true, children: [
+      /* @__PURE__ */ jsx27(Box25, { marginTop: 1, children: /* @__PURE__ */ jsxs26(Text26, { color: COLORS.text, bold: true, children: [
         cursor + 1,
         "/",
         candidates.length
@@ -2710,41 +3479,44 @@ function SmartCleanupView() {
 
 // src/views/history.tsx
 import { useEffect as useEffect13, useState as useState10, useMemo as useMemo4 } from "react";
-import { Box as Box20, Text as Text22, useInput as useInput11, useStdout as useStdout4 } from "ink";
+import { Box as Box26, Text as Text27, useInput as useInput11, useStdout as useStdout5 } from "ink";
 
 // src/stores/history-store.ts
-import { create as create6 } from "zustand";
-var useHistoryStore = create6((set) => ({
+import { create as create7 } from "zustand";
+var useHistoryStore = create7((set) => ({
   entries: [],
   loading: false,
   error: null,
   fetchHistory: async () => {
     set({ loading: true, error: null });
     try {
-      const entries = await loadHistory();
+      const isPro = useLicenseStore.getState().isPro();
+      const entries = await loadHistory(isPro);
       set({ entries, loading: false });
     } catch (err) {
       set({ loading: false, error: err instanceof Error ? err.message : String(err) });
     }
   },
   logAction: async (action, packageName, success, error = null) => {
-    await appendEntry(action, packageName, success, error);
-    const entries = await loadHistory();
+    const isPro = useLicenseStore.getState().isPro();
+    await appendEntry(isPro, action, packageName, success, error);
+    const entries = await loadHistory(isPro);
     set({ entries });
   },
   clearHistory: async () => {
-    await clearHistory();
+    const isPro = useLicenseStore.getState().isPro();
+    await clearHistory(isPro);
     set({ entries: [] });
   }
 }));
 
 // src/views/history.tsx
-import { jsx as jsx22, jsxs as jsxs22 } from "react/jsx-runtime";
+import { jsx as jsx28, jsxs as jsxs27 } from "react/jsx-runtime";
 var ACTION_ICONS = {
-  install: { icon: "+", color: "#22C55E" },
-  uninstall: { icon: "-", color: "#EF4444" },
-  upgrade: { icon: "\u2191", color: "#06B6D4" },
-  "upgrade-all": { icon: "\u21C8", color: "#06B6D4" }
+  install: { icon: "+", color: COLORS.success },
+  uninstall: { icon: "-", color: COLORS.error },
+  upgrade: { icon: "\u2191", color: COLORS.info },
+  "upgrade-all": { icon: "\u21C8", color: COLORS.info }
 };
 var ACTION_LABEL_KEYS = {
   install: "history_actionInstall",
@@ -2817,19 +3589,19 @@ function HistoryView() {
     if (input === "j" || key.downArrow) setCursor((c) => Math.min(c + 1, Math.max(0, filtered.length - 1)));
     else if (input === "k" || key.upArrow) setCursor((c) => Math.max(c - 1, 0));
   });
-  if (loading) return /* @__PURE__ */ jsx22(Loading, { message: t("loading_history") });
-  if (error) return /* @__PURE__ */ jsx22(ErrorMessage, { message: error });
-  const { stdout } = useStdout4();
+  if (loading) return /* @__PURE__ */ jsx28(Loading, { message: t("loading_history") });
+  if (error) return /* @__PURE__ */ jsx28(ErrorMessage, { message: error });
+  const { stdout } = useStdout5();
   const MAX_VISIBLE_ROWS = Math.max(5, (stdout?.rows ?? 24) - 8);
   const start = Math.max(0, cursor - Math.floor(MAX_VISIBLE_ROWS / 2));
   const visible = filtered.slice(start, start + MAX_VISIBLE_ROWS);
-  return /* @__PURE__ */ jsxs22(Box20, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs22(Box20, { gap: 2, marginBottom: 1, children: [
-      /* @__PURE__ */ jsx22(SectionHeader, { emoji: "\u{1F4DC}", title: t("history_title", { count: filtered.length }), gradient: GRADIENTS.gold }),
-      /* @__PURE__ */ jsx22(Text22, { color: filter === "all" ? "#F9FAFB" : "#FFD700", children: t("history_filterLabel", { filter }) })
+  return /* @__PURE__ */ jsxs27(Box26, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs27(Box26, { gap: 2, marginBottom: 1, children: [
+      /* @__PURE__ */ jsx28(SectionHeader, { emoji: "\u{1F4DC}", title: t("history_title", { count: filtered.length }), gradient: GRADIENTS.gold }),
+      /* @__PURE__ */ jsx28(Text27, { color: filter === "all" ? COLORS.text : COLORS.gold, children: t("history_filterLabel", { filter }) })
     ] }),
-    isSearching && /* @__PURE__ */ jsx22(Box20, { marginBottom: 1, children: /* @__PURE__ */ jsx22(SearchInput, { defaultValue: searchQuery, onChange: setSearchQuery, placeholder: t("history_searchPlaceholder"), isActive: true }) }),
-    confirmClear && /* @__PURE__ */ jsx22(
+    isSearching && /* @__PURE__ */ jsx28(Box26, { marginBottom: 1, children: /* @__PURE__ */ jsx28(SearchInput, { defaultValue: searchQuery, onChange: setSearchQuery, placeholder: t("history_searchPlaceholder"), isActive: true }) }),
+    confirmClear && /* @__PURE__ */ jsx28(
       ConfirmDialog,
       {
         message: t("history_confirmClear", { count: entries.length }),
@@ -2840,10 +3612,10 @@ function HistoryView() {
         onCancel: () => setConfirmClear(false)
       }
     ),
-    confirmReplay && /* @__PURE__ */ jsx22(
+    confirmReplay && /* @__PURE__ */ jsx28(
       ConfirmDialog,
       {
-        message: confirmReplay.action === "upgrade-all" ? t("history_replayAll") : t("history_confirmReplay", { action: t(ACTION_LABEL_KEYS[confirmReplay.action]), name: confirmReplay.packageName ?? "" }),
+        message: confirmReplay.action === "upgrade-all" ? t("history_replayAll") + "\n" + t("upgrade_all_warning") : t("history_confirmReplay", { action: t(ACTION_LABEL_KEYS[confirmReplay.action]), name: confirmReplay.packageName ?? "" }),
         onConfirm: async () => {
           const entry = confirmReplay;
           setConfirmReplay(null);
@@ -2868,10 +3640,10 @@ function HistoryView() {
         onCancel: () => setConfirmReplay(null)
       }
     ),
-    (stream.isRunning || stream.lines.length > 0) && /* @__PURE__ */ jsx22(Box20, { marginY: 1, children: /* @__PURE__ */ jsx22(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t("hint_replay") }) }),
-    filtered.length === 0 && !confirmClear && /* @__PURE__ */ jsx22(Text22, { color: "#6B7280", italic: true, children: filter !== "all" ? t("history_noEntriesFor", { filter }) : t("history_noEntries") }),
-    filtered.length > 0 && !confirmClear && /* @__PURE__ */ jsxs22(Box20, { flexDirection: "column", children: [
-      start > 0 && /* @__PURE__ */ jsxs22(Text22, { color: "#6B7280", dimColor: true, children: [
+    (stream.isRunning || stream.lines.length > 0) && /* @__PURE__ */ jsx28(Box26, { marginY: 1, children: /* @__PURE__ */ jsx28(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t("hint_replay") }) }),
+    filtered.length === 0 && !confirmClear && /* @__PURE__ */ jsx28(Text27, { color: COLORS.textSecondary, italic: true, children: filter !== "all" ? t("history_noEntriesFor", { filter }) : t("history_noEntries") }),
+    filtered.length > 0 && !confirmClear && /* @__PURE__ */ jsxs27(Box26, { flexDirection: "column", children: [
+      start > 0 && /* @__PURE__ */ jsxs27(Text27, { color: COLORS.textSecondary, dimColor: true, children: [
         "  ",
         t("scroll_moreAbove", { count: start })
       ] }),
@@ -2880,20 +3652,19 @@ function HistoryView() {
         const isCurrent = idx === cursor;
         const { icon, color } = ACTION_ICONS[entry.action];
         const ts = new Date(entry.timestamp).getTime() / 1e3;
-        return /* @__PURE__ */ jsxs22(Box20, { gap: 1, children: [
-          /* @__PURE__ */ jsx22(Text22, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-          /* @__PURE__ */ jsx22(Text22, { color, bold: true, children: icon }),
-          /* @__PURE__ */ jsx22(Text22, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? "#F9FAFB" : "#9CA3AF", children: t(ACTION_LABEL_KEYS[entry.action]).padEnd(12) }),
-          /* @__PURE__ */ jsx22(Text22, { color: "#F9FAFB", children: entry.packageName ?? t("history_all") }),
-          entry.success ? /* @__PURE__ */ jsx22(StatusBadge, { label: t("badge_ok"), variant: "success" }) : /* @__PURE__ */ jsx22(StatusBadge, { label: t("badge_fail"), variant: "error" }),
-          /* @__PURE__ */ jsx22(Text22, { color: "#9CA3AF", children: formatRelativeTime(ts) })
+        return /* @__PURE__ */ jsxs27(SelectableRow, { isCurrent, children: [
+          /* @__PURE__ */ jsx28(Text27, { color, bold: true, children: icon }),
+          /* @__PURE__ */ jsx28(Text27, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? COLORS.text : COLORS.muted, children: t(ACTION_LABEL_KEYS[entry.action]).padEnd(12) }),
+          /* @__PURE__ */ jsx28(Text27, { color: COLORS.text, children: entry.packageName ?? t("history_all") }),
+          entry.success ? /* @__PURE__ */ jsx28(StatusBadge, { label: t("badge_ok"), variant: "success" }) : /* @__PURE__ */ jsx28(StatusBadge, { label: t("badge_fail"), variant: "error" }),
+          /* @__PURE__ */ jsx28(Text27, { color: COLORS.muted, children: formatRelativeTime(ts) })
         ] }, entry.id);
       }),
-      start + MAX_VISIBLE_ROWS < filtered.length && /* @__PURE__ */ jsxs22(Text22, { color: "#6B7280", dimColor: true, children: [
+      start + MAX_VISIBLE_ROWS < filtered.length && /* @__PURE__ */ jsxs27(Text27, { color: COLORS.textSecondary, dimColor: true, children: [
         "  ",
         t("scroll_moreBelow", { count: filtered.length - start - MAX_VISIBLE_ROWS })
       ] }),
-      /* @__PURE__ */ jsx22(Box20, { marginTop: 1, children: /* @__PURE__ */ jsxs22(Text22, { color: "#F9FAFB", bold: true, children: [
+      /* @__PURE__ */ jsx28(Box26, { marginTop: 1, children: /* @__PURE__ */ jsxs27(Text27, { color: COLORS.text, bold: true, children: [
         cursor + 1,
         "/",
         filtered.length
@@ -2904,10 +3675,10 @@ function HistoryView() {
 
 // src/views/security-audit.tsx
 import { useEffect as useEffect14, useState as useState11 } from "react";
-import { Box as Box21, Text as Text23, useInput as useInput12 } from "ink";
+import { Box as Box27, Text as Text28, useInput as useInput12 } from "ink";
 
 // src/stores/security-store.ts
-import { create as create7 } from "zustand";
+import { create as create8 } from "zustand";
 
 // src/lib/security/osv-api.ts
 var OSV_BATCH_URL = "https://api.osv.dev/v1/querybatch";
@@ -2950,6 +3721,12 @@ async function queryBatch(packages, queries) {
     throw new Error(`OSV API error: ${res.status} ${res.statusText}`);
   }
   const data = await res.json();
+  if (!data || !Array.isArray(data.results)) {
+    throw new Error("Invalid OSV API response: missing results array");
+  }
+  if (data.results.length !== packages.length) {
+    throw new Error(`OSV API response mismatch: expected ${packages.length} results, got ${data.results.length}`);
+  }
   const result = /* @__PURE__ */ new Map();
   for (let i = 0; i < packages.length; i++) {
     const vulns = data.results[i]?.vulns;
@@ -2969,6 +3746,7 @@ async function queryBatch(packages, queries) {
 }
 async function queryOneByOne(packages) {
   const result = /* @__PURE__ */ new Map();
+  const errors = [];
   for (const pkg of packages) {
     try {
       const partial = await queryBatch(
@@ -2976,15 +3754,43 @@ async function queryOneByOne(packages) {
         [{ package: { name: pkg.name, ecosystem: "Homebrew" }, version: pkg.version }]
       );
       for (const [k, v] of partial) result.set(k, v);
-    } catch {
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.includes("400")) {
+        errors.push(`Skipped ${pkg.name}: ${msg}`);
+        continue;
+      }
+      if (msg.includes("429")) {
+        logger.warn(`Rate limited by OSV API, backing off`, { package: pkg.name });
+        await new Promise((r) => setTimeout(r, 2e3));
+        try {
+          const retryResult = await queryBatch(
+            [pkg],
+            [{ package: { name: pkg.name, ecosystem: "Homebrew" }, version: pkg.version }]
+          );
+          for (const [k, v] of retryResult) result.set(k, v);
+        } catch {
+          errors.push(`Failed after retry ${pkg.name}: ${msg}`);
+        }
+        continue;
+      }
+      logger.error(`OSV query failed for ${pkg.name}: ${msg}`);
+      errors.push(`${pkg.name}: ${msg}`);
     }
+    await new Promise((r) => setTimeout(r, 75));
+  }
+  if (errors.length > 0) {
+    logger.warn(`OSV query errors for ${errors.length} packages`, { errors: errors.slice(0, 5) });
   }
   return result;
 }
 async function queryVulnerabilities(packages) {
+  const validPackages = packages.filter(
+    (p) => p.version && typeof p.version === "string" && p.version.trim().length > 0
+  );
   const result = /* @__PURE__ */ new Map();
-  for (let i = 0; i < packages.length; i += BATCH_SIZE) {
-    const batch = packages.slice(i, i + BATCH_SIZE);
+  for (let i = 0; i < validPackages.length; i += BATCH_SIZE) {
+    const batch = validPackages.slice(i, i + BATCH_SIZE);
     const queries = batch.map((p) => ({
       package: { name: p.name, ecosystem: "Homebrew" },
       version: p.version
@@ -3003,9 +3809,8 @@ var SEVERITY_ORDER = {
   LOW: 1,
   UNKNOWN: 0
 };
-async function runSecurityAudit(formulae, casks) {
-  const { license, status } = useLicenseStore.getState();
-  requirePro(license, status);
+async function runSecurityAudit(isPro, formulae, casks) {
+  if (!isPro) throw new Error("Pro license required");
   const packages = [];
   for (const f of formulae) {
     const version = f.installed[0]?.version ?? f.versions.stable;
@@ -3056,11 +3861,17 @@ async function runSecurityAudit(formulae, casks) {
 }
 
 // src/stores/security-store.ts
-var useSecurityStore = create7((set) => ({
+var CACHE_TTL_MS = 30 * 60 * 1e3;
+var useSecurityStore = create8((set, get) => ({
   summary: null,
   loading: false,
   error: null,
-  scan: async () => {
+  cachedAt: null,
+  scan: async (forceRefresh = false) => {
+    const { summary, cachedAt } = get();
+    if (!forceRefresh && summary && cachedAt && Date.now() - cachedAt < CACHE_TTL_MS) {
+      return;
+    }
     set({ loading: true, error: null });
     try {
       const brewState = useBrewStore.getState();
@@ -3068,8 +3879,9 @@ var useSecurityStore = create7((set) => ({
         await brewState.fetchInstalled();
       }
       const { formulae, casks } = useBrewStore.getState();
-      const summary = await runSecurityAudit(formulae, casks);
-      set({ summary, loading: false });
+      const isPro = useLicenseStore.getState().isPro();
+      const result = await runSecurityAudit(isPro, formulae, casks);
+      set({ summary: result, loading: false, cachedAt: Date.now() });
     } catch (err) {
       set({ error: err instanceof Error ? err.message : String(err), loading: false });
     }
@@ -3077,13 +3889,13 @@ var useSecurityStore = create7((set) => ({
 }));
 
 // src/views/security-audit.tsx
-import { jsx as jsx23, jsxs as jsxs23 } from "react/jsx-runtime";
+import { jsx as jsx29, jsxs as jsxs28 } from "react/jsx-runtime";
 var SEVERITY_COLORS = {
-  CRITICAL: "#EF4444",
-  HIGH: "#EF4444",
-  MEDIUM: "#F59E0B",
-  LOW: "#6B7280",
-  UNKNOWN: "#6B7280"
+  CRITICAL: COLORS.error,
+  HIGH: COLORS.error,
+  MEDIUM: COLORS.warning,
+  LOW: COLORS.textSecondary,
+  UNKNOWN: COLORS.textSecondary
 };
 var SEVERITY_BADGE = {
   CRITICAL: "error",
@@ -3092,8 +3904,11 @@ var SEVERITY_BADGE = {
   LOW: "muted",
   UNKNOWN: "muted"
 };
+function isNetworkError2(msg) {
+  return /fetch failed|ECONNREFUSED|ENOTFOUND|ETIMEDOUT|network|abort/i.test(msg);
+}
 function SecurityAuditView() {
-  const { summary, loading, error, scan } = useSecurityStore();
+  const { summary, loading, error, scan, cachedAt } = useSecurityStore();
   const [cursor, setCursor] = useState11(0);
   const [expandedPkg, setExpandedPkg] = useState11(null);
   const [confirmUpgrade, setConfirmUpgrade] = useState11(null);
@@ -3105,7 +3920,7 @@ function SecurityAuditView() {
   useInput12((input, key) => {
     if (confirmUpgrade || stream.isRunning) return;
     if (input === "r") {
-      void scan();
+      void scan(true);
       return;
     }
     if (input === "u" && results[cursor]) {
@@ -3118,30 +3933,31 @@ function SecurityAuditView() {
       setExpandedPkg(expandedPkg === results[cursor].packageName ? null : results[cursor].packageName);
     }
   });
-  if (loading) return /* @__PURE__ */ jsx23(Loading, { message: t("loading_security") });
-  if (error) return /* @__PURE__ */ jsx23(ErrorMessage, { message: error });
-  return /* @__PURE__ */ jsxs23(Box21, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx23(SectionHeader, { emoji: "\u{1F6E1}\uFE0F", title: t("security_title"), gradient: GRADIENTS.ocean }),
-    summary && /* @__PURE__ */ jsxs23(Box21, { gap: 1, marginY: 1, children: [
-      /* @__PURE__ */ jsx23(StatCard, { label: t("security_scanned"), value: summary.totalPackages, color: "#06B6D4" }),
-      /* @__PURE__ */ jsx23(
+  if (loading) return /* @__PURE__ */ jsx29(Loading, { message: t("loading_security") });
+  if (error) {
+    const displayError = isNetworkError2(error) ? t("security_networkError") : error;
+    return /* @__PURE__ */ jsx29(ErrorMessage, { message: displayError });
+  }
+  const cacheAge = cachedAt ? formatRelativeTime(cachedAt / 1e3) : null;
+  return /* @__PURE__ */ jsxs28(Box27, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx29(SectionHeader, { emoji: "\u{1F6E1}\uFE0F", title: t("security_title"), gradient: GRADIENTS.ocean }),
+    summary && /* @__PURE__ */ jsxs28(Box27, { gap: 1, marginY: 1, children: [
+      /* @__PURE__ */ jsx29(StatCard, { label: t("security_scanned"), value: summary.totalPackages, color: COLORS.info }),
+      /* @__PURE__ */ jsx29(
         StatCard,
         {
           label: t("security_vulnerable"),
           value: summary.vulnerablePackages,
-          color: summary.vulnerablePackages > 0 ? "#EF4444" : "#22C55E"
+          color: summary.vulnerablePackages > 0 ? COLORS.error : COLORS.success
         }
       ),
-      summary.criticalCount > 0 && /* @__PURE__ */ jsx23(StatCard, { label: t("security_critical"), value: summary.criticalCount, color: "#EF4444" }),
-      summary.highCount > 0 && /* @__PURE__ */ jsx23(StatCard, { label: t("security_high"), value: summary.highCount, color: "#EF4444" }),
-      summary.mediumCount > 0 && /* @__PURE__ */ jsx23(StatCard, { label: t("security_medium"), value: summary.mediumCount, color: "#F59E0B" })
+      summary.criticalCount > 0 && /* @__PURE__ */ jsx29(StatCard, { label: t("security_critical"), value: summary.criticalCount, color: COLORS.error }),
+      summary.highCount > 0 && /* @__PURE__ */ jsx29(StatCard, { label: t("security_high"), value: summary.highCount, color: COLORS.error }),
+      summary.mediumCount > 0 && /* @__PURE__ */ jsx29(StatCard, { label: t("security_medium"), value: summary.mediumCount, color: COLORS.warning })
     ] }),
-    results.length === 0 && summary && /* @__PURE__ */ jsx23(Box21, { marginTop: 1, children: /* @__PURE__ */ jsx23(Box21, { borderStyle: "round", borderColor: "#22C55E", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsxs23(Text23, { color: "#22C55E", bold: true, children: [
-      "\u2714",
-      " ",
-      t("security_noVulns")
-    ] }) }) }),
-    confirmUpgrade && /* @__PURE__ */ jsx23(Box21, { marginY: 1, children: /* @__PURE__ */ jsx23(
+    cacheAge && /* @__PURE__ */ jsx29(Text28, { color: COLORS.muted, children: t("security_cachedResults", { time: cacheAge }) }),
+    results.length === 0 && summary && /* @__PURE__ */ jsx29(Box27, { marginTop: 1, children: /* @__PURE__ */ jsx29(ResultBanner, { status: "success", message: `\u2714 ${t("security_noVulns")}` }) }),
+    confirmUpgrade && /* @__PURE__ */ jsx29(Box27, { marginY: 1, children: /* @__PURE__ */ jsx29(
       ConfirmDialog,
       {
         message: t("security_confirmUpgrade", { name: confirmUpgrade }),
@@ -3149,40 +3965,39 @@ function SecurityAuditView() {
           const name = confirmUpgrade;
           setConfirmUpgrade(null);
           await stream.run(["upgrade", name]);
-          void scan();
+          void scan(true);
         },
         onCancel: () => setConfirmUpgrade(null)
       }
     ) }),
-    (stream.isRunning || stream.lines.length > 0) && /* @__PURE__ */ jsx23(Box21, { marginY: 1, children: /* @__PURE__ */ jsx23(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t("hint_upgrade") }) }),
-    results.length > 0 && /* @__PURE__ */ jsxs23(Box21, { flexDirection: "column", marginTop: 1, children: [
+    (stream.isRunning || stream.lines.length > 0) && /* @__PURE__ */ jsx29(Box27, { marginY: 1, children: /* @__PURE__ */ jsx29(ProgressLog, { lines: stream.lines, isRunning: stream.isRunning, title: t("hint_upgrade") }) }),
+    results.length > 0 && /* @__PURE__ */ jsxs28(Box27, { flexDirection: "column", marginTop: 1, children: [
       results.map((pkg, i) => {
         const isCurrent = i === cursor;
         const isExpanded = expandedPkg === pkg.packageName;
-        return /* @__PURE__ */ jsxs23(Box21, { flexDirection: "column", children: [
-          /* @__PURE__ */ jsxs23(Box21, { gap: 1, children: [
-            /* @__PURE__ */ jsx23(Text23, { color: isCurrent ? "#22C55E" : "#9CA3AF", children: isCurrent ? "\u25B6" : " " }),
-            /* @__PURE__ */ jsx23(StatusBadge, { label: pkg.maxSeverity, variant: SEVERITY_BADGE[pkg.maxSeverity] }),
-            /* @__PURE__ */ jsx23(Text23, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? "#F9FAFB" : "#9CA3AF", children: pkg.packageName }),
-            /* @__PURE__ */ jsx23(Text23, { color: "#9CA3AF", children: pkg.installedVersion }),
-            /* @__PURE__ */ jsx23(Text23, { color: "#9CA3AF", children: tp("plural_vulns", pkg.vulnerabilities.length) }),
-            /* @__PURE__ */ jsx23(Text23, { color: "#9CA3AF", children: isExpanded ? "\u25BC" : "\u25B6" })
+        return /* @__PURE__ */ jsxs28(Box27, { flexDirection: "column", children: [
+          /* @__PURE__ */ jsxs28(SelectableRow, { isCurrent, children: [
+            /* @__PURE__ */ jsx29(StatusBadge, { label: pkg.maxSeverity, variant: SEVERITY_BADGE[pkg.maxSeverity] }),
+            /* @__PURE__ */ jsx29(Text28, { bold: isCurrent, inverse: isCurrent, color: isCurrent ? COLORS.text : COLORS.muted, children: pkg.packageName }),
+            /* @__PURE__ */ jsx29(Text28, { color: COLORS.muted, children: pkg.installedVersion }),
+            /* @__PURE__ */ jsx29(Text28, { color: COLORS.muted, children: tp("plural_vulns", pkg.vulnerabilities.length) }),
+            /* @__PURE__ */ jsx29(Text28, { color: COLORS.muted, children: isExpanded ? "\u25BC" : "\u25B6" })
           ] }),
-          isExpanded && /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", paddingLeft: 4, marginBottom: 1, children: pkg.vulnerabilities.map((vuln) => /* @__PURE__ */ jsxs23(Box21, { flexDirection: "column", marginBottom: 1, children: [
-            /* @__PURE__ */ jsxs23(Box21, { gap: 1, children: [
-              /* @__PURE__ */ jsx23(Text23, { color: SEVERITY_COLORS[vuln.severity], bold: true, children: vuln.id }),
-              /* @__PURE__ */ jsxs23(Text23, { color: "#9CA3AF", children: [
+          isExpanded && /* @__PURE__ */ jsx29(Box27, { flexDirection: "column", paddingLeft: 4, marginBottom: 1, children: pkg.vulnerabilities.map((vuln) => /* @__PURE__ */ jsxs28(Box27, { flexDirection: "column", marginBottom: 1, children: [
+            /* @__PURE__ */ jsxs28(Box27, { gap: 1, children: [
+              /* @__PURE__ */ jsx29(Text28, { color: SEVERITY_COLORS[vuln.severity], bold: true, children: vuln.id }),
+              /* @__PURE__ */ jsxs28(Text28, { color: COLORS.muted, children: [
                 "[",
                 vuln.severity,
                 "]"
               ] })
             ] }),
-            /* @__PURE__ */ jsx23(Text23, { color: "#9CA3AF", wrap: "wrap", children: vuln.summary }),
-            vuln.fixedVersion && /* @__PURE__ */ jsx23(Text23, { color: "#22C55E", children: t("security_fixedIn", { version: vuln.fixedVersion }) })
+            /* @__PURE__ */ jsx29(Text28, { color: COLORS.muted, wrap: "wrap", children: vuln.summary }),
+            vuln.fixedVersion && /* @__PURE__ */ jsx29(Text28, { color: COLORS.success, children: t("security_fixedIn", { version: vuln.fixedVersion }) })
           ] }, vuln.id)) })
         ] }, pkg.packageName);
       }),
-      /* @__PURE__ */ jsx23(Box21, { marginTop: 1, children: /* @__PURE__ */ jsxs23(Text23, { color: "#F9FAFB", bold: true, children: [
+      /* @__PURE__ */ jsx29(Box27, { marginTop: 1, children: /* @__PURE__ */ jsxs28(Text28, { color: COLORS.text, bold: true, children: [
         cursor + 1,
         "/",
         results.length
@@ -3193,12 +4008,13 @@ function SecurityAuditView() {
 
 // src/views/account.tsx
 import { useState as useState12 } from "react";
-import { Box as Box22, Text as Text24, useInput as useInput13 } from "ink";
-import { Fragment as Fragment5, jsx as jsx24, jsxs as jsxs24 } from "react/jsx-runtime";
+import { Box as Box28, Text as Text29, useInput as useInput13 } from "ink";
+import { Fragment as Fragment5, jsx as jsx30, jsxs as jsxs29 } from "react/jsx-runtime";
 function AccountView() {
   const { status, license, deactivate: deactivate2, degradation } = useLicenseStore();
   const [confirmDeactivate, setConfirmDeactivate] = useState12(false);
   const [deactivating, setDeactivating] = useState12(false);
+  const [deactivateError, setDeactivateError] = useState12(null);
   useInput13((input) => {
     if (confirmDeactivate || deactivating) return;
     if (input === "d" && status === "pro") {
@@ -3209,17 +4025,23 @@ function AccountView() {
     if (key.length <= 8) return key;
     return key.slice(0, 4) + "-****-****-" + key.slice(-4);
   };
-  return /* @__PURE__ */ jsxs24(Box22, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx24(SectionHeader, { emoji: "\u{1F464}", title: t("account_title"), gradient: GRADIENTS.gold }),
-    confirmDeactivate && /* @__PURE__ */ jsx24(Box22, { marginY: 1, children: /* @__PURE__ */ jsx24(
+  if (status === "validating") {
+    return /* @__PURE__ */ jsx30(Loading, { message: t("account_loading") });
+  }
+  return /* @__PURE__ */ jsxs29(Box28, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx30(SectionHeader, { emoji: "\u{1F464}", title: t("account_title"), gradient: GRADIENTS.gold }),
+    confirmDeactivate && /* @__PURE__ */ jsx30(Box28, { marginY: 1, children: /* @__PURE__ */ jsx30(
       ConfirmDialog,
       {
         message: t("account_confirmDeactivate"),
         onConfirm: async () => {
           setConfirmDeactivate(false);
           setDeactivating(true);
+          setDeactivateError(null);
           try {
             await deactivate2();
+          } catch (err) {
+            setDeactivateError(t("deactivate_failed") + ": " + String(err));
           } finally {
             setDeactivating(false);
           }
@@ -3227,122 +4049,128 @@ function AccountView() {
         onCancel: () => setConfirmDeactivate(false)
       }
     ) }),
-    /* @__PURE__ */ jsxs24(Box22, { flexDirection: "column", marginTop: 1, paddingLeft: 2, children: [
-      /* @__PURE__ */ jsxs24(Box22, { gap: 1, children: [
-        /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_statusLabel") }),
-        status === "pro" && /* @__PURE__ */ jsx24(Text24, { color: "#22C55E", bold: true, children: t("account_pro") }),
-        status === "free" && /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_free") }),
-        status === "expired" && /* @__PURE__ */ jsx24(Text24, { color: "#EF4444", children: t("account_expired") }),
-        status === "validating" && /* @__PURE__ */ jsx24(Text24, { color: "#38BDF8", children: t("account_validating") })
+    /* @__PURE__ */ jsxs29(Box28, { flexDirection: "column", marginTop: 1, paddingLeft: 2, children: [
+      /* @__PURE__ */ jsxs29(Box28, { gap: 1, children: [
+        /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_statusLabel") }),
+        status === "pro" && /* @__PURE__ */ jsx30(Text29, { color: COLORS.success, bold: true, children: t("account_pro") }),
+        status === "free" && /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_free") }),
+        status === "expired" && /* @__PURE__ */ jsx30(Text29, { color: COLORS.error, children: t("account_expired") })
       ] }),
-      (degradation === "warning" || degradation === "limited") && license && /* @__PURE__ */ jsx24(Box22, { marginTop: 1, borderStyle: "round", borderColor: "#F59E0B", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx24(Text24, { color: "#F59E0B", children: t("license_offlineWarning", {
+      (degradation === "warning" || degradation === "limited") && license && /* @__PURE__ */ jsx30(Box28, { marginTop: 1, borderStyle: "round", borderColor: COLORS.warning, paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx30(Text29, { color: COLORS.warning, children: t("license_offlineWarning", {
         days: Math.floor((Date.now() - new Date(license.lastValidatedAt).getTime()) / (24 * 60 * 60 * 1e3))
       }) }) }),
-      license && /* @__PURE__ */ jsxs24(Fragment5, { children: [
-        /* @__PURE__ */ jsxs24(Box22, { gap: 1, children: [
-          /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_emailLabel") }),
-          /* @__PURE__ */ jsx24(Text24, { children: license.customerEmail })
+      license && /* @__PURE__ */ jsxs29(Fragment5, { children: [
+        /* @__PURE__ */ jsxs29(Box28, { gap: 1, children: [
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_emailLabel") }),
+          /* @__PURE__ */ jsx30(Text29, { children: license.customerEmail })
         ] }),
-        /* @__PURE__ */ jsxs24(Box22, { gap: 1, children: [
-          /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_nameLabel") }),
-          /* @__PURE__ */ jsx24(Text24, { children: license.customerName })
+        /* @__PURE__ */ jsxs29(Box28, { gap: 1, children: [
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_nameLabel") }),
+          /* @__PURE__ */ jsx30(Text29, { children: license.customerName })
         ] }),
-        /* @__PURE__ */ jsxs24(Box22, { gap: 1, children: [
-          /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_planLabel") }),
-          /* @__PURE__ */ jsx24(Text24, { color: "#22C55E", bold: true, children: "Pro" })
+        /* @__PURE__ */ jsxs29(Box28, { gap: 1, children: [
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_planLabel") }),
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.success, bold: true, children: "Pro" })
         ] }),
-        /* @__PURE__ */ jsxs24(Box22, { gap: 1, children: [
-          /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_keyLabel") }),
-          /* @__PURE__ */ jsx24(Text24, { children: maskKey(license.key) })
+        /* @__PURE__ */ jsxs29(Box28, { gap: 1, children: [
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_keyLabel") }),
+          /* @__PURE__ */ jsx30(Text29, { children: maskKey(license.key) })
         ] }),
-        license.expiresAt && /* @__PURE__ */ jsxs24(Box22, { gap: 1, children: [
-          /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_expiresLabel") }),
-          /* @__PURE__ */ jsx24(Text24, { children: new Date(license.expiresAt).toLocaleDateString() })
+        license.expiresAt && /* @__PURE__ */ jsxs29(Box28, { gap: 1, children: [
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_expiresLabel") }),
+          /* @__PURE__ */ jsx30(Text29, { children: formatDate(license.expiresAt) })
         ] }),
-        /* @__PURE__ */ jsxs24(Box22, { gap: 1, children: [
-          /* @__PURE__ */ jsx24(Text24, { color: "#9CA3AF", children: t("account_activatedLabel") }),
-          /* @__PURE__ */ jsx24(Text24, { children: new Date(license.activatedAt).toLocaleDateString() })
+        /* @__PURE__ */ jsxs29(Box28, { gap: 1, children: [
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.muted, children: t("account_activatedLabel") }),
+          /* @__PURE__ */ jsx30(Text29, { children: formatDate(license.activatedAt) })
         ] })
       ] }),
-      status === "free" && /* @__PURE__ */ jsxs24(Box22, { flexDirection: "column", marginTop: 2, borderStyle: "round", borderColor: "#FF6B2B", paddingX: 2, paddingY: 1, children: [
-        /* @__PURE__ */ jsxs24(Text24, { bold: true, color: "#FF6B2B", children: [
+      status === "free" && /* @__PURE__ */ jsxs29(Box28, { flexDirection: "column", marginTop: 2, borderStyle: "round", borderColor: COLORS.brand, paddingX: 2, paddingY: 1, children: [
+        /* @__PURE__ */ jsxs29(Text29, { bold: true, color: COLORS.brand, children: [
           "\u2B50",
           " ",
           t("account_upgradeTitle")
         ] }),
-        /* @__PURE__ */ jsx24(Text24, { children: " " }),
-        /* @__PURE__ */ jsx24(Text24, { children: t("account_unlockDesc") }),
-        /* @__PURE__ */ jsx24(Text24, { color: "#06B6D4", bold: true, children: t("account_pricing") }),
-        /* @__PURE__ */ jsx24(Text24, { children: " " }),
-        /* @__PURE__ */ jsxs24(Text24, { color: "#9CA3AF", children: [
+        /* @__PURE__ */ jsx30(Text29, { children: " " }),
+        /* @__PURE__ */ jsx30(Text29, { children: t("account_unlockDesc") }),
+        /* @__PURE__ */ jsx30(Text29, { color: COLORS.info, bold: true, children: t("account_pricing") }),
+        /* @__PURE__ */ jsx30(Text29, { children: " " }),
+        /* @__PURE__ */ jsxs29(Text29, { color: COLORS.muted, children: [
           t("upgrade_buyAt"),
           " ",
-          /* @__PURE__ */ jsx24(Text24, { color: "#38BDF8", bold: true, children: t("upgrade_buyUrl") })
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.sky, bold: true, children: t("upgrade_buyUrl") })
         ] }),
-        /* @__PURE__ */ jsxs24(Text24, { color: "#9CA3AF", children: [
+        /* @__PURE__ */ jsxs29(Text29, { color: COLORS.muted, children: [
           t("account_runActivate"),
           " ",
-          /* @__PURE__ */ jsx24(Text24, { color: "#22C55E", bold: true, children: t("account_activateCmd") })
+          /* @__PURE__ */ jsx30(Text29, { color: COLORS.success, bold: true, children: t("account_activateCmd") })
         ] })
       ] }),
-      status === "expired" && /* @__PURE__ */ jsx24(Box22, { marginTop: 1, children: /* @__PURE__ */ jsx24(Box22, { borderStyle: "round", borderColor: "#EF4444", paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx24(Text24, { color: "#EF4444", children: t("account_licenseExpired") }) }) }),
-      deactivating && /* @__PURE__ */ jsx24(Text24, { color: "#38BDF8", children: t("account_deactivating") })
+      status === "expired" && /* @__PURE__ */ jsx30(Box28, { marginTop: 1, children: /* @__PURE__ */ jsx30(Box28, { borderStyle: "round", borderColor: COLORS.error, paddingX: 2, paddingY: 0, children: /* @__PURE__ */ jsx30(Text29, { color: COLORS.error, children: t("account_licenseExpired") }) }) }),
+      deactivating && /* @__PURE__ */ jsx30(Text29, { color: COLORS.sky, children: t("account_deactivating") }),
+      deactivateError && /* @__PURE__ */ jsx30(Text29, { color: COLORS.error, children: deactivateError })
     ] }),
-    /* @__PURE__ */ jsx24(Box22, { marginTop: 2, children: /* @__PURE__ */ jsxs24(Text24, { color: "#6B7280", children: [
+    /* @__PURE__ */ jsx30(Box28, { marginTop: 2, children: /* @__PURE__ */ jsxs29(Text29, { color: COLORS.textSecondary, children: [
       status === "pro" ? `d:${t("hint_deactivate")}` : "",
       " ",
-      t("app_version", { version: "0.2.0" })
+      t("app_version", { version: "0.3.1" })
     ] }) })
   ] });
 }
 
 // src/app.tsx
-import { jsx as jsx25 } from "react/jsx-runtime";
-function App() {
-  const { exit } = useApp();
-  const currentView = useNavigationStore((s) => s.currentView);
-  const isPro = useLicenseStore((s) => s.isPro);
+import { jsx as jsx31, jsxs as jsxs30 } from "react/jsx-runtime";
+function LicenseInitializer() {
   const initLicense = useLicenseStore((s) => s.initialize);
   useEffect15(() => {
     initLicense();
   }, []);
+  return null;
+}
+function ViewRouter({ currentView }) {
+  const isPro = useLicenseStore((s) => s.isPro);
+  if (isProView(currentView) && !isPro()) {
+    return /* @__PURE__ */ jsx31(UpgradePrompt, { viewId: currentView });
+  }
+  switch (currentView) {
+    case "dashboard":
+      return /* @__PURE__ */ jsx31(DashboardView, {});
+    case "installed":
+      return /* @__PURE__ */ jsx31(InstalledView, {});
+    case "search":
+      return /* @__PURE__ */ jsx31(SearchView, {});
+    case "outdated":
+      return /* @__PURE__ */ jsx31(OutdatedView, {});
+    case "package-info":
+      return /* @__PURE__ */ jsx31(PackageInfoView, {});
+    case "services":
+      return /* @__PURE__ */ jsx31(ServicesView, {});
+    case "doctor":
+      return /* @__PURE__ */ jsx31(DoctorView, {});
+    case "profiles":
+      return /* @__PURE__ */ jsx31(ProfilesView, {});
+    case "smart-cleanup":
+      return /* @__PURE__ */ jsx31(SmartCleanupView, {});
+    case "history":
+      return /* @__PURE__ */ jsx31(HistoryView, {});
+    case "security-audit":
+      return /* @__PURE__ */ jsx31(SecurityAuditView, {});
+    case "account":
+      return /* @__PURE__ */ jsx31(AccountView, {});
+  }
+}
+function App() {
+  const { exit } = useApp();
+  const currentView = useNavigationStore((s) => s.currentView);
   useGlobalKeyboard({ onQuit: exit });
-  const renderView = () => {
-    if (isProView(currentView) && !isPro()) {
-      return /* @__PURE__ */ jsx25(UpgradePrompt, { viewId: currentView });
-    }
-    switch (currentView) {
-      case "dashboard":
-        return /* @__PURE__ */ jsx25(DashboardView, {});
-      case "installed":
-        return /* @__PURE__ */ jsx25(InstalledView, {});
-      case "search":
-        return /* @__PURE__ */ jsx25(SearchView, {});
-      case "outdated":
-        return /* @__PURE__ */ jsx25(OutdatedView, {});
-      case "package-info":
-        return /* @__PURE__ */ jsx25(PackageInfoView, {});
-      case "services":
-        return /* @__PURE__ */ jsx25(ServicesView, {});
-      case "doctor":
-        return /* @__PURE__ */ jsx25(DoctorView, {});
-      case "profiles":
-        return /* @__PURE__ */ jsx25(ProfilesView, {});
-      case "smart-cleanup":
-        return /* @__PURE__ */ jsx25(SmartCleanupView, {});
-      case "history":
-        return /* @__PURE__ */ jsx25(HistoryView, {});
-      case "security-audit":
-        return /* @__PURE__ */ jsx25(SecurityAuditView, {});
-      case "account":
-        return /* @__PURE__ */ jsx25(AccountView, {});
-    }
-  };
-  return /* @__PURE__ */ jsx25(AppLayout, { children: renderView() });
+  return /* @__PURE__ */ jsxs30(AppLayout, { children: [
+    /* @__PURE__ */ jsx31(LicenseInitializer, {}),
+    /* @__PURE__ */ jsx31(ViewRouter, { currentView })
+  ] });
 }
 
 // src/index.tsx
-import { jsx as jsx26 } from "react/jsx-runtime";
+import { jsx as jsx32 } from "react/jsx-runtime";
 var [, , command, arg] = process.argv;
 async function runCli() {
   await ensureDataDirs();
@@ -3357,7 +4185,7 @@ async function runCli() {
       console.log(t("cli_activated", { email: license.customerEmail }));
       console.log(t("cli_planPro"));
       if (license.expiresAt) {
-        console.log(t("cli_expires", { date: new Date(license.expiresAt).toLocaleDateString() }));
+        console.log(t("cli_expires", { date: formatDate(license.expiresAt) }));
       }
     } catch (err) {
       console.error(t("cli_activationFailed", { error: err instanceof Error ? err.message : String(err) }));
@@ -3385,25 +4213,62 @@ async function runCli() {
     }
     return;
   }
-  if (command === "status") {
+  if (command === "revalidate") {
     const license = await loadLicense();
     if (!license) {
+      console.log(t("cli_noLicense"));
+      process.exit(1);
+    }
+    const result = await revalidate(license);
+    if (result === "expired") {
+      console.error(t("cli_revalidateFailed"));
+      process.exit(1);
+    }
+    const updated = await loadLicense();
+    if (result === "grace") {
+      console.warn(t("cli_revalidateGrace"));
+    } else {
+      console.log(t("cli_revalidated"));
+    }
+    if (updated?.expiresAt) {
+      console.log(t("cli_expires", { date: formatDate(updated.expiresAt) }));
+    }
+    return;
+  }
+  if (command === "status") {
+    await useLicenseStore.getState().initialize();
+    const { status, license, degradation } = useLicenseStore.getState();
+    if (status === "free") {
       console.log(t("cli_planFree"));
       console.log(t("cli_upgradeHint"));
     } else {
-      console.log(t("cli_planPro"));
-      console.log(t("cli_email", { email: license.customerEmail }));
-      console.log(t("cli_status", { status: license.status }));
-      if (license.expiresAt) {
-        console.log(t("cli_expires", { date: new Date(license.expiresAt).toLocaleDateString() }));
+      const planLabel = status === "expired" ? t("cli_planExpired") : t("cli_planPro");
+      console.log(planLabel);
+      if (license) {
+        console.log(t("cli_email", { email: license.customerEmail }));
+      }
+      const statusText = status === "pro" ? degradation === "none" ? license?.status ?? "active" : degradation : status;
+      console.log(t("cli_status", { status: statusText }));
+      if (license?.expiresAt) {
+        console.log(t("cli_expires", { date: formatDate(license.expiresAt) }));
+      }
+      if (status === "expired") {
+        console.log(t("cli_revalidateHint"));
+      }
+      if (status === "pro" && degradation !== "none" && license) {
+        const days = Math.floor((Date.now() - new Date(license.lastValidatedAt).getTime()) / (24 * 60 * 60 * 1e3));
+        console.log(t("license_offlineWarning", { days }));
+        console.log(t("cli_revalidateHint"));
       }
     }
     return;
   }
   if (command === "install-brewbar") {
-    const { installBrewBar } = await import("./brewbar-installer-4Z2WE57I.js");
+    await useLicenseStore.getState().initialize();
+    const isPro = useLicenseStore.getState().isPro();
+    const { installBrewBar } = await import("./brewbar-installer-H5MLNNTD.js");
     try {
-      await installBrewBar(arg === "--force");
+      await installBrewBar(isPro, arg === "--force");
       console.log(t("cli_brewbarInstalled"));
     } catch (err) {
       console.error(err instanceof Error ? err.message : String(err));
@@ -3412,7 +4277,7 @@ async function runCli() {
     return;
   }
   if (command === "uninstall-brewbar") {
-    const { uninstallBrewBar } = await import("./brewbar-installer-4Z2WE57I.js");
+    const { uninstallBrewBar } = await import("./brewbar-installer-H5MLNNTD.js");
     try {
       await uninstallBrewBar();
       console.log(t("cli_brewbarUninstalled"));
@@ -3422,9 +4287,22 @@ async function runCli() {
     }
     return;
   }
-  render(/* @__PURE__ */ jsx26(App, {}));
+  if (command === "delete-account") {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await rl.question(t("delete_account_confirm") + " (y/N): ");
+    rl.close();
+    if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "s") {
+      console.log(t("cli_deactivateCancelled"));
+      return;
+    }
+    await rm3(DATA_DIR, { recursive: true, force: true });
+    console.log(t("delete_account_success"));
+    return;
+  }
+  render(/* @__PURE__ */ jsx32(App, {}));
 }
 runCli().catch((err) => {
   console.error(err instanceof Error ? err.message : String(err));
   process.exit(1);
 });
+//# sourceMappingURL=index.js.map