switchroom 0.15.45 → 0.16.5

package/telegram-plugin/dist/server.js

@@ -17237,6 +17237,23 @@ function extractToolResultErrorText(content) {
   }
   return "";
 }
+function projectAssistantTextBlocks(content, make) {
+  const out = new Map;
+  let lastToolUseIdx = -1;
+  content.forEach((c, i) => {
+    if (c.type === "tool_use")
+      lastToolUseIdx = i;
+  });
+  content.forEach((c, i) => {
+    if (c.type !== "text")
+      return;
+    const text = c.text ?? "";
+    if (text.trim().length === 0)
+      return;
+    out.set(i, make(text, i, i > lastToolUseIdx));
+  });
+  return out;
+}
 function projectTranscriptLine(line) {
   if (line.length > MAX_JSONL_LINE_BYTES)
     return [];
@@ -17267,7 +17284,8 @@ function projectTranscriptLine(line) {
     if (!Array.isArray(content))
       return [];
     const events = [];
-    for (const c of content) {
+    const textEvents = projectAssistantTextBlocks(content, (text, blockIndex, lastInMessage) => ({ kind: "text", text, blockIndex, lastInMessage }));
+    content.forEach((c, i) => {
       const ct = c.type;
       if (ct === "thinking") {
         events.push({ kind: "thinking" });
@@ -17280,10 +17298,11 @@ function projectTranscriptLine(line) {
           input: input && typeof input === "object" ? input : undefined
         });
       } else if (ct === "text") {
-        const text = c.text ?? "";
-        events.push({ kind: "text", text });
+        const ev = textEvents.get(i);
+        if (ev != null)
+          events.push(ev);
       }
-    }
+    });
     return events;
   }
   if (type === "user") {
@@ -17367,7 +17386,14 @@ function projectSubagentLine(line, agentId, state) {
     if (!Array.isArray(content))
       return [];
     const events = [];
-    for (const c of content) {
+    const textEvents = projectAssistantTextBlocks(content, (text, blockIndex, lastInMessage) => ({
+      kind: "sub_agent_text",
+      agentId,
+      text,
+      blockIndex,
+      lastInMessage
+    }));
+    content.forEach((c, i) => {
       const ct = c.type;
       if (ct === "tool_use") {
         const name = c.name ?? "";
@@ -17383,10 +17409,11 @@ function projectSubagentLine(line, agentId, state) {
           });
         }
       } else if (ct === "text") {
-        const text = c.text ?? "";
-        events.push({ kind: "sub_agent_text", agentId, text });
+        const ev = textEvents.get(i);
+        if (ev != null)
+          events.push(ev);
       }
-    }
+    });
     const stopReason = message?.stop_reason;
     if (stopReason === "end_turn") {
       events.push({ kind: "sub_agent_turn_end", agentId });
@@ -24074,10 +24101,26 @@ import { basename as basename2 } from "node:path";
 function resolveSkillName(input) {
   return readString(input, "skill") ?? readString(input, "skill_name") ?? readString(input, "skillName") ?? readString(input, "name") ?? skillBasenameFromPath(input);
 }
-function filePathFrom(input) {
-  if (!input)
+function filePathFrom(input, rawPreview) {
+  if (input) {
+    const p = readString(input, "file_path") ?? readString(input, "notebook_path");
+    if (p)
+      return p;
+  }
+  if (rawPreview)
+    return extractFilePathFromRaw(rawPreview);
+  return null;
+}
+function extractFilePathFromRaw(raw) {
+  const m = /"(?:file_path|notebook_path)"\s*:\s*"((?:[^"\\]|\\.)*)"/.exec(raw);
+  if (!m)
     return null;
-  return readString(input, "file_path") ?? readString(input, "notebook_path");
+  try {
+    const value = JSON.parse(`"${m[1]}"`);
+    return typeof value === "string" && value.length > 0 ? value : null;
+  } catch {
+    return null;
+  }
 }
 function bashFirstToken(command) {
   const m = /^\s*([^\s|&;<>()`$]+)/.exec(command);
@@ -24142,7 +24185,7 @@ function matchesAllowRule(rule, toolName, inputPreview) {
       return bashFirstToken(cmd) === m[1];
     }
     if (FILE_TOOLS.has(ruleTool)) {
-      return filePathFrom(input) === arg;
+      return filePathFrom(input, inputPreview) === arg;
     }
     return false;
   }

package/telegram-plugin/docs/waiting-ux-spec.md

@@ -1,7 +1,7 @@
 # Waiting-for-reply UX — v2 spec (three-class contract)
 
-Tracks: [#545](https://github.com/mekenthompson/switchroom/issues/545),
-[#553](https://github.com/mekenthompson/switchroom/issues/553) (PR series),
+Tracks: [#545](https://github.com/switchroom/switchroom/issues/545),
+[#553](https://github.com/switchroom/switchroom/issues/553) (PR series),
 [#1713](https://github.com/switchroom/switchroom/issues/1713)
 (reflective status-reaction restoration)