macroclaw 0.29.0 → 0.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macroclaw",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "Telegram-to-Claude-Code bridge",
   "license": "MIT",
   "type": "module",

package/src/orchestrator.test.ts

@@ -775,6 +775,33 @@ describe("Orchestrator", () => {
       const detailResponse = responses[responses.length - 1];
       expect(detailResponse.message).toContain("Model: opus");
     });
+
+    it("shows clean prompt text for main sessions, not XML wrapper", async () => {
+      const claude = mockClaude((): RunningQuery<unknown> => ({
+        sessionId: "main-sid",
+        startedAt: new Date(),
+        result: new Promise(() => {}),
+        kill: mock(async () => {}),
+      }));
+      const { orch, responses } = makeOrchestrator(claude);
+
+      orch.handleMessage("I want to visit my parents at their house");
+      await waitForProcessing(); // Let the queue process and start the main query
+
+      orch.handleSessions();
+      await waitForProcessing();
+      const listResponse = responses[responses.length - 1];
+      const detailBtn = listResponse.buttons![0] as { text: string; data: string };
+      const sessionId = detailBtn.data.slice(7);
+
+      orch.handleDetail(sessionId);
+      await waitForProcessing();
+
+      const detailResponse = responses[responses.length - 1];
+      expect(detailResponse.message).toContain("I want to visit my parents");
+      expect(detailResponse.message).not.toContain("<event");
+      expect(detailResponse.message).not.toContain("<text>");
+    });
   });
 
   describe("handleKill", () => {

package/src/orchestrator.ts

@@ -283,9 +283,9 @@ export class Orchestrator {
     const label = Orchestrator.#requestLabel(request);
     const name = generateName(label);
     const backgroundedName = movedToBackground ? mainInfo?.name : undefined;
-    const prompt = this.#formatPrompt(request, name, backgroundedName);
+    const formatted = this.#formatPrompt(request, name, backgroundedName);
 
-    this.#startMainQuery(name, prompt, this.#config.model);
+    this.#startMainQuery(name, label, formatted, this.#config.model);
   }
 
   // --- Response delivery ---
@@ -319,20 +319,20 @@ export class Orchestrator {
 
   // --- Main session query ---
 
-  #startMainQuery(name: string, prompt: string, model: string | undefined): void {
+  #startMainQuery(name: string, displayPrompt: string, formatted: string, model: string | undefined): void {
     const opts = { model };
     let query: RunningQuery<AgentOutput>;
 
     if (this.#mainSessionId && this.#runningSessions.has(this.#mainSessionId)) {
-      query = this.#claude.forkSession(this.#mainSessionId, prompt, responseResultType, opts);
+      query = this.#claude.forkSession(this.#mainSessionId, formatted, responseResultType, opts);
     } else if (this.#mainSessionId) {
-      query = this.#claude.resumeSession(this.#mainSessionId, prompt, responseResultType, opts);
+      query = this.#claude.resumeSession(this.#mainSessionId, formatted, responseResultType, opts);
     } else {
-      query = this.#claude.newSession(prompt, responseResultType, opts);
+      query = this.#claude.newSession(formatted, responseResultType, opts);
     }
 
     const sid = query.sessionId;
-    this.#runningSessions.set(sid, { name, prompt, model, query, lastMessageAt: new Date() });
+    this.#runningSessions.set(sid, { name, prompt: displayPrompt, model, query, lastMessageAt: new Date() });
 
     if (sid !== this.#mainSessionId) {
       log.info({ oldSessionId: this.#mainSessionId, newSessionId: sid }, "Session updated");