talon-agent 1.9.0 → 1.9.2

package/src/__tests__/tool-id-coercion.test.ts

@@ -0,0 +1,136 @@
+/**
+ * Regression + audit tests — ID-shaped tool params use the strict
+ * shared `idSchema` from `core/tools/schemas.ts`.
+ *
+ * Background: some MCP transport / model paths deliver `message_id`,
+ * `user_id`, `reply_to`, `offset_id` as JSON strings ("2081") rather
+ * than numbers (2081). Plain `z.number()` rejects those with
+ * `expected number, received string`, which manifested as
+ * `react`/`pin_message`/`get_member_info`/`download_media` failing
+ * out of nowhere even when the model formatted the call correctly
+ * for a number-typed JSON Schema field.
+ *
+ * Initial fix used `z.coerce.number().int()`, but per Copilot review
+ * that was too lax — `""`/`null` coerce to 0 and `true` to 1, which
+ * then pass `.int()` and reach the bot API. The current `idSchema` is
+ * a union: `z.number().int().positive()` OR a digit-only string that
+ * gets transformed to a positive integer. Everything else is rejected.
+ */
+import { describe, it, expect } from "vitest";
+import { z } from "zod";
+import { ALL_TOOLS } from "../core/tools/index.js";
+
+const ID_FIELD_NAMES = new Set([
+  "message_id",
+  "user_id",
+  "reply_to",
+  "offset_id",
+]);
+
+function getIdSchema(toolName: string, field: string): z.ZodTypeAny {
+  const tool = ALL_TOOLS.find((t) => t.name === toolName);
+  if (!tool) throw new Error(`tool ${toolName} not found`);
+  const schema = (tool.schema as Record<string, z.ZodTypeAny>)[field];
+  if (!schema) throw new Error(`field ${field} not found on ${toolName}`);
+  return schema;
+}
+
+describe("ID-shaped tool params accept stringified numbers", () => {
+  // Spot-check a representative set across all four files.
+  const cases: Array<[string, string]> = [
+    ["react", "message_id"],
+    ["edit_message", "message_id"],
+    ["delete_message", "message_id"],
+    ["forward_message", "message_id"],
+    ["pin_message", "message_id"],
+    ["unpin_message", "message_id"],
+    ["stop_poll", "message_id"],
+    ["send", "reply_to"],
+    ["get_member_info", "user_id"],
+    ["create_sticker_set", "user_id"],
+    ["add_sticker_to_set", "user_id"],
+    ["read_chat_history", "offset_id"],
+    ["get_message_by_id", "message_id"],
+    ["download_media", "message_id"],
+  ];
+
+  for (const [tool, field] of cases) {
+    it(`${tool}.${field} accepts a number`, () => {
+      const s = getIdSchema(tool, field);
+      const out = s.parse(2081);
+      expect(out).toBe(2081);
+    });
+
+    it(`${tool}.${field} accepts a numeric string and coerces it`, () => {
+      const s = getIdSchema(tool, field);
+      const out = s.parse("2081");
+      expect(out).toBe(2081);
+    });
+
+    it(`${tool}.${field} rejects a non-numeric string`, () => {
+      const s = getIdSchema(tool, field);
+      expect(() => s.parse("abc")).toThrow();
+    });
+
+    it(`${tool}.${field} rejects a non-integer`, () => {
+      const s = getIdSchema(tool, field);
+      expect(() => s.parse(1.5)).toThrow();
+    });
+  }
+});
+
+describe("Audit: every ID-shaped field in tool schemas is the strict idSchema", () => {
+  /**
+   * For each ID field on every tool, this test asserts the full
+   * accept/reject contract of `idSchema` — not just "accepts a
+   * string." That guards against a future replacement that passes
+   * the loose check (`safeParse("123")` succeeds) but doesn't
+   * actually return a positive integer (e.g. `z.string()` would
+   * accept "123" and return the string "123").
+   */
+  for (const tool of ALL_TOOLS) {
+    const schema = tool.schema as Record<string, unknown>;
+    for (const field of Object.keys(schema)) {
+      if (!ID_FIELD_NAMES.has(field)) continue;
+      const zSchema = schema[field] as z.ZodTypeAny;
+
+      it(`${tool.name}.${field}: accepts a positive integer number`, () => {
+        const r = zSchema.safeParse(2081);
+        expect(r.success).toBe(true);
+        if (r.success) expect(r.data).toBe(2081);
+      });
+
+      it(`${tool.name}.${field}: accepts a digit string and returns a number`, () => {
+        const r = zSchema.safeParse("2081");
+        expect(r.success).toBe(true);
+        if (r.success) {
+          expect(typeof r.data).toBe("number");
+          expect(Number.isInteger(r.data as number)).toBe(true);
+          expect(r.data).toBe(2081);
+        }
+      });
+
+      // Reject the inputs that bare `z.coerce.number().int()` was too
+      // permissive about — empty/whitespace/null/booleans coerce to
+      // 0/0/0/1 and would pass `.int()`. The strict union rejects all.
+      const rejectCases: Array<[unknown, string]> = [
+        ["", "empty string"],
+        ["   ", "whitespace string"],
+        ["abc", "non-numeric string"],
+        ["2081abc", "mixed string"],
+        [null, "null"],
+        [true, "true"],
+        [false, "false"],
+        [0, "zero"],
+        [-1, "negative integer"],
+        [1.5, "non-integer"],
+      ];
+      for (const [bad, label] of rejectCases) {
+        it(`${tool.name}.${field}: rejects ${label}`, () => {
+          const r = zSchema.safeParse(bad);
+          expect(r.success).toBe(false);
+        });
+      }
+    }
+  }
+});

