zames_pro 2.10.2 → 2.10.5

package/dist/agent-loop.js

@@ -2,6 +2,7 @@ import { buildSystemPrompt } from './system-prompt.js';
 import { getGitContext, formatGitContext } from './gitTools.js';
 import { parseXmlToolCalls } from './xml-toolcall.js';
 import { translate } from './i18n.js';
+import { normText } from './browser.js';
 export async function runAgentLoop({ browser, tools, task, workdir, maxIterations = 40, freshChat = false, sendSystemPrompt = false, transcript = null, attachments = [], onThinking = () => { }, onAssistantThought = () => { }, onToolCall = () => { }, onToolResult = () => { }, onAssistantMessage = () => { }, onChatReady = () => { }, onWarning = () => { }, debugLog = false, locale = 'ru', }) {
     // UI callbacks must NEVER break the agent loop. A rendering error (a huge
     // tool result, a broken markdown frame, a closed terminal) used to throw
@@ -189,14 +190,22 @@ export async function runAgentLoop({ browser, tools, task, workdir, maxIteration
         // cut-off "Stale. Let me ..." or a truncated JSON). All three mean the
         // turn is unfinished: nudge instead of stopping.
         const wdEmpty = !String(rawResponse || '').trim();
+        // STALE is compared on NORMALIZED text: DeepSeek often echoes the
+        // previous answer with different markdown emphasis (`**done**` vs `done`),
+        // which defeated an exact match and made the loop run the SAME tool again —
+        // the "stopped after a tool call" signature with a duplicate call.
         const wdStale = justRanTool &&
             lastRaw.trim() !== '' &&
-            rawResponse.trim() === lastRaw.trim();
+            (rawResponse.trim() === lastRaw.trim() ||
+                normForStale(rawResponse) === normForStale(lastRaw));
         const wdNoCall = justRanTool &&
             !wdEmpty &&
             !wdStale &&
             parseToolCall(rawResponse) === null &&
             !responseLooksLikeToolCall(rawResponse);
+        // A stale answer is discarded even when it parses to a valid call: it is a
+        // duplicate of the previous turn, and re-running the tool would repeat
+        // side effects and stall the loop.
         if (!isFirst && (wdEmpty || wdStale || wdNoCall) && watchdogRetries < MAX_WATCHDOG_RETRIES) {
             watchdogRetries++;
             transcript?.log('watchdog_nudge', {
@@ -522,6 +531,16 @@ function isMeaningfulRespond(msg) {
         return false;
     return true;
 }
+// Normalize an answer for STALE comparison: collapse whitespace AND strip
+// markdown emphasis/code markers. DeepSeek echoes the previous turn with a
+// different emphasis (`**done**` vs `done`), which defeated an exact match and
+// made the loop re-run the same tool ("stopped after a tool call").
+function normForStale(s) {
+    return normText(s)
+        .replace(/[*_`#>]+/g, '')
+        .replace(/[ \t]+/g, ' ')
+        .trim();
+}
 // Text that promises a tool call in the future tense but contains no call
 // itself. DeepSeek regularly "hangs" like this: it writes
 // "Now update README to mention …", "Let me run the tests", "I'll check now"

package/dist/browser.js

@@ -520,9 +520,23 @@ export class DeepSeekBrowser {
             .replace(/\r\n/g, '\n')
             .replace(/\u00a0/g, ' ')
             .trim();
-        if (!norm(got)) {
+        // Verify the WHOLE text landed in the input, not just that it is non-empty.
+        // A partial paste (DeepSeek input limits, lost chars) used to pass the
+        // old "not empty" check, so a TRUNCATED message was sent, the model
+        // replied to the wrong thing (or nothing), and the loop looked stalled.
+        if (norm(got) !== norm(text)) {
             await input.click();
+            await this.page.keyboard.press("Control+A");
+            await this.page.keyboard.press("Delete");
             await this.page.keyboard.insertText(text);
+            const got2 = await input.evaluate((el) => {
+                if (el.tagName.toLowerCase() === "textarea" || el.tagName.toLowerCase() === "input")
+                    return el.value;
+                return el.innerText || el.textContent || "";
+            });
+            if (norm(got2) !== norm(text)) {
+                throw new Error("Не удалось вставить текст в поле ввода DeepSeek целиком (вставлено " + norm(got2).length + " из " + norm(text).length + " символов). Сообщение не отправлено, чтобы не отправить обрезанный текст.");
+            }
         }
     }
     // Attach files/images to the chat via the hidden <input type=file> of the
@@ -602,6 +616,18 @@ export class DeepSeekBrowser {
         console.error(theme.warn(`⏳ пауза ${Math.ceil(gap / 1000)}с перед отправкой`));
         await this.page.waitForTimeout(gap);
     }
+    // DEBUG: append ask() phases to ~/.zames/ask-debug.log so a stall can be
+    // diagnosed from the field (what the DOM/network looked like at each step).
+    _askDebug(msg) {
+        if (!process.env.ZAMES_ASK_DEBUG)
+            return;
+        try {
+            const line = new Date().toISOString() + ' ' + msg + String.fromCharCode(10);
+            const dir = path.join(os.homedir(), '.zames');
+            void fs.appendFile(path.join(dir, 'ask-debug.log'), line).catch(() => { });
+        }
+        catch { }
+    }
     async _askOnce(prompt, { timeout, agent, attachments = [], }) {
         // We reset the abort flag ONLY at the very start of the send.
         this._abort = false;
@@ -610,6 +636,7 @@ export class DeepSeekBrowser {
             throw new Error('Не найдено поле ввода. Запустите /debug-dom и поправьте INPUT_SELECTORS.');
         }
         const beforeText = await this._readLastAnswerTextClean().catch(() => '');
+        this._askDebug('SEND agent=' + agent + ' len=' + prompt.length + ' beforeLen=' + beforeText.length + ' beforeHead=' + JSON.stringify(beforeText.slice(0, 60)));
         await this._waitForSendSlot(agent);
         this._netCapture = '';
         this._netCaptureAt = 0;
@@ -638,6 +665,7 @@ export class DeepSeekBrowser {
             await this.page.keyboard.press('Enter');
         }
         this._lastSentAt = Date.now();
+        this._askDebug('SENT at=' + this._lastSentAt);
         // Wait for the start: either Stop appeared, or the answer text changed,
         // or the total amount of text on the page grew. In parallel we catch
         // the rate-limit toast (only toasts, not the whole body).
@@ -646,15 +674,23 @@ export class DeepSeekBrowser {
             .evaluate(() => document.body.innerText.length)
             .catch(() => 0);
         let started = false;
+        // A stale/echo answer (the model repeats the previous text, or the answer
+        // legitimately equals it) does NOT change `cur`. In that case the old loop
+        // either threw "did not start" after 15s or hung until the full timeout —
+        // the operator saw the agent "stop after a tool call". We now also accept
+        // the answer when the generation has clearly SETTLED: no Stop button and
+        // the text has been stable for a couple of ticks.
+        let settledTicks = 0;
+        let lastStartCur = '';
         while (Date.now() < startDeadline) {
             if (this._abort)
                 return '(прервано пользователем)';
             const pageText = await this._readPageText();
             if (isRateLimitText(pageText)) {
                 throw new RateLimitError(pageText.slice(0, 300));
-                if (isServerBusyText(pageText)) {
-                    throw new ServerBusyError(pageText.slice(0, 300));
-                }
+            }
+            if (isServerBusyText(pageText)) {
+                throw new ServerBusyError(pageText.slice(0, 300));
             }
             const cur = await this._readLastAnswerTextClean().catch(() => '');
             const bodyLen = await this.page
@@ -676,11 +712,43 @@ export class DeepSeekBrowser {
             const netStarted = !!this._netCapture && this._netCaptureAt >= this._lastSentAt;
             if (changed || netStarted || bodyLen > startBodyLen) {
                 started = true;
+                this._askDebug('STARTED changed=' + changed + ' netStarted=' + netStarted + ' bodyGrew=' + (bodyLen > startBodyLen));
                 break;
             }
+            // Fallback for an echo: the text equals beforeText, so it is the OLD
+            // answer still on screen, NOT a new one. We must NOT return it (that
+            // made the loop re-run the previous tool call). We only return when the
+            // text DIFFERS from beforeText and has settled, or when a fresh network
+            // capture proves a new answer exists. If it stays equal, keep waiting.
+            const notGenerating = !(await this._isGenerating());
+            const differs = !!cur && normText(cur) !== normText(beforeText);
+            if (differs && cur === lastStartCur && notGenerating) {
+                settledTicks++;
+                if (settledTicks >= 2) {
+                    this._askDebug('SETTLED-differs return len=' + cur.length);
+                    return cur;
+                }
+            }
+            else {
+                settledTicks = 0;
+            }
+            lastStartCur = cur;
+            this._askDebug('START-loop curLen=' + cur.length + ' changed=' + changed + ' netStarted=' + netStarted + ' bodyLen=' + bodyLen + ' settled=' + settledTicks + ' generating=' + notGenerating);
             await this.page.waitForTimeout(300);
         }
         if (!started) {
+            // Last chance: accept the text only when it DIFFERS from beforeText
+            // (otherwise it is the old answer on screen) or a fresh network capture
+            // proves a new answer. Returning an equal text made the loop re-run the
+            // previous tool call.
+            const cur = await this._readLastAnswerTextClean().catch(() => '');
+            const fresh = !!this._netCapture && this._netCaptureAt >= this._lastSentAt;
+            if (cur && cur.trim() && normText(cur) !== normText(beforeText) && !(await this._isGenerating())) {
+                return cur;
+            }
+            if (fresh) {
+                return this._netCapture;
+            }
             // We NO LONGER check the limit over the whole page text — that caused
             // false positives and 5-minute waits. We just report that
             // generation did not start.
@@ -718,24 +786,40 @@ export class DeepSeekBrowser {
             // belongs to the CURRENT send even if the DOM still shows the old text.
             const isNew = !!cur &&
                 (netFresh || normText(cur) !== normText(beforeText));
-            if (isNew && cur === last) {
+            // An echo/stale answer equals beforeText, so isNew stays false and the
+            // old loop waited until the full timeout — the "agent stopped after a
+            // tool call" hang. If generation has clearly ENDED (no Stop button) and
+            // the text is stable, accept it (even when it repeats the previous one).
+            const sameAsBefore = !!cur && !isNew && normText(cur) === normText(beforeText);
+            if ((isNew || sameAsBefore) && cur === last) {
                 stable++;
-                if (stable >= 2)
-                    return cur;
+                if (stable >= 2) {
+                    if (isNew || !(await this._isGenerating())) {
+                        this._askDebug('RETURN stable curLen=' + cur.length);
+                        return cur;
+                    }
+                }
             }
             else {
                 stable = 0;
             }
-            if (isNew)
+            if (isNew || sameAsBefore)
                 last = cur;
+            this._askDebug('FIN-loop isNew=' + isNew + ' sameAsBefore=' + sameAsBefore + ' stable=' + stable + ' curLen=' + cur.length + ' lastLen=' + last.length + ' netFresh=' + netFresh);
             await this.page.waitForTimeout(800);
         }
         if (last && (normText(last) !== normText(beforeText) || this._netCapture)) {
+            this._askDebug('RETURN last len=' + last.length);
+            return last;
+        }
+        // Fallback: the turn settled on a text identical to the previous answer.
+        if (last && !(await this._isGenerating())) {
             return last;
         }
         if (this._netCapture && this._netCaptureAt >= this._lastSentAt) {
             return this._netCapture;
         }
+        this._askDebug('THROW no-new-answer lastLen=' + last.length + ' beforeLen=' + beforeText.length);
         throw new Error('Новый ответ не получен (на странице остался прежний текст). ' +
             'Возможно, сообщение не отправилось.');
     }

package/package.json

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