zames_pro 2.40.0 → 2.41.1

package/dist/agent-loop.js

@@ -3,6 +3,7 @@ import { loadProjectContext } from './context.js';
 import { getGitContext, formatGitContext } from './gitTools.js';
 import { parseXmlToolCalls } from './xml-toolcall.js';
 import { translate } from './i18n.js';
+import { substituteAttachmentMarkers } from './commands.js';
 import { normText } from './browser.js';
 export async function runAgentLoop({ browser, tools, task, workdir, maxIterations = 0, freshChat = false, sendSystemPrompt = false, transcript = null, attachments = [], onThinking = () => { }, onSendPause = () => { }, onSendState = () => { }, onNotice = () => { }, onAssistantThought = () => { }, onToolCall = () => { }, onToolResult = () => { }, onAssistantMessage = () => { }, onChatReady = () => { }, onWarning = () => { }, debugLog = false, locale = 'ru', askDeadlineMs = 240_000, maxAfterToolRetries = 6, onAutoCompact = null, autoCompactPct = 95, contextLimit = 1_000_000, getTokenUsage = null, }) {
     // UI callbacks must NEVER break the agent loop. A rendering error (a huge
@@ -117,20 +118,32 @@ export async function runAgentLoop({ browser, tools, task, workdir, maxIteration
         // Tell the model what the markers mean even when the system-prompt is not
         // (re)sent (resumed chat). The files are uploaded to the chat by the
         // browser; this note just explains the [image#N] / [file#N] markers.
-        const markers = attachments.map((a, i) => {
-            const ext = String(a.name || '');
-            const isImg = /\.(png|jpe?g|gif|webp|bmp|svg|ico)$/i.test(ext);
-            return (isImg ? '[image#' : '[file#') + (i + 1) + ']';
+        //
+        // The task text keeps its COMPACT markers in the terminal, but what goes
+        // to the model is expanded to the real file paths (substituteAttachment
+        // Markers) so it can actually read them — a bare [file#1] is useless to
+        // the model. The note below still explains the marker→file mapping.
+        //
+        // Numbering matches AttachmentStore: images and files are counted
+        // SEPARATELY (image#1 and file#1 coexist), so the note lists them the
+        // same way the substitution resolves them.
+        let imgN = 0;
+        let fileN = 0;
+        const markers = attachments.map((a) => {
+            const isImg = String(a.mime || '').startsWith('image/') ||
+                /\.(png|jpe?g|gif|webp|bmp|svg|ico)$/i.test(String(a.name || ''));
+            return isImg ? '[image#' + ++imgN + ']' : '[file#' + ++fileN + ']';
         });
         message =
-            task +
+            substituteAttachmentMarkers(task, attachments) +
                 String.fromCharCode(10) +
                 String.fromCharCode(10) +
                 '(The user attached ' +
                 attachments.length +
                 ' file(s) to this message: ' +
                 markers.join(', ') +
-                '. Look at the uploaded images in the chat; file copies are in <project>/tmp.)';
+                '. The [image#N]/[file#N] markers were replaced above by the real file paths. ' +
+                'Look at the uploaded images in the chat; file copies are in <project>/tmp.)';
     }
     transcript?.log('task', { task });
     let malformedRetries = 0;

package/dist/attachments.js

@@ -139,6 +139,12 @@ export class AttachmentStore {
         this.fileCount = 0;
     }
     add(item) {
+        // De-duplicate by real path: pasting the SAME file twice must reuse one
+        // attachment (one marker, one upload), not create [file#1] and [file#2].
+        // The operator saw exactly that when inserting the same file repeatedly.
+        const existing = this.items.find((a) => a.path === item.path);
+        if (existing)
+            return existing;
         const image = isImageName(item.name) || String(item.mime).startsWith('image/');
         const index = image ? ++this.imageCount : ++this.fileCount;
         const marker = image ? '[image#' + index + ']' : '[file#' + index + ']';

package/dist/commands.js

@@ -508,6 +508,30 @@ export function parseGoalCommand(text) {
         return { sub: 'clear' };
     return { sub: 'set', goal: rest };
 }
+// Replace [image#N] / [file#N] markers in a task with the REAL file path, so
+// the model (reading the message in the DeepSeek chat) gets a usable path
+// instead of a bare marker. The terminal keeps showing the compact markers;
+// only the text sent to the browser is expanded. Numbering must match
+// AttachmentStore.add(): images and files are counted SEPARATELY, in the order
+// the attachments were added. A marker with no matching attachment is left
+// as-is (never silently dropped). Pure, so it is unit-tested.
+export function substituteAttachmentMarkers(text, attachments) {
+    let imageCount = 0;
+    let fileCount = 0;
+    const imagePath = new Map();
+    const filePath = new Map();
+    for (const a of attachments || []) {
+        const isImg = String(a.mime || '').startsWith('image/') || isImageName(a.name);
+        if (isImg)
+            imagePath.set(++imageCount, a.path);
+        else
+            filePath.set(++fileCount, a.path);
+    }
+    let out = String(text ?? '');
+    out = out.replace(/\[image#(\d+)\]/g, (whole, n) => imagePath.get(Number(n)) ?? whole);
+    out = out.replace(/\[file#(\d+)\]/g, (whole, n) => filePath.get(Number(n)) ?? whole);
+    return out;
+}
 // True when a `/config ...` line can be handled LIVE (while the agent is busy):
 // the text subcommands only touch config values, never the chat. The bare
 // `/config` and `/config menu` (which pause the editor and read keys) are NOT

package/dist/gitTools.js

@@ -46,7 +46,6 @@ function quoteArgs(input) {
         .map((v) => JSON.stringify(v))
         .join(' ');
 }
-// Checks whether the directory is a git repository and gathers the context.
 export async function getGitContext(workdir) {
     const probe = await runGit('git rev-parse --is-inside-work-tree', workdir, 5000);
     if (probe.trim() !== 'true')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zames_pro",
-  "version": "2.40.0",
+  "version": "2.41.1",
   "description": "Terminal coding agent over chat.deepseek.com via Playwright",
   "type": "module",
   "bin": {