@cydm/pie 1.0.48 → 1.0.49

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

@@ -1,7 +1,7 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createAskUserCapability
-} from "../../../chunks/chunk-IJMP3JTX.js";
+} from "../../../chunks/chunk-7RYOIXA2.js";
 import "../../../chunks/chunk-FKAO25XH.js";
 import "../../../chunks/chunk-K6ZOCJ4V.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";

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

@@ -7,7 +7,7 @@ import {
   isPlanModeSafeCommand,
   markCompletedPlanSteps,
   restoreExecutionState
-} from "../../../chunks/chunk-IJMP3JTX.js";
+} from "../../../chunks/chunk-7RYOIXA2.js";
 import "../../../chunks/chunk-FKAO25XH.js";
 import {
   Type

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

@@ -1,11 +1,11 @@
 import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
 import {
   createCliHostCapabilities
-} from "../../../chunks/chunk-U4B6RJ6Z.js";
+} from "../../../chunks/chunk-J6PEH6ST.js";
 import {
   createSharedFileSystemTools,
   createSubagentCapability
-} from "../../../chunks/chunk-IJMP3JTX.js";
+} from "../../../chunks/chunk-7RYOIXA2.js";
 import "../../../chunks/chunk-FKAO25XH.js";
 import "../../../chunks/chunk-K6ZOCJ4V.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";

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

@@ -7,7 +7,7 @@ import {
   executeManageTodoList,
   executionStateToTodos,
   restoreExecutionState
-} from "../../../chunks/chunk-IJMP3JTX.js";
+} from "../../../chunks/chunk-7RYOIXA2.js";
 import "../../../chunks/chunk-FKAO25XH.js";
 import "../../../chunks/chunk-K6ZOCJ4V.js";
 import "../../../chunks/chunk-LZQXQOPJ.js";

package/dist/chunks/{chunk-IJMP3JTX.js → chunk-7RYOIXA2.js}

