@cydm/pie 2.6.4 → 2.6.5

package/dist/builtin/extensions/ask-user/index.js

@@ -1,9 +1,9 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createAskUserCapability
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-QKSK5K5N.js";
+import "../../../chunks/chunk-AETQBDEG.js";
+import "../../../chunks/chunk-5OXH6NUH.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

package/dist/builtin/extensions/mcp-adapter/index.js

@@ -24461,6 +24461,72 @@ function redactSecrets(text, secrets) {
   }
   return sanitized;
 }
+function encodedSecretVariants(secrets) {
+  const variants = [...secrets];
+  for (const secret of secrets) {
+    if (secret.length < 4) continue;
+    try {
+      const base642 = Buffer.from(secret, "utf-8").toString("base64");
+      if (base642.length >= 4) {
+        variants.push(base642);
+        const base64url2 = Buffer.from(secret, "utf-8").toString("base64url");
+        if (base64url2 !== base642 && base64url2.length >= 4) variants.push(base64url2);
+      }
+      const urlEncoded = encodeURIComponent(secret);
+      if (urlEncoded !== secret && urlEncoded.length >= 4) variants.push(urlEncoded);
+    } catch {
+    }
+  }
+  return variants;
+}
+function hexSecretVariants(secrets) {
+  const variants = [];
+  for (const secret of secrets) {
+    if (secret.length < 6) continue;
+    try {
+      const hex = Buffer.from(secret, "utf-8").toString("hex");
+      if (hex.length >= 12) variants.push(hex);
+    } catch {
+    }
+  }
+  return variants;
+}
+var MIN_SECRET_FRAGMENT = 8;
+function redactSecretFragments(text, secrets) {
+  const candidates = secrets.filter((secret) => secret.length >= MIN_SECRET_FRAGMENT);
+  if (candidates.length === 0 || text.length < MIN_SECRET_FRAGMENT) return text;
+  const grams = /* @__PURE__ */ new Map();
+  for (const secret of candidates) {
+    for (let offset = 0; offset + MIN_SECRET_FRAGMENT <= secret.length; offset++) {
+      const gram = secret.slice(offset, offset + MIN_SECRET_FRAGMENT);
+      const bucket = grams.get(gram);
+      if (bucket) bucket.push({ secret, offset });
+      else grams.set(gram, [{ secret, offset }]);
+    }
+  }
+  let out = "";
+  let index = 0;
+  while (index < text.length) {
+    const bucket = grams.get(text.slice(index, index + MIN_SECRET_FRAGMENT));
+    let best = 0;
+    if (bucket) {
+      for (const { secret, offset } of bucket) {
+        let length = MIN_SECRET_FRAGMENT;
+        const maxLength = Math.min(secret.length - offset, text.length - index);
+        while (length < maxLength && text[index + length] === secret[offset + length]) length += 1;
+        if (length > best) best = length;
+      }
+    }
+    if (best > 0) {
+      out += "[redacted]";
+      index += best;
+    } else {
+      out += text[index];
+      index += 1;
+    }
+  }
+  return out;
+}
 function redactLeadingSecretSuffix(text, secrets) {
   if (secrets.length === 0 || text.length === 0) return text;
   for (const secret of secrets) {
@@ -24483,13 +24549,26 @@ function redactTrailingSecretPrefix(text, secrets) {
   }
   return text;
 }
+function redactAllSecrets(text, secrets) {
+  const encoded = encodedSecretVariants(secrets);
+  const wholeVariants = [...encoded, ...hexSecretVariants(secrets)];
+  return redactTrailingSecretPrefix(
+    redactLeadingSecretSuffix(
+      redactSecretFragments(redactSecrets(text, wholeVariants), encoded),
+      secrets
+    ),
+    secrets
+  );
+}
 function redactStderrTail(tail, secrets) {
-  return redactTrailingSecretPrefix(redactLeadingSecretSuffix(redactSecrets(tail, secrets), secrets), secrets);
+  return redactAllSecrets(tail, secrets);
 }
 function sanitizeDiagnostic(text, secrets) {
-  const sanitized = redactLeadingSecretSuffix(redactSecrets(text, secrets), secrets);
+  let sanitized = redactAllSecrets(text, secrets);
   if (sanitized.length > DIAGNOSTIC_TEXT_LIMIT) {
-    return `${sanitized.slice(0, DIAGNOSTIC_TEXT_LIMIT)}\u2026[truncated ${sanitized.length - DIAGNOSTIC_TEXT_LIMIT} chars]`;
+    const omitted = sanitized.length - DIAGNOSTIC_TEXT_LIMIT;
+    sanitized = redactAllSecrets(sanitized.slice(0, DIAGNOSTIC_TEXT_LIMIT), secrets);
+    return `${sanitized}\u2026[truncated ${omitted} chars]`;
   }
   return sanitized;
 }
@@ -24589,6 +24668,17 @@ var McpServerManager = class {
         );
       }
     }
