pi-extmgr 0.1.20 → 0.1.22

package/src/ui/unified.ts

@@ -14,22 +14,14 @@ import {
   matchesKey,
   Key,
 } from "@mariozechner/pi-tui";
-import type {
-  UnifiedItem,
-  State,
-  UnifiedAction,
-  InstalledPackage,
-  PackageExtensionEntry,
-} from "../types/index.js";
+import type { UnifiedItem, State, UnifiedAction, InstalledPackage } from "../types/index.js";
 import {
   discoverExtensions,
   removeLocalExtension,
   setExtensionState,
 } from "../extensions/discovery.js";
 import { getInstalledPackages } from "../packages/discovery.js";
-import { discoverPackageExtensions, setPackageExtensionState } from "../packages/extensions.js";
 import {
-  showPackageActions,
   updatePackageWithOutcome,
   removePackageWithOutcome,
   updatePackagesWithOutcome,
@@ -44,12 +36,14 @@ import {
   getChangeMarker,
   formatSize,
 } from "./theme.js";
+import { buildFooterState, buildFooterShortcuts, getPendingToggleChangeCount } from "./footer.js";
 import { logExtensionToggle } from "../utils/history.js";
 import { getKnownUpdates, promptAutoUpdateWizard } from "../utils/auto-update.js";
 import { updateExtmgrStatus } from "../utils/status.js";
 import { parseChoiceByLabel } from "../utils/command.js";
 import { getPackageSourceKind } from "../utils/package-source.js";
 import { UI } from "../constants.js";
+import { configurePackageExtensions } from "./package-config.js";
 
 // Type guard for SettingsList with selectedIndex
 interface SelectableList {
@@ -86,16 +80,15 @@ async function showInteractiveOnce(
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI
 ): Promise<boolean> {
-  // Load local extensions and installed packages, then discover package entrypoints.
+  // Load local extensions and installed packages.
   const [localEntries, installedPackages] = await Promise.all([
     discoverExtensions(ctx.cwd),
     getInstalledPackages(ctx, pi),
   ]);
-  const packageExtensions = await discoverPackageExtensions(installedPackages, ctx.cwd);
 
-  // Build unified items list
+  // Build unified items list.
   const knownUpdates = getKnownUpdates(ctx);
-  const items = buildUnifiedItems(localEntries, installedPackages, packageExtensions, knownUpdates);
+  const items = buildUnifiedItems(localEntries, installedPackages, knownUpdates);
 
   // If nothing found, show quick actions
   if (items.length === 0) {
@@ -111,16 +104,12 @@ async function showInteractiveOnce(
     return true;
   }
 
-  // Staged changes tracking for toggleable rows (local + package extensions)
+  // Staged changes tracking for local extensions.
   const staged = new Map<string, State>();
   const byId = new Map(items.map((item) => [item.id, item]));
 
   const result = await ctx.ui.custom<UnifiedAction>((tui, theme, _keybindings, done) => {
     const container = new Container();
-    const hasLocals = items.some((i) => i.type === "local");
-    const hasPackageExtensions = items.some((i) => i.type === "package-extension");
-    const hasToggleRows = hasLocals || hasPackageExtensions;
-    const hasPackages = items.some((i) => i.type === "package");
 
     // Header
     container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
@@ -129,7 +118,7 @@ async function showInteractiveOnce(
       new Text(
         theme.fg(
           "muted",
-          `${items.length} item${items.length === 1 ? "" : "s"} • Space/Enter toggle extensions • Enter/A actions • u update pkg • x remove selected`
+          `${items.length} item${items.length === 1 ? "" : "s"} • Space/Enter toggle local • Enter/A actions • c configure pkg extensions • u update pkg • x remove selected`
         ),
         2,
         0
@@ -153,7 +142,7 @@ async function showInteractiveOnce(
       getSettingsListTheme(),
       (id: string, newValue: string) => {
         const item = byId.get(id);
-        if (!item || (item.type !== "local" && item.type !== "package-extension")) return;
+        if (!item || item.type !== "local") return;
 
         const state = newValue as State;
         staged.set(id, state);
@@ -173,8 +162,8 @@ async function showInteractiveOnce(
     container.addChild(new Spacer(1));
 
     // Footer with keyboard shortcuts
-    const footerParts = buildFooter(hasToggleRows, hasLocals, hasPackages, staged, byId);
-    container.addChild(new Text(theme.fg("dim", footerParts.join(" | ")), 2, 0));
+    const footerState = buildFooterState(items);
+    container.addChild(new Text(theme.fg("dim", buildFooterShortcuts(footerState)), 2, 0));
     container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
 
     return {
@@ -239,6 +228,10 @@ async function showInteractiveOnce(
             done({ type: "action", itemId: selectedId, action: "details" });
             return;
           }
+          if (data === "c" || data === "C") {
+            done({ type: "action", itemId: selectedId, action: "configure" });
+            return;
+          }
         }
 
         if (selectedId && selectedItem?.type === "local") {
@@ -269,35 +262,21 @@ async function showInteractiveOnce(
   return await handleUnifiedAction(result, items, staged, byId, ctx, pi);
 }
 
+function normalizePathForDuplicateCheck(value: string): string {
+  return value.replace(/\\/g, "/").toLowerCase();
+}
+
 export function buildUnifiedItems(
   localEntries: Awaited<ReturnType<typeof discoverExtensions>>,
   installedPackages: InstalledPackage[],
-  packageExtensions: PackageExtensionEntry[],
   knownUpdates: Set<string>
 ): UnifiedItem[] {
   const items: UnifiedItem[] = [];
   const localPaths = new Set<string>();
 
-  const packageExtensionGroups = new Map<string, PackageExtensionEntry[]>();
-  for (const entry of packageExtensions) {
-    const key = `${entry.packageScope}:${entry.packageSource.toLowerCase()}`;
-    const group = packageExtensionGroups.get(key) ?? [];
-    group.push(entry);
-    packageExtensionGroups.set(key, group);
-  }
-
-  const visiblePackageExtensions = packageExtensions.filter((entry) => {
-    const key = `${entry.packageScope}:${entry.packageSource.toLowerCase()}`;
-    const group = packageExtensionGroups.get(key) ?? [];
-
-    // Avoid duplicate-looking rows for packages that expose a single enabled extension entrypoint.
-    // Keep extension rows when there are multiple entrypoints, or when an entry is disabled so it can be re-enabled.
-    return group.length > 1 || entry.state === "disabled";
-  });
-
   // Add local extensions
   for (const entry of localEntries) {
-    localPaths.add(entry.activePath?.toLowerCase() ?? "");
+    localPaths.add(normalizePathForDuplicateCheck(entry.activePath));
     items.push({
       type: "local",
       id: entry.id,
@@ -311,39 +290,28 @@ export function buildUnifiedItems(
     });
   }
 
-  for (const entry of visiblePackageExtensions) {
-    items.push({
-      type: "package-extension",
-      id: entry.id,
-      displayName: entry.displayName,
-      summary: entry.summary,
-      scope: entry.packageScope,
-      state: entry.state,
-      originalState: entry.state,
-      packageSource: entry.packageSource,
-      extensionPath: entry.extensionPath,
-    });
-  }
-
   for (const pkg of installedPackages) {
-    const pkgSourceLower = pkg.source.toLowerCase();
-    const pkgResolvedLower = pkg.resolvedPath?.toLowerCase() ?? "";
+    const pkgSourceNormalized = normalizePathForDuplicateCheck(pkg.source);
+    const pkgResolvedNormalized = pkg.resolvedPath
+      ? normalizePathForDuplicateCheck(pkg.resolvedPath)
+      : "";
 
     let isDuplicate = false;
     for (const localPath of localPaths) {
-      if (pkgSourceLower === localPath || pkgResolvedLower === localPath) {
+      if (pkgSourceNormalized === localPath || pkgResolvedNormalized === localPath) {
         isDuplicate = true;
         break;
       }
       if (
-        pkgResolvedLower &&
-        (localPath.startsWith(pkgResolvedLower + "/") || pkgResolvedLower.startsWith(localPath))
+        pkgResolvedNormalized &&
+        (localPath.startsWith(`${pkgResolvedNormalized}/`) ||
+          pkgResolvedNormalized.startsWith(localPath))
       ) {
         isDuplicate = true;
         break;
       }
-      const localDir = localPath.replace(/\\/g, "/").split("/").slice(0, -1).join("/");
-      if (pkgResolvedLower && pkgResolvedLower.replace(/\\/g, "/") === localDir) {
+      const localDir = localPath.split("/").slice(0, -1).join("/");
+      if (pkgResolvedNormalized && pkgResolvedNormalized === localDir) {
         isDuplicate = true;
         break;
       }
@@ -368,8 +336,7 @@ export function buildUnifiedItems(
   items.sort((a, b) => {
     const rank = (type: UnifiedItem["type"]): number => {
       if (type === "local") return 0;
-      if (type === "package") return 1;
-      return 2;
+      return 1;
     };
 
     const diff = rank(a.type) - rank(b.type);
@@ -386,7 +353,7 @@ function buildSettingsItems(
   theme: Theme
 ): SettingItem[] {
   return items.map((item) => {
-    if (item.type === "local" || item.type === "package-extension") {
+    if (item.type === "local") {
       const currentState = staged.get(item.id) ?? item.state!;
       const changed = staged.has(item.id) && staged.get(item.id) !== item.originalState;
       return {
@@ -406,34 +373,6 @@ function buildSettingsItems(
   });
 }
 
-function buildFooter(
-  hasToggleRows: boolean,
-  hasLocals: boolean,
-  hasPackages: boolean,
-  staged: Map<string, State>,
-  byId: Map<string, UnifiedItem>
-): string[] {
-  const hasChanges = getPendingToggleChangeCount(staged, byId) > 0;
-
-  const footerParts: string[] = [];
-  footerParts.push("↑↓ Navigate");
-  if (hasToggleRows) footerParts.push("Space/Enter Toggle");
-  if (hasToggleRows) footerParts.push(hasChanges ? "S Save*" : "S Save");
-  if (hasPackages) footerParts.push("Enter/A Actions");
-  if (hasPackages) footerParts.push("u Update");
-  if (hasPackages || hasLocals) footerParts.push("X Remove");
-  footerParts.push("i Install");
-  footerParts.push("f Search");
-  footerParts.push("U Update all");
-  footerParts.push("t Auto-update");
-  footerParts.push("P Palette");
-  footerParts.push("R Browse");
-  footerParts.push("? Help");
-  footerParts.push("Esc Cancel");
-
-  return footerParts;
-}
-
 function formatUnifiedItemLabel(
   item: UnifiedItem,
   state: State,
@@ -442,34 +381,19 @@ function formatUnifiedItemLabel(
 ): string {
   if (item.type === "local") {
     const statusIcon = getStatusIcon(theme, state === "enabled" ? "enabled" : "disabled");
-    const scopeIcon = getScopeIcon(theme, item.scope as "global" | "project");
+    const scopeIcon = getScopeIcon(theme, item.scope);
     const changeMarker = getChangeMarker(theme, changed);
     const name = theme.bold(item.displayName);
     const summary = theme.fg("dim", item.summary);
     return `${statusIcon} [${scopeIcon}] ${name} - ${summary}${changeMarker}`;
   }
 
-  if (item.type === "package-extension") {
-    const statusIcon = getStatusIcon(theme, state === "enabled" ? "enabled" : "disabled");
-    const scopeIcon = getScopeIcon(theme, item.scope as "global" | "project");
-    const sourceKind = getPackageSourceKind(item.packageSource ?? "");
-    const pkgIcon = getPackageIcon(
-      theme,
-      sourceKind === "npm" || sourceKind === "git" || sourceKind === "local" ? sourceKind : "local"
-    );
-    const sourceLabel = sourceKind === "unknown" ? "package" : `${sourceKind} package`;
-    const changeMarker = getChangeMarker(theme, changed);
-    const name = theme.bold(item.displayName);
-    const summary = theme.fg("dim", `${item.summary} • ${sourceLabel}`);
-    return `${statusIcon} ${pkgIcon} [${scopeIcon}] ${name} - ${summary}${changeMarker}`;
-  }
-
   const sourceKind = getPackageSourceKind(item.source ?? "");
   const pkgIcon = getPackageIcon(
     theme,
     sourceKind === "npm" || sourceKind === "git" || sourceKind === "local" ? sourceKind : "local"
   );
-  const scopeIcon = getScopeIcon(theme, item.scope as "global" | "project");
+  const scopeIcon = getScopeIcon(theme, item.scope);
   const name = theme.bold(item.displayName);
   const version = item.version ? theme.fg("dim", `@${item.version}`) : "";
   const updateBadge = item.updateAvailable ? ` ${theme.fg("warning", "[update]")}` : "";
@@ -498,26 +422,8 @@ function formatUnifiedItemLabel(
   return `${pkgIcon} [${scopeIcon}] ${name}${version}${updateBadge} - ${summary}`;
 }
 
-function getPendingToggleChangeCount(
-  staged: Map<string, State>,
-  byId: Map<string, UnifiedItem>
-): number {
-  let count = 0;
-  for (const [id, state] of staged.entries()) {
-    const item = byId.get(id);
-    if (!item) continue;
-    if (
-      (item.type === "local" || item.type === "package-extension") &&
-      item.originalState !== state
-    ) {
-      count += 1;
-    }
-  }
-  return count;
-}
-
 function getToggleItemsForApply(items: UnifiedItem[]): UnifiedItem[] {
-  return items.filter((item) => item.type === "local" || item.type === "package-extension");
+  return items.filter((item) => item.type === "local");
 }
 
 async function applyToggleChangesFromManager(
@@ -528,7 +434,7 @@ async function applyToggleChangesFromManager(
   options?: { promptReload?: boolean }
 ): Promise<{ changed: number; reloaded: boolean }> {
   const toggleItems = getToggleItemsForApply(items);
-  const apply = await applyStagedChanges(toggleItems, staged, pi, ctx.cwd);
+  const apply = await applyStagedChanges(toggleItems, staged, pi);
 
   if (apply.errors.length > 0) {
     ctx.ui.notify(
@@ -538,7 +444,7 @@ async function applyToggleChangesFromManager(
   } else if (apply.changed === 0) {
     ctx.ui.notify("No changes to apply.", "info");
   } else {
-    ctx.ui.notify(`Applied ${apply.changed} extension change(s).`, "info");
+    ctx.ui.notify(`Applied ${apply.changed} local extension change(s).`, "info");
   }
 
   if (apply.changed > 0) {
@@ -547,7 +453,7 @@ async function applyToggleChangesFromManager(
     if (shouldPromptReload) {
       const shouldReload = await ctx.ui.confirm(
         "Reload Required",
-        "Extensions changed. Reload pi now?"
+        "Local extensions changed. Reload pi now?"
       );
 
       if (shouldReload) {
@@ -619,6 +525,34 @@ const QUICK_DESTINATION_LABELS: Record<QuickDestination, string> = {
   help: "Help",
 };
 
+const PACKAGE_ACTION_OPTIONS = {
+  configure: "Configure extensions",
+  update: "Update package",
+  remove: "Remove package",
+  details: "View details",
+  back: "Back to manager",
+} as const;
+
+type PackageActionKey = keyof typeof PACKAGE_ACTION_OPTIONS;
+
+type PackageActionSelection = Exclude<PackageActionKey, "back"> | "cancel";
+
+async function promptPackageActionSelection(
+  pkg: InstalledPackage,
+  ctx: ExtensionCommandContext
+): Promise<PackageActionSelection> {
+  const selection = parseChoiceByLabel(
+    PACKAGE_ACTION_OPTIONS,
+    await ctx.ui.select(pkg.name, Object.values(PACKAGE_ACTION_OPTIONS))
+  );
+
+  if (!selection || selection === "back") {
+    return "cancel";
+  }
+
+  return selection;
+}
+
 async function navigateWithPendingGuard(
   destination: QuickDestination,
   items: UnifiedItem[],
@@ -803,20 +737,29 @@ async function handleUnifiedAction(
       return false;
     }
 
-    if (item.type === "package-extension") {
-      return false;
-    }
-
     const pkg: InstalledPackage = {
       source: item.source!,
       name: item.displayName,
       ...(item.version ? { version: item.version } : {}),
-      scope: item.scope as "global" | "project",
+      scope: item.scope,
       ...(item.description ? { description: item.description } : {}),
       ...(item.size !== undefined ? { size: item.size } : {}),
     };
 
-    switch (result.action) {
+    const selection =
+      !result.action || result.action === "menu"
+        ? await promptPackageActionSelection(pkg, ctx)
+        : result.action;
+
+    if (selection === "cancel") {
+      return false;
+    }
+
+    switch (selection) {
+      case "configure": {
+        const outcome = await configurePackageExtensions(pkg, ctx, pi);
+        return outcome.reloaded;
+      }
       case "update": {
         const outcome = await updatePackageWithOutcome(pkg.source, ctx, pi);
         return outcome.reloaded;
@@ -833,11 +776,6 @@ async function handleUnifiedAction(
         );
         return false;
       }
-      case "menu":
-      default: {
-        const exitManager = await showPackageActions(pkg, ctx, pi);
-        return exitManager;
-      }
     }
   }
 
@@ -848,37 +786,23 @@ async function handleUnifiedAction(
 async function applyStagedChanges(
   items: UnifiedItem[],
   staged: Map<string, State>,
-  pi: ExtensionAPI,
-  cwd: string
+  pi: ExtensionAPI
 ) {
   let changed = 0;
   const errors: string[] = [];
 
   for (const item of items) {
-    if ((item.type !== "local" && item.type !== "package-extension") || !item.originalState) {
+    if (item.type !== "local" || !item.originalState || !item.activePath || !item.disabledPath) {
       continue;
     }
 
     const target = staged.get(item.id) ?? item.originalState;
     if (target === item.originalState) continue;
 
-    let result: { ok: true } | { ok: false; error: string };
-    if (item.type === "local") {
-      if (!item.activePath || !item.disabledPath) continue;
-      result = await setExtensionState(
-        { activePath: item.activePath, disabledPath: item.disabledPath },
-        target
-      );
-    } else {
-      if (!item.packageSource || !item.extensionPath) continue;
-      result = await setPackageExtensionState(
-        item.packageSource,
-        item.extensionPath,
-        item.scope as "global" | "project",
-        target,
-        cwd
-      );
-    }
+    const result = await setExtensionState(
+      { activePath: item.activePath, disabledPath: item.disabledPath },
+      target
+    );
 
     if (result.ok) {
       changed++;

package/src/utils/auto-update.ts

@@ -20,8 +20,7 @@ import {
 import { parseNpmSource } from "./format.js";
 import { TIMEOUTS } from "../constants.js";
 
-// Global timer reference (module-level singleton)
-let autoUpdateTimer: ReturnType<typeof setInterval> | null = null;
+import { startTimer, stopTimer, isTimerRunning } from "./timer.js";
 
 // Context provider for safe session handling
 export type ContextProvider = () => (ExtensionCommandContext | ExtensionContext) | undefined;
@@ -35,10 +34,8 @@ export function startAutoUpdateTimer(
   getCtx: ContextProvider,
   onUpdateAvailable?: (packages: string[]) => void
 ): void {
-  // Clear existing timer
   stopAutoUpdateTimer();
 
-  // Get fresh config from current context
   const ctx = getCtx();
   if (!ctx) return;
 
@@ -51,22 +48,20 @@ export function startAutoUpdateTimer(
   if (!interval) return;
 
   // Run an initial check immediately.
-  void (async () => {
-    const checkCtx = getCtx();
-    if (!checkCtx) return;
-    await checkForUpdates(pi, checkCtx, onUpdateAvailable);
-  })();
+  const initialCtx = getCtx();
+  if (initialCtx) {
+    void checkForUpdates(pi, initialCtx, onUpdateAvailable);
+  }
 
-  // Set up interval with context provider
-  autoUpdateTimer = setInterval(() => {
+  // Set up recurring checks
+  startTimer(interval, () => {
     const checkCtx = getCtx();
     if (!checkCtx) {
-      // Session ended, stop timer
       stopAutoUpdateTimer();
       return;
     }
     void checkForUpdates(pi, checkCtx, onUpdateAvailable);
-  }, interval);
+  });
 
   // Persist that timer is running
   saveAutoUpdateConfig(pi, {
@@ -79,17 +74,14 @@ export function startAutoUpdateTimer(
  * Stop auto-update background checker
  */
 export function stopAutoUpdateTimer(): void {
-  if (autoUpdateTimer) {
-    clearInterval(autoUpdateTimer);
-    autoUpdateTimer = null;
-  }
+  stopTimer();
 }
 
 /**
  * Check if auto-update timer is running
  */
 export function isAutoUpdateRunning(): boolean {
-  return autoUpdateTimer !== null;
+  return isTimerRunning();
 }
 
 /**

package/src/utils/format.ts

@@ -57,28 +57,43 @@ export function formatBytes(bytes: number): string {
   return `${parseFloat((bytes / Math.pow(k, i)).toFixed(1))} ${sizes[i]}`;
 }
 
+const GIT_PATTERNS = {
+  gitPrefix: /^git:/,
+  httpPrefix: /^https?:\/\//,
+  sshPrefix: /^ssh:\/\//,
+  gitProtoPrefix: /^git:\/\//,
+  gitSsh: /^git@[^\s:]+:.+/,
+} as const;
+
+const LOCAL_PATH_PATTERNS = {
+  unixAbsolute: /^\//,
+  unixRelative: /^\.\.?\//,
+  windowsRelative: /^\.\.?\\/,
+  homeRelative: /^~\//,
+  fileProto: /^file:\/\//,
+  windowsDrive: /^[a-zA-Z]:[\\/]/,
+  uncPath: /^\\\\/,
+} as const;
+
 function isGitLikeSource(source: string): boolean {
   return (
-    source.startsWith("git:") ||
-    source.startsWith("http://") ||
-    source.startsWith("https://") ||
-    source.startsWith("ssh://") ||
-    source.startsWith("git://") ||
-    /^git@[^\s:]+:.+/.test(source)
+    GIT_PATTERNS.gitPrefix.test(source) ||
+    GIT_PATTERNS.httpPrefix.test(source) ||
+    GIT_PATTERNS.sshPrefix.test(source) ||
+    GIT_PATTERNS.gitProtoPrefix.test(source) ||
+    GIT_PATTERNS.gitSsh.test(source)
   );
 }
 
 function isLocalPathSource(source: string): boolean {
   return (
-    source.startsWith("/") ||
-    source.startsWith("./") ||
-    source.startsWith("../") ||
-    source.startsWith(".\\") ||
-    source.startsWith("..\\") ||
-    source.startsWith("~/") ||
-    source.startsWith("file://") ||
-    /^[a-zA-Z]:[\\/]/.test(source) ||
-    source.startsWith("\\\\")
+    LOCAL_PATH_PATTERNS.unixAbsolute.test(source) ||
+    LOCAL_PATH_PATTERNS.unixRelative.test(source) ||
+    LOCAL_PATH_PATTERNS.windowsRelative.test(source) ||
+    LOCAL_PATH_PATTERNS.homeRelative.test(source) ||
+    LOCAL_PATH_PATTERNS.fileProto.test(source) ||
+    LOCAL_PATH_PATTERNS.windowsDrive.test(source) ||
+    LOCAL_PATH_PATTERNS.uncPath.test(source)
   );
 }
 
@@ -93,7 +108,7 @@ export function normalizePackageSource(source: string): string {
   const trimmed = source.trim();
   if (!trimmed) return trimmed;
 
-  if (/^git@[^\s:]+:.+/.test(trimmed)) {
+  if (GIT_PATTERNS.gitSsh.test(trimmed)) {
     return `git:${trimmed}`;
   }
 

package/src/utils/history.ts

@@ -119,7 +119,6 @@ export function logPackageUpdate(
     packageSource: source,
     packageName: name,
     version: toVersion,
-    scope: source.includes("node_modules") ? "global" : "project",
     success,
     error,
   });
@@ -155,15 +154,19 @@ export function logCacheClear(pi: ExtensionAPI, success: boolean, error?: string
   });
 }
 
-function asChangeEntry(data: unknown): ExtensionChangeEntry | undefined {
-  if (!data || typeof data !== "object") return undefined;
+function isExtensionChangeEntry(value: unknown): value is ExtensionChangeEntry {
+  if (!value || typeof value !== "object") return false;
 
-  const maybe = data as Partial<ExtensionChangeEntry>;
-  if (typeof maybe.action !== "string") return undefined;
-  if (typeof maybe.timestamp !== "number") return undefined;
-  if (typeof maybe.success !== "boolean") return undefined;
+  const maybe = value as Partial<ExtensionChangeEntry>;
+  if (typeof maybe.action !== "string") return false;
+  if (typeof maybe.timestamp !== "number") return false;
+  if (typeof maybe.success !== "boolean") return false;
 
-  return maybe as ExtensionChangeEntry;
+  return true;
+}
+
+function asChangeEntry(data: unknown): ExtensionChangeEntry | undefined {
+  return isExtensionChangeEntry(data) ? data : undefined;
 }
 
 function matchesHistoryFilters(change: ExtensionChangeEntry, filters: HistoryFilters): boolean {
@@ -235,6 +238,10 @@ export function querySessionChanges(
   return applyHistoryFilters(getAllSessionChanges(ctx), filters);
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
 async function walkSessionFiles(dir: string): Promise<string[]> {
   const result: string[] = [];
 
@@ -284,18 +291,17 @@ export async function queryGlobalHistory(
         continue;
       }
 
-      if (!parsed || typeof parsed !== "object") continue;
-      const entry = parsed as {
-        type?: string;
-        customType?: string;
-        data?: unknown;
-      };
+      if (!isRecord(parsed)) continue;
 
-      if (entry.type !== "custom" || entry.customType !== EXT_CHANGE_CUSTOM_TYPE || !entry.data) {
+      if (
+        parsed.type !== "custom" ||
+        parsed.customType !== EXT_CHANGE_CUSTOM_TYPE ||
+        !parsed.data
+      ) {
         continue;
       }
 
-      const change = asChangeEntry(entry.data);
+      const change = asChangeEntry(parsed.data);
       if (change) {
         all.push({ change, sessionFile: file });
       }