botholomew 0.12.5 → 0.14.0

package/src/tools/context/pipe.ts

@@ -1,28 +1,11 @@
-import { isText } from "istextorbinary";
 import { z } from "zod";
-import { formatDriveRef } from "../../context/drives.ts";
-import { ingestByPath } from "../../context/ingest.ts";
-import {
-  createContextItemStrict,
-  PathConflictError,
-  upsertContextItem,
-} from "../../db/context.ts";
+import { PathConflictError, writeContextFile } from "../../context/store.ts";
 import { getTool, type ToolDefinition } from "../tool.ts";
 
 const PREVIEW_CHARS = 200;
 const ERROR_MESSAGE_CAP = 2000;
 const TOOL_NAME = "pipe_to_context";
 
-function mimeFromPath(path: string): string {
-  const type = Bun.file(path).type.split(";")[0];
-  return type ?? "application/octet-stream";
-}
-
-function isTextualPath(path: string): boolean {
-  const filename = path.split("/").pop() ?? path;
-  return isText(filename) !== false;
-}
-
 function truncate(s: string, cap: number): string {
   if (s.length <= cap) return s;
   return `${s.slice(0, cap)}…[truncated, ${s.length - cap} more chars]`;
@@ -32,39 +15,29 @@ const inputSchema = z.object({
   tool_name: z
     .string()
     .describe(
-      "Name of the tool to dispatch. Its full output is piped into a context item; you (the LLM) will only see the storage acknowledgment, never the raw bytes.",
+      "Name of the tool to dispatch. Its full output is piped into a file under context/; you (the LLM) will only see the storage acknowledgment, never the raw bytes.",
     ),
   tool_input: z
     .record(z.string(), z.unknown())
     .describe(
       "Arguments to pass to the inner tool (same shape as a normal call).",
     ),
-  drive: z
+  path: z
     .string()
-    .default("agent")
     .describe(
-      "Drive to write to (defaults to 'agent', the agent's scratch drive).",
+      "Project-relative path under context/ to write the captured output to (e.g. 'gdoc/quarterly-plan.md').",
     ),
-  path: z.string().describe("Path within the drive (starts with /)"),
-  title: z
-    .string()
-    .optional()
-    .describe("Title for the file (defaults to filename)"),
-  description: z.string().optional().describe("Description of the file"),
   on_conflict: z
     .enum(["error", "overwrite"])
     .optional()
     .describe(
-      "What to do if a file already exists at this (drive, path). Defaults to 'error'. Pass 'overwrite' to replace.",
+      "What to do if a file already exists at this path. Defaults to 'error'. Pass 'overwrite' to replace.",
     ),
 });
 
 const outputSchema = z.object({
   is_error: z.boolean(),
-  id: z.string().optional(),
-  drive: z.string().optional(),
   path: z.string().optional(),
-  ref: z.string().optional(),
   bytes_written: z.number().optional(),
   preview: z
     .string()
@@ -89,7 +62,7 @@ const outputSchema = z.object({
 export const pipeToContextTool = {
   name: TOOL_NAME,
   description:
-    "[[ bash equivalent command: cmd > file ]] Run another tool and pipe its full output directly into a context item, without the result flowing through the conversation. Use this when you need a large tool output (web pages, search dumps, big mcp_exec results) to be searchable/embedded for later but you do NOT need to read the bytes yourself. You'll only see the storage ack (drive, path, id, size, short preview).",
+    "[[ bash equivalent command: cmd > file ]] Run another tool and pipe its full output directly into a file under context/, without the result flowing through the conversation. Use this when you need a large tool output (Google Docs via mcp_exec, web fetches, search dumps) saved for later inspection but you do NOT need to read the bytes yourself. You'll only see the storage ack (path, size, short preview).",
   group: "context",
   inputSchema,
   outputSchema,
@@ -111,7 +84,7 @@ export const pipeToContextTool = {
         error_type: "forbidden_tool",
         message: `Tool "${inner.name}" cannot be piped (terminal tools and pipe_to_context itself are not allowed).`,
         next_action_hint:
-          "Pipe a non-terminal tool (search_grep, mcp_exec, context_refresh, etc.) instead.",
+          "Pipe a non-terminal tool (search, mcp_exec, etc.) instead.",
       };
     }
 
@@ -169,43 +142,16 @@ export const pipeToContextTool = {
       };
     }
 
-    const mimeType = mimeFromPath(input.path);
-    const isTextual = isTextualPath(input.path);
-    const title =
-      input.title ?? input.path.split("/").filter(Boolean).pop() ?? input.path;
-    const onConflict = input.on_conflict ?? "error";
-    const target = { drive: input.drive, path: input.path };
-
     try {
-      const item =
-        onConflict === "overwrite"
-          ? await upsertContextItem(ctx.conn, {
-              title,
-              description: input.description,
-              content: innerOutput,
-              drive: target.drive,
-              path: target.path,
-              mimeType,
-              isTextual,
-            })
-          : await createContextItemStrict(ctx.conn, {
-              title,
-              description: input.description,
-              content: innerOutput,
-              drive: target.drive,
-              path: target.path,
-              mimeType,
-              isTextual,
-            });
-
-      await ingestByPath(ctx.conn, target, ctx.config);
-
+      const entry = await writeContextFile(
+        ctx.projectDir,
+        input.path,
+        innerOutput,
+        { onConflict: input.on_conflict ?? "error" },
+      );
       return {
         is_error: false,
-        id: item.id,
-        drive: item.drive,
-        path: item.path,
-        ref: formatDriveRef(item),
+        path: entry.path,
         bytes_written: innerOutput.length,
         preview: innerOutput.slice(0, PREVIEW_CHARS),
       };
@@ -214,10 +160,8 @@ export const pipeToContextTool = {
         return {
           is_error: true,
           error_type: "path_conflict",
-          drive: err.drive,
           path: err.path,
-          ref: formatDriveRef({ drive: err.drive, path: err.path }),
-          message: `A file already exists at ${formatDriveRef({ drive: err.drive, path: err.path })} (id: ${err.existingId}). The inner tool ran but its output was discarded.`,
+          message: `A file already exists at context/${err.path}. The inner tool ran but its output was discarded.`,
           next_action_hint:
             "Retry with on_conflict='overwrite' to replace, or pick a different path.",
         };

package/src/tools/context/update-beliefs.ts

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { z } from "zod";
-import { getBotholomewDir } from "../../constants.ts";
+import { getPromptsDir } from "../../constants.ts";
 import {
   type ContextFileMeta,
   parseContextFile,
@@ -25,12 +25,12 @@ const outputSchema = z.object({
 export const updateBeliefsTool = {
   name: "update_beliefs",
   description:
-    "Update the agent's beliefs file (.botholomew/beliefs.md). Preserves frontmatter, replaces content body.",
+    "Update the agent's beliefs file (prompts/beliefs.md). Preserves frontmatter, replaces content body.",
   group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const filePath = join(getBotholomewDir(ctx.projectDir), "beliefs.md");
+    const filePath = join(getPromptsDir(ctx.projectDir), "beliefs.md");
     const file = Bun.file(filePath);
 
     let meta: ContextFileMeta = {

package/src/tools/context/update-goals.ts

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { z } from "zod";
-import { getBotholomewDir } from "../../constants.ts";
+import { getPromptsDir } from "../../constants.ts";
 import {
   type ContextFileMeta,
   parseContextFile,
@@ -25,12 +25,12 @@ const outputSchema = z.object({
 export const updateGoalsTool = {
   name: "update_goals",
   description:
-    "Update the agent's goals file (.botholomew/goals.md). Preserves frontmatter, replaces content body.",
+    "Update the agent's goals file (prompts/goals.md). Preserves frontmatter, replaces content body.",
   group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const filePath = join(getBotholomewDir(ctx.projectDir), "goals.md");
+    const filePath = join(getPromptsDir(ctx.projectDir), "goals.md");
     const file = Bun.file(filePath);
 
     let meta: ContextFileMeta = {

package/src/tools/dir/create.ts

@@ -1,44 +1,47 @@
 import { z } from "zod";
-import { formatDriveRef } from "../../context/drives.ts";
-import { contextPathExists, createContextItem } from "../../db/context.ts";
+import { createContextDir, fileExists } from "../../context/store.ts";
 import type { ToolDefinition } from "../tool.ts";
 
 const inputSchema = z.object({
-  drive: z
-    .string()
-    .default("agent")
-    .describe("Drive to create the directory in (defaults to 'agent')"),
-  path: z.string().describe("Directory path to create (starts with /)"),
+  path: z.string().describe("Directory path to create under context/"),
 });
 
 const outputSchema = z.object({
+  path: z.string(),
   created: z.boolean(),
-  ref: z.string(),
   is_error: z.boolean(),
+  error_type: z.string().optional(),
+  message: z.string().optional(),
+  next_action_hint: z.string().optional(),
 });
 
 export const contextCreateDirTool = {
   name: "context_create_dir",
   description:
-    "[[ bash equivalent command: mkdir -p ]] Create a directory placeholder in context.",
+    "[[ bash equivalent command: mkdir -p ]] Create a directory (recursively) under context/. Paths that traverse a user symlink fail with PathEscapeError.",
   group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const target = { drive: input.drive, path: input.path };
-    const exists = await contextPathExists(ctx.conn, target);
-    if (exists) {
-      return { created: false, ref: formatDriveRef(target), is_error: false };
+    try {
+      const existed = await fileExists(ctx.projectDir, input.path);
+      await createContextDir(ctx.projectDir, input.path);
+      return { path: input.path, created: !existed, is_error: false };
+    } catch (err) {
+      // mkdir surfaces ENOTDIR when a path component is a file, EACCES on
+      // permission issues, etc. Convert to a structured error so the agent
+      // can pick a different parent or read what's actually there first.
+      const code = (err as NodeJS.ErrnoException).code;
+      const message = err instanceof Error ? err.message : String(err);
+      return {
+        path: input.path,
+        created: false,
+        is_error: true,
+        error_type: code === "ENOTDIR" ? "not_a_directory" : "create_failed",
+        message,
+        next_action_hint:
+          "Run context_tree on the parent path to see what's there before retrying.",
+      };
     }
-
-    await createContextItem(ctx.conn, {
-      title: input.path.split("/").filter(Boolean).pop() ?? input.path,
-      drive: target.drive,
-      path: target.path,
-      mimeType: "inode/directory",
-      isTextual: false,
-    });
-
-    return { created: true, ref: formatDriveRef(target), is_error: false };
   },
 } satisfies ToolDefinition<typeof inputSchema, typeof outputSchema>;

package/src/tools/dir/size.ts

@@ -1,5 +1,9 @@
 import { z } from "zod";
-import { listContextItemsByPrefix } from "../../db/context.ts";
+import {
+  dirSizeBytes,
+  NotDirectoryError,
+  NotFoundError,
+} from "../../context/store.ts";
 import type { ToolDefinition } from "../tool.ts";
 
 function formatBytes(bytes: number): string {
@@ -11,38 +15,63 @@ function formatBytes(bytes: number): string {
 }
 
 const inputSchema = z.object({
-  drive: z.string().describe("Drive name"),
-  path: z.string().optional().describe("Directory path (defaults to /)"),
-  recursive: z
-    .boolean()
+  path: z
+    .string()
     .optional()
-    .describe("Include subdirectories (defaults to true)"),
+    .default("")
+    .describe("Directory path under context/ (defaults to context root)"),
 });
 
 const outputSchema = z.object({
+  files: z.number(),
   bytes: z.number(),
   formatted: z.string(),
   is_error: z.boolean(),
+  error_type: z.string().optional(),
+  message: z.string().optional(),
 });
 
 export const contextDirSizeTool = {
   name: "context_dir_size",
   description:
-    "[[ bash equivalent command: du -s ]] Get the total size of context items under a drive/directory.",
+    "[[ bash equivalent command: du -s ]] Get the total size of files under a directory in context/.",
   group: "context",
   inputSchema,
   outputSchema,
   execute: async (input, ctx) => {
-    const path = input.path ?? "/";
-    const items = await listContextItemsByPrefix(ctx.conn, input.drive, path, {
-      recursive: input.recursive !== false,
-    });
-
-    let bytes = 0;
-    for (const item of items) {
-      if (item.content != null) bytes += item.content.length;
+    try {
+      const { files, bytes } = await dirSizeBytes(
+        ctx.projectDir,
+        input.path ?? "",
+      );
+      return {
+        files,
+        bytes,
+        formatted: formatBytes(bytes),
+        is_error: false,
+      };
+    } catch (err) {
+      if (err instanceof NotFoundError) {
+        return {
+          files: 0,
+          bytes: 0,
+          formatted: formatBytes(0),
+          is_error: true,
+          error_type: "not_found",
+          message: `No directory at context/${err.path}`,
+        };
+      }
+      if (err instanceof NotDirectoryError) {
+        return {
+          files: 0,
+          bytes: 0,
+          formatted: formatBytes(0),
+          is_error: true,
+          error_type: "not_a_directory",
+          message: `context/${err.path} is not a directory`,
+        };
+      }
+      throw err;
     }
-
-    return { bytes, formatted: formatBytes(bytes), is_error: false };
   },
 } satisfies ToolDefinition<typeof inputSchema, typeof outputSchema>;