@cnwenf/occ 2.1.332 → 2.1.333

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.332","BINARY_NAME":"occ","BUILD_TIME":"2026-09-12T20:24:55.070Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.333","BINARY_NAME":"occ","BUILD_TIME":"2026-09-12T22:14:51.247Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -167193,11 +167193,32 @@ function inputToString(input) {
     return input;
   }
 }
+function isPartialTerminalResponse(buffer) {
+  if (MOUSE_PREFIX_RE.test(buffer))
+    return buffer.length <= MOUSE_PREFIX_MAX;
+  if (OSC_DCS_PARTIAL_RE.test(buffer)) {
+    return buffer.length <= OSC_DCS_PARTIAL_MAX;
+  }
+  return buffer.length <= CSI_PARTIAL_MAX && CSI_PARTIAL_RE.test(buffer);
+}
 function parseMultipleKeypresses(prevState, input = "") {
   const isFlush = input === null;
   const inputString = isFlush ? "" : inputToString(input);
   const tokenizer = prevState._tokenizer ?? createTokenizer({ x10Mouse: true });
-  const tokens = isFlush ? tokenizer.flush() : tokenizer.feed(inputString);
+  let tokens;
+  if (isFlush && prevState.mode !== "IN_PASTE") {
+    const buffered = tokenizer.buffer();
+    if (isPartialTerminalResponse(buffered)) {
+      tokens = [];
+    } else if (MOUSE_PREFIX_RE.test(buffered)) {
+      tokenizer.reset();
+      tokens = [];
+    } else {
+      tokens = tokenizer.flush();
+    }
+  } else {
+    tokens = isFlush ? tokenizer.flush() : tokenizer.feed(inputString);
+  }
   const keys2 = [];
   let inPaste = prevState.mode === "IN_PASTE";
   let pasteBuffer = prevState.pasteBuffer;
@@ -167487,7 +167508,7 @@ function createNavKey(s4, name3, ctrl) {
     isPasted: false
   };
 }
