@prestyj/cli 5.30.1 → 5.30.3

package/dist/tools/write.js

@@ -3,7 +3,9 @@ import path from "node:path";
 import { z } from "zod";
 import { resolvePath, rejectSymlink } from "./path-utils.js";
 import { localOperations } from "./operations.js";
-import { assertFresh, assertFullySeen, recordWrite } from "./read-tracker.js";
+import { diffLines } from "diff";
+import { recordWrite, unseenLines } from "./read-tracker.js";
+import { writeOverflow } from "./overflow.js";
 import { getActiveGoalMode, goalModeMutationRestriction, isPlanModeActive, } from "../core/runtime-mode.js";
 import { resolveWriteGuard } from "../core/workspace-guard.js";
 import { REDACTION_MARKER } from "@prestyj/ai";
@@ -25,6 +27,98 @@ const WriteParams = z.object({
     file_path: z.string(),
     content: z.string(),
 });
+/** Above this, removed unseen lines are summarized instead of listed. */
+const MAX_LISTED_CHARS = 4_000;
+/**
+ * Edit distance past which the exact line diff gives up. Its cost grows with
+ * this distance times the file size, so an unbounded diff of a large rewrite
+ * blocked the shared daemon for minutes (30k changed lines: ~190s).
+ */
+const MAX_DIFF_EDITS = 1_000;
+/** Lines of `text`; a trailing newline does not add an empty last line. */
+function splitLines(text) {
+    return text === "" ? [] : text.replace(/\n$/, "").split("\n");
+}
+/**
+ * Fallback for rewrites too different to diff: an old line counts as removed
+ * once the new text has no copies of it left. Linear time; a line that only
+ * moved is not reported.
+ */
+function removedByCount(before, after, isUnseen) {
+    const left = new Map();
+    for (const text of splitLines(after))
+        left.set(text, (left.get(text) ?? 0) + 1);
+    const removed = [];
+    for (const [i, text] of splitLines(before).entries()) {
+        const copies = left.get(text) ?? 0;
+        if (copies > 0)
+            left.set(text, copies - 1);
+        else if (isUnseen(i + 1))
+            removed.push([i + 1, text]);
+    }
+    return removed;
+}
+/**
+ * On-disk lines `next` removes or replaces that fall in `unseen`, with their
+ * original 1-based line numbers. Line endings are normalized so a CRLF file
+ * rewritten with LF does not count every line as removed.
+ */
+function removedUnseen(current, next, unseen) {
+    const isUnseen = (line) => unseen === "all" || unseen.some(([start, end]) => line >= start && line <= end);
+    const normalize = (text) => text.replace(/\r\n/g, "\n");
+    const before = normalize(current);
+    const after = normalize(next);
+    const changes = diffLines(before, after, { maxEditLength: MAX_DIFF_EDITS });
+    if (!changes)
+        return removedByCount(before, after, isUnseen);
+    const removed = [];
+    let line = 1;
+    for (const change of changes) {
+        if (change.added)
+            continue;
+        const lines = change.value.replace(/\n$/, "").split("\n");
+        if (change.removed) {
+            for (const [i, text] of lines.entries()) {
+                if (isUnseen(line + i))
+                    removed.push([line + i, text]);
+            }
+        }
+        line += change.count ?? lines.length;
+    }
+    return removed;
+}
+/** Collapse sorted line numbers into "3-7, 12" form. */
+function spans(lines) {
+    const ranges = [];
+    for (const line of lines) {
+        const last = ranges[ranges.length - 1];
+        if (last && line === last[1] + 1)
+            last[1] = line;
+        else
+            ranges.push([line, line]);
+    }
+    return ranges.map(([start, end]) => (start === end ? `${start}` : `${start}-${end}`)).join(", ");
+}
+/**
+ * Note appended to a successful write that removed lines the model never saw
+ * (unread file, changed since its last read, or only partly read). The write
+ * is never refused for this: refusing threw away the generated content and
+ * forced a full regeneration. Instead the previous file is backed up and the
+ * model is shown exactly what went, so it can restore anything unintended.
+ */
+function unseenRemovalNote(removed, backup) {
+    const count = removed.length;
+    const lines = `${count} line${count === 1 ? "" : "s"}`;
+    const listing = removed.map(([line, text]) => `${line}|-${text}`).join("\n");
+    const where = backup
+        ? ` The previous file is saved at ${backup}.`
+        : " /rewind restores the previous file.";
+    const body = listing.length <= MAX_LISTED_CHARS
+        ? `:\n${listing}`
+        : ` (old lines ${spans(removed.map(([line]) => line))}).`;
+    return (`\n\nNote: this write removed ${lines} you had not seen in their current form${body}\n` +
+        `If that was intended, carry on. If not, put them back with edit.${where}`);
+}
 export function createWriteTool(cwd, readFiles, ops = localOperations, planModeRefOrOnFileMutated, onFileMutated, onPreFileMutation, getDiagnostics, goalModeRefArg, getWriteGuardSettings) {
     const planModeRef = isPlanModeRef(planModeRefOrOnFileMutated)
         ? planModeRefOrOnFileMutated
@@ -60,13 +154,7 @@ export function createWriteTool(cwd, readFiles, ops = localOperations, planModeR
                 }
                 await fs.mkdir(plansDir, { recursive: true });
             }
-            // Block overwriting existing files that haven't been read, that changed
-            // since the last read, or that were only partly read.
             const exists = await ops.stat(resolved).then(() => true, () => false);
