botholomew 0.6.1 → 0.6.3

package/src/tools/file/edit.ts

@@ -24,11 +24,11 @@ const outputSchema = z.object({
   is_error: z.boolean(),
 });
 
-export const fileEditTool = {
-  name: "file_edit",
+export const contextEditTool = {
+  name: "context_edit",
   description:
-    "Apply git-style patches to a file. Each patch specifies a line range to replace.",
-  group: "file",
+    "Apply git-style patches to a context item. Each patch specifies a line range to replace.",
+  group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {

package/src/tools/file/exists.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
-import { contextPathExists } from "../../db/context.ts";
+import { resolveContextItem } from "../../db/context.ts";
 import type { ToolDefinition } from "../tool.ts";
 
 const inputSchema = z.object({
-  path: z.string().describe("File path to check"),
+  path: z.string().describe("File path or context item ID"),
 });
 
 const outputSchema = z.object({
@@ -11,14 +11,14 @@ const outputSchema = z.object({
   is_error: z.boolean(),
 });
 
-export const fileExistsTool = {
-  name: "file_exists",
-  description: "Check if a file exists in the virtual filesystem.",
-  group: "file",
+export const contextExistsTool = {
+  name: "context_exists",
+  description: "Check if a context item exists.",
+  group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const exists = await contextPathExists(ctx.conn, input.path);
-    return { exists, is_error: false };
+    const item = await resolveContextItem(ctx.conn, input.path);
+    return { exists: item !== null, is_error: false };
   },
 } satisfies ToolDefinition<typeof inputSchema, typeof outputSchema>;

package/src/tools/file/info.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
-import { getContextItemByPath } from "../../db/context.ts";
+import { resolveContextItemOrThrow } from "../../db/context.ts";
 import type { ToolDefinition } from "../tool.ts";
 
 const inputSchema = z.object({
-  path: z.string().describe("File path"),
+  path: z.string().describe("File path or context item ID"),
 });
 
 const outputSchema = z.object({
@@ -22,15 +22,15 @@ const outputSchema = z.object({
   is_error: z.boolean(),
 });
 
-export const fileInfoTool = {
-  name: "file_info",
-  description: "Show file metadata (size, MIME type, line count, etc.).",
-  group: "file",
+export const contextInfoTool = {
+  name: "context_info",
+  description:
+    "Show context item metadata (size, MIME type, line count, etc.).",
+  group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const item = await getContextItemByPath(ctx.conn, input.path);
-    if (!item) throw new Error(`Not found: ${input.path}`);
+    const item = await resolveContextItemOrThrow(ctx.conn, input.path);
 
     const content = item.content ?? "";
     return {

package/src/tools/file/move.ts

@@ -17,10 +17,10 @@ const outputSchema = z.object({
   is_error: z.boolean(),
 });
 
-export const fileMoveTool = {
-  name: "file_move",
-  description: "Move or rename a file in the virtual filesystem.",
-  group: "file",
+export const contextMoveTool = {
+  name: "context_move",
+  description: "Move or rename a context item.",
+  group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {

package/src/tools/file/read.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
-import { getContextItemByPath } from "../../db/context.ts";
+import { resolveContextItemOrThrow } from "../../db/context.ts";
 import type { ToolDefinition } from "../tool.ts";
 
 const inputSchema = z.object({
-  path: z.string().describe("File path to read"),
+  path: z.string().describe("File path or context item ID"),
   offset: z
     .number()
     .optional()
@@ -16,15 +16,14 @@ const outputSchema = z.object({
   is_error: z.boolean(),
 });
 
-export const fileReadTool = {
-  name: "file_read",
-  description: "Read a file's contents from the virtual filesystem.",
-  group: "file",
+export const contextReadTool = {
+  name: "context_read",
+  description: "Read a context item's contents.",
+  group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const item = await getContextItemByPath(ctx.conn, input.path);
-    if (!item) throw new Error(`Not found: ${input.path}`);
+    const item = await resolveContextItemOrThrow(ctx.conn, input.path);
     if (item.content == null) throw new Error(`No text content: ${input.path}`);
 
     let content = item.content;

package/src/tools/file/write.ts

@@ -38,11 +38,11 @@ const outputSchema = z.object({
   is_error: z.boolean(),
 });
 
-export const fileWriteTool = {
-  name: "file_write",
+export const contextWriteTool = {
+  name: "context_write",
   description:
-    "Write content to a file in the virtual filesystem. Creates the file if it doesn't exist, or overwrites if it does.",
-  group: "file",
+    "Write content to a context item. Creates the item if it doesn't exist, or overwrites if it does.",
+  group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {

package/src/tools/registry.ts

@@ -1,23 +1,24 @@
 // Context tools
+
 import { readLargeResultTool } from "./context/read-large-result.ts";
-import { searchContextTool } from "./context/search.ts";
+import { contextSearchTool } from "./context/search.ts";
 import { updateBeliefsTool } from "./context/update-beliefs.ts";
 import { updateGoalsTool } from "./context/update-goals.ts";
-// Directory tools
-import { dirCreateTool } from "./dir/create.ts";
-import { dirListTool } from "./dir/list.ts";
-import { dirSizeTool } from "./dir/size.ts";
-import { dirTreeTool } from "./dir/tree.ts";
-import { fileCopyTool } from "./file/copy.ts";
-import { fileCountLinesTool } from "./file/count-lines.ts";
-import { fileDeleteTool } from "./file/delete.ts";
-import { fileEditTool } from "./file/edit.ts";
-import { fileExistsTool } from "./file/exists.ts";
-import { fileInfoTool } from "./file/info.ts";
-import { fileMoveTool } from "./file/move.ts";
-// File tools
-import { fileReadTool } from "./file/read.ts";
-import { fileWriteTool } from "./file/write.ts";
+// Context — directory operations
+import { contextCreateDirTool } from "./dir/create.ts";
+import { contextListDirTool } from "./dir/list.ts";
+import { contextDirSizeTool } from "./dir/size.ts";
+import { contextTreeTool } from "./dir/tree.ts";
+// Context — file operations
+import { contextCopyTool } from "./file/copy.ts";
+import { contextCountLinesTool } from "./file/count-lines.ts";
+import { contextDeleteTool } from "./file/delete.ts";
+import { contextEditTool } from "./file/edit.ts";
+import { contextExistsTool } from "./file/exists.ts";
+import { contextInfoTool } from "./file/info.ts";
+import { contextMoveTool } from "./file/move.ts";
+import { contextReadTool } from "./file/read.ts";
+import { contextWriteTool } from "./file/write.ts";
 // MCP tools
 import { mcpExecTool } from "./mcp/exec.ts";
 import { mcpInfoTool } from "./mcp/info.ts";
@@ -52,22 +53,24 @@ export function registerAllTools(): void {
   registerTool(listTasksTool);
   registerTool(viewTaskTool);
 
-  // Directory
-  registerTool(dirCreateTool);
-  registerTool(dirListTool);
-  registerTool(dirTreeTool);
-  registerTool(dirSizeTool);
-
-  // File
-  registerTool(fileReadTool);
-  registerTool(fileWriteTool);
-  registerTool(fileEditTool);
-  registerTool(fileDeleteTool);
-  registerTool(fileCopyTool);
-  registerTool(fileMoveTool);
-  registerTool(fileInfoTool);
-  registerTool(fileExistsTool);
-  registerTool(fileCountLinesTool);
+  // Context
+  registerTool(contextCreateDirTool);
+  registerTool(contextListDirTool);
+  registerTool(contextTreeTool);
+  registerTool(contextDirSizeTool);
+  registerTool(contextReadTool);
+  registerTool(contextWriteTool);
+  registerTool(contextEditTool);
+  registerTool(contextDeleteTool);
+  registerTool(contextCopyTool);
+  registerTool(contextMoveTool);
+  registerTool(contextInfoTool);
+  registerTool(contextExistsTool);
+  registerTool(contextCountLinesTool);
+  registerTool(contextSearchTool);
+  registerTool(updateBeliefsTool);
+  registerTool(updateGoalsTool);
+  registerTool(readLargeResultTool);
 
   // Schedule
   registerTool(createScheduleTool);
@@ -81,12 +84,6 @@ export function registerAllTools(): void {
   registerTool(listThreadsTool);
   registerTool(viewThreadTool);
 
-  // Context
-  registerTool(searchContextTool);
-  registerTool(updateBeliefsTool);
-  registerTool(updateGoalsTool);
-  registerTool(readLargeResultTool);
-
   // MCP
   registerTool(mcpListToolsTool);
   registerTool(mcpSearchTool);

package/src/tui/App.tsx

@@ -9,6 +9,7 @@ import {
 import { MAX_INLINE_CHARS, PAGE_SIZE_CHARS } from "../daemon/large-results.ts";
 import type { Interaction } from "../db/threads.ts";
 import { getThread } from "../db/threads.ts";
+import { handleSlashCommand } from "../skills/commands.ts";
 import { ContextPanel } from "./components/ContextPanel.tsx";
 import { HelpPanel } from "./components/HelpPanel.tsx";
 import { InputBar } from "./components/InputBar.tsx";
@@ -209,6 +210,11 @@ export function App({
   queuedMessagesRef.current = queuedMessages;
   selectedQueueIndexRef.current = selectedQueueIndex;
 
+  const tabConsumedRef = useRef(false);
+  const handleTabConsumed = useCallback(() => {
+    tabConsumedRef.current = true;
+  }, []);
+
   const stableAppHandler = useCallback(
     // biome-ignore lint/suspicious/noExplicitAny: Ink's Key type is not exported
     (input: string, key: any) => {
@@ -218,8 +224,12 @@ export function App({
         return;
       }
 
-      // Tab key cycles tabs — always active (InputBar ignores tab)
+      // Tab key cycles tabs — unless InputBar consumed it for completion
       if (key.tab && !key.shift) {
+        if (tabConsumedRef.current) {
+          tabConsumedRef.current = false;
+          return;
+        }
         setActiveTab((t) => ((t % 7) + 1) as TabId);
         return;
       }
@@ -414,6 +424,23 @@ export function App({
       setInputValue("");
 
       if (trimmed === "/help") {
+        const skills = sessionRef.current.skills;
+        const skillLines: string[] = [];
+        if (skills.size > 0) {
+          skillLines.push("", "Skills:");
+          for (const [skillName, skill] of skills) {
+            skillLines.push(
+              `  /${skillName.padEnd(14)} ${skill.description || "(no description)"}`,
+            );
+          }
+        } else {
+          skillLines.push(
+            "",
+            "Skills:",
+            "  (none — add .md files to .botholomew/skills/)",
+          );
+        }
+
         const helpMsg: ChatMessage = {
           id: msgId(),
           role: "system",
@@ -467,7 +494,9 @@ export function App({
             "",
             "Commands:",
             "  /help           Show this help",
+            "  /skills         List available skills",
             "  /quit, /exit    End the chat session",
+            ...skillLines,
           ].join("\n"),
           timestamp: new Date(),
         };
@@ -475,9 +504,28 @@ export function App({
         return;
       }
 
-      if (trimmed === "/quit" || trimmed === "/exit") {
-        exit();
-        return;
+      if (trimmed.startsWith("/")) {
+        const skills = sessionRef.current.skills;
+        const handled = handleSlashCommand(trimmed, {
+          skills,
+          addSystemMessage: (content) => {
+            const msg: ChatMessage = {
+              id: msgId(),
+              role: "system",
+              content,
+              timestamp: new Date(),
+            };
+            setMessages((prev) => [...prev, msg]);
+          },
+          queueUserMessage: (content) => {
+            setInputHistory((prev) => [...prev, trimmed]);
+            queueRef.current.push(content);
+            syncQueue();
+            processQueue();
+          },
+          exit,
+        });
+        if (handled) return;
       }
 
       setInputHistory((prev) => [...prev, trimmed]);
@@ -502,6 +550,15 @@ export function App({
     [projectDir, sessionConn, chatTitle],
   );
 
+  const sessionSkills = ready ? sessionRef.current?.skills : undefined;
+  const skillCompletions = useMemo(() => {
+    const builtins = ["/help", "/quit", "/exit", "/skills"];
+    const skillNames = Array.from(sessionSkills?.keys() ?? []).map(
+      (name) => `/${name}`,
+    );
+    return [...builtins, ...skillNames];
+  }, [sessionSkills]);
+
   const allToolCalls = useMemo(
     () => messages.flatMap((m) => m.toolCalls ?? []),
     [messages],
@@ -624,6 +681,8 @@ export function App({
         disabled={activeTab !== 1}
         history={inputHistory}
         header={inputBarHeader}
+        completions={skillCompletions}
+        onTabConsumed={handleTabConsumed}
       />
       <TabBar activeTab={activeTab} />
     </Box>

package/src/tui/components/InputBar.tsx

@@ -15,6 +15,8 @@ interface InputBarProps {
   disabled: boolean;
   history: string[];
   header?: ReactNode;
+  completions?: string[];
+  onTabConsumed?: () => void;
 }
 
 export const InputBar = memo(function InputBar({
@@ -24,6 +26,8 @@ export const InputBar = memo(function InputBar({
   disabled,
   history,
   header,
+  completions,
+  onTabConsumed,
 }: InputBarProps) {
   const [historyIndex, setHistoryIndex] = useState(-1);
   const [cursorPos, setCursorPos] = useState(0);
@@ -39,6 +43,9 @@ export const InputBar = memo(function InputBar({
   const onChangeRef = useRef(onChange);
   const onSubmitRef = useRef(onSubmit);
   const historyRef = useRef(history);
+  const completionsRef = useRef(completions);
+  const onTabConsumedRef = useRef(onTabConsumed);
+  const tabCycleRef = useRef(-1);
 
   valueRef.current = value;
   cursorPosRef.current = cursorPos;
@@ -46,6 +53,8 @@ export const InputBar = memo(function InputBar({
   onChangeRef.current = onChange;
   onSubmitRef.current = onSubmit;
   historyRef.current = history;
+  completionsRef.current = completions;
+  onTabConsumedRef.current = onTabConsumed;
 
   // Blink cursor when input is active — skip ticks while typing so the
   // cursor stays solid and we avoid unnecessary renders during rapid input.
@@ -173,8 +182,37 @@ export const InputBar = memo(function InputBar({
         return;
       }
 
+      // Tab-completion for slash commands
+      if (key.tab) {
+        const comps = completionsRef.current;
+        if (val.startsWith("/") && comps && comps.length > 0) {
+          const matches = comps.filter((c) => c.startsWith(val));
+          if (matches.length === 1) {
+            const completed = `${matches[0] ?? ""} `;
+            valueRef.current = completed;
+            cursorPosRef.current = completed.length;
+            onChangeRef.current(completed);
+            setCursorPos(completed.length);
+            tabCycleRef.current = -1;
+          } else if (matches.length > 1) {
+            const idx = (tabCycleRef.current + 1) % matches.length;
+            tabCycleRef.current = idx;
+            const completed = matches[idx] ?? "";
+            valueRef.current = completed;
+            cursorPosRef.current = completed.length;
+            onChangeRef.current(completed);
+            setCursorPos(completed.length);
+          }
+          onTabConsumedRef.current?.();
+        }
+        return;
+      }
+
+      // Reset tab cycle on any non-tab key
+      tabCycleRef.current = -1;
+
       // Ignore other control keys
-      if (key.ctrl || key.escape || key.tab) {
+      if (key.ctrl || key.escape) {
         return;
       }