botholomew 0.8.10 → 0.9.5

package/src/tools/search/grep.ts

@@ -1,8 +1,14 @@
 import { z } from "zod";
-import { listContextItemsByPrefix } from "../../db/context.ts";
+import { formatDriveRef } from "../../context/drives.ts";
+import {
+  listContextItems,
+  listContextItemsByPrefix,
+} from "../../db/context.ts";
 import type { ToolDefinition } from "../tool.ts";
 
 const GrepMatchSchema = z.object({
+  ref: z.string(),
+  drive: z.string(),
   path: z.string(),
   line: z.number(),
   content: z.string(),
@@ -11,14 +17,20 @@ const GrepMatchSchema = z.object({
 
 const inputSchema = z.object({
   pattern: z.string().describe("Regex pattern to search for"),
+  drive: z
+    .string()
+    .optional()
+    .describe("Restrict search to a single drive (defaults to all drives)"),
   path: z
     .string()
     .optional()
-    .describe("Directory to search in (defaults to /)"),
+    .describe(
+      "Directory to search under within the drive (defaults to /). Requires `drive`.",
+    ),
   glob: z
     .string()
     .optional()
-    .describe("Only search files matching this glob pattern"),
+    .describe("Only search files whose basename matches this glob pattern"),
   ignore_case: z.boolean().optional().describe("Case-insensitive search"),
   context: z
     .number()
@@ -33,20 +45,39 @@ const inputSchema = z.object({
 const outputSchema = z.object({
   matches: z.array(GrepMatchSchema),
   is_error: z.boolean(),
+  error_type: z.string().optional(),
+  message: z.string().optional(),
 });
 
 export const searchGrepTool = {
   name: "search_grep",
-  description:
-    "Search file contents by regex pattern in the virtual filesystem.",
+  description: "Search file contents by regex pattern across context drives.",
   group: "search",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const searchPath = input.path ?? "/";
-    const items = await listContextItemsByPrefix(ctx.conn, searchPath, {
-      recursive: true,
-    });
+    // `path` scopes to a directory within a single drive; requiring `drive`
+    // alongside prevents a silent full-DB scan when only `path` is passed.
+    if (input.path && !input.drive) {
+      return {
+        matches: [],
+        is_error: true,
+        error_type: "invalid_arguments",
+        message:
+          "`path` requires `drive` — use context_list_drives to see which drives exist, then pass `drive` alongside `path`.",
+      };
+    }
+
+    const items = input.drive
+      ? await listContextItemsByPrefix(
+          ctx.conn,
+          input.drive,
+          input.path ?? "/",
+          {
+            recursive: true,
+          },
+        )
+      : await listContextItems(ctx.conn);
 
     const flags = input.ignore_case ? "gi" : "g";
     const regex = new RegExp(input.pattern, flags);
@@ -60,7 +91,7 @@ export const searchGrepTool = {
       if (item.content == null) continue;
 
       if (globRegex) {
-        const filename = item.context_path.split("/").pop() ?? "";
+        const filename = item.path.split("/").pop() ?? "";
         if (!globRegex.test(filename)) continue;
       }
 
@@ -72,7 +103,9 @@ export const searchGrepTool = {
           const start = Math.max(0, i - contextLines);
           const end = Math.min(lines.length, i + contextLines + 1);
           matches.push({
-            path: item.context_path,
+            ref: formatDriveRef(item),
+            drive: item.drive,
+            path: item.path,
             line: i + 1,
             content: line,
             context_lines: lines.slice(start, end),

package/src/tools/search/semantic.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { formatDriveRef } from "../../context/drives.ts";
 import { embedSingle } from "../../context/embedder.ts";
 import { hybridSearch } from "../../db/embeddings.ts";
 import type { ToolDefinition } from "../tool.ts";
@@ -19,7 +20,7 @@ const inputSchema = z.object({
 const outputSchema = z.object({
   results: z.array(
     z.object({
-      path: z.string(),
+      ref: z.string(),
       title: z.string(),
       score: z.number(),
       snippet: z.string(),
@@ -31,7 +32,7 @@ const outputSchema = z.object({
 export const searchSemanticTool = {
   name: "search_semantic",
   description:
-    "Semantic search over indexed files using vector embeddings. Finds conceptually related content, not just keyword matches.",
+    "Semantic search over indexed context using vector embeddings. Finds conceptually related content, not just keyword matches.",
   group: "search",
   inputSchema,
   outputSchema,
@@ -53,7 +54,10 @@ export const searchSemanticTool = {
     return {
       results: filtered
         .map((r) => ({
-          path: r.source_path || r.context_item_id,
+          ref:
+            r.drive && r.path
+              ? formatDriveRef({ drive: r.drive, path: r.path })
+              : r.context_item_id,
           title: r.title,
           score: Math.round(r.score * 1000) / 1000,
           snippet: (r.chunk_content || "").slice(0, 300),

package/src/tui/components/ContextPanel.tsx

@@ -1,5 +1,6 @@
 import { Box, Text, useInput, useStdout } from "ink";
 import { memo, useCallback, useEffect, useMemo, useState } from "react";
+import { formatDriveRef } from "../../context/drives.ts";
 import { withDb } from "../../db/connection.ts";
 import {
   type ContextItem,
@@ -7,6 +8,7 @@ import {
   deleteContextItemsByPrefix,
   getDistinctDirectories,
   listContextItemsByPrefix,
+  listDriveSummaries,
   searchContextByKeyword,
 } from "../../db/context.ts";
 import { isMarkdownItem, renderMarkdown } from "../markdown.ts";
@@ -16,6 +18,12 @@ interface ContextPanelProps {
   isActive: boolean;
 }
 
+interface DriveEntry {
+  type: "drive";
+  drive: string;
+  count: number;
+}
+
 interface DirEntry {
   type: "directory";
   name: string;
@@ -27,9 +35,8 @@ interface FileEntry {
   item: ContextItem;
 }
 
-type Entry = DirEntry | FileEntry;
+type Entry = DriveEntry | DirEntry | FileEntry;
 
-// Reserve lines for header, search bar, padding, tab bar, status/input bar
 const CHROME_LINES = 8;
 
 export const ContextPanel = memo(function ContextPanel({
@@ -39,6 +46,8 @@ export const ContextPanel = memo(function ContextPanel({
   const { stdout } = useStdout();
   const termRows = stdout?.rows ?? 24;
 
+  // currentDrive === null means we're at the "pick a drive" level.
+  const [currentDrive, setCurrentDrive] = useState<string | null>(null);
   const [currentPath, setCurrentPath] = useState("/");
   const [entries, setEntries] = useState<Entry[]>([]);
   const [cursor, setCursor] = useState(0);
@@ -54,7 +63,6 @@ export const ContextPanel = memo(function ContextPanel({
 
   const visibleRows = Math.max(1, termRows - CHROME_LINES);
 
-  // Keep cursor in view by adjusting scroll offset
   useEffect(() => {
     if (cursor < scrollOffset) {
       setScrollOffset(cursor);
@@ -64,10 +72,26 @@ export const ContextPanel = memo(function ContextPanel({
   }, [cursor, scrollOffset, visibleRows]);
 
   const loadEntries = useCallback(
-    async (path: string) => {
+    async (drive: string | null, path: string) => {
+      if (drive === null) {
+        const summaries = await withDb(dbPath, (conn) =>
+          listDriveSummaries(conn),
+        );
+        const driveEntries: DriveEntry[] = summaries.map((s) => ({
+          type: "drive",
+          drive: s.drive,
+          count: s.count,
+        }));
+        setEntries(driveEntries);
+        setCursor(0);
+        setScrollOffset(0);
+        setPreview(null);
+        return;
+      }
+
       const [dirs, files] = await withDb(dbPath, async (conn) => [
-        await getDistinctDirectories(conn, path),
-        await listContextItemsByPrefix(conn, path, { recursive: false }),
+        await getDistinctDirectories(conn, drive, path),
+        await listContextItemsByPrefix(conn, drive, path, { recursive: false }),
       ]);
 
       const dirEntries: DirEntry[] = dirs.map((d) => ({
@@ -77,7 +101,7 @@ export const ContextPanel = memo(function ContextPanel({
       }));
 
       const fileEntries: FileEntry[] = files
-        .filter((f) => !dirs.some((d) => f.context_path.startsWith(`${d}/`)))
+        .filter((f) => !dirs.some((d) => f.path.startsWith(`${d}/`)))
         .map((f) => ({ type: "file", item: f }));
 
       setEntries([...dirEntries, ...fileEntries]);
@@ -90,9 +114,9 @@ export const ContextPanel = memo(function ContextPanel({
 
   useEffect(() => {
     if (searchResults === null) {
-      loadEntries(currentPath);
+      loadEntries(currentDrive, currentPath);
     }
-  }, [currentPath, loadEntries, searchResults]);
+  }, [currentDrive, currentPath, loadEntries, searchResults]);
 
   const executeSearch = useCallback(
     async (query: string) => {
@@ -111,7 +135,6 @@ export const ContextPanel = memo(function ContextPanel({
     [dbPath],
   );
 
-  // Compute the items list and visible window for the current view
   const items = searchResults ?? entries;
   const itemCount = items.length;
   const visibleItems = useMemo(
@@ -119,9 +142,6 @@ export const ContextPanel = memo(function ContextPanel({
     [items, scrollOffset, visibleRows],
   );
 
-  // Preview content split into lines for scrolling. Markdown files are
-  // rendered through Bun.markdown.ansi so headers/emphasis/code display
-  // with ANSI formatting in the terminal.
   const previewLines = useMemo(() => {
     if (!preview?.content) return [];
     const body = isMarkdownItem(preview)
@@ -132,7 +152,6 @@ export const ContextPanel = memo(function ContextPanel({
 
   useInput(
     (input, key) => {
-      // Search mode: capture text input
       if (searchMode) {
         if (key.return) {
           setSearchMode(false);
@@ -155,7 +174,6 @@ export const ContextPanel = memo(function ContextPanel({
         return;
       }
 
-      // Preview mode: scroll content
       if (preview) {
         if (key.upArrow) {
           setPreviewScroll((s) => Math.max(0, s - 1));
@@ -174,20 +192,23 @@ export const ContextPanel = memo(function ContextPanel({
         return;
       }
 
-      // Delete confirmation mode
       if (confirmDelete) {
         if (input === "y" || input === "d") {
           const entry = entries[cursor];
           if (entry) {
             void withDb(dbPath, async (conn) => {
-              if (entry.type === "directory") {
-                await deleteContextItemsByPrefix(conn, entry.path);
-              } else {
+              if (entry.type === "directory" && currentDrive) {
+                await deleteContextItemsByPrefix(
+                  conn,
+                  currentDrive,
+                  entry.path,
+                );
+              } else if (entry.type === "file") {
                 await deleteContextItem(conn, entry.item.id);
               }
             });
             setConfirmDelete(false);
-            loadEntries(currentPath);
+            loadEntries(currentDrive, currentPath);
           }
         } else {
           setConfirmDelete(false);
@@ -195,7 +216,6 @@ export const ContextPanel = memo(function ContextPanel({
         return;
       }
 
-      // Normal navigation
       if (input === "d" && itemCount > 0 && searchResults === null) {
         setConfirmDelete(true);
         return;
@@ -236,7 +256,10 @@ export const ContextPanel = memo(function ContextPanel({
         }
         const entry = entries[cursor];
         if (!entry) return;
-        if (entry.type === "directory") {
+        if (entry.type === "drive") {
+          setCurrentDrive(entry.drive);
+          setCurrentPath("/");
+        } else if (entry.type === "directory") {
           setCurrentPath(entry.path);
         } else {
           setPreview(entry.item);
@@ -251,13 +274,14 @@ export const ContextPanel = memo(function ContextPanel({
           parts.pop();
           const parent = parts.length <= 1 ? "/" : `${parts.join("/")}/`;
           setCurrentPath(parent);
+        } else if (currentDrive !== null) {
+          setCurrentDrive(null);
         }
       }
     },
     { isActive },
   );
 
-  // Render search results view
   if (searchResults !== null && !preview) {
     return (
       <Box flexDirection="column" flexGrow={1} paddingX={1} overflow="hidden">
@@ -272,17 +296,14 @@ export const ContextPanel = memo(function ContextPanel({
           {visibleItems.map((item, vi) => {
             const i = vi + scrollOffset;
             const ci = item as ContextItem;
-            const slashIdx = ci.context_path.lastIndexOf("/");
-            const dir =
-              slashIdx >= 0 ? ci.context_path.slice(0, slashIdx + 1) : "";
+            const ref = formatDriveRef(ci);
             return (
               <Box key={ci.id}>
                 <Text
                   backgroundColor={i === cursor ? "#333" : undefined}
                   color={i === cursor ? "cyan" : undefined}
                 >
-                  {"  "}📄 <Text dimColor>{dir}</Text>
-                  {ci.title}
+                  {"  "}📄 <Text dimColor>{ref}</Text> — {ci.title}
                   <Text dimColor> ({ci.mime_type})</Text>
                 </Text>
               </Box>
@@ -301,7 +322,6 @@ export const ContextPanel = memo(function ContextPanel({
     );
   }
 
-  // Render file preview with scrolling
   if (preview) {
     const visiblePreviewLines = previewLines.slice(
       previewScroll,
@@ -311,7 +331,7 @@ export const ContextPanel = memo(function ContextPanel({
       <Box flexDirection="column" flexGrow={1} paddingX={1} overflow="hidden">
         <Box>
           <Text bold color="cyan">
-            {preview.context_path}
+            {formatDriveRef(preview)}
           </Text>
           <Text dimColor> (esc to go back · ↑↓ to scroll)</Text>
         </Box>
@@ -321,7 +341,6 @@ export const ContextPanel = memo(function ContextPanel({
             {preview.description ? ` · ${preview.description}` : ""}
           </Text>
           <Text dimColor>
-            Source: {preview.source_path ?? "n/a"} ·{" "}
             {preview.indexed_at ? "Indexed" : "Not indexed"} · Updated:{" "}
             {preview.updated_at.toLocaleDateString()}
           </Text>
@@ -354,12 +373,16 @@ export const ContextPanel = memo(function ContextPanel({
     );
   }
 
-  // Render directory listing with scroll window
+  const headerLabel =
+    currentDrive === null
+      ? "(drives)"
+      : formatDriveRef({ drive: currentDrive, path: currentPath });
+
   return (
     <Box flexDirection="column" flexGrow={1} paddingX={1} overflow="hidden">
       <Box>
         <Text bold color="cyan">
-          {currentPath}
+          {headerLabel}
         </Text>
         <Text dimColor>
           {" "}
@@ -378,8 +401,10 @@ export const ContextPanel = memo(function ContextPanel({
           <Text color="red" bold>
             Delete{" "}
             {entries[cursor].type === "directory"
-              ? `${entries[cursor].name}/ and all contents`
-              : (entries[cursor] as FileEntry).item.title}
+              ? `${(entries[cursor] as DirEntry).name}/ and all contents`
+              : entries[cursor].type === "file"
+                ? (entries[cursor] as FileEntry).item.title
+                : "(pick a file first)"}
             ? (y/n)
           </Text>
         </Box>
@@ -390,6 +415,19 @@ export const ContextPanel = memo(function ContextPanel({
           const i = vi + scrollOffset;
           const entry = raw as Entry;
           const isSelected = i === cursor;
+          if (entry.type === "drive") {
+            return (
+              <Box key={entry.drive}>
+                <Text
+                  backgroundColor={isSelected ? "#333" : undefined}
+                  color={isSelected ? "cyan" : "magenta"}
+                  bold={isSelected}
+                >
+                  {"  "}🗄 {entry.drive}:/ <Text dimColor>({entry.count})</Text>
+                </Text>
+              </Box>
+            );
+          }
           if (entry.type === "directory") {
             return (
               <Box key={entry.path}>

package/src/tui/markdown.ts

@@ -6,10 +6,9 @@ export function renderMarkdown(text: string): string {
 }
 
 export function isMarkdownItem(
-  item: Pick<ContextItem, "mime_type" | "source_path" | "context_path">,
+  item: Pick<ContextItem, "mime_type" | "path">,
 ): boolean {
   if (item.mime_type === "text/markdown") return true;
-  if (item.source_path?.toLowerCase().endsWith(".md")) return true;
-  if (item.context_path.toLowerCase().endsWith(".md")) return true;
+  if (item.path.toLowerCase().endsWith(".md")) return true;
   return false;
 }

package/src/worker/prompt.ts

@@ -107,8 +107,9 @@ export async function buildSystemPrompt(
       if (results.length > 0) {
         prompt += "## Relevant Context\n";
         for (const r of results) {
-          const path = r.source_path || r.context_item_id;
-          prompt += `### ${r.title} (${path})\n`;
+          const ref =
+            r.drive && r.path ? `${r.drive}:${r.path}` : r.context_item_id;
+          prompt += `### ${r.title} (${ref})\n`;
           if (r.chunk_content) {
             prompt += `${r.chunk_content.slice(0, 1000)}\n`;
           }
@@ -130,6 +131,8 @@ When calling complete_task, write a summary that captures your key findings, dec
     prompt += `
 ## External Tools (MCP)
 
+Before reaching for MCP tools to **find** information, check local context first — content from Drive, Gmail, GitHub, URLs, and prior agent runs is often already ingested. Use \`search_semantic\` (semantic) or \`context_search\` (keyword) across drives, then \`context_read\` / \`context_tree\` to drill in. Only fall through to \`mcp_exec\` when the data is fresh, write-side (sending an email, creating an issue), or genuinely missing locally.
+
 You have access to external tools via MCP servers. Before calling any MCP tool you haven't used yet this session, you MUST fetch its schema first:
 
 1. Discover tools with \`mcp_search\` (preferred — semantic) or \`mcp_list_tools\`.

package/src/tools/dir/list.ts

@@ -1,89 +0,0 @@
-import { z } from "zod";
-import {
-  getDistinctDirectories,
-  listContextItemsByPrefix,
-} from "../../db/context.ts";
-import type { ToolDefinition } from "../tool.ts";
-
-const DirEntrySchema = z.object({
-  name: z.string(),
-  type: z.enum(["file", "directory"]),
-  size: z.number(),
-});
-
-const inputSchema = z.object({
-  path: z.string().optional().describe("Directory path (defaults to /)"),
-  recursive: z
-    .boolean()
-    .optional()
-    .default(true)
-    .describe("Include contents of subdirectories (defaults to true)"),
-  limit: z
-    .number()
-    .optional()
-    .default(100)
-    .describe("Maximum number of entries to return (defaults to 100)"),
-  offset: z
-    .number()
-    .optional()
-    .default(0)
-    .describe("Number of entries to skip (defaults to 0)"),
-});
-
-const outputSchema = z.object({
-  entries: z.array(DirEntrySchema),
-  total: z.number(),
-  is_error: z.boolean(),
-});
-
-export const contextListDirTool = {
-  name: "context_list_dir",
-  description:
-    "[[ bash equivalent command: ls ]] List directory contents in context.",
-  group: "context",
-  inputSchema,
-  outputSchema,
-  execute: async (input, ctx) => {
-    const path = input.path ?? "/";
-    const recursive = input.recursive ?? true;
-    const limit = input.limit ?? 100;
-    const offset = input.offset ?? 0;
-    const normalizedPath = path.endsWith("/") ? path : `${path}/`;
-
-    const allItems = await listContextItemsByPrefix(ctx.conn, path, {
-      recursive,
-    });
-
-    const entries: z.infer<typeof DirEntrySchema>[] = allItems.map((item) => ({
-      name: recursive
-        ? item.context_path
-        : item.context_path.slice(normalizedPath.length),
-      type:
-        item.mime_type === "inode/directory"
-          ? ("directory" as const)
-          : ("file" as const),
-      size: item.content?.length ?? 0,
-    }));
-
-    // Add subdirectories (if not recursive, show immediate child dirs)
-    if (!recursive) {
-      const dirs = await getDistinctDirectories(ctx.conn, path);
-      for (const dir of dirs) {
-        const name = dir.slice(normalizedPath.length);
-        if (!entries.some((e) => e.name === name)) {
-          entries.push({ name, type: "directory", size: 0 });
-        }
-      }
-    }
-
-    entries.sort((a, b) => {
-      if (a.type !== b.type) return a.type === "directory" ? -1 : 1;
-      return a.name.localeCompare(b.name);
-    });
-
-    const total = entries.length;
-    const paginated = entries.slice(offset, offset + limit);
-
-    return { entries: paginated, total, is_error: false };
-  },
-} satisfies ToolDefinition<typeof inputSchema, typeof outputSchema>;