-var META_KEY_CODE_RE, FN_KEY_RE, CSI_U_RE, MODIFY_OTHER_KEYS_RE, DECRPM_RE, DA1_RE, DA2_RE, KITTY_FLAGS_RE, CURSOR_POSITION_RE, OSC_RESPONSE_RE, XTVERSION_RE, SGR_MOUSE_RE, INITIAL_STATE, keyName, nonAlphanumericKeys, isShiftKey = (code) => {
+var META_KEY_CODE_RE, FN_KEY_RE, CSI_U_RE, MODIFY_OTHER_KEYS_RE, DECRPM_RE, DA1_RE, DA2_RE, KITTY_FLAGS_RE, CURSOR_POSITION_RE, OSC_RESPONSE_RE, XTVERSION_RE, SGR_MOUSE_RE, INITIAL_STATE, MOUSE_PREFIX_RE, MOUSE_PREFIX_MAX = 32, OSC_DCS_PARTIAL_RE, OSC_DCS_PARTIAL_MAX = 256, CSI_PARTIAL_RE, CSI_PARTIAL_MAX = 64, keyName, nonAlphanumericKeys, isShiftKey = (code) => {
   return [
     "[a",
     "[b",
@@ -167537,6 +167558,9 @@ var init_parse_keypress = __esm(() => {
     incomplete: "",
     pasteBuffer: ""
   };
+  MOUSE_PREFIX_RE = /^\x1b\[<[\d;]*$/;
+  OSC_DCS_PARTIAL_RE = /^\x1b(?:\][0-9]|P[0-9>|$+=!]|_G)[^\x07]*$/s;
+  CSI_PARTIAL_RE = /^\x1b\[(?:[0-9:;]+|[<=>?][0-9:;]*[ -/]*)$/;
   keyName = {
     OP: "f1",
     OQ: "f2",
@@ -184538,6 +184562,14 @@ class Ink {
   get isAltScreenActive() {
     return this.altScreenActive;
   }
+  get nativeCursorSeq() {
+    if (this.accessibilityMode || this.isScreenReaderEnabled)
+      return "";
+    return this.nativeCursorVisible ? SHOW_CURSOR : HIDE_CURSOR;
+  }
+  get hasUnmounted() {
+    return this.isUnmounted;
+  }
   reassertTerminalModes = (includeAltScreen = false) => {
     if (!this.options.stdout.isTTY)
       return;
@@ -372511,8 +372543,20 @@ function createLSPClient(serverName, onCrash) {
       isStopping = true;
       try {
         if (connection3) {
-          await connection3.sendRequest("shutdown", {});
-          await connection3.sendNotification("exit", {});
+          let shutdownRequestError;
+          try {
+            await connection3.sendRequest("shutdown", {});
+          } catch (error52) {
+            shutdownRequestError = error52;
+          }
+          try {
+            await connection3.sendNotification("exit", {});
+          } catch (error52) {
+            throw shutdownRequestError ?? error52;
+          }
+          if (shutdownRequestError !== undefined) {
+            throw shutdownRequestError;
+          }
         }
       } catch (error52) {
         const err2 = error52;
@@ -481024,6 +481068,16 @@ async function getAllCommands(context6) {
   const localCommands = await getCommands(getProjectRoot());
   return dropShadowedSkills(uniqBy_default([...localCommands, ...mcpSkills], "name"));
 }
+function buildUnknownSkillMessage(name3, commands7) {
+  const match = findPluginSkillFullNameMatch(name3, commands7);
+  if (match.kind === "unique" && isSkillNameSafeToDisplay(match.command.name)) {
+    return `Unknown skill: ${name3}. Did you mean ${match.command.name}? Invoke it by that full name.`;
+  }
+  if (match.kind === "ambiguous" && match.candidates.every((c9) => isSkillNameSafeToDisplay(c9.name))) {
+    return `Unknown skill: ${name3}. Several skills match that name: ${match.candidates.map((c9) => c9.name).join(", ")} \u2014 invoke one by its full name.`;
+  }
+  return `Unknown skill: ${name3}`;
+}
 async function executeForkedSkill(command4, commandName, args, context6, canUseTool, parentMessage, onProgress) {
   const startTime2 = Date.now();
   const agentId = createAgentId();
@@ -481338,9 +481392,15 @@ var init_SkillTool = __esm(() => {
       const commands7 = await getAllCommands(context6);
       const foundCommand = findCommand(normalizedCommandName, commands7);
       if (!foundCommand) {
+        const match = findPluginSkillFullNameMatch(normalizedCommandName, commands7);
+        if (match.kind !== "none") {
+          logEvent2("tengu_skill_tool_suffix_match", {
+            candidate_count: match.kind === "ambiguous" ? match.candidates.length : 1
+          });
+        }
         return {
           result: false,
-          message: `Unknown skill: ${normalizedCommandName}`,
+          message: buildUnknownSkillMessage(normalizedCommandName, commands7),
           errorCode: 2
         };
       }
@@ -601621,7 +601681,7 @@ async function generateSuggestion(abortController, promptId, cacheSafeParams) {
     const contentArr = Array.isArray(msg.message.content) ? msg.message.content : [];
     const textBlock = contentArr.find((b6) => b6.type === "text");
     if (textBlock?.type === "text" && typeof textBlock.text === "string") {
-      const suggestion = textBlock.text.trim();
+      const suggestion = stripSuggestionMeta(textBlock.text);
       if (suggestion) {
         return { suggestion, generationRequestId };
       }
@@ -601629,22 +601689,60 @@ async function generateSuggestion(abortController, promptId, cacheSafeParams) {
   }
   return { suggestion: null, generationRequestId };
 }
+function stripSuggestionMeta(text2) {
+  return text2.trim().replace(/^<(suggestion|response|output|answer|result)>([\s\S]*)<\/\1>$/i, (match, tag, inner) => inner.includes(`</${tag.toLowerCase()}>`) || inner.includes(`</${tag.toUpperCase()}>`) ? match : inner).replace(/^\s*(suggested\s+(response|reply|input|prompt)|suggestion|response|reply|answer|output|result|\u63D0\u6848|\u56DE\u7B54|\u8FD4\u4FE1|\u5FDC\u7B54|\u51FA\u529B|\u7D50\u679C|\u5EFA\u8BAE|\u56DE\u590D|\u7B54\u6848|\u8F93\u51FA|\u7ED3\u679C|\uC81C\uC548|\uB2F5\uBCC0|\uC751\uB2F5|\uCD9C\uB825|\uACB0\uACFC)\s*[:\uFF1A]\s*/i, "").trim();
+}
+function classifyScripts(text2) {
+  let han = 0;
+  let phonetic = 0;
+  let hangul = 0;
+  let other = 0;
+  for (const char of text2) {
+    if (HAN_SCRIPT_RE.test(char))
+      han++;
+    else if (PHONETIC_SCRIPT_RE.test(char))
+      phonetic++;
+    else if (HANGUL_SCRIPT_RE.test(char))
+      hangul++;
+    else if (LETTER_NUMBER_RE.test(char))
+      other++;
+  }
+  return { han, phonetic, hangul, other };
+}
+function countCjkCharacters(text2) {
+  const { han, phonetic, hangul } = classifyScripts(text2);
+  return han + phonetic + hangul;
+}
+function countSuggestionWords(text2) {
+  const trimmed = text2.trim();
+  if (trimmed === "")
+    return 0;
+  let total = 0;
+  for (const token of trimmed.split(/\s+/)) {
+    const { han, phonetic, hangul, other } = classifyScripts(token);
+    total += han === 0 && phonetic === 0 ? 1 : (other + hangul > 0 ? 1 : 0) + han / 2 + phonetic / 4;
+  }
+  return Math.ceil(total);
+}
 function shouldFilterSuggestion(suggestion, promptId, source2) {
   if (!suggestion) {
     logSuggestionSuppressed("empty", undefined, promptId, source2);
     return true;
   }
   const lower = suggestion.toLowerCase();
-  const wordCount = suggestion.trim().split(/\s+/).length;
+  const wordCount = countSuggestionWords(suggestion);
   const filters = [
-    ["done", () => lower === "done"],
+    [
+      "done",
+      () => lower === "done" || /^\P{L}*(\u5B8C\u4E86(\u3057\u307E\u3057\u305F)?|\u5B8C\u6210\u4E86?|\uC644\uB8CC\uB428?)\P{L}*$/u.test(suggestion)
+    ],
     [
       "meta_text",
-      () => lower === "nothing found" || lower === "nothing found." || lower.startsWith("nothing to suggest") || lower.startsWith("no suggestion") || /\bsilence is\b|\bstay(s|ing)? silent\b/.test(lower) || /^\W*silence\W*$/.test(lower)
+      () => lower === "nothing found" || lower === "nothing found." || lower.startsWith("nothing to suggest") || lower.startsWith("no suggestion") || /\bsilence is\b|\bstay(s|ing)? silent\b/.test(lower) || /^\W*silence\W*$/.test(lower) || /^\P{L}*(\u6C88\u9ED9|\u6C89\u9ED8|\u9759\u9ED8|\uCE68\uBB35|\u63D0\u6848(\u306A\u3057|\u306F\u3042\u308A\u307E\u305B\u3093)|\u7279\u306B(\u306A\u3057|\u3042\u308A\u307E\u305B\u3093)|[\u65E0\u6CA1\u6C92]\u6709?\u5EFA[\u8BAE\u8B70]|(\uC81C\uC548|\uD574\uB2F9)\s*\uC5C6\uC74C)\P{L}*$/u.test(suggestion)
     ],
     [
       "meta_wrapped",
-      () => /^\(.*\)$|^\[.*\]$/.test(suggestion)
+      () => /^(\(.*\)|\[.*\]|\uFF08.*\uFF09|\uFF3B.*\uFF3D|\u3010.*\u3011|\u3014.*\u3015)$/.test(suggestion)
     ],
     [
       "error_message",
@@ -601658,6 +601756,9 @@ function shouldFilterSuggestion(suggestion, promptId, source2) {
           return false;
         if (suggestion.startsWith("/"))
           return false;
+        const cjkCount = countCjkCharacters(suggestion);
+        if (cjkCount > 0)
+          return cjkCount < 2;
         const ALLOWED_SINGLE_WORDS = new Set([
           "yes",
           "yeah",
@@ -601682,15 +601783,18 @@ function shouldFilterSuggestion(suggestion, promptId, source2) {
     ],
     ["too_many_words", () => wordCount > 12],
     ["too_long", () => suggestion.length >= 100],
-    ["multiple_sentences", () => /[.!?]\s+[A-Z]/.test(suggestion)],
+    [
+      "multiple_sentences",
+      () => /[.!?]\s+[A-Z]|[\u3002\uFF01\uFF1F]\s*[\p{L}\p{N}]/u.test(suggestion)
+    ],
     ["has_formatting", () => /[\n*]|\*\*/.test(suggestion)],
     [
       "evaluative",
-      () => /thanks|thank you|looks good|sounds good|that works|that worked|that's all|nice|great|perfect|makes sense|awesome|excellent/.test(lower)
+      () => /thanks|thank you|looks good|sounds good|that works|that worked|that's all|nice|great|perfect|makes sense|awesome|excellent/.test(lower) || /^\P{L}*(\u3042\u308A\u304C\u3068\u3046(\u3054\u3056\u3044\u307E\u3059|\u3054\u3056\u3044\u307E\u3057\u305F)?|\u52A9\u304B\u308A\u307E\u3057\u305F|[\u8C22\u8B1D][\u8C22\u8B1D][\u4F60\u60A8]?|\u611F\u8C22[\u4F60\u60A8]?|\u611F\u8B1D\u3057\u307E\u3059|\uAC10\uC0AC\uD569\uB2C8\uB2E4|\uACE0\uB9C8\uC6CC\uC694?)(\P{L}|\u7684|$)/u.test(suggestion) || /(\u826F\u3055\u305D\u3046|\u3088\u3055\u305D\u3046|\u3044\u3044\u3067\u3059\u306D|\u770B\u8D77\u6765\u4E0D\u9519|\u592A\u597D\u4E86|\u5B8C\u74A7|\u5B8C\u7F8E|\uC88B\uB124\uC694)(\u3067\u3059|\u3067\u3059\u306D|\u3060\u306D)?\P{L}*$/u.test(suggestion)
     ],
     [
       "claude_voice",
-      () => /^(let me|i'll|i've|i'm|i can|i would|i think|i notice|here's|here is|here are|that's|this is|this will|you can|you should|you could|sure,|of course|certainly)/i.test(suggestion)
+      () => /^(let me|i'll|i've|i'm|i can|i would|i think|i notice|here's|here is|here are|that's|this is|this will|you can|you should|you could|sure,|of course|certainly|\u8BA9\u6211(?!\u4EEC)|\u6211\u6765|\u6211\u4F1A|\u6211\u5C06)/i.test(suggestion)
     ]
   ];
   for (const [reason, check3] of filters) {
@@ -601766,7 +601870,7 @@ Stay silent if the next step isn't obvious from what the user said.
 
 Format: 2-12 words, match the user's style. Or nothing.
 
-Reply with ONLY the suggestion, no quotes or explanation.`, SUGGESTION_PROMPTS;
+Reply with ONLY the suggestion, no quotes or explanation.`, SUGGESTION_PROMPTS, HAN_SCRIPT_RE, PHONETIC_SCRIPT_RE, HANGUL_SCRIPT_RE, LETTER_NUMBER_RE;
 var init_promptSuggestion = __esm(() => {
   init_state();
   init_agentSwarmsEnabled();
@@ -601785,6 +601889,10 @@ var init_promptSuggestion = __esm(() => {
     user_intent: SUGGESTION_PROMPT,
     stated_intent: SUGGESTION_PROMPT
   };
+  HAN_SCRIPT_RE = /\p{Script=Han}/u;
+  PHONETIC_SCRIPT_RE = /[\p{Script=Hiragana}\p{Script=Katakana}\u30FC\uFF70\p{Script=Thai}\p{Script=Lao}\p{Script=Khmer}\p{Script=Myanmar}]/u;
+  HANGUL_SCRIPT_RE = /\p{Script=Hangul}/u;
+  LETTER_NUMBER_RE = /[\p{L}\p{N}]/u;
 });
 
 // src/state/AppStateStore.ts
@@ -610924,9 +611032,11 @@ var init_loadPluginCommands = __esm(() => {
 
 // src/utils/plugins/zipCache.ts
 import { randomBytes as randomBytes10 } from "crypto";
+import { constants as fsConstants8 } from "fs";
 import {
   chmod as chmod8,
   lstat as lstat9,
+  open as open13,
   readdir as readdir24,
   readFile as readFile44,
   rename as rename4,
@@ -611084,22 +611194,91 @@ async function collectFilesForZip(baseDir, relativePath, files2, visited) {
     }
   }
 }
-async function extractZipToDirectory(zipPath, targetDir) {
-  const zipBuf = await getFsImplementation().readFileBytes(zipPath);
-  const files2 = await unzipFile(zipBuf);
-  const modes = parseZipModes(zipBuf);
-  await getFsImplementation().mkdir(targetDir);
+function errnoCode(error52) {
+  return typeof error52 === "object" && error52 !== null && "code" in error52 ? String(error52.code) : undefined;
+}
+function isInPlaceFallbackError(error52) {
+  const code = errnoCode(error52);
+  return code !== undefined && IN_PLACE_FALLBACK_ERRNOS.has(code);
+}
+function errorText(error52) {
+  return error52 instanceof Error ? error52.message : String(error52);
+}
+async function isExistingDirectory(path35) {
+  try {
+    return (await stat36(path35)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+async function removeExtractionTree(path35) {
+  await rm8(path35, { recursive: true, force: true }).catch((error52) => {
+    logForDebugging(`Failed to remove the extraction tree ${path35}: ${errorText(error52)}`, { level: "warn" });
+  });
+}
+async function hardenExtractedFileMode(filePath, diskMode) {
+  if ((diskMode & GROUP_OTHER_WRITE_BITS) === 0)
+    return;
+  let handle2;
+  try {
+    handle2 = await open13(filePath, fsConstants8.O_RDONLY | fsConstants8.O_NOFOLLOW | fsConstants8.O_NONBLOCK);
+    const fdStat = await handle2.stat();
+    if (!fdStat.isFile() || fdStat.nlink !== 1)
+      return;
+    if ((fdStat.mode & GROUP_OTHER_WRITE_BITS) !== 0) {
+      await handle2.chmod(fdStat.mode & EXTRACTED_MODE_MASK);
+    }
+  } catch {} finally {
+    await handle2?.close().catch(() => {});
+  }
+}
+async function extractZipEntriesToDir(files2, modes, destDir) {
+  await getFsImplementation().mkdir(destDir);
   for (const [relPath, data] of Object.entries(files2)) {
     if (relPath.endsWith("/")) {
-      await getFsImplementation().mkdir(join119(targetDir, relPath));
+      await getFsImplementation().mkdir(join119(destDir, relPath));
       continue;
     }
-    const fullPath = join119(targetDir, relPath);
+    const fullPath = join119(destDir, relPath);
     await getFsImplementation().mkdir(dirname52(fullPath));
     await writeFile36(fullPath, data);
     const mode = modes[relPath];
-    if (mode && mode & 73) {
-      await chmod8(fullPath, mode & 511).catch(() => {});
+    if (mode && mode & EXEC_MODE_BITS) {
+      await chmod8(fullPath, mode & EXTRACTED_MODE_MASK).catch(() => {});
+    }
+    const diskStat = await lstat9(fullPath).catch(() => {
+      return;
+    });
+    if (diskStat)
+      await hardenExtractedFileMode(fullPath, diskStat.mode);
+  }
+}
+async function extractZipToDirectory(zipPath, targetDir) {
+  const zipBuf = await getFsImplementation().readFileBytes(zipPath);
+  const files2 = await unzipFile(zipBuf);
+  const modes = parseZipModes(zipBuf);
+  const swapHex = randomBytes10(4).toString("hex");
+  const stagingDir = `${targetDir}.staging-${swapHex}`;
+  const previousDir = `${targetDir}.previous-${swapHex}`;
+  await extractZipEntriesToDir(files2, modes, stagingDir);
+  let movedAside = false;
+  try {
+    if (await isExistingDirectory(targetDir)) {
+      await rename4(targetDir, previousDir);
+      movedAside = true;
+    }
+    await rename4(stagingDir, targetDir);
+    if (movedAside)
+      await removeExtractionTree(previousDir);
+  } catch (error52) {
+    if (movedAside)
+      await rename4(previousDir, targetDir).catch(() => {});
+    await removeExtractionTree(stagingDir);
+    if (isInPlaceFallbackError(error52)) {
+      logForDebugging(`Plugin extraction directory ${targetDir} or its staged copy is held open; extracting the archive in place, so files dropped from it are not cleared this time`, { level: "warn" });
+      await extractZipEntriesToDir(files2, modes, targetDir);
+    } else {
+      throw error52;
     }
   }
   logForDebugging(`Extracted ZIP to ${targetDir}: ${Object.keys(files2).length} entries`);
@@ -611116,13 +611295,14 @@ function getMarketplaceJsonRelativePath(marketplaceName) {
 function isMarketplaceSourceSupportedByZipCache(source2) {
   return ["github", "git", "url", "settings"].includes(source2.source);
 }
-var sessionPluginCachePath = null, sessionPluginCachePromise = null;
+var sessionPluginCachePath = null, sessionPluginCachePromise = null, EXTRACTED_MODE_MASK = 493, EXEC_MODE_BITS = 73, GROUP_OTHER_WRITE_BITS = 18, IN_PLACE_FALLBACK_ERRNOS;
 var init_zipCache = __esm(() => {
   init_debug();
   init_zip();
   init_envUtils();
   init_fsOperations();
   init_pathValidation();
+  IN_PLACE_FALLBACK_ERRNOS = new Set(["EBUSY", "EPERM", "ENOTEMPTY", "EEXIST"]);
 });
 
 // src/utils/plugins/cacheUtils.ts
@@ -616709,11 +616889,11 @@ function normalizeMessagesForAPI(messages, tools = []) {
     if (!isSyntheticApiErrorMessage(msg)) {
       continue;
     }
-    const errorText = Array.isArray(msg.message.content) && msg.message.content[0]?.type === "text" ? msg.message.content[0].text : undefined;
-    if (!errorText) {
+    const errorText2 = Array.isArray(msg.message.content) && msg.message.content[0]?.type === "text" ? msg.message.content[0].text : undefined;
+    if (!errorText2) {
       continue;
     }
-    const blockTypesToStrip = errorToBlockTypes[errorText];
+    const blockTypesToStrip = errorToBlockTypes[errorText2];
     if (!blockTypesToStrip) {
       continue;
     }
@@ -621870,11 +622050,11 @@ var init_dist11 = __esm(() => {
           return;
         }
         const decoder = new TextDecoder, reader = body.getReader();
-        let open13 = true;
+        let open14 = true;
         do {
           const { done, value } = await reader.read();
-          value && __privateGet(this, _parser).feed(decoder.decode(value, { stream: !done })), done && (open13 = false, __privateGet(this, _parser).reset(), __privateMethod(this, _EventSource_instances, scheduleReconnect_fn).call(this));
-        } while (open13);
+          value && __privateGet(this, _parser).feed(decoder.decode(value, { stream: !done })), done && (open14 = false, __privateGet(this, _parser).reset(), __privateMethod(this, _EventSource_instances, scheduleReconnect_fn).call(this));
+        } while (open14);
       }), __privateAdd(this, _onFetchError, (err2) => {
         __privateSet(this, _controller, undefined), !(err2.name === "AbortError" || err2.type === "aborted") && __privateMethod(this, _EventSource_instances, scheduleReconnect_fn).call(this, flattenError2(err2));
       }), __privateAdd(this, _onEvent, (event) => {
@@ -636674,6 +636854,27 @@ function getRuleByContentsForToolName(context7, toolName, behavior) {
   }
   return ruleByContents;
 }
+function getRuleListForToolName(context7, toolName, behavior) {
+  let rules2 = [];
+  switch (behavior) {
+    case "allow":
+      rules2 = getAllowRules(context7);
+      break;
+    case "deny":
+      rules2 = getDenyRules(context7);
+      break;
+    case "ask":
+      rules2 = getAskRules(context7);
+      break;
+  }
+  const matched = [];
+  for (const rule of rules2) {
+    if (rule.ruleValue.toolName === toolName && rule.ruleValue.ruleContent !== undefined && rule.ruleBehavior === behavior) {
+      matched.push(rule);
+    }
+  }
+  return matched;
+}
 async function runPermissionRequestHooksForHeadlessAgent(tool, input2, toolUseID, context7, permissionMode, suggestions) {
   try {
     for await (const hookResult of executePermissionRequestHooks(tool.name, toolUseID, input2, context7, permissionMode, suggestions, context7.abortController.signal)) {
@@ -643207,7 +643408,7 @@ async function ensureZombieKill(pid, graceMs = 3000) {
 var init_process2 = () => {};
 
 // src/daemon/lockfile.ts
-import { open as open13, readFile as readFile50, unlink as unlink22, writeFile as writeFile43 } from "fs/promises";
+import { open as open14, readFile as readFile50, unlink as unlink22, writeFile as writeFile43 } from "fs/promises";
 import { existsSync as existsSync18, statSync as statSync16 } from "fs";
 import { join as join135 } from "path";
 function getDaemonLockfilePath() {
@@ -643241,7 +643442,7 @@ async function acquireLockfile(identity9) {
   await mkdir41(getClaudeConfigHomeDir(), { recursive: true }).catch(() => {});
   if (!existsSync18(path35)) {
     try {
-      const fh = await open13(path35, "ax");
+      const fh = await open14(path35, "ax");
       const contents = {
         supervisorPid: identity9.supervisorPid,
         supervisorProcStart: identity9.supervisorProcStart,
@@ -643277,7 +643478,7 @@ async function acquireLockfile(identity9) {
     await unlink22(path35);
   } catch {}
   try {
-    const fh = await open13(path35, "ax");
+    const fh = await open14(path35, "ax");
     const contents = {
       supervisorPid: identity9.supervisorPid,
       supervisorProcStart: identity9.supervisorProcStart,
@@ -683408,11 +683609,11 @@ var require_dijkstra = __commonJS((exports, module) => {
       var predecessors = {};
       var costs = {};
       costs[s4] = 0;
-      var open14 = dijkstra.PriorityQueue.make();
-      open14.push(s4, 0);
+      var open15 = dijkstra.PriorityQueue.make();
+      open15.push(s4, 0);
       var closest, u7, v6, cost_of_s_to_u, adjacent_nodes, cost_of_e, cost_of_s_to_u_plus_cost_of_e, cost_of_s_to_v, first_visit;
-      while (!open14.empty()) {
-        closest = open14.pop();
+      while (!open15.empty()) {
+        closest = open15.pop();
         u7 = closest.value;
         cost_of_s_to_u = closest.cost;
         adjacent_nodes = graph[u7] || {};
@@ -683424,7 +683625,7 @@ var require_dijkstra = __commonJS((exports, module) => {
             first_visit = typeof costs[v6] === "undefined";
             if (first_visit || cost_of_s_to_v > cost_of_s_to_u_plus_cost_of_e) {
               costs[v6] = cost_of_s_to_u_plus_cost_of_e;
-              open14.push(v6, cost_of_s_to_u_plus_cost_of_e);
+              open15.push(v6, cost_of_s_to_u_plus_cost_of_e);
               predecessors[v6] = u7;
             }
           }
@@ -687998,13 +688199,13 @@ function computeSearchText(msg) {
       break;
   }
   let t4 = raw;
-  let open14 = t4.indexOf("<system-reminder>");
-  while (open14 >= 0) {
-    const close = t4.indexOf(SYSTEM_REMINDER_CLOSE, open14);
+  let open15 = t4.indexOf("<system-reminder>");
+  while (open15 >= 0) {
+    const close = t4.indexOf(SYSTEM_REMINDER_CLOSE, open15);
     if (close < 0)
       break;
-    t4 = t4.slice(0, open14) + t4.slice(close + SYSTEM_REMINDER_CLOSE.length);
-    open14 = t4.indexOf("<system-reminder>");
+    t4 = t4.slice(0, open15) + t4.slice(close + SYSTEM_REMINDER_CLOSE.length);
+    open15 = t4.indexOf("<system-reminder>");
   }
   return t4;
 }
@@ -715455,8 +715656,8 @@ var init_advisor2 = __esm(() => {
 });
 
 // src/skills/bundledSkills.ts
-import { constants as fsConstants8 } from "fs";
-import { mkdir as mkdir49, open as open14 } from "fs/promises";
+import { constants as fsConstants9 } from "fs";
+import { mkdir as mkdir49, open as open15 } from "fs/promises";
 import { dirname as dirname68, isAbsolute as isAbsolute33, join as join158, normalize as normalize16, sep as pathSep2 } from "path";
 function registerBundledSkill(definition) {
   const { files: files3 } = definition;
@@ -715537,7 +715738,7 @@ async function writeSkillFiles(dir, files3) {
   }));
 }
 async function safeWriteFile(p4, content) {
-  const fh = await open14(p4, SAFE_WRITE_FLAGS, 384);
+  const fh = await open15(p4, SAFE_WRITE_FLAGS, 384);
   try {
     await fh.writeFile(content, "utf8");
   } finally {
@@ -715568,8 +715769,8 @@ var init_bundledSkills = __esm(() => {
   init_debug();
   init_filesystem();
   bundledSkills = [];
-  O_NOFOLLOW = fsConstants8.O_NOFOLLOW ?? 0;
-  SAFE_WRITE_FLAGS = process.platform === "win32" ? "wx" : fsConstants8.O_WRONLY | fsConstants8.O_CREAT | fsConstants8.O_EXCL | O_NOFOLLOW;
+  O_NOFOLLOW = fsConstants9.O_NOFOLLOW ?? 0;
+  SAFE_WRITE_FLAGS = process.platform === "win32" ? "wx" : fsConstants9.O_WRONLY | fsConstants9.O_CREAT | fsConstants9.O_EXCL | O_NOFOLLOW;
 });
 
 // src/commands/env/index.js
@@ -721156,7 +721357,7 @@ __export(exports_insights, {
   buildExportData: () => buildExportData
 });
 import { execFileSync as execFileSync7 } from "child_process";
-import { constants as fsConstants9 } from "fs";
+import { constants as fsConstants10 } from "fs";
 import {
   copyFile as copyFile10,
   mkdir as mkdir51,
@@ -722966,7 +723167,7 @@ var init_insights = __esm(() => {
           const srcFile = join160(projectPath, fileName);
           const destFile = join160(destProjectPath, fileName);
           try {
-            await copyFile10(srcFile, destFile, fsConstants9.COPYFILE_EXCL);
+            await copyFile10(srcFile, destFile, fsConstants10.COPYFILE_EXCL);
             result.copied++;
           } catch {
             result.skipped++;
@@ -723372,6 +723573,21 @@ async function getWorkflowCommands(_cwd) {
 function getBuiltInCommandByName(name3) {
   return COMMANDS().find((_4) => _4.name === name3 || _4.aliases?.includes(name3));
 }
+function isSkillNameSafeToDisplay(name3) {
+  return name3.length > 0 && name3.length <= MAX_SAFE_SKILL_NAME_LENGTH && !UNSAFE_SKILL_NAME_CHARS_RE.test(name3);
+}
+function findPluginSkillFullNameMatch(query2, commands7) {
+  if (query2 === "" || query2.includes(":"))
+    return { kind: "none" };
+  const suffix2 = `:${query2}`;
+  const matches = commands7.filter((cmd) => cmd.type === "prompt" && cmd.name.endsWith(suffix2));
+  if (matches.length > 1)
+    return { kind: "ambiguous", candidates: matches };
+  const unique = matches[0];
+  if (unique === undefined || unique.source !== "plugin")
+    return { kind: "none" };
+  return { kind: "unique", command: unique };
+}
 async function getSkills(cwd2) {
   try {
     const [skillDirCommands, pluginSkills] = await Promise.all([
@@ -723516,7 +723732,7 @@ function formatDescriptionWithSource(cmd) {
   }
   return `${cmd.description} (${getSettingSourceName(cmd.source)})`;
 }
-var agentsPlatform, proactive, briefCommand, assistantCommand, bridge2, remoteControlServerCommand, voiceCommand, forceSnip, workflowsCmd, webCmd, clearSkillIndexCache3, subscribePr, ultraplan, torch, peersCmd, forkCmd, buddy, usageReport2, INTERNAL_ONLY_COMMANDS2, COMMANDS, builtInCommandNames, getWorkflowCommands2, loadAllCommands, getSkillToolCommands, getSlashCommandToolSkills, REMOTE_SAFE_COMMANDS, BRIDGE_SAFE_COMMANDS;
+var agentsPlatform, proactive, briefCommand, assistantCommand, bridge2, remoteControlServerCommand, voiceCommand, forceSnip, workflowsCmd, webCmd, clearSkillIndexCache3, subscribePr, ultraplan, torch, peersCmd, forkCmd, buddy, usageReport2, INTERNAL_ONLY_COMMANDS2, COMMANDS, builtInCommandNames, UNSAFE_SKILL_NAME_CHARS_RE, MAX_SAFE_SKILL_NAME_LENGTH = 256, getWorkflowCommands2, loadAllCommands, getSkillToolCommands, getSlashCommandToolSkills, REMOTE_SAFE_COMMANDS, BRIDGE_SAFE_COMMANDS;
 var init_commands5 = __esm(() => {
   init_envUtils();
   init_add_dir2();
@@ -723810,6 +724026,7 @@ var init_commands5 = __esm(() => {
     ...process.env.USER_TYPE === "ant" && !process.env.IS_DEMO ? INTERNAL_ONLY_COMMANDS2 : []
   ]);
   builtInCommandNames = memoize_default(() => new Set(COMMANDS().flatMap((_4) => [_4.name, ..._4.aliases ?? []])));
+  UNSAFE_SKILL_NAME_CHARS_RE = /[\x00-\x1f\x7f-\x9f\u2028\u2029<>]/;
   getWorkflowCommands2 = feature("WORKFLOW_SCRIPTS") ? __toCommonJS(exports_createWorkflowCommand).getWorkflowCommands : null;
   loadAllCommands = memoize_default(async (cwd2) => {
     const [
@@ -727533,9 +727750,12 @@ import { posix as posix8 } from "path";
 function unescapePatternSegment(segment2) {
   return segment2.replace(/\\([\s\S])/g, (match, char) => ESCAPABLE_PATTERN_CHAR.test(char) ? char : match);
 }
-function escapePatternPath(path39) {
+function escapePatternPath(path39, opts) {
+  const escapeGlobs = opts?.escapeGlobs ?? true;
   let escaped = path39.replaceAll("\\", "\\\\").replace(/[[\]()|+^$]/g, (char) => `\\${char}`);
-  escaped = escaped.replaceAll("*", "\\*");
+  if (escapeGlobs) {
+    escaped = escaped.replaceAll("*", "\\*");
+  }
   if (escaped.startsWith("!") || escaped.startsWith("#")) {
     escaped = `\\${escaped}`;
   }
@@ -727932,7 +728152,7 @@ function getFileReadIgnorePatterns(toolPermissionContext) {
   const matchersByRoot = getCachedPatternMatchers(toolPermissionContext, "read", "deny");
   const result = new Map;
   for (const [patternRoot, { patternMap }] of matchersByRoot.entries()) {
-    result.set(patternRoot, Array.from(patternMap.keys()));
+    result.set(patternRoot, Array.from(patternMap.keys()).filter((pattern) => !pattern.startsWith("!")));
   }
   return result;
 }
@@ -727980,6 +728200,30 @@ function normalizeIgnorePattern(pattern) {
   }
   return pattern;
 }
+function warnUnusablePermissionRule(tag, pattern, reason, action2 = "treating it as matching nothing") {
+  const dedupKey = `${tag}\x00${pattern}`;
+  if (warnedUnusablePatterns.has(dedupKey)) {
+    return;
+  }
+  warnedUnusablePatterns.add(dedupKey);
+  logForDebugging(`[${tag}] gitignore-style pattern is unusable (${reason}); ${action2}: ${pattern}`, { level: "warn" });
+}
+function normalizePermissionRulePattern(pattern, isAllow) {
+  const normalized = normalizeTrailingGlobstar(pattern, isAllow);
+  const reason = !isAllow && BARE_NEGATION_PATTERN.test(normalized) ? "a negation of every path" : unusablePatternReason(normalized);
+  if (reason === null) {
+    return pattern;
+  }
+  const bangPrefix = pattern.startsWith("!") ? "!" : "";
+  const shouldDrop = bangPrefix ? !isAllow : isAllow;
+  warnUnusablePermissionRule("permission_rules", pattern, reason, shouldDrop ? "dropping it" : "matching the literal path it spells");
+  if (shouldDrop) {
+    return null;
+  }
+  const globstarSuffix = pattern.endsWith("/**") ? "/**" : "";
+  const middle = pattern.slice(bangPrefix.length, pattern.length - globstarSuffix.length);
+  return bangPrefix + escapePatternPath(unescapePatternSegment(middle), { escapeGlobs: false }) + globstarSuffix;
+}
 function getCachedPatternMatchers(toolPermissionContext, toolType, behavior) {
   const rulesObject = behavior === "deny" ? toolPermissionContext.alwaysDenyRules : behavior === "ask" ? toolPermissionContext.alwaysAskRules : null;
   const additionalDirs = JSON.stringify([...toolPermissionContext.additionalWorkingDirectories.keys()].sort());
@@ -728003,23 +728247,7 @@ function getCachedPatternMatchers(toolPermissionContext, toolType, behavior) {
       }
     }
   }
-  const patternsByRoot = getPatternsByRoot(toolPermissionContext, toolType, behavior);
-  const result = new Map;
-  for (const [root3, patternMap] of patternsByRoot.entries()) {
-    let ig;
-    let useCount = 0;
-    result.set(root3, {
-      patternMap,
-      getIg: () => {
-        if (ig === undefined || ++useCount > MATCHER_RECOMPILE_THRESHOLD) {
-          useCount = 1;
-          const patternsToAdd = behavior === "allow" ? Array.from(patternMap.keys()) : Array.from(patternMap.keys(), normalizeIgnorePattern);
-          ig = import_ignore6.default().add(patternsToAdd);
-        }
-        return ig;
-      }
-    });
-  }
+  const result = buildPatternBuckets(toolPermissionContext, toolType, behavior);
   if (rulesObject !== null) {
     let innerMap = matcherCache.get(rulesObject);
     if (innerMap === undefined) {
@@ -728036,7 +728264,7 @@ function getCachedPatternMatchers(toolPermissionContext, toolType, behavior) {
   }
   return result;
 }
-function getPatternsByRoot(toolPermissionContext, toolType, behavior) {
+function buildPatternBuckets(toolPermissionContext, toolType, behavior) {
   const toolName = (() => {
     switch (toolType) {
       case "edit":
@@ -728045,36 +728273,73 @@ function getPatternsByRoot(toolPermissionContext, toolType, behavior) {
         return FILE_READ_TOOL_NAME;
     }
   })();
-  const rules2 = getRuleByContentsForToolName(toolPermissionContext, toolName, behavior);
-  const patternsByRoot = new Map;
-  for (const [pattern, rule] of rules2.entries()) {
-    const { relativePattern, root: root3 } = patternWithRoot(pattern, rule.source);
-    let patternsForRoot = patternsByRoot.get(root3);
-    if (patternsForRoot === undefined) {
-      patternsForRoot = new Map;
-      patternsByRoot.set(root3, patternsForRoot);
-    }
-    patternsForRoot.set(relativePattern, rule);
-    if (behavior === "allow" || root3 === null) {
+  const isAllow = behavior === "allow";
+  const rulesList = getRuleListForToolName(toolPermissionContext, toolName, behavior);
+  const rules2 = isAllow ? Array.from(new Map(rulesList.map((rule) => [rule.ruleValue.ruleContent, rule])).values()) : rulesList;
+  const bucketsByRoot = new Map;
+  const getMatcher = (root3, source2) => {
+    let bucket = bucketsByRoot.get(root3);
+    if (bucket === undefined) {
+      bucket = { patternMap: new Map, matchers: [] };
+      bucketsByRoot.set(root3, bucket);
+    }
+    let matcher = bucket.matchers.find((candidate) => candidate.source === source2);
+    if (matcher === undefined) {
+      const patternMap = new Map;
+      let ig;
+      let useCount = 0;
+      matcher = {
+        source: source2,
+        patternMap,
+        getIg: () => {
+          if (ig === undefined || ++useCount > MATCHER_RECOMPILE_THRESHOLD) {
+            useCount = 1;
+            const patternsToAdd = isAllow ? Array.from(patternMap.keys()) : Array.from(patternMap.keys(), normalizeIgnorePattern);
+            ig = import_ignore6.default().add(patternsToAdd);
+          }
+          return ig;
+        }
+      };
+      bucket.matchers.push(matcher);
+    }
+    return { bucket, matcher };
+  };
+  for (const rule of rules2) {
+    const ruleContent = rule.ruleValue.ruleContent;
+    if (ruleContent === undefined) {
+      continue;
+    }
+    const { relativePattern, root: root3 } = patternWithRoot(ruleContent, rule.source);
+    const pattern = normalizePermissionRulePattern(collapsePatternSlashes(relativePattern), isAllow);
+    if (pattern === null) {
       continue;
     }
-    const twins = getOrInitPhysicalTwins(makePhysicalTwinsKey(root3, relativePattern));
-    const twin = resolvePhysicalTwinPattern(root3, relativePattern);
+    const matcherSource = isAllow ? null : rule.source;
+    const { bucket, matcher } = getMatcher(root3, matcherSource);
+    if (!isAllow) {
+      matcher.patternMap.delete(pattern);
+    }
+    matcher.patternMap.set(pattern, rule);
+    bucket.patternMap.set(pattern, rule);
+    if (isAllow || root3 === null) {
+      continue;
+    }
+    const twins = getOrInitPhysicalTwins(makePhysicalTwinsKey(root3, pattern));
+    const twin = resolvePhysicalTwinPattern(root3, pattern);
     if (twin !== null) {
       twins.add(twin);
     }
     for (const twinPattern of twins) {
-      let rootSlashPatterns = patternsByRoot.get(DIR_SEP2);
-      if (rootSlashPatterns === undefined) {
-        rootSlashPatterns = new Map;
-        patternsByRoot.set(DIR_SEP2, rootSlashPatterns);
+      const { bucket: twinBucket, matcher: twinMatcher } = getMatcher(DIR_SEP2, matcherSource);
+      if (!twinMatcher.patternMap.has(twinPattern)) {
+        twinMatcher.patternMap.set(twinPattern, rule);
       }
-      if (!rootSlashPatterns.has(twinPattern)) {
-        rootSlashPatterns.set(twinPattern, rule);
+      if (!twinBucket.patternMap.has(twinPattern)) {
+        twinBucket.patternMap.set(twinPattern, rule);
       }
     }
   }
-  return patternsByRoot;
+  return bucketsByRoot;
 }
 function matchingRuleForInput(path39, toolPermissionContext, toolType, behavior) {
   let fileAbsolutePath = expandPath(path39);
@@ -728082,8 +728347,7 @@ function matchingRuleForInput(path39, toolPermissionContext, toolType, behavior)
     fileAbsolutePath = windowsPathToPosixPath(fileAbsolutePath);
   }
   const matchersByRoot = getCachedPatternMatchers(toolPermissionContext, toolType, behavior);
-  for (const [root3, { patternMap, getIg }] of matchersByRoot.entries()) {
-    const ig = getIg();
+  for (const [root3, { matchers }] of matchersByRoot.entries()) {
     const relativePathStr = relativePath(root3 ?? getCwd(), fileAbsolutePath ?? getCwd());
     if (relativePathStr.startsWith(`..${DIR_SEP2}`)) {
       continue;
@@ -728091,14 +728355,31 @@ function matchingRuleForInput(path39, toolPermissionContext, toolType, behavior)
     if (!relativePathStr) {
       continue;
     }
-    const igResult = ig.test(relativePathStr);
-    if (igResult.ignored && igResult.rule) {
+    for (let i6 = matchers.length - 1;i6 >= 0; i6--) {
+      const matcher = matchers[i6];
+      if (matcher === undefined) {
+        continue;
+      }
+      const { patternMap, getIg } = matcher;
+      const igResult = getIg().test(relativePathStr);
+      if (!igResult.ignored || !igResult.rule) {
+        continue;
+      }
       const originalPattern = igResult.rule.pattern;
       const withWildcard = originalPattern + "/**";
-      if (patternMap.has(withWildcard)) {
+      if (patternMap.has(withWildcard) && (originalPattern.includes("/") || behavior !== "allow")) {
         return patternMap.get(withWildcard) ?? null;
       }
-      return patternMap.get(originalPattern) ?? null;
+      if (originalPattern.startsWith("/")) {
+        const withoutLeadingSlash = originalPattern.slice(1) + "/**";
+        if (patternMap.has(withoutLeadingSlash)) {
+          return patternMap.get(withoutLeadingSlash) ?? null;
+        }
+      }
+      const rule = patternMap.get(originalPattern);
+      if (rule !== undefined || behavior === "allow") {
+        return rule ?? null;
+      }
     }
   }
   return null;
@@ -728546,7 +728827,7 @@ function checkReadableInternalPath(absolutePath, input2) {
   }
   return { behavior: "passthrough", message: "" };
 }
-var import_ignore6, DANGEROUS_FILES2, DANGEROUS_DIRECTORIES2, DIR_SEP2, getClaudeTempDir, getBundledSkillsRoot, getResolvedWorkingDirPaths, MATCHER_RECOMPILE_THRESHOLD = 1e4, MATCHER_CACHE_MAX_ENTRIES = 16, matcherCache;
+var import_ignore6, DANGEROUS_FILES2, DANGEROUS_DIRECTORIES2, DIR_SEP2, getClaudeTempDir, getBundledSkillsRoot, getResolvedWorkingDirPaths, MATCHER_RECOMPILE_THRESHOLD = 1e4, MATCHER_CACHE_MAX_ENTRIES = 16, matcherCache, BARE_NEGATION_PATTERN, warnedUnusablePatterns;
 var init_filesystem = __esm(() => {
   init_featureFlags();
   init_memoize();
@@ -728556,6 +728837,7 @@ var init_filesystem = __esm(() => {
   init_growthbook();
   init_prompt3();
   init_cwd2();
+  init_debug();
   init_envUtils();
   init_fsOperations();
   init_path2();
@@ -728606,6 +728888,8 @@ var init_filesystem = __esm(() => {
   });
   getResolvedWorkingDirPaths = memoize_default(getPathsForPermissionCheck);
   matcherCache = new WeakMap;
+  BARE_NEGATION_PATTERN = /^!\s*$/;
+  warnedUnusablePatterns = new Set;
 });
 
 // src/utils/task/diskOutput.ts
@@ -728629,10 +728913,10 @@ __export(exports_diskOutput, {
   MAX_TASK_OUTPUT_BYTES: () => MAX_TASK_OUTPUT_BYTES,
   DiskTaskOutput: () => DiskTaskOutput
 });
-import { constants as fsConstants10 } from "fs";
+import { constants as fsConstants11 } from "fs";
 import {
   mkdir as mkdir53,
-  open as open15,
+  open as open16,
   stat as stat45,
   symlink as symlink4,
   unlink as unlink27
@@ -728720,7 +729004,7 @@ class DiskTaskOutput {
       try {
         if (!this.#fileHandle) {
           await ensureOutputDir();
-          this.#fileHandle = await open15(this.#path, process.platform === "win32" ? "a" : fsConstants10.O_WRONLY | fsConstants10.O_APPEND | fsConstants10.O_CREAT | O_NOFOLLOW2);
+          this.#fileHandle = await open16(this.#path, process.platform === "win32" ? "a" : fsConstants11.O_WRONLY | fsConstants11.O_APPEND | fsConstants11.O_CREAT | O_NOFOLLOW2);
         }
         while (true) {
           const cancelCount = this.#cancelCount;
@@ -728931,7 +729215,7 @@ function initTaskOutput(taskId) {
   return track((async () => {
     await ensureOutputDir();
     const outputPath = getTaskOutputPath(taskId);
-    const fh = await open15(outputPath, process.platform === "win32" ? "wx" : fsConstants10.O_WRONLY | fsConstants10.O_CREAT | fsConstants10.O_EXCL | O_NOFOLLOW2);
+    const fh = await open16(outputPath, process.platform === "win32" ? "wx" : fsConstants11.O_WRONLY | fsConstants11.O_CREAT | fsConstants11.O_EXCL | O_NOFOLLOW2);
     await fh.close();
     return outputPath;
   })());
@@ -728963,7 +729247,7 @@ var init_diskOutput = __esm(() => {
   init_fsOperations();
   init_log3();
   init_filesystem();
-  O_NOFOLLOW2 = fsConstants10.O_NOFOLLOW ?? 0;
+  O_NOFOLLOW2 = fsConstants11.O_NOFOLLOW ?? 0;
   DEFAULT_MAX_READ_BYTES = 8 * 1024 * 1024;
   MAX_TASK_OUTPUT_BYTES = 5 * 1024 * 1024 * 1024;
   MAX_UNWRITTEN_CHARS_BEFORE_DROP = 16 * 1024 * 1024;
@@ -772137,8 +772421,8 @@ function findTextObject(text2, offset, objectType2, isInner) {
     return findWordObject(text2, offset, isInner, (ch2) => !isVimWhitespace(ch2));
   const pair = PAIRS[objectType2];
   if (pair) {
-    const [open16, close] = pair;
-    return open16 === close ? findQuoteObject(text2, offset, open16, isInner) : findBracketObject(text2, offset, open16, close, isInner);
+    const [open17, close] = pair;
+    return open17 === close ? findQuoteObject(text2, offset, open17, isInner) : findBracketObject(text2, offset, open17, close, isInner);
   }
   return null;
 }
@@ -772213,13 +772497,13 @@ function findQuoteObject(text2, offset, quote2, isInner) {
   }
   return null;
 }
-function findBracketObject(text2, offset, open16, close, isInner) {
+function findBracketObject(text2, offset, open17, close, isInner) {
   let depth = 0;
   let start = -1;
   for (let i6 = offset;i6 >= 0; i6--) {
     if (text2[i6] === close && i6 !== offset)
       depth++;
-    else if (text2[i6] === open16) {
+    else if (text2[i6] === open17) {
       if (depth === 0) {
         start = i6;
         break;
@@ -772232,7 +772516,7 @@ function findBracketObject(text2, offset, open16, close, isInner) {
   depth = 0;
   let end = -1;
   for (let i6 = start + 1;i6 < text2.length; i6++) {
-    if (text2[i6] === open16)
+    if (text2[i6] === open17)
       depth++;
     else if (text2[i6] === close) {
       if (depth === 0) {
@@ -776445,6 +776729,43 @@ var init_PromptInputStashNotice = __esm(() => {
   jsx_runtime436 = __toESM(require_jsx_runtime(), 1);
 });
 
+// src/components/PromptInput/sanitizeBannerText.ts
+function stripLoneSurrogates(text2) {
+  if (isWellFormed && isWellFormed(text2))
+    return text2;
+  return text2.replace(LONE_SURROGATE_RE, "");
+}
+function stripAnsiSequences(text2) {
+  let result = text2;
+  for (let pass2 = 0;pass2 < ANSI_STRIP_PASSES; pass2++) {
+    const next2 = result.replace(ANSI_SEQUENCE_RE, "");
+    if (next2 === result)
+      break;
+    result = next2;
+  }
+  return result;
+}
+function replaceControlsWithSpace(text2) {
+  return text2.replace(CONTROL_FORMAT_RE, " ");
+}
+function sanitizeBannerText(text2) {
+  return replaceControlsWithSpace(stripAnsiSequences(stripLoneSurrogates(text2))).replace(/ {2,}/g, " ").trim();
+}
+function clampBannerTextWidth(maxWidth) {
+  return Math.max(1, Math.min(BANNER_TEXT_MAX_WIDTH, maxWidth - 1));
+}
+function sanitizeAndClampBannerText(text2, maxWidth) {
+  return truncateToWidth(sanitizeBannerText(text2), clampBannerTextWidth(maxWidth));
+}
+var BANNER_TEXT_MAX_WIDTH = 24, ANSI_STRIP_PASSES = 4, ANSI_SEQUENCE_RE, LONE_SURROGATE_RE, CONTROL_FORMAT_RE, isWellFormed;
+var init_sanitizeBannerText = __esm(() => {
+  init_truncate();
+  ANSI_SEQUENCE_RE = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]|\x1b[\]PX^_][^\x1b\x07]*(?:\x07|\x1b\\)/g;
+  LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
+  CONTROL_FORMAT_RE = /[\p{Cc}\p{Cf}\u2028\u2029]+/gu;
+  isWellFormed = typeof String.prototype.isWellFormed === "function" ? Function.prototype.call.bind(String.prototype.isWellFormed) : undefined;
+});
+
 // src/components/PromptInput/inputPaste.ts
 function maybeTruncateMessageForInput(text2, nextPasteId) {
   if (text2.length <= TRUNCATION_THRESHOLD) {
@@ -778564,6 +778885,7 @@ function PromptInput({
       })
     });
   }
+  const bannerText = swarmBanner ? sanitizeAndClampBannerText(swarmBanner.text, columns) : "";
   const textInputElement = isVimModeEnabled() ? /* @__PURE__ */ jsx_runtime437.jsx(VimTextInput, {
     ...baseProps,
     initialMode: vimMode,
@@ -778593,15 +778915,15 @@ function PromptInput({
         children: [
           /* @__PURE__ */ jsx_runtime437.jsx(ThemedText, {
             color: swarmBanner.bgColor,
-            children: swarmBanner.text ? /* @__PURE__ */ jsx_runtime437.jsxs(jsx_runtime437.Fragment, {
+            children: bannerText ? /* @__PURE__ */ jsx_runtime437.jsxs(jsx_runtime437.Fragment, {
               children: [
-                "\u2500".repeat(Math.max(0, columns - stringWidth(swarmBanner.text) - 4)),
+                "\u2500".repeat(Math.max(0, columns - stringWidth(bannerText) - 4)),
                 /* @__PURE__ */ jsx_runtime437.jsxs(ThemedText, {
                   backgroundColor: swarmBanner.bgColor,
                   color: "inverseText",
                   children: [
                     " ",
-                    swarmBanner.text,
+                    bannerText,
                     " "
                   ]
                 }),
@@ -778878,6 +779200,7 @@ var init_PromptInput = __esm(() => {
   init_PromptInputModeIndicator();
   init_PromptInputQueuedCommands();
   init_PromptInputStashNotice();
+  init_sanitizeBannerText();
   init_useMaybeTruncateInput();
   init_usePromptInputPlaceholder();
   init_useShowFastIconHint();
@@ -795149,7 +795472,7 @@ function useSurveyState({
     setState("submitted");
     setTimeout(setState, hideThanksAfterMs, "closed");
   }, [hideThanksAfterMs]);
-  const open16 = import_react293.useCallback(() => {
+  const open17 = import_react293.useCallback(() => {
     if (state4 !== "closed") {
       return;
     }
@@ -795200,7 +795523,7 @@ function useSurveyState({
   return {
     state: state4,
     lastResponse,
-    open: open16,
+    open: open17,
     handleSelect,
     handleTranscriptSelect
   };
@@ -795336,7 +795659,7 @@ function useFeedbackSurvey(messages, isLoading, submitCount, surveyType = "sessi
   const {
     state: state4,
     lastResponse,
-    open: open16,
+    open: open17,
     handleSelect,
     handleTranscriptSelect
   } = useSurveyState({
@@ -795417,9 +795740,9 @@ function useFeedbackSurvey(messages, isLoading, submitCount, surveyType = "sessi
   }, [state4, isLoading, hasActivePrompt, isModelAllowed2, feedbackSurvey.timeLastShown, feedbackSurvey.submitCountAtLastAppearance, submitCount, config8.minTimeBetweenFeedbackMs, config8.minTimeBetweenGlobalFeedbackMs, config8.minUserTurnsBetweenFeedback, config8.minTimeBeforeFeedbackMs, config8.minUserTurnsBeforeFeedback, config8.probability, settingsRate]);
   import_react294.useEffect(() => {
     if (shouldOpen) {
-      open16();
+      open17();
     }
-  }, [shouldOpen, open16]);
+  }, [shouldOpen, open17]);
   return {
     state: state4,
     lastResponse,
@@ -795563,7 +795886,7 @@ function useMemorySurvey(messages, isLoading, hasActivePrompt = false, {
   const {
     state: state4,
     lastResponse,
-    open: open16,
+    open: open17,
     handleSelect,
     handleTranscriptSelect
   } = useSurveyState({
@@ -795616,9 +795939,9 @@ function useMemorySurvey(messages, isLoading, hasActivePrompt = false, {
       return;
     }
     if (Math.random() < SURVEY_PROBABILITY) {
-      open16();
+      open17();
     }
-  }, [enabled2, state4, isLoading, hasActivePrompt, lastAssistant, messages, open16]);
+  }, [enabled2, state4, isLoading, hasActivePrompt, lastAssistant, messages, open17]);
   return {
     state: state4,
     lastResponse,
@@ -795700,7 +796023,7 @@ function usePostCompactSurvey(messages, isLoading, t0, t1) {
   const {
     state: state4,
     lastResponse,
-    open: open16,
+    open: open17,
     handleSelect
   } = useSurveyState(t5);
   let t6;
@@ -795732,7 +796055,7 @@ function usePostCompactSurvey(messages, isLoading, t0, t1) {
   const currentCompactBoundaries = t8;
   let t10;
   let t9;
-  if ($4[9] !== currentCompactBoundaries || $4[10] !== enabled2 || $4[11] !== gateEnabled || $4[12] !== hasActivePrompt || $4[13] !== isLoading || $4[14] !== messages || $4[15] !== open16 || $4[16] !== state4) {
+  if ($4[9] !== currentCompactBoundaries || $4[10] !== enabled2 || $4[11] !== gateEnabled || $4[12] !== hasActivePrompt || $4[13] !== isLoading || $4[14] !== messages || $4[15] !== open17 || $4[16] !== state4) {
     t9 = () => {
       if (!enabled2) {
         return;
@@ -795756,7 +796079,7 @@ function usePostCompactSurvey(messages, isLoading, t0, t1) {
         if (hasMessageAfterBoundary(messages, pendingCompactBoundaryUuid.current)) {
           pendingCompactBoundaryUuid.current = null;
           if (Math.random() < SURVEY_PROBABILITY2) {
-            open16();
+            open17();
           }
           return;
         }
@@ -795767,14 +796090,14 @@ function usePostCompactSurvey(messages, isLoading, t0, t1) {
         pendingCompactBoundaryUuid.current = newBoundaries[newBoundaries.length - 1];
       }
     };
-    t10 = [enabled2, currentCompactBoundaries, state4, isLoading, hasActivePrompt, gateEnabled, messages, open16];
+    t10 = [enabled2, currentCompactBoundaries, state4, isLoading, hasActivePrompt, gateEnabled, messages, open17];
     $4[9] = currentCompactBoundaries;
     $4[10] = enabled2;
     $4[11] = gateEnabled;
     $4[12] = hasActivePrompt;
     $4[13] = isLoading;
     $4[14] = messages;
-    $4[15] = open16;
+    $4[15] = open17;
     $4[16] = state4;
     $4[17] = t10;
     $4[18] = t9;
@@ -801933,12 +802256,13 @@ function AlternateScreen(t0) {
       if (!writeRaw) {
         return;
       }
-      writeRaw(ENTER_ALT_SCREEN + "\x1B[2J\x1B[H" + (mouseTracking ? ENABLE_MOUSE_TRACKING : ""));
+      writeRaw(ENTER_ALT_SCREEN + "\x1B[2J\x1B[H" + (mouseTracking ? ENABLE_MOUSE_TRACKING : "") + (ink?.nativeCursorSeq ?? ""));
       ink?.setAltScreenActive(true, mouseTracking);
       return () => {
         ink?.setAltScreenActive(false);
         ink?.clearTextSelection();
-        writeRaw((mouseTracking ? DISABLE_MOUSE_TRACKING : "") + EXIT_ALT_SCREEN);
+        const cursorSeq = !ink?.hasUnmounted ? ink?.nativeCursorSeq ?? "" : "";
+        writeRaw((mouseTracking ? DISABLE_MOUSE_TRACKING : "") + EXIT_ALT_SCREEN + cursorSeq);
       };
     };
     t32 = [writeRaw, mouseTracking];
@@ -813815,7 +814139,7 @@ var init_claudeInChrome = __esm(() => {
 });
 
 // src/skills/bundled/debug.ts
-import { open as open16, stat as stat52 } from "fs/promises";
+import { open as open17, stat as stat52 } from "fs/promises";
 function registerDebugSkill() {
   registerBundledSkill({
     name: "debug",
@@ -813832,7 +814156,7 @@ function registerDebugSkill() {
         const stats = await stat52(debugLogPath);
         const readSize = Math.min(stats.size, TAIL_READ_BYTES);
         const startOffset = stats.size - readSize;
-        const fd2 = await open16(debugLogPath, "r");
+        const fd2 = await open17(debugLogPath, "r");
         try {
           const { buffer, bytesRead } = await fd2.read({
             buffer: Buffer.alloc(readSize),
@@ -818337,7 +818661,7 @@ __export(exports_fetchPluginZip, {
   DEFAULT_PLUGIN_ZIP_TIMEOUT_MS: () => DEFAULT_PLUGIN_ZIP_TIMEOUT_MS
 });
 import { randomUUID as randomUUID64 } from "crypto";
-import { mkdir as mkdir60, open as open17, rm as rm14 } from "fs/promises";
+import { mkdir as mkdir60, open as open18, rm as rm14 } from "fs/promises";
 import { tmpdir as tmpdir19 } from "os";
 import { join as join186 } from "path";
 function validatePluginZipUrl(raw) {
@@ -818353,7 +818677,7 @@ function validatePluginZipUrl(raw) {
   return parsed;
 }
 async function openForWrite(path43) {
-  const handle2 = await open17(path43, "w");
+  const handle2 = await open18(path43, "w");
   return {
     write: async (chunk) => {
       await handle2.writeFile(chunk);
@@ -824802,14 +825126,14 @@ async function startMCPServer(cwd3, debug10, verbose) {
     } catch (error52) {
       logError2(error52);
       const parts = error52 instanceof Error ? getErrorParts(error52) : [String(error52)];
-      const errorText = parts.filter(Boolean).join(`
+      const errorText2 = parts.filter(Boolean).join(`
 `).trim() || "Error";
       return {
         isError: true,
         content: [
           {
             type: "text",
-            text: errorText
+            text: errorText2
           }
         ]
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.332",
+  "version": "2.1.333",
   "license": "MIT",
   "type": "module",
   "bin": {