@docyrus/docyrus 0.0.5 → 0.0.7

package/tui.mjs

@@ -4,7 +4,7 @@ import { createRoot } from "@opentui/react";
 
 // src/tui/opentui/DocyrusOpenTuiApp.tsx
 import { useKeyboard as useKeyboard2, useRenderer } from "@opentui/react";
-import { useCallback as useCallback2, useEffect, useMemo, useState as useState2 } from "react";
+import { useCallback as useCallback2, useEffect, useMemo, useRef, useState as useState2 } from "react";
 
 // src/services/tuiProcessExecutor.ts
 import { spawnSync } from "node:child_process";
@@ -202,21 +202,6 @@ function preventDefault(event) {
     event.preventDefault();
   }
 }
-function resolveSectionJumpKey(keyName, shift) {
-  if (keyName === "s") {
-    return "shortcuts";
-  }
-  if (keyName === "h") {
-    return "history";
-  }
-  if (keyName === "m") {
-    return "messages";
-  }
-  if (keyName === "?" || keyName === "/" && shift) {
-    return "help";
-  }
-  return null;
-}
 function useCommandInput(options) {
   const [history, setHistory] = useState([]);
   const [historyCursor, setHistoryCursor] = useState(null);
@@ -273,12 +258,13 @@ function useCommandInput(options) {
       return;
     }
     const keyName = keyEvent.name;
+    const hotkeysEnabled = options.hotkeysEnabled !== false;
     if (keyEvent.ctrl && keyName === "l") {
       preventDefault(keyEvent);
       options.onClear();
       return;
     }
-    if (keyName === "tab") {
+    if (hotkeysEnabled && keyName === "tab") {
       preventDefault(keyEvent);
       if (keyEvent.shift) {
         options.onPreviousSection();
@@ -287,12 +273,12 @@ function useCommandInput(options) {
       options.onNextSection();
       return;
     }
-    if (keyName === "[") {
+    if (hotkeysEnabled && keyName === "[") {
       preventDefault(keyEvent);
       options.onPreviousSection();
       return;
     }
-    if (keyName === "]") {
+    if (hotkeysEnabled && keyName === "]") {
       preventDefault(keyEvent);
       options.onNextSection();
       return;
@@ -307,18 +293,10 @@ function useCommandInput(options) {
       recallHistory("down");
       return;
     }
-    if (options.input.length === 0) {
-      const jumpSection = resolveSectionJumpKey(keyName, Boolean(keyEvent.shift));
-      if (jumpSection) {
-        preventDefault(keyEvent);
-        options.onJumpSection(jumpSection);
-        return;
-      }
-    }
     if (options.busy) {
       return;
     }
-    if (options.input.length === 0 && /^[1-6]$/.test(keyName)) {
+    if (hotkeysEnabled && options.input.length === 0 && /^[1-6]$/.test(keyName)) {
       preventDefault(keyEvent);
       options.onShortcut(Number(keyName));
     }
@@ -328,6 +306,188 @@ function useCommandInput(options) {
   };
 }
 
+// src/tui/opentui/dataSourceCatalog.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function toNonEmptyString(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function toStringValue(value, fallback) {
+  return toNonEmptyString(value) || fallback;
+}
+function getArrayCandidates(payload) {
+  if (Array.isArray(payload)) {
+    return payload;
+  }
+  if (!isRecord(payload)) {
+    return [];
+  }
+  const directData = payload.data;
+  if (Array.isArray(directData)) {
+    return directData;
+  }
+  if (isRecord(directData) && Array.isArray(directData.data)) {
+    return directData.data;
+  }
+  if (Array.isArray(payload.items)) {
+    return payload.items;
+  }
+  if (Array.isArray(payload.dataSources)) {
+    return payload.dataSources;
+  }
+  return [];
+}
+function compareByName(a, b) {
+  return a.localeCompare(b, void 0, { sensitivity: "base" });
+}
+function getDataSourceDisplayName(dataSource) {
+  return dataSource.title || dataSource.name || dataSource.slug;
+}
+function extractAppsFromPayload(payload) {
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const candidate of getArrayCandidates(payload)) {
+    if (!isRecord(candidate)) {
+      continue;
+    }
+    const id = toNonEmptyString(candidate.id);
+    const slug = toNonEmptyString(candidate.slug);
+    if (!id || !slug) {
+      continue;
+    }
+    const name = toStringValue(candidate.name, slug);
+    const dedupeKey = `${id}::${slug}`;
+    if (seen.has(dedupeKey)) {
+      continue;
+    }
+    seen.add(dedupeKey);
+    result.push({ id, slug, name });
+  }
+  result.sort((a, b) => compareByName(a.name, b.name));
+  return result;
+}
+function extractDataSourcesFromPayload(payload) {
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const candidate of getArrayCandidates(payload)) {
+    if (!isRecord(candidate)) {
+      continue;
+    }
+    const id = toNonEmptyString(candidate.id);
+    const slug = toNonEmptyString(candidate.slug);
+    if (!id || !slug) {
+      continue;
+    }
+    const title = toNonEmptyString(candidate.title);
+    const name = toStringValue(candidate.name, slug);
+    const appSlug = toNonEmptyString(candidate.app_slug);
+    const tenantAppId = toNonEmptyString(candidate.tenant_app_id);
+    const dedupeKey = `${id}::${slug}`;
+    if (seen.has(dedupeKey)) {
+      continue;
+    }
+    seen.add(dedupeKey);
+    result.push({
+      id,
+      name,
+      title,
+      slug,
+      app_slug: appSlug,
+      tenant_app_id: tenantAppId
+    });
+  }
+  result.sort((a, b) => compareByName(getDataSourceDisplayName(a), getDataSourceDisplayName(b)));
+  return result;
+}
+function groupDataSourcesByApp(params) {
+  const { apps, dataSources } = params;
+  const appById = /* @__PURE__ */ new Map();
+  const appBySlug = /* @__PURE__ */ new Map();
+  const groups = /* @__PURE__ */ new Map();
+  for (const app of apps) {
+    appById.set(app.id, app);
+    appBySlug.set(app.slug, app);
+  }
+  for (const dataSource of dataSources) {
+    const byId = dataSource.tenant_app_id ? appById.get(dataSource.tenant_app_id) : void 0;
+    const bySlug = dataSource.app_slug ? appBySlug.get(dataSource.app_slug) : void 0;
+    const matchedApp = byId || bySlug;
+    const appKey = matchedApp ? matchedApp.id : dataSource.app_slug ? `slug:${dataSource.app_slug}` : "unknown";
+    const group = groups.get(appKey) || {
+      appKey,
+      appId: matchedApp?.id || dataSource.tenant_app_id,
+      appName: matchedApp?.name || dataSource.app_slug || "Unknown App",
+      appSlug: matchedApp?.slug || dataSource.app_slug,
+      dataSources: []
+    };
+    group.dataSources.push(dataSource);
+    groups.set(appKey, group);
+  }
+  const list = Array.from(groups.values());
+  for (const group of list) {
+    group.dataSources.sort((a, b) => compareByName(getDataSourceDisplayName(a), getDataSourceDisplayName(b)));
+  }
+  list.sort((a, b) => compareByName(a.appName, b.appName));
+  return list;
+}
+function filterDataSources(groups, query) {
+  const normalizedQuery = query.trim().toLowerCase();
+  if (normalizedQuery.length === 0) {
+    return groups;
+  }
+  return groups.map((group) => {
+    const filteredDataSources = group.dataSources.filter((dataSource) => {
+      const haystack = [
+        dataSource.title,
+        dataSource.name,
+        dataSource.slug
+      ].filter((value) => Boolean(value)).join(" ").toLowerCase();
+      return haystack.includes(normalizedQuery);
+    });
+    return {
+      ...group,
+      dataSources: filteredDataSources
+    };
+  }).filter((group) => group.dataSources.length > 0);
+}
+function flattenTreeRows(params) {
+  const rows = [];
+  const alwaysExpanded = params.query.trim().length > 0;
+  for (const group of params.groups) {
+    const expanded = alwaysExpanded || params.expandedAppKeys.has(group.appKey);
+    rows.push({
+      id: `app:${group.appKey}`,
+      kind: "app",
+      appKey: group.appKey,
+      appName: group.appName,
+      appSlug: group.appSlug,
+      expanded
+    });
+    if (!expanded) {
+      continue;
+    }
+    for (const dataSource of group.dataSources) {
+      const dataSourceName = getDataSourceDisplayName(dataSource);
+      rows.push({
+        id: `ds:${group.appKey}:${dataSource.id}`,
+        kind: "datasource",
+        appKey: group.appKey,
+        appName: group.appName,
+        appSlug: group.appSlug || dataSource.app_slug,
+        dataSourceId: dataSource.id,
+        dataSourceName,
+        dataSourceSlug: dataSource.slug
+      });
+    }
+  }
+  return rows;
+}
+
 // src/tui/opentui/renderResult.tsx
 import { RGBA, SyntaxStyle } from "@opentui/core";
 
@@ -479,26 +639,26 @@ var SHORTCUTS = [
     label: "insert: ds list <appSlug> <dataSourceSlug>"
   }
 ];
-var SECTION_ORDER = ["shortcuts", "history", "messages", "help"];
+var SECTION_ORDER = ["shortcuts", "datasources", "history", "messages", "help"];
 var FOCUS_ORDER = ["input", "left", "result"];
 var ESC_ARM_TIMEOUT_MS = 1400;
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function extractMetadata(payload) {
-  if (!isRecord(payload)) {
+  if (!isRecord2(payload)) {
     return {};
   }
   const environmentValue = payload.environment;
   const contextValue = payload.context;
-  const environment = isRecord(environmentValue) && typeof environmentValue.id === "string" && typeof environmentValue.name === "string" ? { id: environmentValue.id, name: environmentValue.name } : void 0;
+  const environment = isRecord2(environmentValue) && typeof environmentValue.id === "string" && typeof environmentValue.name === "string" ? { id: environmentValue.id, name: environmentValue.name } : void 0;
   if (contextValue === null) {
     return {
       environment,
       context: null
     };
   }
-  const context = isRecord(contextValue) && typeof contextValue.email === "string" && typeof contextValue.tenantDisplay === "string" ? {
+  const context = isRecord2(contextValue) && typeof contextValue.email === "string" && typeof contextValue.tenantDisplay === "string" ? {
     email: contextValue.email,
     tenantDisplay: contextValue.tenantDisplay
   } : void 0;
@@ -535,6 +695,17 @@ function isEscapeKey(keyName) {
 function isEnterKey(keyName) {
   return keyName === "enter" || keyName === "return";
 }
+function isSlashKey(keyName) {
+  return keyName === "/" || keyName === "slash";
+}
+function toCatalogErrorMessage(command, result) {
+  const details = result.error?.details || result.error?.message || "Unknown error.";
+  if (details.includes("Architect.Read.All") || details.includes("Architect.ReadWrite.All")) {
+    return `${command} failed: missing required scope Architect.Read.All or Architect.ReadWrite.All.`;
+  }
+  const message = result.error?.message || "Command failed.";
+  return `${command} failed: ${message}`;
+}
 function DocyrusOpenTuiApp(props) {
   const renderer = useRenderer();
   const [input, setInput] = useState2("");
@@ -551,11 +722,36 @@ function DocyrusOpenTuiApp(props) {
   const [selectedHistoryIndex, setSelectedHistoryIndex] = useState2(0);
   const [isExitConfirmOpen, setIsExitConfirmOpen] = useState2(false);
   const [isEscArmed, setIsEscArmed] = useState2(false);
+  const [dataSourceSearch, setDataSourceSearch] = useState2("");
+  const [dataSourcePanelFocus, setDataSourcePanelFocus] = useState2("tree");
+  const [selectedDataSourceRowIndex, setSelectedDataSourceRowIndex] = useState2(0);
+  const [expandedAppKeys, setExpandedAppKeys] = useState2([]);
+  const [appsCatalog, setAppsCatalog] = useState2([]);
+  const [dataSourcesCatalog, setDataSourcesCatalog] = useState2([]);
+  const [isCatalogLoading, setIsCatalogLoading] = useState2(false);
+  const [catalogError, setCatalogError] = useState2(null);
+  const [catalogLoadedAt, setCatalogLoadedAt] = useState2(null);
+  const catalogScopeRef = useRef("");
   const executor = useMemo(() => {
     return createTuiProcessExecutor({
       executionConfig: props.executionConfig
     });
   }, [props.executionConfig]);
+  const applyMetadataFromPayload = useCallback2((payload) => {
+    const metadata = extractMetadata(payload);
+    if (metadata.environment) {
+      setEnvironment(metadata.environment);
+    }
+    if (metadata.context !== void 0) {
+      setContext(metadata.context);
+    }
+  }, []);
+  const appendSystemMessages = useCallback2((messages) => {
+    if (messages.length === 0) {
+      return;
+    }
+    setSystemMessages((previous) => [...previous, ...messages]);
+  }, []);
   const applyCommandResult = useCallback2((result, command) => {
     const entry = {
       id: `${Date.now()}-${Math.random().toString(16).slice(2)}`,
@@ -567,18 +763,12 @@ function DocyrusOpenTuiApp(props) {
     setActiveEntryId(entry.id);
     setSelectedHistoryIndex(0);
     if (result.messages && result.messages.length > 0) {
-      setSystemMessages((previous) => [...previous, ...result.messages || []]);
+      appendSystemMessages(result.messages);
     }
     if (result.ok && result.data !== void 0) {
-      const metadata = extractMetadata(result.data);
-      if (metadata.environment) {
-        setEnvironment(metadata.environment);
-      }
-      if (metadata.context !== void 0) {
-        setContext(metadata.context);
-      }
+      applyMetadataFromPayload(result.data);
     }
-  }, []);
+  }, [appendSystemMessages, applyMetadataFromPayload]);
   const executeArgs = useCallback2(async (args, commandText) => {
     setIsRunning(true);
     try {
@@ -588,6 +778,13 @@ function DocyrusOpenTuiApp(props) {
       setIsRunning(false);
     }
   }, [applyCommandResult, executor]);
+  const runInternalArgs = useCallback2(async (args) => {
+    const result = await executor.runCliCommand(args);
+    if (result.ok && result.data !== void 0) {
+      applyMetadataFromPayload(result.data);
+    }
+    return result;
+  }, [applyMetadataFromPayload, executor]);
   const executeLine = useCallback2((line) => {
     let args;
     try {
@@ -615,7 +812,7 @@ function DocyrusOpenTuiApp(props) {
   }, [applyCommandResult, executeArgs]);
   const applyShortcut = useCallback2((shortcutId) => {
     const action = SHORTCUTS.find((shortcut) => shortcut.id === shortcutId);
-    if (!action || isRunning) {
+    if (!action || isRunning || isCatalogLoading) {
       return;
     }
     if (action.template) {
@@ -626,7 +823,107 @@ function DocyrusOpenTuiApp(props) {
     if (action.run) {
       void executeArgs(parseCommandLine(action.run), action.run);
     }
-  }, [executeArgs, isRunning]);
+  }, [executeArgs, isCatalogLoading, isRunning]);
+  const groupedDataSourceItems = useMemo(() => {
+    return groupDataSourcesByApp({
+      apps: appsCatalog,
+      dataSources: dataSourcesCatalog
+    });
+  }, [appsCatalog, dataSourcesCatalog]);
+  const filteredDataSourceGroups = useMemo(() => {
+    return filterDataSources(groupedDataSourceItems, dataSourceSearch);
+  }, [dataSourceSearch, groupedDataSourceItems]);
+  const dataSourceCountByAppKey = useMemo(() => {
+    const result = /* @__PURE__ */ new Map();
+    for (const group of filteredDataSourceGroups) {
+      result.set(group.appKey, group.dataSources.length);
+    }
+    return result;
+  }, [filteredDataSourceGroups]);
+  const expandedAppKeySet = useMemo(() => {
+    return new Set(expandedAppKeys);
+  }, [expandedAppKeys]);
+  const dataSourceRows = useMemo(() => {
+    return flattenTreeRows({
+      groups: filteredDataSourceGroups,
+      expandedAppKeys: expandedAppKeySet,
+      query: dataSourceSearch
+    });
+  }, [dataSourceSearch, expandedAppKeySet, filteredDataSourceGroups]);
+  const selectedDataSourceRow = useMemo(() => {
+    if (dataSourceRows.length === 0) {
+      return null;
+    }
+    return dataSourceRows[selectedDataSourceRowIndex] || dataSourceRows[0] || null;
+  }, [dataSourceRows, selectedDataSourceRowIndex]);
+  const toggleAppExpansion = useCallback2((appKey) => {
+    setExpandedAppKeys((previous) => {
+      if (previous.includes(appKey)) {
+        return previous.filter((key) => key !== appKey);
+      }
+      return [...previous, appKey];
+    });
+  }, []);
+  const loadDataSourceCatalog = useCallback2(async () => {
+    if (isCatalogLoading) {
+      return;
+    }
+    setIsCatalogLoading(true);
+    setCatalogError(null);
+    try {
+      const nextMessages = [];
+      const appsResult = await runInternalArgs(["apps", "list"]);
+      const dataSourcesResult = await runInternalArgs(["curl", "/dev/data-sources"]);
+      const nextApps = appsResult.ok && appsResult.data !== void 0 ? extractAppsFromPayload(appsResult.data) : [];
+      const nextDataSources = dataSourcesResult.ok && dataSourcesResult.data !== void 0 ? extractDataSourcesFromPayload(dataSourcesResult.data) : [];
+      if (!appsResult.ok) {
+        nextMessages.push(toCatalogErrorMessage("apps list", appsResult));
+      }
+      if (!dataSourcesResult.ok) {
+        nextMessages.push(toCatalogErrorMessage("curl /dev/data-sources", dataSourcesResult));
+      }
+      setAppsCatalog(nextApps);
+      setDataSourcesCatalog(nextDataSources);
+      setCatalogLoadedAt(Date.now());
+      const nextGroups = groupDataSourcesByApp({
+        apps: nextApps,
+        dataSources: nextDataSources
+      });
+      setExpandedAppKeys((previous) => {
+        if (previous.length > 0) {
+          const allowed = new Set(nextGroups.map((group) => group.appKey));
+          return previous.filter((key) => allowed.has(key));
+        }
+        return nextGroups.map((group) => group.appKey);
+      });
+      if (nextMessages.length > 0) {
+        appendSystemMessages(nextMessages);
+        setCatalogError(nextMessages[0] || "Failed to load catalog.");
+      } else {
+        setCatalogError(null);
+      }
+    } finally {
+      setIsCatalogLoading(false);
+    }
+  }, [appendSystemMessages, isCatalogLoading, runInternalArgs]);
+  const runSelectedDataSourceRow = useCallback2(async (row) => {
+    if (!row || isRunning || isCatalogLoading) {
+      return;
+    }
+    if (row.kind === "app") {
+      toggleAppExpansion(row.appKey);
+      return;
+    }
+    if (!row.appSlug || !row.dataSourceSlug) {
+      appendSystemMessages([
+        "Cannot execute ds get because selected row is missing appSlug or dataSourceSlug."
+      ]);
+      return;
+    }
+    const command = `ds get ${row.appSlug} ${row.dataSourceSlug}`;
+    setFocusedPanel("result");
+    await executeArgs(["ds", "get", row.appSlug, row.dataSourceSlug], command);
+  }, [appendSystemMessages, executeArgs, isCatalogLoading, isRunning, toggleAppExpansion]);
   const setSectionByIndex = useCallback2((index) => {
     const safeIndex = index < 0 ? SECTION_ORDER.length - 1 : index >= SECTION_ORDER.length ? 0 : index;
     const section = SECTION_ORDER[safeIndex];
@@ -676,11 +973,13 @@ function DocyrusOpenTuiApp(props) {
       return [...previous, message];
     });
   }, []);
+  const isDataSourceSearchFocused = activeSection === "datasources" && focusedPanel === "left" && dataSourcePanelFocus === "search" && !isRunning && !isExitConfirmOpen;
   const { submitInput } = useCommandInput({
-    busy: isRunning,
+    busy: isRunning || isCatalogLoading,
     input,
     isInputFocused: focusedPanel === "input",
     isModalOpen: isExitConfirmOpen,
+    hotkeysEnabled: !isRunning && !isDataSourceSearchFocused,
     setInput,
     onSubmit: executeLine,
     onClear: () => {
@@ -691,11 +990,7 @@ function DocyrusOpenTuiApp(props) {
     },
     onShortcut: applyShortcut,
     onNextSection: nextSection,
-    onPreviousSection: previousSection,
-    onJumpSection: (section) => {
-      setActiveSection(section);
-      setFocusedPanel("left");
-    }
+    onPreviousSection: previousSection
   });
   useKeyboard2((keyEvent) => {
     const keyName = keyEvent.name;
@@ -715,10 +1010,23 @@ function DocyrusOpenTuiApp(props) {
       }
       return;
     }
+    if (activeSection === "datasources" && focusedPanel === "left" && dataSourcePanelFocus === "search" && isEscapeKey(keyName)) {
+      preventDefault2(keyEvent);
+      setDataSourcePanelFocus("tree");
+      return;
+    }
+    if (activeSection === "datasources" && focusedPanel === "left" && dataSourcePanelFocus === "tree" && isSlashKey(keyName)) {
+      preventDefault2(keyEvent);
+      setDataSourcePanelFocus("search");
+      return;
+    }
     if (keyEvent.ctrl && keyName === "c") {
       renderer.destroy();
       return;
     }
+    if (isRunning) {
+      return;
+    }
     if (isEscapeKey(keyName)) {
       preventDefault2(keyEvent);
       if (focusedPanel !== "input") {
@@ -733,6 +1041,13 @@ function DocyrusOpenTuiApp(props) {
       openExitConfirmation();
       return;
     }
+    if (activeSection === "datasources" && focusedPanel === "left" && dataSourcePanelFocus === "tree" && keyName === "space") {
+      preventDefault2(keyEvent);
+      if (selectedDataSourceRow?.kind === "app") {
+        toggleAppExpansion(selectedDataSourceRow.appKey);
+      }
+      return;
+    }
     if (keyName === "left" || keyName === "right") {
       if (focusedPanel === "input" && input.length > 0) {
         return;
@@ -746,7 +1061,12 @@ function DocyrusOpenTuiApp(props) {
       }
       return;
     }
-    if (keyName === "r" && activeSection === "history" && focusedPanel === "left" && input.length === 0 && !isRunning) {
+    if (keyName === "r" && activeSection === "datasources" && focusedPanel === "left" && dataSourcePanelFocus === "tree" && !isCatalogLoading) {
+      preventDefault2(keyEvent);
+      void loadDataSourceCatalog();
+      return;
+    }
+    if (keyName === "r" && activeSection === "history" && focusedPanel === "left" && input.length === 0 && !isRunning && !isCatalogLoading) {
       const entry = entries[selectedHistoryIndex];
       if (entry) {
         void runHistoryEntry(entry);
@@ -768,7 +1088,7 @@ function DocyrusOpenTuiApp(props) {
     };
   }, [isEscArmed]);
   useEffect(() => {
-    if (!isRunning) {
+    if (!isRunning && !isCatalogLoading) {
       return;
     }
     const timer = setInterval(() => {
@@ -777,7 +1097,7 @@ function DocyrusOpenTuiApp(props) {
     return () => {
       clearInterval(timer);
     };
-  }, [isRunning]);
+  }, [isCatalogLoading, isRunning]);
   useEffect(() => {
     if (selectedHistoryIndex < entries.length) {
       return;
@@ -785,6 +1105,43 @@ function DocyrusOpenTuiApp(props) {
     const nextIndex = Math.max(entries.length - 1, 0);
     setSelectedHistoryIndex(nextIndex);
   }, [entries.length, selectedHistoryIndex]);
+  useEffect(() => {
+    if (selectedDataSourceRowIndex < dataSourceRows.length) {
+      return;
+    }
+    const nextIndex = Math.max(dataSourceRows.length - 1, 0);
+    setSelectedDataSourceRowIndex(nextIndex);
+  }, [dataSourceRows.length, selectedDataSourceRowIndex]);
+  useEffect(() => {
+    if (activeSection !== "datasources" && dataSourcePanelFocus !== "tree") {
+      setDataSourcePanelFocus("tree");
+    }
+  }, [activeSection, dataSourcePanelFocus]);
+  useEffect(() => {
+    const scopeKey = `${environment?.id || ""}::${context?.tenantDisplay || ""}`;
+    if (catalogScopeRef.current.length === 0) {
+      catalogScopeRef.current = scopeKey;
+      return;
+    }
+    if (catalogScopeRef.current === scopeKey) {
+      return;
+    }
+    catalogScopeRef.current = scopeKey;
+    if (catalogLoadedAt !== null) {
+      setCatalogLoadedAt(null);
+      setAppsCatalog([]);
+      setDataSourcesCatalog([]);
+      setExpandedAppKeys([]);
+      setSelectedDataSourceRowIndex(0);
+      setCatalogError(null);
+    }
+  }, [catalogLoadedAt, context?.tenantDisplay, environment?.id]);
+  useEffect(() => {
+    if (activeSection !== "datasources" || catalogLoadedAt !== null || isCatalogLoading) {
+      return;
+    }
+    void loadDataSourceCatalog();
+  }, [activeSection, catalogLoadedAt, isCatalogLoading, loadDataSourceCatalog]);
   const spinner = useMemo(() => {
     return ["|", "/", "-", "\\"][spinnerFrame] || "|";
   }, [spinnerFrame]);
@@ -803,8 +1160,8 @@ function DocyrusOpenTuiApp(props) {
       ...SECTION_ORDER.filter((section) => section !== activeSection)
     ];
     return ordered.map((section) => ({
-      name: section === "shortcuts" ? "Shortcuts" : section === "history" ? "History" : section === "messages" ? "Messages" : "Help",
-      description: section === "shortcuts" ? "Quick actions" : section === "history" ? "Past runs" : section === "messages" ? "System output" : "Key map",
+      name: section === "shortcuts" ? "Shortcuts" : section === "datasources" ? "DataSources" : section === "history" ? "History" : section === "messages" ? "Messages" : "Help",
+      description: section === "shortcuts" ? "Quick actions" : section === "datasources" ? "App tree" : section === "history" ? "Past runs" : section === "messages" ? "System output" : "Key map",
       value: section
     }));
   }, [activeSection]);
@@ -822,12 +1179,30 @@ function DocyrusOpenTuiApp(props) {
       value: entry.id
     }));
   }, [entries]);
+  const dataSourceOptions = useMemo(() => {
+    return dataSourceRows.map((row) => {
+      if (row.kind === "app") {
+        const itemCount = dataSourceCountByAppKey.get(row.appKey) || 0;
+        return {
+          name: `${row.expanded ? "[-]" : "[+]"} ${row.appName}${row.appSlug ? ` (${row.appSlug})` : ""}`,
+          description: `${itemCount} data source${itemCount === 1 ? "" : "s"}`,
+          value: row.id
+        };
+      }
+      const dataSourceLabel = row.dataSourceName || row.dataSourceSlug || row.dataSourceId || "Unknown";
+      return {
+        name: `  - ${dataSourceLabel}${row.dataSourceSlug ? ` (${row.dataSourceSlug})` : ""}`,
+        description: row.appSlug ? `app: ${row.appSlug}` : "missing app slug",
+        value: row.id
+      };
+    });
+  }, [dataSourceCountByAppKey, dataSourceRows]);
   const renderLeftSection = () => {
     if (activeSection === "shortcuts") {
       return /* @__PURE__ */ jsx2(
         "select",
         {
-          focused: focusedPanel === "left" && !isExitConfirmOpen,
+          focused: focusedPanel === "left" && !isExitConfirmOpen && !isRunning,
           options: shortcutOptions,
           selectedIndex: selectedShortcutIndex,
           onChange: (index) => {
@@ -847,6 +1222,53 @@ function DocyrusOpenTuiApp(props) {
         }
       );
     }
+    if (activeSection === "datasources") {
+      const treeFocused = focusedPanel === "left" && dataSourcePanelFocus === "tree" && !isRunning && !isExitConfirmOpen;
+      const searchFocused = focusedPanel === "left" && dataSourcePanelFocus === "search" && !isRunning && !isExitConfirmOpen;
+      return /* @__PURE__ */ jsxs2("box", { flexDirection: "column", flexGrow: 1, children: [
+        /* @__PURE__ */ jsx2("box", { border: true, borderStyle: "single", borderColor: searchFocused ? "#7aa2f7" : "#414868", paddingX: 1, children: /* @__PURE__ */ jsx2(
+          "input",
+          {
+            value: dataSourceSearch,
+            placeholder: "Search data sources...",
+            onChange: (value) => {
+              setDataSourceSearch(value);
+              setSelectedDataSourceRowIndex(0);
+            },
+            onSubmit: () => {
+              setDataSourcePanelFocus("tree");
+            },
+            focused: searchFocused,
+            style: {
+              flexGrow: 1
+            }
+          }
+        ) }),
+        /* @__PURE__ */ jsx2("box", { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx2("text", { fg: "gray", children: "/ to search, Esc to tree, Space toggle app, Enter run ds get, r refresh" }) }),
+        isCatalogLoading && /* @__PURE__ */ jsx2("text", { fg: "cyan", children: "Loading DataSources catalog..." }),
+        catalogError && /* @__PURE__ */ jsx2("text", { fg: "red", children: catalogError }),
+        dataSourceOptions.length === 0 ? /* @__PURE__ */ jsx2("text", { fg: "gray", children: dataSourceSearch.trim().length > 0 ? `No data sources match "${dataSourceSearch}".` : "No data sources available for this tenant." }) : /* @__PURE__ */ jsx2(
+          "select",
+          {
+            focused: treeFocused,
+            options: dataSourceOptions,
+            selectedIndex: selectedDataSourceRowIndex,
+            onChange: (index) => {
+              setSelectedDataSourceRowIndex(index);
+            },
+            onSelect: (index) => {
+              setSelectedDataSourceRowIndex(index);
+              const row = dataSourceRows[index] || null;
+              void runSelectedDataSourceRow(row);
+            },
+            showScrollIndicator: true,
+            style: {
+              flexGrow: 1
+            }
+          }
+        )
+      ] });
+    }
     if (activeSection === "history") {
       if (entries.length === 0) {
         return /* @__PURE__ */ jsx2("text", { fg: "gray", children: "No command history yet." });
@@ -856,7 +1278,7 @@ function DocyrusOpenTuiApp(props) {
         /* @__PURE__ */ jsx2(
           "select",
           {
-            focused: focusedPanel === "left" && !isExitConfirmOpen,
+            focused: focusedPanel === "left" && !isExitConfirmOpen && !isRunning,
             options: historyOptions,
             selectedIndex: selectedHistoryIndex,
             onChange: (index, option) => {
@@ -880,12 +1302,12 @@ function DocyrusOpenTuiApp(props) {
       ] });
     }
     if (activeSection === "messages") {
-      return /* @__PURE__ */ jsxs2("scrollbox", { focused: focusedPanel === "left" && !isExitConfirmOpen, style: { height: "100%" }, children: [
+      return /* @__PURE__ */ jsxs2("scrollbox", { focused: focusedPanel === "left" && !isExitConfirmOpen && !isRunning, style: { height: "100%" }, children: [
         systemMessages.length === 0 && /* @__PURE__ */ jsx2("text", { fg: "gray", children: "No messages yet." }),
         systemMessages.map((line, index) => /* @__PURE__ */ jsx2("text", { children: line }, `message-${index}`))
       ] });
     }
-    return /* @__PURE__ */ jsxs2("scrollbox", { focused: focusedPanel === "left" && !isExitConfirmOpen, style: { height: "100%" }, children: [
+    return /* @__PURE__ */ jsxs2("scrollbox", { focused: focusedPanel === "left" && !isExitConfirmOpen && !isRunning, style: { height: "100%" }, children: [
       /* @__PURE__ */ jsx2("text", { fg: "cyan", children: "Key Bindings" }),
       /* @__PURE__ */ jsx2("text", { children: "Left/Right: switch focused panel" }),
       /* @__PURE__ */ jsx2("text", { children: "Up/Down in left lists: selection" }),
@@ -894,8 +1316,11 @@ function DocyrusOpenTuiApp(props) {
       /* @__PURE__ */ jsx2("text", { children: "Up/Down in input: command history" }),
       /* @__PURE__ */ jsx2("text", { children: "Tab / Shift+Tab: next/prev left section" }),
       /* @__PURE__ */ jsx2("text", { children: "[ / ]: next/prev left section" }),
-      /* @__PURE__ */ jsx2("text", { children: "s/h/m/?: jump to section" }),
       /* @__PURE__ */ jsx2("text", { children: "1..6: run shortcut" }),
+      /* @__PURE__ */ jsx2("text", { children: "/ in DataSources: focus search" }),
+      /* @__PURE__ */ jsx2("text", { children: "Esc in DataSources search: return to tree" }),
+      /* @__PURE__ */ jsx2("text", { children: "Space in DataSources tree: toggle app folder" }),
+      /* @__PURE__ */ jsx2("text", { children: "Enter in DataSources tree: run ds get or toggle app" }),
       /* @__PURE__ */ jsx2("text", { children: "Ctrl+L: clear command and message history" }),
       /* @__PURE__ */ jsx2("text", { children: "Esc (other panel): focus command input" }),
       /* @__PURE__ */ jsx2("text", { children: "Esc then Esc: open exit confirmation" }),
@@ -913,7 +1338,7 @@ function DocyrusOpenTuiApp(props) {
         ] }),
         /* @__PURE__ */ jsxs2("text", { children: [
           "status: ",
-          isRunning ? `${spinner} running` : "idle"
+          isRunning ? `${spinner} running` : isCatalogLoading ? `${spinner} loading-catalog` : "idle"
         ] }),
         /* @__PURE__ */ jsxs2("text", { children: [
           "account: ",
@@ -940,10 +1365,12 @@ function DocyrusOpenTuiApp(props) {
             /* @__PURE__ */ jsx2(
               "tab-select",
               {
+                focused: focusedPanel === "left" && !isExitConfirmOpen && !isRunning,
                 options: sectionOptions,
                 onChange: (_index, option) => {
                   if (typeof option?.value === "string") {
                     setActiveSection(option.value);
+                    setDataSourcePanelFocus("tree");
                   }
                 }
               }
@@ -960,7 +1387,10 @@ function DocyrusOpenTuiApp(props) {
           borderColor: focusedPanel === "result" ? "#9ece6a" : "#3b4261",
           padding: 1,
           flexGrow: 1,
-          children: renderResult({
+          children: isRunning ? /* @__PURE__ */ jsxs2("box", { width: "100%", height: "100%", alignItems: "center", justifyContent: "center", flexDirection: "column", children: [
+            /* @__PURE__ */ jsx2("text", { fg: "cyan", children: spinner }),
+            /* @__PURE__ */ jsx2("text", { fg: "gray", children: "Running command..." })
+          ] }) : renderResult({
             entry: activeEntry,
             isFocused: focusedPanel === "result" && !isExitConfirmOpen
           })
@@ -989,7 +1419,7 @@ function DocyrusOpenTuiApp(props) {
               onSubmit: (value) => {
                 submitInput(typeof value === "string" ? value : void 0);
               },
-              focused: !isRunning && focusedPanel === "input" && !isExitConfirmOpen
+              focused: !isRunning && !isCatalogLoading && focusedPanel === "input" && !isExitConfirmOpen
             }
           )
         ]