+    const byLowercase = /* @__PURE__ */ new Map();
+    for (const key of this.definitions.keys()) {
+      const lower = key.toLowerCase();
+      byLowercase.set(lower, [...byLowercase.get(lower) ?? [], key]);
+    }
+    const caseClashes = [...byLowercase.entries()].filter(([, keys]) => keys.length > 1).map(([, keys]) => keys.map((key) => `"${key}"`).join(" and "));
+    if (caseClashes.length > 0) {
+      throw new Error(
+        `MCP server names collide case-insensitively (their cache shard files share one name on macOS/Windows): ${caseClashes.join("; ")}. Rename one of them.`
+      );
+    }
     this.cacheDir = cacheDir;
     this.log = log;
   }

package/dist/builtin/extensions/plan-mode/index.js

@@ -7,9 +7,9 @@ import {
   isPlanModeSafeCommand,
   markCompletedPlanSteps,
   restoreExecutionState
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-QKSK5K5N.js";
+import "../../../chunks/chunk-AETQBDEG.js";
+import "../../../chunks/chunk-5OXH6NUH.js";
 import {
   Type
 } from "../../../chunks/chunk-XXGYUYXI.js";

package/dist/builtin/extensions/subagent/index.js

@@ -1,13 +1,13 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createCliHostCapabilities
-} from "../../../chunks/chunk-6QEDYZUR.js";
+} from "../../../chunks/chunk-TFRQE7UQ.js";
 import {
   createSharedFileSystemTools,
   createSubagentCapability
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-QKSK5K5N.js";
+import "../../../chunks/chunk-AETQBDEG.js";
+import "../../../chunks/chunk-5OXH6NUH.js";
 import "../../../chunks/chunk-5353DEEC.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";

package/dist/builtin/extensions/todo/index.js

@@ -8,9 +8,9 @@ import {
   executeManageTodoList,
   executionStateToTodos,
   restoreExecutionState
-} from "../../../chunks/chunk-3AOMWS2Z.js";
-import "../../../chunks/chunk-YEUBQBOB.js";
-import "../../../chunks/chunk-OCEYHWVX.js";
+} from "../../../chunks/chunk-QKSK5K5N.js";
+import "../../../chunks/chunk-AETQBDEG.js";
+import "../../../chunks/chunk-5OXH6NUH.js";
 import "../../../chunks/chunk-XXGYUYXI.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";
 

package/dist/builtin/skills/chrome-devtools-axi/chrome-devtools-axi-runtime.js

@@ -21,6 +21,6 @@ function tryFastPath(argv, options) {
 
 // vendor/chrome-devtools-axi/bin/chrome-devtools-axi.ts
 if (!tryFastPath(process.argv.slice(2), { version: VERSION })) {
-  const { main } = await import("./cli-GB37NZHQ.js");
+  const { main } = await import("./cli-5Z4COIKQ.js");
   await main(process.argv.slice(2));
 }

package/dist/builtin/skills/chrome-devtools-axi/{cli-GB37NZHQ.js → cli-5Z4COIKQ.js}

@@ -1934,6 +1934,45 @@ async function waitForProcessExit(pid, timeoutMs) {
   }
   return !isProcessAlive(pid);
 }