package/src/backend/claude-sdk/handler.ts

@@ -227,10 +227,9 @@ export async function handleMessage(
   // ── Build result ──────────────────────────────────────────────────────────
 
   state.allResponseText += state.currentBlockText;
-  const totalPrompt =
-    state.sdkInputTokens + state.sdkCacheRead + state.sdkCacheWrite;
+  const cacheTotal = state.sdkInputTokens + state.sdkCacheRead;
   const cacheHitPct =
-    totalPrompt > 0 ? Math.round((state.sdkCacheRead / totalPrompt) * 100) : 0;
+    cacheTotal > 0 ? Math.round((state.sdkCacheRead / cacheTotal) * 100) : 0;
 
   log(
     "agent",

package/src/core/constants.ts

@@ -21,6 +21,11 @@ export const DISALLOWED_TOOLS_CORE = [
   "TaskOutput",
   "TaskStop",
   "AskUserQuestion",
+  // ScheduleWakeup is a /loop-skill-only tool. Calling it outside /loop dynamic
+  // mode registers a wakeup the runtime never fires, leaving the dispatcher
+  // wedged with the chat lock held until manual restart. Confirmed root cause
+  // of a 35-minute hang on 2026-04-27 (talon.log [e2589f7e]).
+  "ScheduleWakeup",
 ] as const;
 
 /** Disallowed tools for background agents — dream and heartbeat (core + Agent). */

package/src/core/gateway.ts

@@ -267,9 +267,19 @@ export class Gateway {
           res.end(json);
         } catch (err) {
           if (res.headersSent) return;
-          const msg = err instanceof Error ? err.message : String(err);
+          // Log full error (incl. stack via logError's structured `stack`
+          // field) on the server; return a generic message to the client so
+          // we don't leak implementation details.
+          // CodeQL: js/stack-trace-exposure (alert #4).
+          logError(
+            "gateway",
+            `Unhandled error on ${req.method} ${req.url}`,
+            err,
+          );
           res.writeHead(500, { "Content-Type": "application/json" });
-          res.end(JSON.stringify({ ok: false, error: msg }));
+          res.end(
+            JSON.stringify({ ok: false, error: "Internal server error" }),
+          );
         }
       },
     );

package/src/core/tools/history.ts

@@ -4,6 +4,7 @@
 
 import { z } from "zod";
 import type { ToolDefinition } from "./types.js";
