botholomew 0.14.2 → 0.15.1

package/README.md

@@ -76,6 +76,8 @@ Requires [Bun](https://bun.sh) 1.1+.
 bun install -g botholomew
 ```
 
+The CLI installs as both `botholomew` and `bothy` — the same binary, two names.
+
 Or run the dev build from a checkout:
 
 ```bash

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "botholomew",
-  "version": "0.14.2",
+  "version": "0.15.1",
   "description": "An autonomous AI agent for knowledge work — works your task queue while you sleep.",
   "type": "module",
   "bin": {
-    "botholomew": "./src/cli.ts"
+    "botholomew": "./src/cli.ts",
+    "bothy": "./src/cli.ts"
   },
   "files": [
     "src",

package/src/chat/session.ts

@@ -180,6 +180,10 @@ export async function endChatSession(session: ChatSession): Promise<void> {
 export async function clearChatSession(
   session: ChatSession,
 ): Promise<{ previousThreadId: string; newThreadId: string }> {
+  // Abort any in-flight stream up front so its callbacks don't continue to
+  // fire into the new thread (caused #190 — old messages reappearing on the
+  // next user submission).
+  abortActiveStream(session);
   const previousThreadId = session.threadId;
   await endThread(session.projectDir, previousThreadId);
   const newThreadId = await createThread(

package/src/commands/chat.ts

@@ -1,17 +1,26 @@
 import type { Command } from "commander";
+import { loadConfig } from "../config/loader.ts";
 
 export function registerChatCommand(program: Command) {
   program
     .command("chat")
     .description(
       "Open the interactive chat TUI\n\n" +
-        "  Keyboard shortcuts:\n" +
+        "  Tab navigation (Ctrl+<letter> from any tab):\n" +
+        "    Ctrl+a  Chat        Ctrl+t  Tasks       Ctrl+w  Workers\n" +
+        "    Ctrl+o  Tools       Ctrl+r  Threads     ?       Help (non-chat)\n" +
+        "    Ctrl+n  Context     Ctrl+s  Schedules   Esc     Return to Chat\n\n" +
+        "  Chat input:\n" +
         "    Enter          Send message\n" +
-        "    ⌥+Enter        Insert newline (multiline input)\n" +
-        "    ↑/↓            Browse input history\n\n" +
-        "  Commands:\n" +
-        "    /help           Show keyboard shortcuts\n" +
-        "    /tools          Open tool call inspector\n" +
+        "    ⌥+Enter        Insert newline\n" +
+        "    ↑/↓            Browse input history\n" +
+        "    Esc            Steer / abort an in-flight turn\n" +
+        "    Ctrl+J/K       Navigate queued messages\n" +
+        "    Ctrl+E/X       Edit / remove the selected queued message\n\n" +
+        "  Slash commands:\n" +
+        "    /help           Show chat-command reference (Help tab has the full keymap)\n" +
+        "    /skills         List available skills\n" +
+        "    /clear          End current thread and start a new one\n" +
         "    /exit           End the chat session",
     )
     .option("--thread-id <id>", "Resume an existing chat thread")
@@ -21,6 +30,8 @@ export function registerChatCommand(program: Command) {
       const React = await import("react");
       const { App } = await import("../tui/App.tsx");
       const dir = program.opts().dir;
+      const config = await loadConfig(dir);
+      const idleTimeoutMs = config.tui_idle_timeout_seconds * 1000;
 
       // VHS/ttyd doesn't fully negotiate the Kitty Keyboard protocol, so
       // Ink's "enabled" mode drops non-text keystrokes (Tab, Escape) under
@@ -33,6 +44,7 @@ export function registerChatCommand(program: Command) {
           projectDir: dir,
           threadId: opts.threadId,
           initialPrompt: opts.prompt,
+          idleTimeoutMs,
         }),
         {
           exitOnCtrlC: false,

package/src/config/schemas.ts

@@ -14,6 +14,7 @@ export interface BotholomewConfig {
   worker_stopped_retention_seconds?: number;
   schedule_min_interval_seconds?: number;
   schedule_claim_stale_seconds?: number;
+  tui_idle_timeout_seconds?: number;
   log_level?: string;
 }
 
@@ -33,5 +34,6 @@ export const DEFAULT_CONFIG: Required<BotholomewConfig> = {
   worker_stopped_retention_seconds: 3600,
   schedule_min_interval_seconds: 60,
   schedule_claim_stale_seconds: 300,
+  tui_idle_timeout_seconds: 180,
   log_level: "",
 };

package/src/context/fetcher.ts

@@ -39,7 +39,7 @@ export interface FetchedContent {
   /**
    * MCP server that produced the content (e.g. "google-docs", "github",
    * "firecrawl"), or null when we fell back to a plain HTTP fetch. Useful
-   * for `bothy context import` to pick a default destination subdirectory.
+   * for `botholomew context import` to pick a default destination subdirectory.
    */
   source: string | null;
 }

package/src/tui/App.tsx

@@ -33,6 +33,7 @@ import { ThreadPanel } from "./components/ThreadPanel.tsx";
 import type { ToolCallData } from "./components/ToolCall.tsx";
 import { ToolPanel } from "./components/ToolPanel.tsx";
 import { WorkerPanel } from "./components/WorkerPanel.tsx";
+import { IdleProvider, useIdle } from "./idle.tsx";
 import { buildSlashCommands, getSlashMatches } from "./slashCompletion.ts";
 import { ansi } from "./theme.ts";
 
@@ -40,6 +41,7 @@ interface AppProps {
   projectDir: string;
   threadId?: string;
   initialPrompt?: string;
+  idleTimeoutMs: number;
 }
 
 let nextMsgId = 0;
@@ -47,6 +49,21 @@ function msgId(): string {
   return `msg-${++nextMsgId}`;
 }
 
+// Tab routing: Ctrl+<letter> jumps to a tab. Chosen for memorability — first
+// available letter that doesn't collide with other Ctrl bindings (Ctrl+C exit,
+// Ctrl+J/K/X/E queue ops on Chat). Help is bound to `?` instead of Ctrl+H
+// because most terminals send Ctrl+H as ASCII 0x08 (backspace), which Ink
+// reports as `key.backspace=true`, not `input='h'`.
+const TAB_BY_CTRL_KEY: Record<string, TabId> = {
+  a: 1, // ch[a]t
+  o: 2, // t[o]ols
+  n: 3, // co[n]text
+  t: 4, // [t]asks
+  r: 5, // th[r]eads
+  s: 6, // [s]chedules
+  w: 7, // [w]orkers
+};
+
 function detectToolError(output: string | undefined): boolean {
   if (!output) return false;
   try {
@@ -123,8 +140,32 @@ export function App({
   projectDir,
   threadId: resumeThreadId,
   initialPrompt,
+  idleTimeoutMs,
 }: AppProps) {
+  return (
+    <IdleProvider timeoutMs={idleTimeoutMs}>
+      <AppInner
+        projectDir={projectDir}
+        threadId={resumeThreadId}
+        initialPrompt={initialPrompt}
+      />
+    </IdleProvider>
+  );
+}
+
+interface AppInnerProps {
+  projectDir: string;
+  threadId?: string;
+  initialPrompt?: string;
+}
+
+function AppInner({
+  projectDir,
+  threadId: resumeThreadId,
+  initialPrompt,
+}: AppInnerProps) {
   const { exit } = useApp();
+  const { markActivity } = useIdle();
   const [messages, setMessages] = useState<ChatMessage[]>([]);
   const [messagesEpoch, setMessagesEpoch] = useState(0);
   const [inputValue, setInputValue] = useState("");
@@ -187,7 +228,7 @@ export function App({
             id: msgId(),
             role: "system" as const,
             content:
-              "Press Tab to switch between panels. Type /help for commands.",
+              "Switch panels with Ctrl+<letter> (^a chat · ^o tools · ^n context · ^t tasks · ^r threads · ^s schedules · ^w workers) — `?` for help. Type /help for commands.",
             timestamp: new Date(),
           },
         ]);
@@ -250,26 +291,44 @@ export function App({
   const slashCommandsRef = useRef<SlashCommand[]>([]);
   const inputValueRef = useRef("");
 
+  const markActivityRef = useRef(markActivity);
+  markActivityRef.current = markActivity;
+
   const stableAppHandler = useCallback(
     // biome-ignore lint/suspicious/noExplicitAny: Ink's Key type is not exported
     (input: string, key: any) => {
+      markActivityRef.current();
+
       // Ctrl+C exits
       if (input === "c" && key.ctrl) {
         exit();
         return;
       }
 
-      // Tab key cycles tabs — but on the Chat tab, let InputBar consume it
-      // whenever the slash autocomplete popup would be open.
-      if (key.tab && !key.shift) {
-        if (activeTabRef.current === 1) {
-          const popupOpen = getSlashMatches(
-            inputValueRef.current,
-            slashCommandsRef.current,
-          );
-          if (popupOpen) return;
+      // Ctrl+<letter> jumps directly to a tab from any tab. On Chat, only
+      // suppress these if the slash-autocomplete popup needs the keystroke
+      // (Ctrl combos don't drive the popup, but keep the guard symmetric
+      // with the previous Tab-cycle behavior).
+      if (key.ctrl) {
+        const tabForKey = TAB_BY_CTRL_KEY[input];
+        if (tabForKey !== undefined) {
+          if (activeTabRef.current === 1) {
+            const popupOpen = getSlashMatches(
+              inputValueRef.current,
+              slashCommandsRef.current,
+            );
+            if (popupOpen) return;
+          }
+          setActiveTab(tabForKey);
+          return;
         }
-        setActiveTab((t) => ((t % 8) + 1) as TabId);
+      }
+
+      // `?` jumps to the Help tab from any non-chat tab (on Chat, `?` is
+      // a regular character). Acts as the Help shortcut since Ctrl+H is
+      // unusable — most terminals send it as backspace.
+      if (input === "?" && activeTabRef.current !== 1) {
+        setActiveTab(8);
         return;
       }
 
@@ -316,12 +375,6 @@ export function App({
       }
 
       if (tab !== 1) {
-        // Number keys jump to tab on non-chat tabs
-        const num = Number.parseInt(input, 10);
-        if (num >= 1 && num <= 8) {
-          setActiveTab(num as TabId);
-          return;
-        }
         // Escape returns to chat
         if (key.escape) {
           setActiveTab(1);
@@ -385,12 +438,15 @@ export function App({
             if (now - lastStreamFlush >= 50) {
               setStreamingText(currentText);
               lastStreamFlush = now;
+              markActivityRef.current();
             }
           },
           onToolPreparing: (id, name) => {
+            markActivityRef.current();
             setPreparingTool({ id, name });
           },
           onToolStart: (id, name, input) => {
+            markActivityRef.current();
             if (currentText) {
               finalizeSegment();
             }
@@ -406,6 +462,7 @@ export function App({
             setPreparingTool(null);
           },
           onToolEnd: (id, _name, output, isError, meta) => {
+            markActivityRef.current();
             const tc = pendingToolCalls.find((t) => t.id === id);
             if (tc) {
               tc.running = false;
@@ -512,81 +569,30 @@ export function App({
 
       if (trimmed === "/help") {
         const skills = sessionRef.current.skills;
-        const skillLines: string[] = [];
+        const lines: string[] = [
+          "For the full keyboard reference, switch to the Help tab (`?` from any non-chat tab) — this message lists chat commands only.",
+          "",
+          "Slash commands:",
+          "  /help           Show this message",
+          "  /skills         List available skills",
+          "  /clear          End current thread and start a new one",
+          "  /exit           End the chat session",
+        ];
         if (skills.size > 0) {
-          skillLines.push("", "Skills:");
+          lines.push("", "Skills:");
           for (const [skillName, skill] of skills) {
-            skillLines.push(
+            lines.push(
               `  /${skillName.padEnd(14)} ${skill.description || "(no description)"}`,
             );
           }
         } else {
-          skillLines.push("", "Skills:", "  (none — add .md files to skills/)");
+          lines.push("", "Skills:", "  (none — add .md files to skills/)");
         }
 
         const helpMsg: ChatMessage = {
           id: msgId(),
           role: "system",
-          content: [
-            "Navigation:",
-            "  Tab            Cycle between panels",
-            "  1-7            Jump to panel (when not in Chat)",
-            "  Escape         Return to Chat",
-            "",
-            "Chat (Tab 1):",
-            "  Enter          Send message",
-            "  ⌥+Enter        Insert newline",
-            "  ↑/↓            Browse input history",
-            "  /              Open slash-command autocomplete",
-            "  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",
-            "",
-            "Tools (Tab 2):",
-            "  ↑/↓            Select tool call",
-            "  Shift+↑/↓      Scroll detail pane",
-            "  j/k            Scroll detail pane",
-            "",
-            "Context (Tab 3):",
-            "  ↑/↓            Navigate items",
-            "  Enter          Expand directory / preview file",
-            "  Backspace      Go up one directory",
-            "  /              Search context",
-            "  d              Delete selected item",
-            "",
-            "Tasks (Tab 4):",
-            "  ↑/↓            Navigate task list",
-            "  Shift+↑/↓      Scroll detail pane",
-            "  j/k            Scroll detail pane",
-            "  f              Cycle status filter",
-            "  p              Cycle priority filter",
-            "  r              Refresh tasks",
-            "",
-            "Threads (Tab 5):",
-            "  ↑/↓            Navigate thread list",
-            "  Shift+↑/↓      Scroll detail pane",
-            "  j/k            Scroll detail pane",
-            "  f              Cycle type filter",
-            "  d              Delete thread (with confirmation)",
-            "  r              Refresh threads",
-            "",
-            "Schedules (Tab 6):",
-            "  ↑/↓            Navigate schedule list",
-            "  Shift+↑/↓      Scroll detail pane",
-            "  j/k            Scroll detail pane",
-            "  f              Cycle enabled/disabled filter",
-            "  e              Toggle enable/disable",
-            "  d              Delete schedule (with confirmation)",
-            "  r              Refresh schedules",
-            "",
-            "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"),
+          content: lines.join("\n"),
           timestamp: new Date(),
         };
         setMessages((prev) => [...prev, helpMsg]);
@@ -622,8 +628,23 @@ export function App({
             // Drain any queued messages so they don't leak into the new thread.
             queueRef.current.length = 0;
             syncQueue();
-            clearChatSession(session)
-              .then(({ previousThreadId, newThreadId }) => {
+            // Abort any in-flight stream synchronously so its callbacks stop
+            // firing before we reset UI state. clearChatSession also calls
+            // this, but doing it here lets us start the wait-for-quiesce
+            // poll below immediately rather than waiting on the
+            // createThread/endThread round trip first.
+            abortActiveStream(session);
+            void (async () => {
+              // Wait for any in-flight processQueue iteration to finish so
+              // its trailing `finalizeSegment` can't race our state reset
+              // and re-add the previous thread's assistant message after
+              // the UI has been cleared. (Issue #190.)
+              while (processingRef.current) {
+                await new Promise((r) => setTimeout(r, 10));
+              }
+              try {
+                const { previousThreadId, newThreadId } =
+                  await clearChatSession(session);
                 // 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)
@@ -639,8 +660,10 @@ export function App({
                 ]);
                 setMessagesEpoch((n) => n + 1);
                 setChatTitle(undefined);
-              })
-              .catch((err) => {
+                setStreamingText("");
+                setActiveToolCalls([]);
+                setPreparingTool(null);
+              } catch (err) {
                 setMessages((prev) => [
                   ...prev,
                   {
@@ -650,7 +673,8 @@ export function App({
                     timestamp: new Date(),
                   },
                 ]);
-              });
+              }
+            })();
           },
         });
         if (handled) return;