-            if (readFiles && exists) {
-                await assertFresh(readFiles, resolved, ops);
-                assertFullySeen(readFiles, resolved);
-            }
             // Never replace real secrets with the placeholder the model was shown.
             if (exists && content.includes(REDACTION_MARKER)) {
                 const original = await ops.readFile(resolved).catch(() => undefined);
@@ -74,6 +162,20 @@ export function createWriteTool(cwd, readFiles, ops = localOperations, planModeR
                 if (lossError)
                     return `Error: ${lossError}`;
             }
+            // Lines this overwrite drops that the model never saw are reported, not
+            // refused. Computed before the write, against the file as it is now.
+            let unseenNote = "";
+            if (exists) {
+                const unseen = await unseenLines(readFiles, resolved, ops);
+                if (unseen === "all" || unseen.length > 0) {
+                    const current = await ops.readFile(resolved);
+                    const removed = removedUnseen(current, content, unseen);
+                    if (removed.length > 0) {
+                        const backup = await writeOverflow(current, "write-backup").catch(() => null);
+                        unseenNote = unseenRemovalNote(removed, backup);
+                    }
+                }
+            }
             // Snapshot the pre-mutation on-disk state for /rewind before writing.
             await onPreFileMutation?.(resolved);
             await ops.writeFile(resolved, content);
@@ -91,7 +193,7 @@ export function createWriteTool(cwd, readFiles, ops = localOperations, planModeR
                 }
             }
             const lines = content.split("\n").length;
-            return `Wrote ${lines} lines to ${resolved}` + diagnosticsNote;
+            return `Wrote ${lines} lines to ${resolved}` + unseenNote + diagnosticsNote;
         },
     };
 }

package/dist/tools/write.js.map

@@ -1 +1 @@
-{"version":3,"file":"write.js","sourceRoot":"","sources":["../../src/tools/write.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"write.js","sourceRoot":"","sources":["../../src/tools/write.ts"],"names":[],"mappings":"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"}

package/dist/ui/App.js

@@ -805,29 +805,22 @@ export function App(props) {
             killTask(props.processManager, id);
     }, [props.processManager]);
     const handleTaskNavigate = useCallback((index) => navigateTaskBar(index), []);
-    // Resolve fresh OAuth credentials before each agent loop run.
-    // Falls back to the static props when authStorage is not available.
+    // Resolve fresh OAuth credentials before each agent loop run. Only wired up
+    // when authStorage exists; without it the loop uses the static apiKey props.
+    const authStorage = props.authStorage;
     const resolveCredentials = useCallback(async (opts) => {
-        if (props.authStorage) {
-            const creds = await props.authStorage.resolveCredentials(currentProvider, {
-                ...opts,
-                storageKeys: getAuthStorageKeys(currentProvider, currentModel),
-            });
-            return {
-                apiKey: creds.accessToken,
-                accountId: creds.accountId,
-                projectId: creds.projectId,
-            };
-        }
-        return { apiKey: activeApiKey, accountId: activeAccountId, projectId: activeProjectId };
-    }, [
-        props.authStorage,
-        currentProvider,
-        currentModel,
-        activeApiKey,
-        activeAccountId,
-        activeProjectId,
-    ]);
+        if (!authStorage)
+            throw new Error("resolveCredentials called without authStorage");
+        const creds = await authStorage.resolveCredentials(currentProvider, {
+            ...opts,
+            storageKeys: getAuthStorageKeys(currentProvider, currentModel),
+        });
+        return {
+            apiKey: creds.accessToken,
+            accountId: creds.accountId,
+            projectId: creds.projectId,
+        };
+    }, [authStorage, currentProvider, currentModel]);
     // Back-reference to the loop, so callbacks defined in its own options object
     // (which run long after mount) can read loop-owned refs such as runStartRef.
     const agentLoopRef = useRef(null);
@@ -844,7 +837,7 @@ export function App(props) {
         baseUrl: activeBaseUrl,
         accountId: activeAccountId,
         projectId: activeProjectId,
-        resolveCredentials,
+        resolveCredentials: authStorage ? resolveCredentials : undefined,
         transformContext,
         getLoopBreakMessage: (stats, stage) => {
             if (!idealReviewEnabledRef.current)
@@ -2436,10 +2429,11 @@ export function App(props) {
                 // re-spawning `npx` there only risks a failed
                 // re-spawn that would silently drop the tools.
                 const glmInvolved = newProvider === "glm" || prevProvider === "glm";
-                if (props.mcpManager && glmInvolved) {
+                const mcpManager = props.mcpManager;
+                if (mcpManager && glmInvolved) {
                     void (async () => {
                         // Disconnect old MCP servers
-                        await props.mcpManager.dispose();
+                        await mcpManager.dispose();
                         // Remove old MCP tools, connect new ones
                         let apiKey;
                         if (newProvider === "glm" && props.authStorage) {
@@ -2459,7 +2453,7 @@ export function App(props) {
                             // ~/.ezcoder/mcp.json and ./.ezcoder/mcp.json) survive the reconnect —
                             // getMCPServers returns provider defaults only.
                             const servers = await getAllMcpServers(newProvider, apiKey, props.cwd);
-                            const mcpTools = await props.mcpManager.connectAll(servers);
+                            const mcpTools = await mcpManager.connectAll(servers);
                             setCurrentTools((prev) => {
                                 const next = [...prev.filter((t) => !t.name.startsWith("mcp__")), ...mcpTools];
                                 rebuildPromptWithTools(next);