botholomew 0.8.5 → 0.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botholomew",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "An autonomous AI agent for knowledge work — works your task queue while you sleep.",
   "type": "module",
   "bin": {

package/src/chat/session.ts

@@ -140,3 +140,22 @@ export async function endChatSession(session: ChatSession): Promise<void> {
   await withDb(session.dbPath, (conn) => endThread(conn, session.threadId));
   await session.cleanup();
 }
+
+/**
+ * End the current thread and start a fresh one on the same session.
+ * The old thread is persisted (marked ended) and can still be resumed
+ * via `botholomew chat --thread-id <id>`. Returns the previous thread
+ * ID so callers can display it to the user.
+ */
+export async function clearChatSession(
+  session: ChatSession,
+): Promise<{ previousThreadId: string; newThreadId: string }> {
+  const previousThreadId = session.threadId;
+  const newThreadId = await withDb(session.dbPath, async (conn) => {
+    await endThread(conn, previousThreadId);
+    return createThread(conn, "chat_session", undefined, "New chat");
+  });
+  session.threadId = newThreadId;
+  session.messages.length = 0;
+  return { previousThreadId, newThreadId };
+}

package/src/commands/mcpx.ts

@@ -51,155 +51,64 @@ function getDir(program: Command): string {
   return program.opts().dir;
 }
 
+// Slice process.argv from the token after "mcpx" so flags (including --help)
+// and positional args flow through to upstream mcpx verbatim.
+function getRawMcpxArgs(): string[] {
+  const idx = process.argv.indexOf("mcpx");
+  return idx === -1 ? [] : process.argv.slice(idx + 1);
+}
+
+const PASSTHROUGH_SUBCOMMANDS: ReadonlyArray<[name: string, desc: string]> = [
+  ["servers", "List configured MCP server names"],
+  ["info", "Show server overview or schema for a specific tool"],
+  ["search", "Search tools by keyword and/or semantic similarity"],
+  ["exec", "Execute a tool call"],
+  ["add", "Add an MCP server"],
+  ["remove", "Remove an MCP server"],
+  ["ping", "Check connectivity to MCP servers"],
+  ["auth", "Authenticate with an HTTP MCP server"],
+  ["deauth", "Remove stored authentication for a server"],
+  ["resource", "List resources for a server, or read a specific resource"],
+  ["prompt", "List prompts for a server, or get a specific prompt"],
+  ["task", "Manage async tool tasks (list, get, result, cancel)"],
+  ["index", "Build the search index from all configured servers"],
+];
+
 export function registerMcpxCommand(program: Command) {
   const mcpx = program
     .command("mcpx")
     .description("Manage MCP servers via MCPX");
 
-  // --- servers ---
-  mcpx
-    .command("servers")
-    .description("List configured MCP server names")
-    .action(async () => {
-      const out = await runMcpx(getDir(program), ["servers"]);
-      process.stdout.write(out);
-    });
-
-  // --- info ---
-  mcpx
-    .command("info <first> [second]")
-    .description(
-      "Show server overview, or schema for a specific tool (server is optional if tool name is unambiguous)",
-    )
-    .action(async (first: string, second?: string) => {
-      const out = await runMcpx(getDir(program), ["info", first, second]);
-      process.stdout.write(out);
-    });
-
-  // --- search ---
-  mcpx
-    .command("search <terms...>")
-    .description("Search tools by keyword and/or semantic similarity")
-    .action(async (terms: string[]) => {
-      const out = await runMcpx(getDir(program), ["search", ...terms]);
-      process.stdout.write(out);
-    });
+  for (const [name, description] of PASSTHROUGH_SUBCOMMANDS) {
+    mcpx
+      .command(name)
+      .description(description)
+      .allowUnknownOption(true)
+      .helpOption(false)
+      .argument("[args...]", "arguments forwarded to mcpx")
+      .action(async () => {
+        await runMcpx(getDir(program), getRawMcpxArgs(), { inherit: true });
+      });
+  }
 
-  // --- exec ---
+  // Upstream mcpx's "list" is the default action when invoked with no
+  // subcommand — not a registered subcommand — so we strip the "list"
+  // token before forwarding.
   mcpx
-    .command("exec <first> [second] [third]")
+    .command("list")
     .description(
-      "Execute a tool call (server is optional if tool name is unambiguous)",
+      "List all tools, resources, and prompts across all configured servers",
     )
-    .action(async (first: string, second?: string, third?: string) => {
-      const out = await runMcpx(getDir(program), [
-        "exec",
-        first,
-        second,
-        third,
-      ]);
-      process.stdout.write(out);
-    });
-
-  // --- add ---
-  mcpx
-    .command("add <name>")
-    .description("Add an MCP server")
-    .option("--command <cmd>", "Stdio server command")
-    .option("--args <args...>", "Stdio server arguments")
-    .option("--url <url>", "HTTP server URL")
-    .option("--transport <type>", "HTTP transport: sse or streamable-http")
-    .option("--env <pairs...>", "Environment variables as KEY=VALUE pairs")
-    .action(
-      async (
-        name: string,
-        opts: {
-          command?: string;
-          args?: string[];
-          url?: string;
-          transport?: string;
-          env?: string[];
-        },
-      ) => {
-        const cliArgs: string[] = ["add", name];
-        if (opts.command) cliArgs.push("--command", opts.command);
-        if (opts.args) {
-          for (const a of opts.args) cliArgs.push("--args", a);
-        }
-        if (opts.url) cliArgs.push("--url", opts.url);
-        if (opts.transport) cliArgs.push("--transport", opts.transport);
-        if (opts.env) {
-          for (const e of opts.env) cliArgs.push("--env", e);
-        }
-        const out = await runMcpx(getDir(program), cliArgs);
-        process.stdout.write(out);
-      },
-    );
-
-  // --- remove ---
-  mcpx
-    .command("remove <name>")
-    .description("Remove an MCP server")
-    .action(async (name: string) => {
-      const out = await runMcpx(getDir(program), ["remove", name]);
-      process.stdout.write(out);
-    });
-
-  // --- ping ---
-  mcpx
-    .command("ping [servers...]")
-    .description("Check connectivity to MCP servers")
-    .action(async (servers: string[]) => {
-      const out = await runMcpx(getDir(program), ["ping", ...servers]);
-      process.stdout.write(out);
-    });
-
-  // --- auth ---
-  mcpx
-    .command("auth <server>")
-    .description("Authenticate with an HTTP MCP server")
-    .action(async (server: string) => {
-      await runMcpx(getDir(program), ["auth", server], { inherit: true });
-    });
-
-  // --- resource ---
-  mcpx
-    .command("resource [server] [uri]")
-    .description("List resources for a server, or read a specific resource")
-    .action(async (server?: string, uri?: string) => {
-      const out = await runMcpx(getDir(program), ["resource", server, uri]);
-      process.stdout.write(out);
-    });
-
-  // --- prompt ---
-  mcpx
-    .command("prompt [server] [name] [args]")
-    .description("List prompts for a server, or get a specific prompt")
-    .action(async (server?: string, name?: string, argsJson?: string) => {
-      const out = await runMcpx(getDir(program), [
-        "prompt",
-        server,
-        name,
-        argsJson,
-      ]);
-      process.stdout.write(out);
-    });
-
-  // --- task ---
-  mcpx
-    .command("task <action> <server> [taskId]")
-    .description("Manage async tasks (actions: list, get, result, cancel)")
-    .action(async (action: string, server: string, taskId?: string) => {
-      const out = await runMcpx(getDir(program), [
-        "task",
-        action,
-        server,
-        taskId,
-      ]);
-      process.stdout.write(out);
+    .allowUnknownOption(true)
+    .helpOption(false)
+    .argument("[args...]", "arguments forwarded to mcpx")
+    .action(async () => {
+      const raw = getRawMcpxArgs();
+      const args = raw[0] === "list" ? raw.slice(1) : raw;
+      await runMcpx(getDir(program), args, { inherit: true });
     });
 
-  // --- import-global ---
+  // Botholomew-specific: copy system-wide MCPX settings into this project.
   mcpx
     .command("import-global")
     .description("Copy system-wide MCPX settings (~/.mcpx) into this project")
@@ -234,12 +143,4 @@ export function registerMcpxCommand(program: Command) {
         );
       }
     });
-
-  // --- index ---
-  mcpx
-    .command("index")
-    .description("Build the search index from all configured servers")
-    .action(async () => {
-      await runMcpx(getDir(program), ["index"], { inherit: true });
-    });
 }