+function splitCommandLine(command) {
+  const tokens = [];
+  let current = "";
+  let quote = null;
+  for (const char of command.trim()) {
+    if (quote !== null) {
+      if (char === quote) quote = null;
+      else current += char;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      continue;
+    }
+    if (/\s/.test(char)) {
+      if (current.length > 0) {
+        tokens.push(current);
+        current = "";
+      }
+      continue;
+    }
+    current += char;
+  }
+  if (current.length > 0) tokens.push(current);
+  return tokens;
+}
+function commandLineLooksLikeBridge(command) {
+  const tokens = splitCommandLine(command);
+  if (tokens.length === 0) return false;
+  if (!/(?:^|[\\/])(node|npx|tsx)(?:\.(?:exe|cmd))?$/i.test(tokens[0])) return false;
+  for (let index = 1; index < tokens.length; index++) {
+    const token = tokens[index];
+    if (token.startsWith("-")) continue;
+    if (/(?:^|[\\/])tsx(?:\.(?:exe|cmd))?$/i.test(token)) continue;
+    const base = token.split(/[\\/]/).pop() ?? token;
+    return /^chrome-devtools-axi-bridge\.(?:js|mjs|cjs|ts)$/i.test(base);
+  }
+  return false;
+}
 function isBridgeProcess(pid) {
   if (process.platform === "win32") {
     try {
@@ -1947,7 +1986,7 @@ function isBridgeProcess(pid) {
         ],
         { encoding: "utf-8", timeout: 4e3 }
       );
-      return command.includes("chrome-devtools-axi-bridge");
+      return commandLineLooksLikeBridge(command);
     } catch {
       return false;
     }
@@ -1957,7 +1996,7 @@ function isBridgeProcess(pid) {
       encoding: "utf-8",
       timeout: 1e3
     });
-    return command.includes("chrome-devtools-axi-bridge");
+    return commandLineLooksLikeBridge(command);
   } catch {
     return false;
   }