+import { idSchema } from "./schemas.js";
 
 export const historyTools: ToolDefinition[] = [
   {
@@ -19,7 +20,7 @@ export const historyTools: ToolDefinition[] = [
         .string()
         .optional()
         .describe("Fetch messages before this date (ISO format)"),
-      offset_id: z.number().optional().describe("Fetch before this message ID"),
+      offset_id: idSchema.optional().describe("Fetch before this message ID"),
     },
     execute: (params, bridge) =>
       bridge("read_history", {
@@ -58,7 +59,7 @@ export const historyTools: ToolDefinition[] = [
   {
     name: "get_message_by_id",
     description: "Get a specific message by ID.",
-    schema: { message_id: z.number() },
+    schema: { message_id: idSchema },
     execute: (params, bridge) => bridge("get_message_by_id", params),
     frontends: ["telegram"],
     tag: "history",
@@ -69,9 +70,9 @@ export const historyTools: ToolDefinition[] = [
     description:
       "Download a photo, document, or other media from a message by its ID. Saves the file to the workspace and returns the file path so you can read/analyze it. Use this when you see a [photo] or [document] in chat history but don't have the file.",
     schema: {
-      message_id: z
-        .number()
-        .describe("Message ID containing the media to download"),
+      message_id: idSchema.describe(
+        "Message ID containing the media to download",
+      ),
     },
     execute: (params, bridge) => bridge("download_media", params),
     frontends: ["telegram"],

package/src/core/tools/members.ts

@@ -4,6 +4,7 @@
 
 import { z } from "zod";
 import type { ToolDefinition } from "./types.js";
+import { idSchema } from "./schemas.js";
 
 export const memberTools: ToolDefinition[] = [
   {
@@ -19,7 +20,7 @@ export const memberTools: ToolDefinition[] = [
   {
     name: "get_member_info",
     description: "Get detailed info about a user by ID.",
-    schema: { user_id: z.number() },
+    schema: { user_id: idSchema },
     execute: (params, bridge) => bridge("get_member_info", params),
     frontends: ["telegram"],
     tag: "members",

package/src/core/tools/messaging.ts

@@ -4,6 +4,7 @@
 
 import { z } from "zod";
 import type { ToolDefinition } from "./types.js";
+import { idSchema } from "./schemas.js";
 
 export const messagingTools: ToolDefinition[] = [
   // ── Telegram unified send ─────────────────────────────────────────────
@@ -43,7 +44,7 @@ Examples:
         .string()
         .optional()
         .describe("Message text (for type=text). Supports Markdown."),
-      reply_to: z.number().optional().describe("Message ID to reply to"),
+      reply_to: idSchema.optional().describe("Message ID to reply to"),
       file_path: z
         .string()
         .optional()
@@ -227,7 +228,7 @@ Example: send_message_with_buttons(text="Choose:", rows=[[{"text":"Docs","url":"
     description:
       "Add an emoji reaction to a message. Valid: 👍 👎 ❤ 🔥 🥰 👏 😁 🤔 🤯 😱 🤬 😢 🎉 🤩 🤮 💩 🙏 👌 🕊 🤡 🥱 🥴 😍 🐳 ❤‍🔥 🌚 🌭 💯 🤣 ⚡ 🍌 🏆 💔 🤨 😐 🍓 🍾 💋 🖕 😈 😴 😭 🤓 👻 👨‍💻 👀 🎃 🙈 😇 😨 🤝 ✍ 🤗 🫡 🎅 🎄 ☃ 💅 🤪 🗿 🆒 💘 🙉 🦄 😘 💊 🙊 😎 👾 🤷 🤷‍♂ 🤷‍♀ 😡",
     schema: {
-      message_id: z.number().describe("Message ID"),
+      message_id: idSchema.describe("Message ID"),
       emoji: z.string().describe("Reaction emoji"),
     },
     execute: (params, bridge) => bridge("react", params),
@@ -239,7 +240,7 @@ Example: send_message_with_buttons(text="Choose:", rows=[[{"text":"Docs","url":"
   {
     name: "edit_message",
     description: "Edit a previously sent message.",
-    schema: { message_id: z.number(), text: z.string() },
+    schema: { message_id: idSchema, text: z.string() },
     execute: (params, bridge) => bridge("edit_message", params),
     frontends: ["telegram"],
     tag: "messaging",
@@ -249,7 +250,7 @@ Example: send_message_with_buttons(text="Choose:", rows=[[{"text":"Docs","url":"
   {
     name: "delete_message",
     description: "Delete a message.",
-    schema: { message_id: z.number() },
+    schema: { message_id: idSchema },
     execute: (params, bridge) => bridge("delete_message", params),
     frontends: ["telegram"],
     tag: "messaging",
@@ -259,7 +260,7 @@ Example: send_message_with_buttons(text="Choose:", rows=[[{"text":"Docs","url":"
   {
     name: "forward_message",
     description: "Forward a message within the chat.",
-    schema: { message_id: z.number() },
+    schema: { message_id: idSchema },
     execute: (params, bridge) => bridge("forward_message", params),
     frontends: ["telegram"],
     tag: "messaging",
@@ -269,7 +270,7 @@ Example: send_message_with_buttons(text="Choose:", rows=[[{"text":"Docs","url":"
   {
     name: "pin_message",
     description: "Pin a message.",
-    schema: { message_id: z.number() },
+    schema: { message_id: idSchema },
     execute: (params, bridge) => bridge("pin_message", params),
     frontends: ["telegram"],
     tag: "messaging",
@@ -279,7 +280,7 @@ Example: send_message_with_buttons(text="Choose:", rows=[[{"text":"Docs","url":"
   {
     name: "unpin_message",
     description: "Unpin a message.",
-    schema: { message_id: z.number().optional() },
+    schema: { message_id: idSchema.optional() },
     execute: (params, bridge) => bridge("unpin_message", params),
     frontends: ["telegram"],
     tag: "messaging",
@@ -291,7 +292,7 @@ Example: send_message_with_buttons(text="Choose:", rows=[[{"text":"Docs","url":"
     description:
       "Stop an active poll and get the final results. Returns vote counts for each option.",
     schema: {
-      message_id: z.number().describe("Message ID of the poll to stop"),
+      message_id: idSchema.describe("Message ID of the poll to stop"),
     },
     execute: (params, bridge) => bridge("stop_poll", params),
     frontends: ["telegram"],

package/src/core/tools/schemas.ts

@@ -0,0 +1,34 @@
+/**
+ * Shared zod schema fragments for tool input definitions.
+ */
+
+import { z } from "zod";
+
+/**
+ * Telegram-style positive integer ID (message_id, user_id, reply_to,
+ * offset_id, etc.).
+ *
+ * Accepts:
+ *   - actual numbers that are positive integers (`2081`)
+ *   - digit-only strings (`"2081"`) which are transformed into numbers
+ *
+ * Rejects:
+ *   - non-numeric strings (`"abc"`, `"2081abc"`, `""`, `"   "`)
+ *   - booleans, `null`, `undefined` (would otherwise coerce to 0/1)
+ *   - non-integer numbers (`1.5`)
+ *   - zero and negatives
+ *
+ * Use this instead of `z.number()` or `z.coerce.number()` for any ID
+ * field on tool input schemas. The plain coercion path was too lax —
+ * `z.coerce.number().int()` happily turns `null`/`""` into `0` and
+ * `true` into `1`, both of which the Telegram bot API would then
+ * dispatch to. The strict union avoids that.
+ */
+export const idSchema = z.union([
+  z.number().int().positive(),
+  z
+    .string()
+    .regex(/^\d+$/, "must be a positive integer")
+    .transform((s) => Number(s))
+    .pipe(z.number().int().positive()),
+]);

package/src/core/tools/stickers.ts

@@ -4,6 +4,7 @@
 
 import { z } from "zod";
 import type { ToolDefinition } from "./types.js";
+import { idSchema } from "./schemas.js";
 
 export const stickerTools: ToolDefinition[] = [
   {
@@ -56,7 +57,7 @@ The set name will automatically get "_by_<botname>" appended if needed.
 
 Example: create_sticker_set(user_id=123, name="cool_pack", title="Cool Stickers", file_path="/path/to/sticker.png", emoji_list=["😎"])`,
     schema: {
-      user_id: z.number().describe("Telegram user ID who will own the pack"),
+      user_id: idSchema.describe("Telegram user ID who will own the pack"),
       name: z
         .string()
         .describe(
@@ -85,7 +86,7 @@ Example: create_sticker_set(user_id=123, name="cool_pack", title="Cool Stickers"
     description:
       "Add a new sticker to an existing sticker pack created by the bot.",
     schema: {
-      user_id: z.number().describe("Telegram user ID who owns the pack"),
+      user_id: idSchema.describe("Telegram user ID who owns the pack"),
       name: z.string().describe("Sticker set name (including _by_<botname>)"),
       file_path: z.string().describe("Path to the sticker image file"),
       emoji_list: z

package/src/frontend/telegram/commands.ts

@@ -529,10 +529,9 @@ export function registerCommands(
       "\u2588".repeat(filled) + "\u2591".repeat(barLen - filled);
     const contextWarn = ctxPct >= 80 ? " \u26A0\uFE0F consider /reset" : "";
 
-    const totalPrompt =
-      displayInputTokens + displayCacheRead + displayCacheWrite;
+    const cacheTotal = displayInputTokens + displayCacheRead;
     const cacheHitPct =
-      totalPrompt > 0 ? Math.round((displayCacheRead / totalPrompt) * 100) : 0;
+      cacheTotal > 0 ? Math.round((displayCacheRead / cacheTotal) * 100) : 0;
 
     const avgResponseMs =
       info.turns > 0 && u.totalResponseMs

package/src/frontend/telegram/handlers.ts

@@ -8,10 +8,6 @@ import type { TalonConfig } from "../../util/config.js";
 import { markdownToTelegramHtml, escapeHtml } from "./formatting.js";
 import { execute } from "../../core/dispatcher.js";
 import { classify, friendlyMessage } from "../../core/errors.js";
-import {
-  enrichDMPrompt,
-  enrichGroupPrompt,
-} from "../../core/prompt-builder.js";
 import { writeFileSync, mkdirSync, existsSync } from "node:fs";
 import { resolve } from "node:path";
 import {
@@ -759,19 +755,15 @@ async function processAndReply(params: ProcessAndReplyParams): Promise<void> {
       stream,
     );
 
-    // Enrich prompt with sender context
-    let enrichedPrompt = prompt;
-    if (!isGroup && senderName) {
-      enrichedPrompt = enrichDMPrompt(prompt, senderName, senderUsername);
-      if (senderId) trackDmUser(senderId, senderName, senderUsername);
-    } else if (isGroup && senderId) {
-      enrichedPrompt = enrichGroupPrompt(prompt, String(chatId), senderId);
+    // Track first-time DM users for logging (no prompt mutation).
+    if (!isGroup && senderName && senderId) {
+      trackDmUser(senderId, senderName, senderUsername);
     }
 
     const result = await execute({
       chatId: String(chatId),
       numericChatId,
-      prompt: enrichedPrompt,
+      prompt,
       senderName,
       isGroup,
       messageId,

package/src/util/log.ts

@@ -128,7 +128,10 @@ export function logError(
   err?: unknown,
 ): void {
   if (err instanceof Error) {
-    logger.error({ component, err: err.message }, message);
+    // Capture both the concise message (for log consumers that look at `err`)
+    // and the full stack (for diagnostics). pino-pretty renders the `stack`
+    // field on its own line; JSON consumers can read either field.
+    logger.error({ component, err: err.message, stack: err.stack }, message);
   } else if (err !== undefined) {
     logger.error({ component, err: String(err) }, message);
   } else {