package/src/skills/commands.ts

@@ -4,11 +4,13 @@ import { renderSkill } from "./parser.ts";
 export interface SlashCommand {
   name: string;
   description: string;
+  takesArgs?: boolean;
 }
 
 export const BUILTIN_SLASH_COMMANDS: SlashCommand[] = [
   { name: "help", description: "Show command reference and shortcuts" },
   { name: "skills", description: "List available skills" },
+  { name: "clear", description: "End current thread and start a new one" },
   { name: "exit", description: "End the chat session" },
 ];
 
@@ -17,6 +19,7 @@ export interface SlashCommandContext {
   addSystemMessage: (content: string) => void;
   queueUserMessage: (content: string) => void;
   exit: () => void;
+  clearChat?: () => void;
 }
 
 /**
@@ -38,6 +41,15 @@ export function handleSlashCommand(
     return true;
   }
 
+  if (name === "clear") {
+    if (ctx.clearChat) {
+      ctx.clearChat();
+    } else {
+      ctx.addSystemMessage("/clear is only available in the chat TUI.");
+    }
+    return true;
+  }
+
   if (name === "skills") {
     if (ctx.skills.size === 0) {
       ctx.addSystemMessage(

package/src/tui/App.tsx

@@ -2,6 +2,7 @@ import { Box, Static, Text, useApp, useInput } from "ink";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   type ChatSession,
+  clearChatSession,
   endChatSession,
   sendMessage,
   startChatSession,
@@ -126,6 +127,7 @@ export function App({
 }: AppProps) {
   const { exit } = useApp();
   const [messages, setMessages] = useState<ChatMessage[]>([]);
+  const [messagesEpoch, setMessagesEpoch] = useState(0);
   const [inputValue, setInputValue] = useState("");
   const [inputHistory, setInputHistory] = useState<string[]>([]);
   const [isLoading, setIsLoading] = useState(false);
@@ -490,7 +492,8 @@ export function App({
             "  ⌥+Enter        Insert newline",
             "  ↑/↓            Browse input history",
             "  /              Open slash-command autocomplete",
-            "  Tab/Enter      Accept highlighted command (popup open)",
+            "  Enter          Run highlighted command / insert if it takes args (popup open)",
+            "  Tab            Insert highlighted command without submitting (popup open)",
             "  ↑/↓            Move highlight (popup open)",
             "  Esc            Close popup",
             "",
@@ -534,6 +537,7 @@ export function App({
             "Commands:",
             "  /help           Show this help",
             "  /skills         List available skills",
+            "  /clear          End current thread and start a new one",
             "  /exit           End the chat session",
             ...skillLines,
           ].join("\n"),
@@ -563,6 +567,42 @@ export function App({
             processQueue();
           },
           exit,
+          clearChat: () => {
+            const session = sessionRef.current;
+            if (!session) return;
+            // Drain any queued messages so they don't leak into the new thread.
+            queueRef.current.length = 0;
+            syncQueue();
+            clearChatSession(session)
+              .then(({ previousThreadId, newThreadId }) => {
+                // Ink's <Static> writes messages to terminal scrollback and
+                // can't un-write them, so setMessages alone leaves the old
+                // lines visible. Clear the terminal (including scrollback)
+                // and bump the epoch key on <Static> to force a fresh mount.
+                process.stdout.write("\x1b[2J\x1b[3J\x1b[H");
+                setMessages([
+                  {
+                    id: msgId(),
+                    role: "system",
+                    content: `Started a new chat thread (${newThreadId}). Previous thread saved — resume with: botholomew chat --thread-id ${previousThreadId}`,
+                    timestamp: new Date(),
+                  },
+                ]);
+                setMessagesEpoch((n) => n + 1);
+                setChatTitle(undefined);
+              })
+              .catch((err) => {
+                setMessages((prev) => [
+                  ...prev,
+                  {
+                    id: msgId(),
+                    role: "system",
+                    content: `Failed to clear chat: ${err}`,
+                    timestamp: new Date(),
+                  },
+                ]);
+              });
+          },
         });
         if (handled) return;
       }
@@ -595,6 +635,10 @@ export function App({
       ? Array.from(sessionSkills.values()).map((s) => ({
           name: s.name,
           description: s.description,
+          takesArgs:
+            s.arguments.length > 0 ||
+            /\$ARGUMENTS\b/.test(s.body) ||
+            /\$[1-9]\b/.test(s.body),
         }))
       : [];
     return buildSlashCommands(BUILTIN_SLASH_COMMANDS, skillList);
@@ -640,7 +684,7 @@ export function App({
           node always has proper terminal width in its Yoga layout.
           Otherwise Ink's border renderer crashes with a negative
           contentWidth when tool-call boxes are rendered at width 0. */}