@@ -1983,15 +2022,17 @@ async function judgeRecordedBridge(pidInfo, sessionName) {
   if (probe.identity === "own") {
     if (probe.reportedPid !== void 0) {
       if (probe.reportedPid === pidInfo.pid) {
+        const verified = isBridgeProcess(pidInfo.pid);
         return {
-          terminate: true,
-          killProcessGroup: isBridgeProcess(pidInfo.pid),
+          terminate: verified,
+          killProcessGroup: verified,
           targetPid: pidInfo.pid
         };
       }
+      const reportedIsBridge = isBridgeProcess(probe.reportedPid);
       return {
-        terminate: true,
-        killProcessGroup: isBridgeProcess(probe.reportedPid),
+        terminate: reportedIsBridge,
+        killProcessGroup: reportedIsBridge,
         targetPid: probe.reportedPid
       };
     }

package/dist/chunks/{chunk-OCEYHWVX.js → chunk-5OXH6NUH.js}

@@ -1755,6 +1755,7 @@ var NodeHttpClient = class {
             let done = false;
             let error = null;
             let waiting = null;
+            let consumerClosed = false;
             const wake = (value) => {
               if (!waiting) return;
               const w = waiting;
@@ -1840,6 +1841,7 @@ var NodeHttpClient = class {
               failStream(requestTimeoutError ?? new Error("SSE stream aborted"));
             });
             res.on("close", () => {
+              if (consumerClosed) return;
               if (!done || !res.complete) {
                 failStream(requestTimeoutError ?? new Error("SSE stream closed before end"));
               }
@@ -1865,6 +1867,7 @@ var NodeHttpClient = class {
                 void waitResult;
               }
             } finally {
+              consumerClosed = true;
               if (signal && abortHandler) {
                 signal.removeEventListener("abort", abortHandler);
               }
@@ -2524,9 +2527,19 @@ var FileSystemGateway = class {
     const recursive = options?.recursive ?? true;
     const platform = detectPlatform();
     if (platform === "puerts" && typeof CS !== "undefined") {
-      if (CS.System.IO.Directory.Exists(path)) {
+      if (!CS.System.IO.Directory.Exists(path)) {
+        return;
+      }
+      if (typeof CS.System.IO.Directory.Delete === "function") {
         CS.System.IO.Directory.Delete(path, recursive);
+        return;
+      }
+      const info = new CS.System.IO.DirectoryInfo(path);
+      if (info && typeof info.Delete === "function") {
+        info.Delete(recursive);
+        return;
       }
+      deletePuertsDirectoryByEnumeration(path, recursive);
       return;
     }
     const fs = nodeRequire("fs");
@@ -2549,9 +2562,20 @@ var FileSystemGateway = class {
         throw new Error(`Directory not found: ${source}`);
       }
       if (CS.System.IO.Directory.Exists(destination)) {
-        throw new Error(`Move target already exists: ${destination}`);
+        const destinationFiles = Array.from(CS.System.IO.Directory.GetFiles(destination) ?? []);
+        const destinationDirs = Array.from(CS.System.IO.Directory.GetDirectories(destination) ?? []);
+        const isEmpty = destinationFiles.length === 0 && destinationDirs.length === 0;
+        if (!isEmpty) {
+          throw new Error(`Move target already exists: ${destination}`);
+        }
+        movePuertsDirectoryContents(source, destination);
+        return;
+      }
+      if (typeof CS.System.IO.Directory.Move === "function") {
+        CS.System.IO.Directory.Move(source, destination);
+      } else {
+        new CS.System.IO.DirectoryInfo(source).MoveTo(destination);
       }
-      CS.System.IO.Directory.Move(source, destination);
       return;
     }
     const fs = nodeRequire("fs");
@@ -2671,6 +2695,83 @@ var FileSystemGateway = class {
     return this.config;
   }
 };
+function movePuertsDirectoryContents(source, destination) {
+  const directory = CS.System.IO.Directory;
+  const file = CS.System.IO.File;
+  if (typeof directory.GetFiles !== "function" || typeof directory.GetDirectories !== "function" || typeof directory.CreateDirectory !== "function" || typeof file.Copy !== "function") {
+    throw new Error(
+      `Host filesystem binding cannot move onto existing directory '${destination}': directory enumeration/copy is unavailable`
+    );
+  }
+  if (isPuertsReparsePoint(source) || isPuertsReparsePoint(destination)) {
+    throw new Error(
+      `Refusing to move '${source}' through a reparse point (symlink/junction); resolve the link or delete it first`
+    );
+  }
+  directory.CreateDirectory(destination);
+  for (const entry of Array.from(directory.GetFiles(source) ?? [])) {
+    const name = String(entry).replace(/\\/g, "/").split("/").pop();
+    file.Copy(String(entry), `${destination}/${name}`, true);
+  }
+  for (const subdir of Array.from(directory.GetDirectories(source) ?? [])) {
+    const name = String(subdir).replace(/\\/g, "/").split("/").pop();
+    if (isPuertsReparsePoint(String(subdir))) continue;
+    movePuertsDirectoryContents(String(subdir), `${destination}/${name}`);
+  }
+  for (const entry of Array.from(directory.GetFiles(source) ?? [])) {
+    try {
+      file.Delete(String(entry));
+    } catch {
+    }
+  }
+}
+var warnedMissingPuertsGetAttributes = false;
+function isPuertsReparsePoint(path) {
+  const file = CS.System.IO.File;
+  if (typeof file.GetAttributes !== "function") {
+    if (!warnedMissingPuertsGetAttributes) {
+      warnedMissingPuertsGetAttributes = true;
+      try {
+        console.warn(
+          "[platform] File.GetAttributes is unbound on this host; directory symlink checks are disabled (move/delete follow links)"
+        );
+      } catch {
+      }
+    }
+    return false;
+  }
+  try {
+    const attrs = file.GetAttributes(path);
+    const raw = typeof attrs === "number" ? attrs : attrs.value__;
+    const value = typeof raw === "number" ? raw : Number(raw);
+    if (!Number.isFinite(value)) return false;
+    return (value & 1024) !== 0;
+  } catch {
+    return false;
+  }
+}
+function deletePuertsDirectoryByEnumeration(path, recursive) {
+  const directory = CS.System.IO.Directory;
+  const file = CS.System.IO.File;
+  if (typeof directory.GetFiles !== "function" || typeof file.Delete !== "function") {
+    throw new Error(
+      `Host filesystem binding cannot delete directory '${path}': Directory.Delete and enumeration are unavailable`
+    );
+  }
+  if (isPuertsReparsePoint(path)) {
+    throw new Error(
+      `Refusing to delete '${path}' through a reparse point (symlink/junction); resolve the link or delete it directly`
+    );
+  }
+  const files = Array.from(directory.GetFiles(path) ?? []);
+  for (const entry of files) file.Delete(entry);
+  if (!recursive) return;
+  const subdirs = Array.from(directory.GetDirectories(path) ?? []);
+  for (const subdir of subdirs) {
+    if (isPuertsReparsePoint(String(subdir))) continue;
+    deletePuertsDirectoryByEnumeration(String(subdir), true);
+  }
+}
 
 // ../../packages/platform/src/index.ts
 var fileSystemInstance = null;
@@ -3734,8 +3835,11 @@ ${entry.partialArgs}`;
         block.arguments = parseFinalToolArguments(partialArgs, block.name);
         stream.push({ type: "toolcall_end", contentIndex, toolCall: block, partial: output });
       }
-      if (output.stopReason !== "error" && output.stopReason !== "aborted" && output.content.some((block) => block.type === "toolCall")) {
+      const hasToolCallBlocks = output.content.some((block) => block.type === "toolCall");
+      if (output.stopReason !== "error" && output.stopReason !== "aborted" && hasToolCallBlocks) {
         output.stopReason = "toolUse";
+      } else if (output.stopReason === "toolUse" && !hasToolCallBlocks) {
+        output.stopReason = "stop";
       }
       if (options?.signal?.aborted) {
         throw new Error("Request was aborted");

package/dist/chunks/{chunk-YEUBQBOB.js → chunk-AETQBDEG.js}

@@ -3,7 +3,7 @@ import {
   EventStream,
   streamSimple,
   validateToolArguments
-} from "./chunk-OCEYHWVX.js";
+} from "./chunk-5OXH6NUH.js";
 
 // ../../packages/agent-core/src/agent-loop.ts
 function createLoopErrorMessage(error, config, signal) {
@@ -986,7 +986,7 @@ var Agent = class {
             message: event.message,
             toolResults: event.toolResults
           });
-        } else if (hasToolCalls || stopReason === "toolUse") {
+        } else if (hasToolCalls) {
           this.updateStatusSnapshot({
             phase: "responding",
             turnState: "continuing",

package/dist/chunks/{chunk-3AOMWS2Z.js → chunk-QKSK5K5N.js}

@@ -2,7 +2,7 @@ import { createRequire as __createRequire } from "node:module"; const require =
 import {
   Agent,
   getToolCallerIdentity
-} from "./chunk-YEUBQBOB.js";
+} from "./chunk-AETQBDEG.js";
 import {
   FileSystemGateway,
   completeSimple,
@@ -11,7 +11,7 @@ import {
   getPlatformConfig,
   hashText,
   streamSimple
-} from "./chunk-OCEYHWVX.js";
+} from "./chunk-5OXH6NUH.js";
 import {
   Type
 } from "./chunk-XXGYUYXI.js";
@@ -1595,13 +1595,16 @@ function inferUncertainty(text, signals) {
   if (signals.some((signal) => signal.type === "tool_error" || signal.type === "model_fallback")) {
     return "medium";
   }
+  if (signals.some((signal) => signal.type === "no_text_report")) {
+    return "medium";
+  }
   if (signals.some((signal) => signal.type === "tool_success" || signal.type === "file_read" || signal.type === "command_run")) {
     return "low";
   }
   return "medium";
 }
 function isParentHandoffRequired(task) {
-  return task.mode === "edit" || task.needsParentWrite || task.status === "timeout" || task.status === "failed" || task.confidenceSignals.some((signal) => signal.type === "tool_error" || signal.type === "no_tool_use");
+  return task.mode === "edit" || task.needsParentWrite || task.status === "timeout" || task.status === "failed" || task.confidenceSignals.some((signal) => signal.type === "tool_error" || signal.type === "no_tool_use" || signal.type === "no_text_report");
 }
 async function runSubagentWithProgress(deps, task, reportProgress, signal) {
   const startTime = Date.now();
@@ -1746,12 +1749,16 @@ ${formatSkillsForPrompt(deps.skills ?? [])}`;
     const lastAssistant = [...messages].reverse().find((m) => m?.role === "assistant");
     const terminalStopReason = lastAssistant?.stopReason;
     const terminalError = typeof lastAssistant?.errorMessage === "string" ? lastAssistant.errorMessage : void 0;
-    const collectedResponse = collectLastAssistantText(messages);
-    if (terminalStopReason === "error" || terminalStopReason === "aborted" || terminalError || !collectedResponse) {
+    const collectedResponse = collectLastAssistantText(messages) || void 0;
+    const streamInterrupted = terminalStopReason === "error" || terminalStopReason === "aborted" || terminalError || !collectedResponse && terminalStopReason !== "stop";
+    if (streamInterrupted) {
       const detail = terminalError ? `: ${terminalError.slice(0, 200)}` : "";
       throw new Error(`Subagent stream interrupted (SSE stream aborted before the report was produced, stopReason=${terminalStopReason ?? "none"}${collectedResponse ? ", partial transcript discarded" : ", no text response"})${detail}`);
     }
-    let response = collectedResponse;
+    let response = collectedResponse ?? "[No textual report: the subagent finished normally (stopReason=stop) but produced no text \u2014 every assistant message was tool calls only. Review the task's effects directly, or rerun it with an explicit instruction to summarize findings.]";
+    if (!collectedResponse) {
+      task.confidenceSignals.push({ type: "no_text_report", message: "subagent finished normally without any textual report" });
+    }
     const outputTruncated = terminalStopReason === "length";
     if (outputTruncated) {
       task.confidenceSignals.push({ type: "output_truncated", message: "final response hit the provider's output token limit" });
@@ -3485,6 +3492,7 @@ var FileSessionStore = class {
   }
   delete(sessionId) {
     const paths = this.pathsFor(sessionId);
+    if (sessionDirIsSymlink(paths.dir)) return false;
     if (!this.gateway.exists(paths.dir)) return false;
     this.gateway.deleteDirectory(paths.dir, { recursive: true });
     this.dropCaches();
@@ -5701,7 +5709,12 @@ var AgentSessionRetryController = class {
   removeTrailingAssistantError;
   continueTurn;
   setRecoveryState;
-  retryAttempt = 0;
+  /** Attempts consumed per failure KIND: budgets are granted per kind (a
+   *  10-attempt network budget must not be eaten by interleaved provider
+   *  errors, and vice versa), so each kind counts its own attempts. */
+  retryAttempts = /* @__PURE__ */ new Map();
+  /** Total attempts across kinds in this recovery episode, for reporting. */
+  totalRetryAttempts = 0;
   retryTimer;
   pendingRetry;
   resolvePendingRetry;
@@ -5720,36 +5733,41 @@ var AgentSessionRetryController = class {
       return;
     }
     if (!failure) {
-      if (this.retryAttempt > 0) {
-        this.emit({ type: "retry_succeeded", attempts: this.retryAttempt });
-        this.emit({ type: "turn_retry_succeeded", attempts: this.retryAttempt });
-        this.retryAttempt = 0;
+      if (this.totalRetryAttempts > 0) {
+        this.emit({ type: "retry_succeeded", attempts: this.totalRetryAttempts });
+        this.emit({ type: "turn_retry_succeeded", attempts: this.totalRetryAttempts });
+        this.resetAttempts();
         this.setRecoveryState("none");
         this.resolvePending();
       }
       return;
     }
     if (!failure.retryable) {
-      if (this.retryAttempt > 0) {
-        this.retryAttempt = 0;
+      if (this.totalRetryAttempts > 0) {
+        this.resetAttempts();
         this.setRecoveryState("none");
         this.resolvePending();
       }
       return;
     }
     const maxRetries = this.retry.maxRetriesForFailure?.(failure) ?? this.retry.maxRetries ?? 3;
-    this.retryAttempt += 1;
-    if (this.retryAttempt > maxRetries) {
+    const kindAttempts = (this.retryAttempts.get(failure.kind) ?? 0) + 1;
+    this.retryAttempts.set(failure.kind, kindAttempts);
+    this.totalRetryAttempts += 1;
+    const totalBudget = this.retry.maxTotalRetries;
+    const kindExhausted = kindAttempts > maxRetries;
+    const totalExhausted = totalBudget !== void 0 && this.totalRetryAttempts > totalBudget;
+    if (kindExhausted || totalExhausted) {
       const terminalFailure = asTerminalFailure(failure);
-      this.emit({ type: "retry_exhausted", errorMessage: failure.message, maxRetries });
+      this.emit({ type: "retry_exhausted", errorMessage: failure.message, maxRetries: totalExhausted ? totalBudget : maxRetries });
       this.emit({ type: "turn_failed_terminal", failure: terminalFailure, message });
       this.emit({ type: "turn_settled" });
-      this.retryAttempt = 0;
+      this.resetAttempts();
       this.setRecoveryState("terminal");
       this.resolvePending();
       return;
     }
-    const attempt = this.retryAttempt;
+    const attempt = kindAttempts;
     const rawDelayMs = (this.retry.baseDelayMs ?? 2e3) * 2 ** (attempt - 1);
     const delayMs = this.retry.maxDelayMs !== void 0 ? Math.min(rawDelayMs, this.retry.maxDelayMs) : rawDelayMs;
     this.ensurePending();
@@ -5774,7 +5792,7 @@ var AgentSessionRetryController = class {
         });
         this.emit({ type: "turn_failed_terminal", failure: terminalFailure, message });
         this.emit({ type: "turn_settled" });
-        this.retryAttempt = 0;
+        this.resetAttempts();
         this.setRecoveryState("terminal");
         this.resolvePending();
       });
@@ -5803,15 +5821,19 @@ var AgentSessionRetryController = class {
     this.emit({ type: "retry_exhausted", errorMessage: terminalFailure.message, maxRetries });
     this.emit({ type: "turn_failed_terminal", failure: terminalFailure });
     this.emit({ type: "turn_settled" });
-    this.retryAttempt = 0;
+    this.resetAttempts();
     this.setRecoveryState("terminal");
     this.resolvePending();
   }
   cancel() {
     this.cancelTimerOnly();
-    this.retryAttempt = 0;
+    this.resetAttempts();
     this.resolvePending();
   }
+  resetAttempts() {
+    this.retryAttempts.clear();
+    this.totalRetryAttempts = 0;
+  }
   cancelTimerOnly() {
     if (this.retryTimer === void 0) {
       return;
@@ -9296,10 +9318,28 @@ function isSpecialDevicePath(path4) {
 function detectUnderstandingKind(filePath) {
   const lower = filePath.toLowerCase();
   if (/\.(mp4|mov|m4v|webm|avi|mkv)$/.test(lower)) {
-    return { kind: "video", mimeType: lower.endsWith(".mov") ? "video/quicktime" : lower.endsWith(".webm") ? "video/webm" : "video/mp4" };
+    const videoMime = {
+      mp4: "video/mp4",
+      mov: "video/quicktime",
+      m4v: "video/x-m4v",
+      webm: "video/webm",
+      avi: "video/x-msvideo",
+      mkv: "video/x-matroska"
+    };
+    const ext2 = lower.split(".").pop();
+    return { kind: "video", mimeType: videoMime[ext2] ?? "video/mp4" };
   }
   if (/\.(mp3|wav|m4a|aac|flac|ogg)$/.test(lower)) {
-    return { kind: "audio", mimeType: lower.endsWith(".wav") ? "audio/wav" : lower.endsWith(".m4a") ? "audio/mp4" : "audio/mpeg" };
+    const audioMime = {
+      mp3: "audio/mpeg",
+      wav: "audio/wav",
+      m4a: "audio/mp4",
+      aac: "audio/aac",
+      flac: "audio/flac",
+      ogg: "audio/ogg"
+    };
+    const ext2 = lower.split(".").pop();
+    return { kind: "audio", mimeType: audioMime[ext2] ?? "audio/mpeg" };
   }
   if (/\.(pdf)$/.test(lower)) {
     return { kind: "document", mimeType: "application/pdf" };
@@ -13659,13 +13699,14 @@ Focus: ${request.question.trim()}` : ""}` },
         if (request.signal?.aborted) throw new Error("Operation aborted");
         const data = await fs2.readFile(request.absolutePath, "base64");
         if (request.signal?.aborted) throw new Error("Operation aborted");
-        if (data) return {
+        const readBytes = Math.floor(data.length * 3 / 4) - (data.endsWith("==") ? 2 : data.endsWith("=") ? 1 : 0);
+        if (readBytes > 0 && readBytes <= cap && data) return {
           content: [
             { type: "text", text: `Read ${request.kind} file ${request.displayPath} [${request.mimeType}]. Original media attached for the current model.${request.question?.trim() ? `
 Focus: ${request.question.trim()}` : ""}` },
             { type: request.kind, data, mimeType: request.mimeType }
           ],
-          details: { understanding: { purpose, kind: request.kind, mimeType: request.mimeType, agentModel: getModelLabel(agentModel), routeSource: "current_model", inputMode: "nativeAttachment", attachmentBytes: size } },
+          details: { understanding: { purpose, kind: request.kind, mimeType: request.mimeType, agentModel: getModelLabel(agentModel), routeSource: "current_model", inputMode: "nativeAttachment", attachmentBytes: readBytes } },
           isError: false
         };
       }