@@ -7869,6 +7869,193 @@ function fuzzyFindText(content, oldText) {
 function stripBom(content) {
   return content.startsWith("\uFEFF") ? { bom: "\uFEFF", text: content.slice(1) } : { bom: "", text: content };
 }
+function findEditMatch(content, oldText, newText) {
+  const direct = fuzzyFindText(content, oldText);
+  if (direct.found) {
+    return { found: true, occurrences: direct.occurrences, matches: direct.matches, matchKind: direct.matchKind };
+  }
+  return findWhitespaceRelaxedMatch(content, oldText, newText);
+}
+function leadingWhitespace(line) {
+  const match2 = line.match(/^[ \t]*/);
+  return match2 ? match2[0] : "";
+}
+function findRelaxedWindows(fileLines, qLines) {
+  const firstNonBlank = qLines.findIndex((line) => line.trim() !== "");
+  if (firstNonBlank === -1) return [];
+  const anchor = qLines[firstNonBlank].trim();
+  if (!anchor) return [];
+  const windows = [];
+  for (let anchorFileLine = 0; anchorFileLine < fileLines.length; anchorFileLine++) {
+    if (fileLines[anchorFileLine].trim() !== anchor) continue;
+    const startLine = anchorFileLine - firstNonBlank;
+    if (startLine < 0) continue;
+    let fileLine = startLine;
+    let ok = true;
+    let lastPaired = -1;
+    const qLineToFileLine = /* @__PURE__ */ new Map();
+    for (let qLine = 0; qLine < qLines.length; qLine++) {
+      if (fileLine >= fileLines.length) {
+        ok = false;
+        break;
+      }
+      const q = qLines[qLine];
+      const f = fileLines[fileLine];
+      if (q.trim() === "") {
+        if (f.trim() !== "") {
+          ok = false;
+          break;
+        }
+      } else {
+        if (f.trim() !== q.trim()) {
+          ok = false;
+          break;
+        }
+        qLineToFileLine.set(qLine, fileLine);
+        lastPaired = fileLine;
+      }
+      fileLine++;
+    }
+    if (ok && lastPaired !== -1) windows.push({ startLine, endLine: lastPaired, qLineToFileLine });
+  }
+  return windows;
+}
+function lineSpanToCharSpan(fileLines, startLine, endLine) {
+  let index = 0;
+  for (let i = 0; i < startLine; i++) index += fileLines[i].length + 1;
+  let matchLength = 0;
+  for (let i = startLine; i <= endLine; i++) matchLength += fileLines[i].length + (i < endLine ? 1 : 0);
+  return { index, matchLength };
+}
+function reindentNewText(newText, qLines, fileLines, window) {
+  const newLines = newText.split("\n");
+  const qIndent = (qLine) => {
+    const fileLine = window.qLineToFileLine.get(qLine);
+    return fileLine === void 0 ? "" : leadingWhitespace(fileLines[fileLine]);
+  };
+  const qIdx = [];
+  for (let i = 0; i < qLines.length; i++) if (qLines[i].trim() !== "") qIdx.push(i);
+  const nIdx = [];
+  const nPosOfLine = /* @__PURE__ */ new Map();
+  for (let i = 0; i < newLines.length; i++) {
+    if (newLines[i].trim() === "") continue;
+    nPosOfLine.set(i, nIdx.length);
+    nIdx.push(i);
+  }
+  if (nIdx.length === 0) return newText;
+  const counterpart = /* @__PURE__ */ new Map();
+  let p = 0;
+  while (p < qIdx.length && p < nIdx.length && qLines[qIdx[p]].trim() === newLines[nIdx[p]].trim()) {
+    counterpart.set(p, p);
+    p++;
+  }
+  let s = 0;
+  while (s < qIdx.length - p && s < nIdx.length - p && qLines[qIdx[qIdx.length - 1 - s]].trim() === newLines[nIdx[nIdx.length - 1 - s]].trim()) {
+    counterpart.set(nIdx.length - 1 - s, qIdx.length - 1 - s);
+    s++;
+  }
+  const midQ = [];
+  for (let pos = p; pos < qIdx.length - s; pos++) midQ.push(pos);
+  const midN = [];
+  for (let pos = p; pos < nIdx.length - s; pos++) midN.push(pos);
+  const pairRegion = (qLo, qHi, nLo, nHi) => {
+    const qCount = qHi - qLo;
+    const nCount = nHi - nLo;
+    const paired = Math.min(qCount, nCount);
+    for (let k = 0; k < paired; k++) counterpart.set(nLo + k, qLo + k);
+    const fallbackQ = qCount > 0 ? qHi - 1 : Math.max(qLo - 1, 0);
+    for (let k = paired; k < nCount; k++) counterpart.set(nLo + k, fallbackQ);
+  };
+  const qTextCounts = /* @__PURE__ */ new Map();
+  for (const qPos of midQ) {
+    const t = qLines[qIdx[qPos]].trim();
+    qTextCounts.set(t, (qTextCounts.get(t) ?? 0) + 1);
+  }
+  const qPosByText = /* @__PURE__ */ new Map();
+  for (const qPos of midQ) {
+    const t = qLines[qIdx[qPos]].trim();
+    if (qTextCounts.get(t) === 1) qPosByText.set(t, qPos);
+  }
+  const nTextCounts = /* @__PURE__ */ new Map();
+  for (const nPos of midN) {
+    const t = newLines[nIdx[nPos]].trim();
+    nTextCounts.set(t, (nTextCounts.get(t) ?? 0) + 1);
+  }
+  let cursorQ = p;
+  let cursorN = p;
+  for (const nPos of midN) {
+    const t = newLines[nIdx[nPos]].trim();
+    const qPos = qPosByText.get(t);
+    if (nTextCounts.get(t) !== 1 || qPos === void 0 || qPos < cursorQ) continue;
+    pairRegion(cursorQ, qPos, cursorN, nPos);
+    counterpart.set(nPos, qPos);
+    cursorQ = qPos + 1;
+    cursorN = nPos + 1;
+  }
+  pairRegion(cursorQ, qIdx.length - s, cursorN, nIdx.length - s);
+  const result = [];
+  for (let i = 0; i < newLines.length; i++) {
+    if (newLines[i].trim() === "") {
+      result.push("");
+      continue;
+    }
+    const nPos = nPosOfLine.get(i) ?? 0;
+    const qPos = counterpart.get(nPos) ?? 0;
+    result.push(qIndent(qIdx[qPos] ?? qIdx[0]) + newLines[i].trim());
+  }
+  return result.join("\n");
+}
+function findWhitespaceRelaxedMatch(content, oldText, newText) {
+  const fileLines = content.split("\n");
+  const qLines = oldText.split("\n");
+  const windows = findRelaxedWindows(fileLines, qLines);
+  if (windows.length === 0) {
+    return { found: false, occurrences: 0, matches: [], matchKind: "none" };
+  }
+  const matches = windows.map((window) => {
+    const span = lineSpanToCharSpan(fileLines, window.startLine, window.endLine);
+    return { ...span, replacementText: reindentNewText(newText, qLines, fileLines, window) };
+  });
+  return { found: true, occurrences: matches.length, matches, matchKind: "whitespace-relaxed" };
+}
+function describeClosestRegion(content, oldText) {
+  const qLines = oldText.split("\n");
+  const firstNonBlank = qLines.findIndex((line) => line.trim() !== "");
+  if (firstNonBlank === -1) return void 0;
+  const anchor = qLines[firstNonBlank].trim();
+  const fileLines = content.split("\n");
+  const clip = (text) => text.length > 90 ? `${text.slice(0, 90)}\u2026` : text;
+  let best;
+  for (let i = 0; i < fileLines.length; i++) {
+    if (fileLines[i].trim() !== anchor) continue;
+    let matched = 0;
+    let fi = i;
+    let firstDiff;
+    for (let qi = firstNonBlank; qi < qLines.length; qi++) {
+      const q = qLines[qi].trim();
+      if (!q) continue;
+      while (fi < fileLines.length && !fileLines[fi].trim()) fi++;
+      if (fi >= fileLines.length || fileLines[fi].trim() !== q) {
+        firstDiff = { fileNo: fi + 1, fileLine: fileLines[fi] ?? "<end of file>", qLine: qLines[qi] };
+        break;
+      }
+      matched++;
+      fi++;
+    }
+    if (!best || matched > best.matched) best = { start: i, matched, firstDiff };
+  }
+  const total = qLines.filter((line) => line.trim() !== "").length;
+  if (!best) {
+    return `No line matching ${JSON.stringify(clip(anchor))} exists in this file \u2014 the text may live in a different file, or the file changed since it was read.`;
+  }
+  const parts = [`Closest match: file lines ${best.start + 1}\u2013${best.start + total} (${best.matched}/${total} lines matched by trimmed content).`];
+  if (best.firstDiff) {
+    parts.push(`First difference at line ${best.firstDiff.fileNo}: file has ${JSON.stringify(clip(best.firstDiff.fileLine.trim()))}, edit expected ${JSON.stringify(clip(best.firstDiff.qLine.trim()))}.`);
+  } else {
+    parts.push("All non-empty lines match by trimmed content \u2014 the mismatch is leading whitespace or blank-line placement.");
+  }
+  return parts.join(" ");
+}
 function generateDiffString(oldContent, newContent, contextLines = 4) {
   const oldLines = normalizeToLF(stripBom(oldContent).text).split("\n");
   const newLines = normalizeToLF(stripBom(newContent).text).split("\n");
@@ -7982,7 +8169,8 @@ function createEditErrorResult(params) {
   const detailLines = [
     params.message,
     params.recoveryHint,
-    params.alreadyAppliedCandidate ? "Diagnostic: newText already appears in the current file, but edit_file did not treat that as success because it may be an unrelated occurrence." : ""
+    params.alreadyAppliedCandidate ? "Diagnostic: newText already appears in the current file, but edit_file did not treat that as success because it may be an unrelated occurrence." : "",
+    params.closestMatch ? `Diagnostic: ${params.closestMatch}` : ""
   ].filter(Boolean);
   return {
     content: [{ type: "text", text: detailLines.join("\n") }],
@@ -8034,7 +8222,7 @@ function createEditTool(cwd, options) {
       newText: Type.String({ description: "Replacement text", maxLength: MAX_EDIT_INPUT_CHARS }),
       replaceAll: Type.Optional(Type.Boolean({ description: "Replace every occurrence" }))
     }), {
-      description: "One or more independent replacements matched against the original file",
+      description: "Replacements applied in order: each edit matches the file as left by the previous edit, so later edits can build on earlier ones. Whole-line indentation drift is tolerated \u2014 matches locate by trimmed content and the replacement adopts the file's indentation.",
       minItems: 1,
       maxItems: MAX_EDIT_BLOCKS
     })
@@ -8043,7 +8231,7 @@ function createEditTool(cwd, options) {
   return {
     name: "edit",
     label: "edit",
-    description: `Make precise exact-text replacements in one file. For multiple changes in the same file, put all independent replacements in one edits[] call. ${pathResolutionDescription}`,
+    description: `Make precise exact-text replacements in one file. For multiple changes in the same file, put all replacements in one edits[] call \u2014 they apply in order, so later edits can target what earlier ones just changed. ${pathResolutionDescription}`,
     parameters: editSchema,
     execute: async (_toolCallId, params, signal) => {
       const { path: path4, root } = params;
@@ -8087,7 +8275,9 @@ function createEditTool(cwd, options) {
             const { bom, text: content } = stripBom(rawContent);
             const originalEnding = detectLineEnding(content);
             const normalizedContent = normalizeToLF(content);
-            const planned = [];
+            let workingContent = normalizedContent;
+            const plannedKinds = /* @__PURE__ */ new Set();
+            let replacedOccurrences = 0;
             let totalOldOccurrences = 0;
             let totalNewOccurrences = 0;
             let anyReplaceAll = false;
@@ -8095,8 +8285,8 @@ function createEditTool(cwd, options) {
               throwIfAborted();
               const normalizedOldText = normalizeToLF(replacement.oldText);
               const normalizedNewText = normalizeToLF(replacement.newText);
-              const newTextOccurrences = countOccurrences(normalizedContent, normalizedNewText);
-              const matchResult = fuzzyFindText(normalizedContent, normalizedOldText);
+              const newTextOccurrences = countOccurrences(workingContent, normalizedNewText);
+              const matchResult = findEditMatch(workingContent, normalizedOldText, normalizedNewText);
               totalOldOccurrences += matchResult.occurrences;
               totalNewOccurrences += newTextOccurrences;
               anyReplaceAll ||= replacement.replaceAll;
@@ -8111,7 +8301,8 @@ function createEditTool(cwd, options) {
                   replaceAll: replacement.replaceAll,
                   staleBaseLikely: newTextOccurrences > 0,
                   alreadyAppliedCandidate: newTextOccurrences > 0,
-                  recoveryHint: newTextOccurrences > 0 ? "The replacement may already be present. Read the current file before retrying." : "Read the latest file and retry with exact text."
+                  recoveryHint: newTextOccurrences > 0 ? "The replacement may already be present. Read the current file before retrying." : "Read the latest file and retry with exact text.",
+                  closestMatch: describeClosestRegion(workingContent, normalizedOldText)
                 }));
                 return;
               }
@@ -8128,9 +8319,9 @@ function createEditTool(cwd, options) {
                 }));
                 return;
               }
-              const matches = replacement.replaceAll ? matchResult.matches : matchResult.matches.slice(0, 1);
-              const changingMatches = matches.filter(
-                (match2) => normalizedContent.slice(match2.index, match2.index + match2.matchLength) !== normalizedNewText
+              const selected = replacement.replaceAll ? matchResult.matches : matchResult.matches.slice(0, 1);
+              const changingMatches = selected.filter(
+                (match2) => workingContent.slice(match2.index, match2.index + match2.matchLength) !== (match2.replacementText ?? normalizedNewText)
               );
               if (changingMatches.length === 0) {
                 if (signal) signal.removeEventListener("abort", onAbort);
@@ -8146,42 +8337,20 @@ function createEditTool(cwd, options) {
                 }));
                 return;
               }
