fix: refine gemini cli tool result presents

davidliuk · davidliuk · commit d70cf9f527df · 2026-03-06T23:22:09.000-05:00
diff --git a/server/gemini-cli.js b/server/gemini-cli.js
@@ -169,6 +169,65 @@ function extractTodosFromShellCommand(command) {
   return parseTodosFromMarkdown(heredocMatch[1]);
 }
 
+async function enrichListDirectoryResult(toolContext, outputText, workingDir) {
+  if (!toolContext) return outputText;
+  const rawName = String(toolContext.rawToolName || '').toLowerCase();
+  if (rawName !== 'list_directory') return outputText;
+
+  const dirInput = String(toolContext.toolInput?.dir_path || toolContext.toolInput?.path || '.');
+  const resolvedDir = path.isAbsolute(dirInput)
+    ? path.resolve(dirInput)
+    : path.resolve(workingDir, dirInput);
+  const normalizedRoot = path.resolve(workingDir) + path.sep;
+  if (!resolvedDir.startsWith(normalizedRoot) && resolvedDir !== path.resolve(workingDir)) {
+    return outputText;
+  }
+
+  try {
+    const entries = await fs.readdir(resolvedDir, { withFileTypes: true });
+    const sortedEntries = [...entries].sort((a, b) => {
+      if (a.isDirectory() !== b.isDirectory()) {
+        return a.isDirectory() ? -1 : 1;
+      }
+      return a.name.localeCompare(b.name);
+    });
+    const visibleEntries = sortedEntries
+      .slice(0, 200)
+      .map((entry) => ({
+        name: entry.name,
+        isDirectory: entry.isDirectory()
+      }));
+
+    const baseRel = path.relative(workingDir, resolvedDir).replace(/\\/g, '/');
+    const relDir = baseRel && baseRel !== '' ? baseRel : '.';
+    const items = visibleEntries.map((entry) => {
+      const relPath = relDir === '.'
+        ? entry.name
+        : `${relDir}/${entry.name}`;
+      return {
+        name: entry.name,
+        path: `${relPath}${entry.isDirectory ? '/' : ''}`,
+        isDirectory: entry.isDirectory
+      };
+    });
+
+    return JSON.stringify(
+      {
+        summary: outputText,
+        directory: relDir,
+        files: items.map((item) => item.path),
+        items,
+        total: entries.length,
+        truncated: entries.length > visibleEntries.length
+      },
+      null,
+      2
+    );
+  } catch {
+    return outputText;
+  }
+}
+
 /**
  * Ensures a session directory exists and creates a basic JSONL metadata file if it doesn't.
  * This helps VibeLab discover the session even if the CLI hasn't written to it yet.
@@ -668,10 +727,11 @@ export async function spawnGemini(command, options = {}, ws) {
           case 'tool_result':
             if (response.output || response.content) {
               const rawResult = response.output !== undefined ? response.output : response.content;
-              const outputText = typeof rawResult === 'string' ? rawResult : JSON.stringify(rawResult, null, 2);
+              const baseOutputText = typeof rawResult === 'string' ? rawResult : JSON.stringify(rawResult, null, 2);
               const resultToolCallId = response.id || response.tool_use_id;
               const ctx = resultToolCallId ? toolCallContext.get(resultToolCallId) : null;
               const isError = Boolean(response.is_error || response.error);
+              const outputText = await enrichListDirectoryResult(ctx, baseOutputText, workingDir);
               
               await appendToSessionFile(capturedSessionId || sessionId || initialKey, {
                 type: 'tool_result',
diff --git a/src/components/chat/tools/configs/toolConfigs.ts b/src/components/chat/tools/configs/toolConfigs.ts
@@ -41,6 +41,127 @@ export interface ToolDisplayConfig {
   };
 }
 
+function formatActivateSkillResult(content: unknown): string {
+  const raw = String(content || '').trim();
+  if (!raw) return 'Skill activated.';
+
+  const lines = raw.split('\n');
+  const treeStart = lines.findIndex((line) => /^(\/|~\/|[A-Za-z]:[\\/])/.test(line.trim()));
+  if (treeStart === -1) return raw;
+
+  const beforeTree = lines.slice(0, treeStart).join('\n').trim();
+  const treeSection = lines.slice(treeStart).join('\n').trim();
+
+  return `${beforeTree}\n\n\`\`\`text\n${treeSection}\n\`\`\``.trim();
+}
+
+function parseJsonSafe(input: unknown): any | null {
+  if (typeof input !== 'string') return null;
+  try {
+    return JSON.parse(input);
+  } catch {
+    return null;
+  }
+}
+
+function parseLsResultPayload(result: any): {
+  directory: string;
+  total: number;
+  truncated: boolean;
+  summary: string;
+  files: string[];
+  items: Array<{ name: string; path: string; isDirectory: boolean }>;
+} | null {
+  const raw = result?.content ?? result;
+  const parsed = typeof raw === 'object' && raw !== null ? raw : parseJsonSafe(String(raw || ''));
+  if (!parsed || typeof parsed !== 'object') return null;
+
+  const directory = typeof parsed.directory === 'string' ? parsed.directory : '.';
+  const summary = typeof parsed.summary === 'string' ? parsed.summary : '';
+  const truncated = Boolean(parsed.truncated);
+  const total = typeof parsed.total === 'number' ? parsed.total : 0;
+  const files = Array.isArray(parsed.files)
+    ? parsed.files.filter((f: unknown) => typeof f === 'string')
+    : [];
+
+  let items: Array<{ name: string; path: string; isDirectory: boolean }> = [];
+  if (Array.isArray(parsed.items)) {
+    items = parsed.items
+      .map((item: any) => ({
+        name: typeof item?.name === 'string' ? item.name : '',
+        path: typeof item?.path === 'string' ? item.path : '',
+        isDirectory: Boolean(item?.isDirectory)
+      }))
+      .filter((item) => item.path);
+  }
+
+  if (items.length === 0 && files.length > 0) {
+    items = files.map((filePath: string) => {
+      const normalized = filePath.replace(/\\/g, '/');
+      const isDirectory = normalized.endsWith('/');
+      const clean = isDirectory ? normalized.slice(0, -1) : normalized;
+      const parts = clean.split('/');
+      return {
+        name: parts[parts.length - 1] || clean,
+        path: normalized,
+        isDirectory
+      };
+    });
+  }
+
+  return { directory, total, truncated, summary, files, items };
+}
+
+function formatLsResultAsMarkdown(result: any): string {
+  const payload = parseLsResultPayload(result);
+  if (!payload) {
+    const raw = String(result?.content || result || '').trim();
+    return raw || 'No directory entries returned.';
+  }
+
+  const sortedItems = [...payload.items].sort((a, b) => {
+    if (a.isDirectory !== b.isDirectory) {
+      return a.isDirectory ? -1 : 1;
+    }
+    return a.name.localeCompare(b.name);
+  });
+
+  const visibleCount = sortedItems.length;
+  const dirCount = sortedItems.filter((item) => item.isDirectory).length;
+  const fileCount = visibleCount - dirCount;
+  const treeHeader = payload.directory === '.' ? './' : `${payload.directory.replace(/\/+$/, '')}/`;
+  const treeLines = [treeHeader];
+
+  sortedItems.forEach((item, index) => {
+    const prefix = index === visibleCount - 1 ? '└── ' : '├── ';
+    treeLines.push(`${prefix}${item.name}${item.isDirectory ? '/' : ''}`);
+  });
+
+  if (visibleCount === 0) {
+    treeLines.push('└── (empty)');
+  }
+
+  const lines = [
+    `**Path:** \`${payload.directory}\``,
+    `**Entries:** ${visibleCount}${payload.total > visibleCount ? ` (showing first ${visibleCount} of ${payload.total})` : ''}`,
+    `**Breakdown:** ${dirCount} dirs, ${fileCount} files`,
+    '',
+    '```text',
+    treeLines.join('\n'),
+    '```'
+  ];
+
+  if (payload.truncated) {
+    lines.push('', '_Results truncated to keep the panel responsive._');
+  }
+
+  if (payload.summary && !/listed\s+\d+\s+items?/i.test(payload.summary)) {
+    lines.push('', `**Tool output:** ${payload.summary.trim()}`);
+  }
+
+  return lines.join('\n');
+}
+
 export const TOOL_CONFIGS: Record<string, ToolDisplayConfig> = {
   // ============================================================================
   // COMMAND TOOLS
@@ -85,6 +206,29 @@ export const TOOL_CONFIGS: Record<string, ToolDisplayConfig> = {
     }
   },
 
+  activate_skill: {
+    input: {
+      type: 'one-line',
+      label: 'Activate Skill',
+      getValue: (input) => input.name || input.skill || 'skill',
+      action: 'none',
+      colorScheme: {
+        primary: 'text-indigo-600 dark:text-indigo-300',
+        border: 'border-indigo-400 dark:border-indigo-500',
+        icon: 'text-indigo-500 dark:text-indigo-400'
+      }
+    },
+    result: {
+      type: 'collapsible',
+      defaultOpen: true,
+      title: 'Skill activation details',
+      contentType: 'markdown',
+      getContentProps: (result) => ({
+        content: formatActivateSkillResult(result?.content || result)
+      })
+    }
+  },
+
   // ============================================================================
   // FILE OPERATION TOOLS
   // ============================================================================
@@ -246,6 +390,33 @@ export const TOOL_CONFIGS: Record<string, ToolDisplayConfig> = {
     }
   },
 
+  LS: {
+    input: {
+      type: 'one-line',
+      label: 'LS',
+      getValue: (input) => input.dir_path || input.path || '.',
+      action: 'none',
+      colorScheme: {
+        primary: 'text-gray-700 dark:text-gray-300',
+        border: 'border-gray-300 dark:border-gray-600',
+        icon: 'text-gray-500 dark:text-gray-400'
+      }
+    },
+    result: {
+      type: 'collapsible',
+      defaultOpen: true,
+      title: (result) => {
+        const payload = parseLsResultPayload(result);
+        const count = payload?.items?.length ?? 0;
+        return `Directory listing${count > 0 ? ` (${count})` : ''}`;
+      },
+      contentType: 'markdown',
+      getContentProps: (result) => ({
+        content: formatLsResultAsMarkdown(result)
+      })
+    }
+  },
+
   // ============================================================================
   // TODO TOOLS
   // ============================================================================
@@ -608,7 +779,7 @@ const GEMINI_TOOL_ALIASES: Record<string, string> = {
   google_web_search: 'WebSearch',
   web_fetch: 'WebFetch',
   complete_task: 'Default',
-  activate_skill: 'Default',
+  activate_skill: 'activate_skill',
   save_memory: 'Default',
   get_internal_docs: 'Default'
 };
@@ -619,32 +790,6 @@ for (const [alias, target] of Object.entries(GEMINI_TOOL_ALIASES)) {
   }
 }
 
-if (!TOOL_CONFIGS.LS) {
-  TOOL_CONFIGS.LS = {
-    input: {
-      type: 'one-line',
-      label: 'LS',
-      getValue: (input) => input.dir_path || input.path || '.',
-      action: 'none',
-      colorScheme: {
-        primary: 'text-gray-700 dark:text-gray-300',
-        border: 'border-gray-300 dark:border-gray-600',
-        icon: 'text-gray-500 dark:text-gray-400'
-      }
-    },
-    result: {
-      type: 'collapsible',
-      defaultOpen: false,
-      title: 'Directory listing',
-      contentType: 'text',
-      getContentProps: (result) => ({
-        content: String(result?.content || ''),
-        format: 'plain'
-      })
-    }
-  };
-}
-
 /**
  * Get configuration for a tool, with fallback to default
  */