-      <Static items={messages}>
+      <Static key={messagesEpoch} items={messages}>
         {(msg) => <MessageBubble key={msg.id} message={msg} />}
       </Static>
 

package/src/tui/components/InputBar.tsx

@@ -9,7 +9,7 @@ import {
   useState,
 } from "react";
 import type { SlashCommand } from "../../skills/commands.ts";
-import { getSlashMatches } from "../slashCompletion.ts";
+import { getSlashMatches, shouldSubmitOnEnter } from "../slashCompletion.ts";
 import { SlashCommandPopup } from "./SlashCommandPopup.tsx";
 
 interface InputBarProps {
@@ -128,11 +128,23 @@ export const InputBar = memo(function InputBar({
         ? getSlashMatches(val, slashCommandsRef.current ?? [])
         : null;
 
-      const acceptSelection = () => {
+      const acceptSelection = (mode: "insert" | "submit") => {
         if (!popupOpen) return false;
         const chosen =
           popupOpen[Math.min(selectedIndexRef.current, popupOpen.length - 1)];
         if (!chosen) return false;
+        if (mode === "submit") {
+          const completed = `/${chosen.name}`;
+          valueRef.current = completed;
+          cursorPosRef.current = 0;
+          onChangeRef.current(completed);
+          setCursorPos(0);
+          historyIndexRef.current = -1;
+          setHistoryIndex(-1);
+          savedInput.current = "";
+          onSubmitRef.current(completed);
+          return true;
+        }
         const completed = `/${chosen.name} `;
         valueRef.current = completed;
         cursorPosRef.current = completed.length;
@@ -152,11 +164,16 @@ export const InputBar = memo(function InputBar({
         return;
       }
 
-      // Enter: if popup is open, accept selection (do not submit).
-      // Otherwise submit as before.
+      // Enter: if popup is open, accept the highlighted entry. No-arg
+      // commands submit in one keystroke; commands that take args insert
+      // `/<name> ` and wait for the user to finish typing.
       if (key.return) {
         if (popupOpen && !key.shift && !key.meta) {
-          acceptSelection();
+          const chosen =
+            popupOpen[Math.min(selectedIndexRef.current, popupOpen.length - 1)];
+          acceptSelection(
+            chosen && shouldSubmitOnEnter(chosen) ? "submit" : "insert",
+          );
           return;
         }
         if (key.shift || key.meta) {
@@ -179,10 +196,10 @@ export const InputBar = memo(function InputBar({
         return;
       }
 
-      // Tab: accept popup selection if open. No-op otherwise.
+      // Tab: insert the highlighted completion so the user can keep editing.
       if (key.tab) {
         if (popupOpen) {
-          acceptSelection();
+          acceptSelection("insert");
         }
         return;
       }

package/src/tui/slashCompletion.ts

@@ -28,11 +28,25 @@ export function getSlashMatches(
 
 export function buildSlashCommands(
   builtins: SlashCommand[],
-  skills: Iterable<{ name: string; description: string }>,
+  skills: Iterable<{ name: string; description: string; takesArgs?: boolean }>,
 ): SlashCommand[] {
   const out: SlashCommand[] = [...builtins];
   for (const s of skills) {
-    out.push({ name: s.name, description: s.description });
+    out.push({
+      name: s.name,
+      description: s.description,
+      takesArgs: s.takesArgs,
+    });
   }
   return out;
 }
+
+/**
+ * Decide whether pressing Enter on a highlighted popup entry should both
+ * accept the completion and immediately submit. True for no-argument
+ * commands (single-Enter runs them); false for commands that take args,
+ * where we insert `/<name> ` and wait for the user to finish typing.
+ */
+export function shouldSubmitOnEnter(cmd: SlashCommand): boolean {
+  return !cmd.takesArgs;
+}