-              for (const match2 of changingMatches) {
-                planned.push({ ...match2, newText: normalizedNewText, matchKind: matchResult.matchKind });
-              }
-            }
-            const ordered = [...planned].sort((left, right) => left.index - right.index);
-            for (let index = 1; index < ordered.length; index++) {
-              throwIfAborted();
-              const previous = ordered[index - 1];
-              const current = ordered[index];
-              if (current.index < previous.index + previous.matchLength) {
-                if (signal) signal.removeEventListener("abort", onAbort);
-                resolve3(createEditErrorResult({
-                  message: `Edits overlap in ${path4}; no changes were made.`,
-                  matchKind: "mixed",
-                  errorReason: "overlapping_edits",
-                  oldTextOccurrences: totalOldOccurrences,
-                  newTextOccurrences: totalNewOccurrences,
-                  replaceAll: anyReplaceAll,
-                  recoveryHint: "Merge overlapping replacements into one exact edit."
-                }));
-                return;
+              for (const match2 of [...changingMatches].sort((left, right) => right.index - left.index)) {
+                throwIfAborted();
+                workingContent = workingContent.substring(0, match2.index) + (match2.replacementText ?? normalizedNewText) + workingContent.substring(match2.index + match2.matchLength);
+                replacedOccurrences++;
+                if (matchResult.matchKind !== "none") plannedKinds.add(matchResult.matchKind);
               }
             }
             throwIfAborted();
-            const baseContent = normalizedContent;
-            let newContent = baseContent;
-            for (const match2 of [...planned].sort((left, right) => right.index - left.index)) {
-              throwIfAborted();
-              newContent = newContent.substring(0, match2.index) + match2.newText + newContent.substring(match2.index + match2.matchLength);
-            }
-            if (baseContent === newContent) {
+            if (workingContent === normalizedContent) {
               if (signal) signal.removeEventListener("abort", onAbort);
               resolve3(
                 createEditErrorResult({
                   message: `No changes made to ${path4}. The replacement produced identical content.`,
-                  matchKind: planned.every((match2) => match2.matchKind === planned[0]?.matchKind) ? planned[0]?.matchKind ?? "none" : "mixed",
+                  matchKind: plannedKinds.size === 1 ? [...plannedKinds][0] : "mixed",
                   errorReason: "replacement_no_change",
                   oldTextOccurrences: totalOldOccurrences,
                   newTextOccurrences: totalNewOccurrences,
@@ -8192,6 +8361,7 @@ function createEditTool(cwd, options) {
               );
               return;
             }
+            const newContent = workingContent;
             const finalContent = bom + restoreLineEndings(newContent, originalEnding);
             throwIfAborted();
             await fs2.writeFile(absolutePath, finalContent, "utf-8");
@@ -8201,13 +8371,12 @@ function createEditTool(cwd, options) {
               signal.removeEventListener("abort", onAbort);
             }
             const diffResult = generateDiffString(content, restoreLineEndings(newContent, originalEnding));
-            const matchKinds = new Set(planned.map((match2) => match2.matchKind));
-            const matchKind = matchKinds.size === 1 ? planned[0]?.matchKind ?? "none" : "mixed";
+            const matchKind = plannedKinds.size === 1 ? [...plannedKinds][0] : "mixed";
             resolve3({
               content: [
                 {
                   type: "text",
-                  text: `Changed ${path4}: ${replacements.length} edit block${replacements.length === 1 ? "" : "s"}, ${planned.length} replacement${planned.length === 1 ? "" : "s"}. First changed line: ${diffResult.firstChangedLine}.`
+                  text: `Changed ${path4}: ${replacements.length} edit block${replacements.length === 1 ? "" : "s"}, ${replacedOccurrences} replacement${replacedOccurrences === 1 ? "" : "s"}. First changed line: ${diffResult.firstChangedLine}.`
                 },
                 { type: "text", text: boundedDiff(diffResult.diff) }
               ],
@@ -8221,7 +8390,7 @@ function createEditTool(cwd, options) {
                 oldTextOccurrences: totalOldOccurrences,
                 newTextOccurrences: totalNewOccurrences,
                 replaceAll: anyReplaceAll,
-                replacedOccurrences: planned.length,
+                replacedOccurrences,
                 replacedBlocks: replacements.length
               }
             });

package/dist/chunks/{chunk-U4B6RJ6Z.js → chunk-J6PEH6ST.js}

@@ -8,7 +8,7 @@ import {
   createSharedWebSearchTool,
   interpretShellExit,
   requestInteraction
-} from "./chunk-IJMP3JTX.js";
+} from "./chunk-7RYOIXA2.js";
 import {
   Type
 } from "./chunk-K6ZOCJ4V.js";

package/dist/cli.js

@@ -19,7 +19,10 @@ import {
   getThemesDir,
   migrateConfigFromAgentDir,
   truncateHeadTail
-} from "./chunks/chunk-U4B6RJ6Z.js";
+} from "./chunks/chunk-J6PEH6ST.js";
+import {
+  resolveCliProjectRoot
+} from "./chunks/chunk-WLFOBECN.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
@@ -70,7 +73,7 @@ import {
   setExtensionEnabledInSettings,
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState
-} from "./chunks/chunk-IJMP3JTX.js";
+} from "./chunks/chunk-7RYOIXA2.js";
 import "./chunks/chunk-FKAO25XH.js";
 import {
   Deref,
@@ -108,9 +111,6 @@ import {
   sortToolModelCandidatesByCapability,
   type_exports
 } from "./chunks/chunk-K6ZOCJ4V.js";
-import {
-  resolveCliProjectRoot
-} from "./chunks/chunk-WLFOBECN.js";
 import {
   __commonJS,
   __require,
@@ -51855,13 +51855,6 @@ var Editor = class {
   autocompleteState = null;
   autocompletePrefix = "";
   autocompleteMaxVisible = 5;
-  /**
-   * Whether the user moved the autocomplete selection (arrows/paging).
-   * A bare "/" + Enter still submits the slash itself (root command menu),
-   * but once the user has actively highlighted an item, Enter must accept
-   * that selection instead of re-opening the same menu.
-   */
-  autocompleteListTouched = false;
   // Paste tracking for large pastes
   pastes = /* @__PURE__ */ new Map();
   pasteCounter = 0;
@@ -52098,12 +52091,10 @@ var Editor = class {
         return;
       }
       if (kb.matches(data, "selectUp") || kb.matches(data, "selectDown")) {
-        this.autocompleteListTouched = true;
         this.autocompleteList.handleInput(data);
         return;
       }
       if (kb.matches(data, "cursorLeft") || kb.matches(data, "cursorRight") || kb.matches(data, "pageUp") || kb.matches(data, "pageDown")) {
-        this.autocompleteListTouched = true;
         this.autocompleteList.handleInput(data);
         return;
       }
@@ -52128,32 +52119,26 @@ var Editor = class {
         return;
       }
       if (kb.matches(data, "selectConfirm")) {
-        const currentLine = this.state.lines[this.state.cursorLine] || "";
-        const isBareSlashSubmit = !this.autocompleteListTouched && this.state.lines.length === 1 && currentLine === "/" && this.state.cursorCol === 1;
-        if (isBareSlashSubmit) {
-          this.cancelAutocomplete();
-        } else {
-          const selected = this.autocompleteList.getSelectedItem();
-          if (selected && this.autocompleteProvider) {
-            this.pushUndoSnapshot();
-            this.lastAction = null;
-            const result = this.autocompleteProvider.applyCompletion(
-              this.state.lines,
-              this.state.cursorLine,
-              this.state.cursorCol,
-              selected,
-              this.autocompletePrefix
-            );
-            this.state.lines = result.lines;
-            this.state.cursorLine = result.cursorLine;
-            this.setCursorCol(result.cursorCol);
-            if (this.autocompletePrefix.startsWith("/")) {
-              this.cancelAutocomplete();
-            } else {
-              this.cancelAutocomplete();
-              if (this.onChange) this.onChange(this.getText());
-              return;
-            }
+        const selected = this.autocompleteList.getSelectedItem();
+        if (selected && this.autocompleteProvider) {
+          this.pushUndoSnapshot();
+          this.lastAction = null;
+          const result = this.autocompleteProvider.applyCompletion(
+            this.state.lines,
+            this.state.cursorLine,
+            this.state.cursorCol,
+            selected,
+            this.autocompletePrefix
+          );
+          this.state.lines = result.lines;
+          this.state.cursorLine = result.cursorLine;
+          this.setCursorCol(result.cursorCol);
+          if (this.autocompletePrefix.startsWith("/")) {
+            this.cancelAutocomplete();
+          } else {
+            this.cancelAutocomplete();
+            if (this.onChange) this.onChange(this.getText());
+            return;
           }
         }
       }
@@ -53149,7 +53134,6 @@ var Editor = class {
     );
     if (suggestions && suggestions.items.length > 0) {
       this.autocompletePrefix = suggestions.prefix;
-      this.autocompleteListTouched = false;
       this.autocompleteList = new SelectList(
         suggestions.items,
         this.computeAutocompleteMaxVisible(suggestions.items.length),
@@ -53221,7 +53205,6 @@ var Editor = class {
         return;
       }
       this.autocompletePrefix = suggestions.prefix;
-      this.autocompleteListTouched = false;
       this.autocompleteList = new SelectList(
         suggestions.items,
         this.computeAutocompleteMaxVisible(suggestions.items.length),
@@ -53236,7 +53219,6 @@ var Editor = class {
     this.autocompleteState = null;
     this.autocompleteList = void 0;
     this.autocompletePrefix = "";
-    this.autocompleteListTouched = false;
   }
   isShowingAutocomplete() {
     return this.autocompleteState !== null;
@@ -62729,7 +62711,12 @@ var BUILTIN_SLASH_COMMANDS = [
   { name: "tools/subagent", description: "Spawn subagents in parallel to handle tasks" },
   { name: "files/upload", description: "Attach a file to the conversation" },
   { name: "files/upload-pic", description: "Attach an image to the conversation" },
-  { name: "files/upload-video", description: "Attach a video to the conversation" }
+  { name: "files/upload-video", description: "Attach a video to the conversation" },
+  { name: "files/list", description: "List uploaded files" },
+  { name: "files/status", description: "Check file status" },
+  { name: "files/refresh", description: "Refresh expired files" },
+  { name: "files/delete", description: "Delete a file" },
+  { name: "files/stats", description: "Show file statistics" }
 ];
 
 // src/commands/interactive-debug-commands.ts
@@ -65305,6 +65292,7 @@ function handleSkillsCommand(host) {
   host.showSelector((done) => {
     const settingsManager = host.options.settingsManager;
     const discovered = listDiscoveredSkills(host);
+    const lastPersisted = /* @__PURE__ */ new Map();
     const items = discovered.map((skill) => ({
       id: `skill:${skill.name}`,
       label: skill.name,
@@ -65312,25 +65300,23 @@ function handleSkillsCommand(host) {
       currentValue: settingsManager.isSkillEnabled(skill.name) ? "on" : "off",
       values: ["on", "off"]
     }));
+    for (const item of items) lastPersisted.set(item.id, item.currentValue);
     const settingsList = new SettingsList(
       items,
       12,
-      {
-        label: (text, selected) => selected ? theme.fg("accent", text) : theme.fg("text", text),
-        value: (text, selected) => selected ? theme.fg("accent", text) : theme.fg("accent", text),
-        description: (text) => theme.fg("muted", text),
-        cursor: "> ",
-        hint: (text) => theme.fg("dim", text)
-      },
+      getSettingsListTheme(),
       (id, newValue) => {
         const name = id.slice("skill:".length);
         const enabled = newValue === "on";
+        const previous = lastPersisted.get(id) ?? "on";
         try {
           settingsManager.setSkillEnabled(name, enabled);
         } catch (error) {
+          settingsList.updateValue(id, previous);
           host.showError(`Failed to update skill "${name}": ${errorMessage2(error)}`);
           return;
         }
+        lastPersisted.set(id, newValue);
         applyReloadedSkills(host, discoverSkills(host));
         host.showStatus(`Skill "${name}" ${enabled ? "enabled" : "disabled"} (reloaded).`);
       },
@@ -65628,23 +65614,8 @@ async function handleSkillsReload(host) {
   host.chatContainer.addChild(new Text(theme.fg("accent", "Reloading skills..."), 1, 0));
   host.ui.requestRender();
   try {
-    const builtinDir = path25.join(getBuiltinDir(), "skills");
-    const userDir = path25.join(os7.homedir(), ".pie", "skills");
-    const projectDir = path25.join(process.cwd(), ".pie", "skills");
-    const result = loadSkills({ dirs: buildSkillDirs({ builtinDir, userDir, projectDir, cwd: process.cwd() }) });
-    host.skills = result.skills.filter((skill) => host.options.settingsManager.isSkillEnabled(skill.name));
-    host.skillsSection = formatSkillsForPrompt(host.skills);
-    host.applyRuntimeToolMode(host.allTools.length > 0 ? host.allTools : host.agent.state.tools);
-    host.updateSystemPromptTools();
-    for (const skill of host.skills) {
-      const skillPath = ["skills", `skill:${skill.name}`];
-      if (!commandTree.find(skillPath)) {
-        commandTree.register(skillPath, {
-          description: skill.description,
-          handler: (_2, args) => host.handleSkillInvoke(skill.name, args || "")
-        });
-      }
-    }
+    const result = discoverSkills(host);
+    applyReloadedSkills(host, result);
     const builtinCount = host.skills.filter((s) => s.source === "builtin").length;
     const userCount = host.skills.filter((s) => s.source === "user" || s.source === "user-agents").length;
     const projectCount = host.skills.filter((s) => s.source === "project" || s.source === "project-agents").length;
@@ -65677,10 +65648,18 @@ function collectKnownToolNames(host) {
   const disabled = disabledNames.filter((name) => !liveNames.includes(name));
   return { active: [...liveNames].sort(), disabled: [...disabled].sort() };
 }
+function describeToggleEffect(host, name, enabled) {
+  const loaded = collectKnownToolNames(host).active.includes(name);
+  if (enabled) {
+    return loaded ? `Tool "${name}" enabled (active now).` : `Tool "${name}" enabled in ~/.pie/settings.json (loads on next start \u2014 it was not loaded this session).`;
+  }
+  return loaded ? `Tool "${name}" disabled (removed from this session).` : `Tool "${name}" disabled in ~/.pie/settings.json.`;
+}
 function showToolsManager(host) {
   host.showSelector((done) => {
     const { active, disabled } = collectKnownToolNames(host);
     const settingsManager = host.options.settingsManager;
+    const lastPersisted = /* @__PURE__ */ new Map();
     const items = [
       ...active.map((name) => ({
         id: `tool:${name}`,
@@ -65692,28 +65671,30 @@ function showToolsManager(host) {
       ...disabled.map((name) => ({
         id: `tool:${name}`,
         label: name,
-        description: "Not loaded this session (start with it enabled to use it)",
+        description: "Not loaded this session (starts enabled next launch)",
         currentValue: "off",
         values: ["on", "off"]
       }))
     ];
+    for (const item of items) lastPersisted.set(item.id, item.currentValue);
     const settingsList = new SettingsList(
       items,
       14,
       getSettingsListTheme(),
-      (_id, newValue) => {
-        const name = _id.slice("tool:".length);
+      (id, newValue) => {
+        const name = id.slice("tool:".length);
         const enabled = newValue === "on";
+        const previous = lastPersisted.get(id) ?? "off";
         try {
           settingsManager.setToolEnabled(name, enabled);
         } catch (error) {
+          settingsList.updateValue(id, previous);
           host.showError(`Failed to update tool "${name}": ${errorMessage3(error)}`);
           return;
         }
+        lastPersisted.set(id, newValue);
         host.applyRuntimeToolMode();
-        host.showStatus(
-          enabled ? `Tool "${name}" enabled (active now).` : `Tool "${name}" disabled (removed from this session).`
-        );
+        host.showStatus(describeToggleEffect(host, name, enabled));
       },
       () => done(),
       { enableSearch: true }
@@ -65733,7 +65714,7 @@ function renderHeader(width) {
   const lines = [];
   lines.push(theme.bold(theme.fg("accent", "Tools")));
   lines.push("");
-  lines.push(theme.fg("muted", "Enter/Space toggles \xB7 changes apply immediately \xB7 Esc to close"));
+  lines.push(theme.fg("muted", "Enter/Space toggles \xB7 live tools apply immediately \xB7 Esc to close"));
   const hint = "Usage: /tools/enable <name> | /tools/disable <name>";
   if (width > 20) lines.push(theme.fg("dim", hint));
   return lines;
@@ -65762,7 +65743,7 @@ function handleToolsCommand(host, args) {
     host.applyRuntimeToolMode();
     host.chatContainer.addChild(new Spacer(1));
     host.chatContainer.addChild(new Text(
-      theme.fg("accent", `Tool "${name}" ${enabled ? "enabled" : "disabled"} in ~/.pie/settings.json (applied now).`),
+      theme.fg("accent", describeToggleEffect(host, name, enabled)),
       1,
       0
     ));
@@ -66471,7 +66452,7 @@ function registerBuiltinCommands(host) {
     handler: (_2, args) => host.handleToolsCommand(args ? `list ${args}` : "list")
   });
   commandTree.register(["tools", "enable"], {
-    description: "Enable a tool by name (writes settings; applies now)",
+    description: "Enable a tool by name (writes settings; live tools apply now)",
     handler: (_2, args) => host.handleToolsCommand(`enable ${args || ""}`)
   });
   commandTree.register(["tools", "disable"], {
@@ -66633,6 +66614,7 @@ function ringTerminalBell(options = {}) {
 function ringTurnSettledBell(host) {
   if ((host.agentSessionController?.pendingMessageCount ?? 0) > 0) return;
   if (host.executionState.read().awaitingContinuation) return;
+  if (host.peekTodoAutoContinuePrompt?.()) return;
   host.ringAttentionBell?.("turn-settled");
 }
 function attentionMessage(reason) {
@@ -70275,12 +70257,19 @@ function clearContinuationTimeout(host, reason) {
 function isWaitingForUserInteraction(host) {
   return host.activeInteractionCount > 0;
 }
+function peekTodoAutoContinuePrompt(host) {
+  if (isWaitingForUserInteraction(host)) return void 0;
+  if (host.submitLock || host.isProcessing || host.isInterrupting || host.isCompacting) return void 0;
+  const hasTodoTool = (host.agent?.state?.tools ?? []).some((tool) => tool.name === "manage_todo_list");
+  if (!hasTodoTool) return void 0;
+  return host.executionState.takeTodoClosureFollowUp() || void 0;
+}
 function getTodoAutoContinueMessage(host) {
+  const prompt = peekTodoAutoContinuePrompt(host);
   if (isWaitingForUserInteraction(host)) return { reason: "waiting_for_user_interaction" };
   if (host.submitLock || host.isProcessing || host.isInterrupting || host.isCompacting) return { reason: "host_busy" };
   const hasTodoTool = (host.agent?.state?.tools ?? []).some((tool) => tool.name === "manage_todo_list");
   if (!hasTodoTool) return { reason: "todo_tool_unavailable" };
-  const prompt = host.executionState.takeTodoClosureFollowUp();
   if (!prompt) return { reason: "no_active_todo_follow_up" };
   host.logDebug("todo_closure:follow_up", {
     textPreview: prompt.slice(0, 120),
@@ -71317,11 +71306,14 @@ async function restoreExtensionProviderCredentials(modelRegistry) {
 }
 
 // src/attachments/resolver.ts
+var PROVIDER_SOURCE = "(provider)";
 var AttachmentResolver = class {
-  constructor(extensions) {
+  constructor(extensions, builtInHandlers = []) {
     this.extensions = extensions;
+    this.builtInHandlers = builtInHandlers;
   }
   extensions;
+  builtInHandlers;
   findHandler(model, attachment) {
     const candidate = this.collectCandidates(model, attachment)[0];
     if (!candidate) return void 0;
@@ -71346,6 +71338,15 @@ var AttachmentResolver = class {
   }
   collectCandidates(model, attachment) {
     const matches = [];
+    for (const handler of this.builtInHandlers) {
+      if (!handler.matches(model, attachment)) continue;
+      matches.push({
+        handlerName: handler.name,
+        extensionPath: PROVIDER_SOURCE,
+        priority: handler.priority ?? 0,
+        prepare: handler.prepare.bind(handler)
+      });
+    }
     for (const extension of this.extensions) {
       for (const handler of extension.attachmentHandlers.values()) {
         if (!handler.matches(model, attachment)) continue;
@@ -71368,6 +71369,48 @@ var AttachmentResolver = class {
   }
 };
 
+// src/attachments/provider-handlers.ts
+function getModality(mimeType) {
+  if (mimeType.startsWith("image/")) return "image";
+  if (mimeType.startsWith("video/")) return "video";
+  return "file";
+}
+function isKimiAttachmentPlatform(model) {
+  return model.attachmentPlatform === "kimi" || model.filePlatform === "kimi";
+}
+var kimiNativeAttachmentHandler = {
+  name: "kimi-native-attachments",
+  priority: 100,
+  matches(model, attachment) {
+    return isKimiAttachmentPlatform(model) && Boolean(attachment.fileId) && getModality(attachment.mimeType) !== "file";
+  },
+  async prepare(_model, attachment, ctx) {
+    const fileId = attachment.fileId;
+    if (!fileId) {
+      return {
+        items: [{ type: "text", text: `[${attachment.id}]` }],
+        warnings: ["\u9644\u4EF6\u7F3A\u5C11 fileId\uFF0C\u65E0\u6CD5\u8D70 Kimi \u539F\u751F\u5F15\u7528"]
+      };
+    }
+    const modality = getModality(attachment.mimeType);
+    const url = `ms://${fileId}`;
+    ctx.log(`Kimi handler prepared ${modality} reference for ${attachment.id}`);
+    return {
+      items: [
+        {
+          type: "file-ref",
+          mimeType: attachment.mimeType,
+          url,
+          modality
+        }
+      ]
+    };
+  }
+};
+var providerAttachmentHandlers = [
+  kimiNativeAttachmentHandler
+];
+
 // src/app/runtime-composition-pipeline.ts
 var CLI_COMPOSITION_STEP_ORDER = [
   "model_config",
@@ -71518,7 +71561,7 @@ async function loadInteractiveExtensions(host) {
     buildExtensionLoadOptions(host.options.settingsManager, host.options.extensionFlags)
   );
   host.extensions = extensions;
-  host.attachmentResolver = new AttachmentResolver(extensions);
+  host.attachmentResolver = new AttachmentResolver(extensions, providerAttachmentHandlers);
   host.extensionRunner = new ExtensionRunner(
     extensions,
     extensionActions,
@@ -71690,6 +71733,10 @@ var InteractiveMode = class {
   getTodoAutoContinueMessage() {
     return getTodoAutoContinueMessage(this.continuationHost);
   }
+  /** Side-effect-free todo auto-continue prediction for the turn-settled bell. */
+  peekTodoAutoContinuePrompt() {
+    return peekTodoAutoContinuePrompt(this.continuationHost);
+  }
   appendWarningSummary(message) {
     return appendWarningSummary(this.continuationHost, message);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-	"version": "1.0.48",
+	"version": "1.0.49",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {
@@ -18,7 +18,7 @@
 		"test": "npm run test:offline",
 		"pretest:offline": "npm run build --workspace @pie/agent-framework && npm run build --workspace @pie/shared-headless-capabilities && npm run build",
 		"posttest:offline": "node --test --import tsx test/remote-model-catalog.test.ts",
-		"test:offline": "node --test --import tsx test/core-services.test.ts test/cli.test.ts test/cli-auto-compaction.test.ts test/execution-state-manager.test.ts test/queued-steer-execution-state.test.ts test/architecture-boundaries.test.ts test/attachment-resolver.test.ts test/kimi-attachment-extension.test.ts test/document-attachment-extension.test.ts test/auto-compact-overflow.test.ts test/hierarchical-command-system.test.ts test/extensions-enablement.test.ts test/skill-tool-enablement.test.ts test/message-queue-unit.test.ts test/evals-harness.test.ts test/session-trace.test.ts test/runtime-mode-context.test.ts test/tool-policy.test.ts test/retry-policy.test.ts test/yolo-command.test.ts test/footer-lifecycle.test.ts test/files-utils.test.ts test/source-size-guard.test.ts test/runtime-logger.test.ts test/release-readiness.test.ts test/package-artifacts.test.ts test/code-intel-typescript-provider.test.ts test/init-extension-contract.test.ts test/skills-runtime.test.ts test/skills-agents-discovery.test.ts test/skills-symlink.test.ts test/model-overrides.test.ts test/auth-storage.test.ts test/extension-register-provider.test.ts test/extension-reload.test.ts test/extension-terminal-input.test.ts test/extension-session-before-events.test.ts test/extension-widgets.test.ts test/extension-render-hint.test.ts test/extension-oauth-restore.test.ts test/cross-host-parity.test.ts test/tool-name-rendering.test.ts test/session-selector.test.ts test/terminal-title.test.ts test/interactive-controller-title.test.ts test/todo-title.terminal.test.ts test/plan-mode-extension.test.ts test/tools-registry.test.ts test/system-prompt-contract.test.ts test/direct-bash.test.ts test/terminal-bell.test.ts test/calm-mode.test.ts test/project-root.test.ts test/guard-advisory-context.test.ts test/clear-command-usage.test.ts test/daily-agent-smoke.terminal.test.ts test/slash-menu-toggles.terminal.test.ts",
+		"test:offline": "node --test --import tsx test/core-services.test.ts test/cli.test.ts test/cli-auto-compaction.test.ts test/execution-state-manager.test.ts test/queued-steer-execution-state.test.ts test/architecture-boundaries.test.ts test/attachment-resolver.test.ts test/kimi-attachment-provider.test.ts test/document-attachment-extension.test.ts test/auto-compact-overflow.test.ts test/hierarchical-command-system.test.ts test/extensions-enablement.test.ts test/skill-tool-enablement.test.ts test/message-queue-unit.test.ts test/evals-harness.test.ts test/session-trace.test.ts test/runtime-mode-context.test.ts test/tool-policy.test.ts test/retry-policy.test.ts test/yolo-command.test.ts test/footer-lifecycle.test.ts test/files-utils.test.ts test/source-size-guard.test.ts test/runtime-logger.test.ts test/release-readiness.test.ts test/package-artifacts.test.ts test/code-intel-typescript-provider.test.ts test/init-extension-contract.test.ts test/skills-runtime.test.ts test/skills-agents-discovery.test.ts test/skills-symlink.test.ts test/model-overrides.test.ts test/auth-storage.test.ts test/extension-register-provider.test.ts test/extension-reload.test.ts test/extension-terminal-input.test.ts test/extension-session-before-events.test.ts test/extension-widgets.test.ts test/extension-render-hint.test.ts test/extension-oauth-restore.test.ts test/cross-host-parity.test.ts test/tool-name-rendering.test.ts test/session-selector.test.ts test/terminal-title.test.ts test/interactive-controller-title.test.ts test/todo-title.terminal.test.ts test/plan-mode-extension.test.ts test/tools-registry.test.ts test/system-prompt-contract.test.ts test/direct-bash.test.ts test/terminal-bell.test.ts test/calm-mode.test.ts test/project-root.test.ts test/guard-advisory-context.test.ts test/clear-command-usage.test.ts test/daily-agent-smoke.terminal.test.ts test/slash-menu-toggles.terminal.test.ts",
 		"test:all": "npm run test:offline && npm run test:terminal:vitest",
 		"test:terminal:vitest": "vitest run test/mention-file-select.terminal.test.ts test/tool-partial-display.terminal.test.ts test/viewport-position-final.test.ts test/resume-header.terminal.test.ts --no-file-parallelism",
 		"test:todo-tui": "PIE_REAL_TODO_TUI=1 node --test --import tsx test/todo-closure.terminal.test.ts",

package/dist/builtin/extensions/kimi-attachments/index.js

@@ -1,47 +0,0 @@
-import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
-import "../../../chunks/chunk-LZQXQOPJ.js";
-
-// builtin/extensions/kimi-attachments/index.ts
-function isKimiAttachmentPlatform(model) {
-  return model.attachmentPlatform === "kimi" || model.filePlatform === "kimi";
-}
-function getModality(mimeType) {
-  if (mimeType.startsWith("image/")) return "image";
-  if (mimeType.startsWith("video/")) return "video";
-  return "file";
-}
-function kimiAttachmentsExtension(ctx) {
-  ctx.log("Kimi attachment extension loaded");
-  ctx.registerAttachmentHandler({
-    name: "kimi-native-attachments",
-    priority: 100,
-    matches(model, attachment) {
-      return isKimiAttachmentPlatform(model) && Boolean(attachment.fileId) && getModality(attachment.mimeType) !== "file";
-    },
-    async prepare(_model, attachment, prepareCtx) {
-      const fileId = attachment.fileId;
-      if (!fileId) {
-        return {
-          items: [{ type: "text", text: `[${attachment.id}]` }],
-          warnings: ["\u9644\u4EF6\u7F3A\u5C11 fileId\uFF0C\u65E0\u6CD5\u8D70 Kimi \u539F\u751F\u5F15\u7528"]
-        };
-      }
-      const modality = getModality(attachment.mimeType);
-      const url = `ms://${fileId}`;
-      prepareCtx.log(`Kimi handler prepared ${modality} reference for ${attachment.id}`);
-      return {
-        items: [
-          {
-            type: "file-ref",
-            mimeType: attachment.mimeType,
-            url,
-            modality
-          }
-        ]
-      };
-    }
-  });
-}
-export {
-  kimiAttachmentsExtension as default
-};

package/dist/builtin/extensions/kimi-attachments/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@pie/extension-kimi-attachments",
-  "version": "1.0.0",
-  "description": "Kimi file upload attachment handlers",
-  "main": "index.ts",
-  "type": "module",
-  "pie": {
-    "name": "kimi-attachments",
-    "main": "index.ts"
-  }
-}