macroclaw 0.32.0 → 0.34.0

package/src/app.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, mock } from "bun:test";
 import { existsSync, rmSync } from "node:fs";
 import { App, type AppConfig } from "./app";
-import { type Claude, QueryProcessError, type QueryResult, type RunningQuery } from "./claude";
+import { type Claude, type ClaudeProcess, type ProcessState, QueryProcessError, type QueryResult } from "./claude";
 import { saveSessions } from "./sessions";
 import type { SpeechToText } from "./speech-to-text";
 
@@ -53,6 +53,7 @@ mock.module("grammy", () => ({
 }));
 
 const tmpSettingsDir = "/tmp/macroclaw-test-settings";
+const activeApps: App[] = [];
 
 beforeEach(() => {
   mockTranscribe.mockReset();
@@ -61,7 +62,10 @@ beforeEach(() => {
   saveSessions({ mainSessionId: "test-session" }, tmpSettingsDir);
 });
 
-afterEach(() => {
+afterEach(async () => {
+  for (const app of activeApps.splice(0)) {
+    await app.dispose();
+  }
   if (existsSync(tmpSettingsDir)) rmSync(tmpSettingsDir, { recursive: true });
 });
 
@@ -69,47 +73,57 @@ function queryResult<T>(value: T, sessionId = "test-session-id"): QueryResult<T>
   return { value, sessionId, duration: "1.0s", cost: "$0.05" };
 }
 
-function resolvedQuery<T>(value: T, sessionId = "test-session-id"): RunningQuery<T> {
+function autoProcess(value: unknown, sessionId = "test-sid"): ClaudeProcess<unknown> {
   return {
     sessionId,
     startedAt: new Date(),
-    result: Promise.resolve(queryResult(value, sessionId)),
+    get state(): ProcessState { return "idle"; },
+    send: mock(async (_prompt: string) => queryResult(value, sessionId)),
     kill: mock(async () => {}),
-  };
+  } as unknown as ClaudeProcess<unknown>;
 }
 
 interface CallInfo {
   method: string;
-  prompt: string;
   sessionId?: string;
 }
 
-function mockClaude(handler: (info: CallInfo) => RunningQuery<unknown>): Claude & { calls: CallInfo[] } {
+function mockClaude(handler: (info: CallInfo) => ClaudeProcess<unknown>): Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] } {
   const calls: CallInfo[] = [];
+  const processes: ClaudeProcess<unknown>[] = [];
+
+  function handleCall(info: CallInfo): ClaudeProcess<unknown> {
+    calls.push(info);
+    const proc = handler(info);
+    processes.push(proc);
+    return proc;
+  }
+
   const claude = {
-    newSession: mock((prompt: string, _resultType: unknown, _options?: any) => {
-      const info: CallInfo = { method: "newSession", prompt };
-      calls.push(info);
-      return handler(info);
+    newSession: mock((_resultType: unknown, _options?: unknown) => {
+      return handleCall({ method: "newSession" });
     }),
-    resumeSession: mock((sessionId: string, prompt: string, _resultType: unknown, _options?: any) => {
-      const info: CallInfo = { method: "resumeSession", sessionId, prompt };
-      calls.push(info);
-      return handler(info);
+    resumeSession: mock((sessionId: string, _resultType: unknown, _options?: unknown) => {
+      return handleCall({ method: "resumeSession", sessionId });
     }),
-    forkSession: mock((sessionId: string, prompt: string, _resultType: unknown, _options?: any) => {
-      const info: CallInfo = { method: "forkSession", sessionId, prompt };
-      calls.push(info);
-      return handler(info);
+    forkSession: mock((sessionId: string, _resultType: unknown, _options?: unknown) => {
+      return handleCall({ method: "forkSession", sessionId });
     }),
     calls,
-  } as unknown as Claude & { calls: CallInfo[] };
+    processes,
+  } as unknown as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
   return claude;
 }
 
-function defaultMockClaude(): Claude & { calls: CallInfo[] } {
-  return mockClaude((info) =>
-    resolvedQuery({ action: "send", message: `Response to: ${info.prompt}`, actionReason: "user message" }),
+function defaultMockClaude(): Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] } {
+  return mockClaude(() =>
+    autoProcess({ action: "send", message: "Response", actionReason: "user message" }),
+  );
+}
+
+function sentPrompts(claude: { processes: ClaudeProcess<unknown>[] }): string[] {
+  return claude.processes.flatMap((p) =>
+    (p.send as ReturnType<typeof mock>).mock.calls.map((c: unknown[]) => c[0] as string),
   );
 }
 
@@ -121,18 +135,30 @@ function makeConfig(overrides?: Partial<AppConfig>): AppConfig {
     settingsDir: tmpSettingsDir,
     claude: defaultMockClaude(),
     stt: mockStt(),
+    healthCheckInterval: 0,
     ...overrides,
   };
 }
 
+function makeApp(overrides?: Partial<AppConfig>): App {
+  const app = new App(makeConfig(overrides));
+  activeApps.push(app);
+  return app;
+}
+
+function trackApp(app: App): App {
+  activeApps.push(app);
+  return app;
+}
+
 describe("App", () => {
   it("creates bot", () => {
-    const app = new App(makeConfig());
+    const app = makeApp();
     expect(app.bot).toBeDefined();
   });
 
   it("registers message:text, message:photo, message:document, message:voice, and callback_query:data handlers", () => {
-    const app = new App(makeConfig());
+    const app = makeApp();
     const bot = app.bot as any;
     expect(bot.filterHandlers.has("message:text")).toBe(true);
     expect(bot.filterHandlers.has("message:photo")).toBe(true);
@@ -141,16 +167,17 @@ describe("App", () => {
     expect(bot.filterHandlers.has("callback_query:data")).toBe(true);
   });
 
-  it("registers chatid, bg, and sessions commands", () => {
-    const app = new App(makeConfig());
+  it("registers chatid, bg, sessions, and clear commands", () => {
+    const app = makeApp();
     const bot = app.bot as any;
     expect(bot.commandHandlers.has("chatid")).toBe(true);
     expect(bot.commandHandlers.has("bg")).toBe(true);
     expect(bot.commandHandlers.has("sessions")).toBe(true);
+    expect(bot.commandHandlers.has("clear")).toBe(true);
   });
 
   it("registers error handler", () => {
-    const app = new App(makeConfig());
+    const app = makeApp();
     const bot = app.bot as any;
     expect(bot.errorHandler).not.toBeNull();
   });
@@ -158,33 +185,33 @@ describe("App", () => {
   describe("message handler", () => {
     it("routes messages from authorized chat to orchestrator", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
       handler({ chat: { id: 12345 }, message: { text: "hello" } });
       await new Promise((r) => setTimeout(r, 50));
 
-      const claude = config.claude as Claude & { calls: CallInfo[] };
-      expect(claude.calls[0].prompt).toContain("<text>hello</text>");
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
+      expect(sentPrompts(claude)[0]).toContain("<text>hello</text>");
     });
 
     it("ignores messages from unauthorized chats", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
       handler({ chat: { id: 99999 }, message: { text: "hello" } });
       await new Promise((r) => setTimeout(r, 50));
 
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
     });
 
     it("sends [No output] for empty claude response", async () => {
-      const claude = mockClaude(() => resolvedQuery({ action: "send", message: "", actionReason: "empty" }));
+      const claude = mockClaude(() => autoProcess({ action: "send", message: "", actionReason: "empty" }));
       const config = makeConfig({ claude });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
@@ -197,9 +224,9 @@ describe("App", () => {
     });
 
     it("skips sending when action is silent", async () => {
-      const claude = mockClaude(() => resolvedQuery({ action: "silent", actionReason: "no new results" }));
+      const claude = mockClaude(() => autoProcess({ action: "silent", actionReason: "no new results" }));
       const config = makeConfig({ claude });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
@@ -211,26 +238,25 @@ describe("App", () => {
 
     it("does not treat bg: prefix as special", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
       handler({ chat: { id: 12345 }, message: { text: "bg: research pricing" } });
       await new Promise((r) => setTimeout(r, 50));
 
-      const claude = config.claude as Claude & { calls: CallInfo[] };
-      expect(claude.calls[0].prompt).toContain("<text>bg: research pricing</text>");
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
+      expect(sentPrompts(claude)[0]).toContain("<text>bg: research pricing</text>");
     });
 
     it("sends error wrapped in response", async () => {
-      const claude = mockClaude((): RunningQuery<unknown> => ({
-        sessionId: "err-sid",
-        startedAt: new Date(),
-        result: Promise.reject(new QueryProcessError(1, "spawn failed")),
-        kill: mock(async () => {}),
-      }));
+      const claude = mockClaude((): ClaudeProcess<unknown> => {
+        const proc = autoProcess(null, "err-sid");
+        (proc as any).send = mock(async () => { throw new QueryProcessError(1, "spawn failed"); });
+        return proc;
+      });
       const config = makeConfig({ claude });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
@@ -250,7 +276,7 @@ describe("App", () => {
       ) as any;
 
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:photo")![0];
 
@@ -267,9 +293,9 @@ describe("App", () => {
       await new Promise((r) => setTimeout(r, 50));
 
       expect(bot.api.getFile).toHaveBeenCalledWith("large");
-      const claude = config.claude as Claude & { calls: CallInfo[] };
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
       expect(claude.calls).toHaveLength(1);
-      expect(claude.calls[0].prompt).toContain("<file path=");
+      expect(sentPrompts(claude)[0]).toContain("<file path=");
 
       globalThis.fetch = origFetch;
     });
@@ -281,7 +307,7 @@ describe("App", () => {
       ) as any;
 
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:document")![0];
 
@@ -295,16 +321,16 @@ describe("App", () => {
       await new Promise((r) => setTimeout(r, 50));
 
       expect(bot.api.getFile).toHaveBeenCalledWith("doc-id");
-      const claude = config.claude as Claude & { calls: CallInfo[] };
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
       expect(claude.calls).toHaveLength(1);
-      expect(claude.calls[0].prompt).toContain("<file path=");
+      expect(sentPrompts(claude)[0]).toContain("<file path=");
 
       globalThis.fetch = origFetch;
     });
 
     it("routes error message when photo download fails", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       bot.api.getFile = mock(async () => { throw new Error("too large"); });
       const handler = bot.filterHandlers.get("message:photo")![0];
@@ -315,14 +341,14 @@ describe("App", () => {
       });
       await new Promise((r) => setTimeout(r, 50));
 
-      const claude = config.claude as Claude & { calls: CallInfo[] };
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
       expect(claude.calls).toHaveLength(1);
-      expect(claude.calls[0].prompt).toContain("[File download failed: photo.jpg]");
+      expect(sentPrompts(claude)[0]).toContain("[File download failed: photo.jpg]");
     });
 
     it("routes error message when document download fails", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       bot.api.getFile = mock(async () => { throw new Error("too large"); });
       const handler = bot.filterHandlers.get("message:document")![0];
@@ -333,9 +359,9 @@ describe("App", () => {
       });
       await new Promise((r) => setTimeout(r, 50));
 
-      const claude = config.claude as Claude & { calls: CallInfo[] };
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
       expect(claude.calls).toHaveLength(1);
-      expect(claude.calls[0].prompt).toContain("[File download failed: huge.pdf]");
+      expect(sentPrompts(claude)[0]).toContain("[File download failed: huge.pdf]");
     });
 
     it("handles voice messages by transcribing and routing text to orchestrator", async () => {
@@ -346,7 +372,7 @@ describe("App", () => {
       mockTranscribe.mockImplementationOnce(async () => "hello from voice");
 
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:voice")![0];
 
@@ -361,9 +387,9 @@ describe("App", () => {
       expect(echoCall).toBeDefined();
       expect(echoCall[1]).toContain("hello from voice");
 
-      const claude = config.claude as Claude & { calls: CallInfo[] };
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
       expect(claude.calls).toHaveLength(1);
-      expect(claude.calls[0].prompt).toContain("<text>hello from voice</text>");
+      expect(sentPrompts(claude)[0]).toContain("<text>hello from voice</text>");
 
       globalThis.fetch = origFetch;
     });
@@ -376,7 +402,7 @@ describe("App", () => {
       mockTranscribe.mockImplementationOnce(async () => { throw new Error("API error"); });
 
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:voice")![0];
 
@@ -389,7 +415,7 @@ describe("App", () => {
       const sendCalls = (bot.api.sendMessage as any).mock.calls;
       const errorCall = sendCalls.find((c: any) => c[1].includes("[Failed to transcribe audio]"));
       expect(errorCall).toBeDefined();
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
 
       globalThis.fetch = origFetch;
     });
@@ -402,7 +428,7 @@ describe("App", () => {
       mockTranscribe.mockImplementationOnce(async () => "  ");
 
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:voice")![0];
 
@@ -415,14 +441,14 @@ describe("App", () => {
       const sendCalls = (bot.api.sendMessage as any).mock.calls;
       const emptyCall = sendCalls.find((c: any) => c[1].includes("[Could not understand audio]"));
       expect(emptyCall).toBeDefined();
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
 
       globalThis.fetch = origFetch;
     });
 
     it("ignores voice messages from unauthorized chats", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:voice")![0];
 
@@ -432,12 +458,12 @@ describe("App", () => {
       });
       await new Promise((r) => setTimeout(r, 50));
 
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
     });
 
     it("responds with unavailable message when stt is not configured", async () => {
       const config = makeConfig({ stt: undefined });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:voice")![0];
 
@@ -449,12 +475,12 @@ describe("App", () => {
       const sendCalls = (bot.api.sendMessage as any).mock.calls;
       const call = sendCalls.find((c: any) => c[1].includes("openaiApiKey"));
       expect(call).toBeDefined();
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
     });
 
     it("ignores photo messages from unauthorized chats", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:photo")![0];
 
@@ -464,21 +490,21 @@ describe("App", () => {
       });
       await new Promise((r) => setTimeout(r, 50));
 
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
     });
 
     it("sends outbound files before text message (onResponse delivery)", async () => {
       const tmpFile = `/tmp/macroclaw-test-outbound-${Date.now()}.png`;
       await Bun.write(tmpFile, "fake png");
 
-      const claude = mockClaude(() => resolvedQuery({
+      const claude = mockClaude(() => autoProcess({
         action: "send",
         message: "Here's your chart",
         actionReason: "ok",
         files: [tmpFile],
       }));
       const config = makeConfig({ claude });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
@@ -493,14 +519,14 @@ describe("App", () => {
     });
 
     it("passes buttons to sendResponse (onResponse delivery)", async () => {
-      const claude = mockClaude(() => resolvedQuery({
+      const claude = mockClaude(() => autoProcess({
         action: "send",
         message: "Choose one",
         actionReason: "ok",
         buttons: ["Yes", "No"],
       }));
       const config = makeConfig({ claude });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
@@ -514,7 +540,7 @@ describe("App", () => {
 
     it("handles callback_query by routing button event to orchestrator", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("callback_query:data")![0];
 
@@ -530,14 +556,14 @@ describe("App", () => {
 
       expect(ctx.answerCallbackQuery).toHaveBeenCalled();
       expect(ctx.editMessageReplyMarkup).toHaveBeenCalledWith({ reply_markup: { inline_keyboard: [[{ text: "✓ Yes", callback_data: "_noop" }]] } });
-      const claude = config.claude as Claude & { calls: CallInfo[] };
+      const claude = config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] };
       expect(claude.calls).toHaveLength(1);
-      expect(claude.calls[0].prompt).toContain('<button>Yes</button>');
+      expect(sentPrompts(claude)[0]).toContain('<button>Yes</button>');
     });
 
     it("handles _dismiss callback by removing reply markup", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("callback_query:data")![0];
 
@@ -553,12 +579,12 @@ describe("App", () => {
 
       expect(ctx.answerCallbackQuery).toHaveBeenCalled();
       expect(ctx.editMessageReplyMarkup).toHaveBeenCalledWith({ reply_markup: undefined });
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
     });
 
     it("handles detail: callback by routing to orchestrator.handleDetail", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("callback_query:data")![0];
 
@@ -581,7 +607,7 @@ describe("App", () => {
 
     it("handles peek: callback by routing to orchestrator.handlePeek", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("callback_query:data")![0];
 
@@ -604,7 +630,7 @@ describe("App", () => {
 
     it("handles kill: callback by routing to orchestrator.handleKill", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("callback_query:data")![0];
 
@@ -627,7 +653,7 @@ describe("App", () => {
 
     it("ignores callback_query from unauthorized chats", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("callback_query:data")![0];
 
@@ -642,18 +668,18 @@ describe("App", () => {
       await new Promise((r) => setTimeout(r, 50));
 
       expect(ctx.answerCallbackQuery).toHaveBeenCalled();
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
     });
 
     it("skips outbound files that don't exist", async () => {
-      const claude = mockClaude(() => resolvedQuery({
+      const claude = mockClaude(() => autoProcess({
         action: "send",
         message: "Done",
         actionReason: "ok",
         files: ["/tmp/nonexistent-xyz.png"],
       }));
       const config = makeConfig({ claude });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.filterHandlers.get("message:text")![0];
 
@@ -667,7 +693,7 @@ describe("App", () => {
 
   describe("commands", () => {
     it("/chatid replies with chat ID", () => {
-      const app = new App(makeConfig());
+      const app = makeApp();
       const bot = app.bot as any;
       const handler = bot.commandHandlers.get("chatid")!;
       const ctx = { chat: { id: 12345 }, reply: mock(() => {}) };
@@ -678,7 +704,7 @@ describe("App", () => {
 
     it("/bg without prompt sends usage hint", async () => {
       const config = makeConfig();
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.commandHandlers.get("bg")!;
       const ctx = { chat: { id: 12345 }, match: "" };
@@ -686,20 +712,23 @@ describe("App", () => {
       handler(ctx);
       await new Promise((r) => setTimeout(r, 50));
 
-      expect((config.claude as Claude & { calls: CallInfo[] }).calls).toHaveLength(0);
+      expect((config.claude as Claude & { calls: CallInfo[]; processes: ClaudeProcess<unknown>[] }).calls).toHaveLength(0);
       const calls = (bot.api.sendMessage as any).mock.calls;
       expect(calls[calls.length - 1][1]).toBe("Usage: /bg &lt;prompt&gt;");
     });
 
     it("/bg with prompt spawns a background agent via sendMessage", async () => {
-      const claude = mockClaude((): RunningQuery<unknown> => ({
-        sessionId: "bg-sid",
-        startedAt: new Date(),
-        result: new Promise(() => {}),
-        kill: mock(async () => {}),
-      }));
+      const claude = mockClaude((): ClaudeProcess<unknown> => {
+        return {
+          sessionId: "bg-sid",
+          startedAt: new Date(),
+          get state(): ProcessState { return "busy"; },
+          send: mock(async () => new Promise(() => {})),
+          kill: mock(async () => {}),
+        } as unknown as ClaudeProcess<unknown>;
+      });
       const config = makeConfig({ claude });
-      const app = new App(config);
+      const app = trackApp(new App(config));
       const bot = app.bot as any;
       const handler = bot.commandHandlers.get("bg")!;
       const ctx = { chat: { id: 12345 }, match: "research pricing" };
@@ -714,7 +743,7 @@ describe("App", () => {
     });
 
     it("/sessions lists running sessions via sendMessage", async () => {
-      const app = new App(makeConfig());
+      const app = makeApp();
       const bot = app.bot as any;
       const handler = bot.commandHandlers.get("sessions")!;
       const ctx = { chat: { id: 12345 } };
@@ -727,8 +756,34 @@ describe("App", () => {
       expect(text).toBe("No running sessions.");
     });
 
+    it("/clear sends confirmation", async () => {
+      const app = makeApp();
+      const bot = app.bot as any;
+      const handler = bot.commandHandlers.get("clear")!;
+      const ctx = { chat: { id: 12345 } };
+
+      handler(ctx);
+      await new Promise((r) => setTimeout(r, 50));
+
+      const calls = (bot.api.sendMessage as any).mock.calls;
+      const text = calls[calls.length - 1][1];
+      expect(text).toBe("Session cleared.");
+    });
+
+    it("/clear is ignored for unauthorized chats", async () => {
+      const app = makeApp();
+      const bot = app.bot as any;
+      const handler = bot.commandHandlers.get("clear")!;
+      const ctx = { chat: { id: 99999 } };
+
+      handler(ctx);
+      await new Promise((r) => setTimeout(r, 50));
+
+      expect((bot.api.sendMessage as any).mock.calls.length).toBe(0);
+    });
+
     it("/sessions is ignored for unauthorized chats", async () => {
-      const app = new App(makeConfig());
+      const app = makeApp();
       const bot = app.bot as any;
       const handler = bot.commandHandlers.get("sessions")!;
       const ctx = { chat: { id: 99999 } };
@@ -745,7 +800,7 @@ describe("App", () => {
 
   describe("error handler", () => {
     it("does not throw on bot errors", () => {
-      const app = new App(makeConfig());
+      const app = makeApp();
       const bot = app.bot as any;
 
       expect(() => bot.errorHandler({ message: "connection lost" })).not.toThrow();
@@ -754,12 +809,12 @@ describe("App", () => {
 
   describe("start", () => {
     it("starts the bot and logs info", () => {
-      const app = new App(makeConfig());
+      const app = makeApp();
       expect(() => app.start()).not.toThrow();
     });
 
     it("registers commands with Telegram on start", () => {
-      const app = new App(makeConfig());
+      const app = makeApp();
       const bot = app.bot as any;
 
       app.start();
@@ -767,6 +822,7 @@ describe("App", () => {
         { command: "chatid", description: "Show current chat ID" },
         { command: "bg", description: "Spawn a background agent" },
         { command: "sessions", description: "List running sessions" },
+        { command: "clear", description: "Clear session and start fresh" },
       ]);
     });
   });