zames_pro 2.10.4 → 2.10.7

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,10 +665,11 @@ 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).
-        const startDeadline = Date.now() + 15_000;
+        const startDeadline = Date.now() + 30_000;
         const startBodyLen = await this.page
             .evaluate(() => document.body.innerText.length)
             .catch(() => 0);
@@ -684,16 +712,20 @@ 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/stale answer: the send happened (lastSentAt was
-            // just updated), the Stop button is gone and the text stopped changing.
-            // Two stable ticks in a row mean the turn is over even if it equals the
-            // previous text — return it instead of hanging/throwing.
+            // 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());
-            if (cur && cur === lastStartCur && notGenerating && cur.trim()) {
+            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;
                 }
             }
@@ -701,19 +733,52 @@ export class DeepSeekBrowser {
                 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: the answer may have arrived and settled exactly at the
-            // deadline. Return the current text instead of a hard error.
+            // 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(() => '');
-            if (cur && cur.trim() && !(await this._isGenerating())) {
+            const fresh = !!this._netCapture && this._netCaptureAt >= this._lastSentAt;
+            if (cur && cur.trim() && normText(cur) !== normText(beforeText) && !(await this._isGenerating())) {
                 return cur;
             }
-            // 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.
-            throw new Error('Ответ не начал генерироваться за 15с. Возможно, сообщение не отправилось.');
+            if (fresh) {
+                return this._netCapture;
+            }
+            // The send did not start generation within 15s. The most common cause is
+            // that the message did not actually go out (Enter lost, button not
+            // clicked). Instead of throwing (which made ask() retry for minutes and
+            // looked like a stall), press Enter once more and give it another
+            // window. Only if that also fails do we throw.
+            this._askDebug('START-failed, resending');
+            await this.page.keyboard.press('Enter');
+            this._lastSentAt = Date.now();
+            const retryDeadline = Date.now() + 20_000;
+            while (Date.now() < retryDeadline) {
+                if (this._abort)
+                    return '(прервано пользователем)';
+                const cur2 = await this._readLastAnswerTextClean().catch(() => '');
+                const net2 = !!this._netCapture && this._netCaptureAt >= this._lastSentAt;
+                const grew2 = (await this.page
+                    .evaluate(() => document.body.innerText.length)
+                    .catch(() => 0)) > startBodyLen;
+                if (net2 ||
+                    grew2 ||
+                    (!!cur2 && normText(cur2) !== normText(beforeText))) {
+                    started = true;
+                    this._askDebug('STARTED-after-resend');
+                    break;
+                }
+                await this.page.waitForTimeout(300);
+            }
+        }
+        if (!started) {
+            throw new Error('Ответ не начал генерироваться за 35с даже после повторной отправки. ' +
+                'Проверьте чат DeepSeek вручную.');
         }
         // Wait until the answer stops changing. We check the "not generating"
         // condition via text growth, NOT via _isGenerating().
@@ -752,30 +817,33 @@ export class DeepSeekBrowser {
             // 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) {
+            if (isNew && cur === last) {
                 stable++;
                 if (stable >= 2) {
-                    if (isNew || !(await this._isGenerating()))
+                    if (isNew || !(await this._isGenerating())) {
+                        this._askDebug('RETURN stable curLen=' + cur.length);
                         return cur;
+                    }
                 }
             }
             else {
                 stable = 0;
             }
-            if (isNew || sameAsBefore)
+            if (isNew)
                 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;
-        }
+        // No fallback on a text equal to beforeText: returning it would re-run
+        // the previous tool call. Only a fresh network capture is accepted below.
         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.4",
+  "version": "2.10.7",
   "description": "Terminal coding agent over chat.deepseek.com via Playwright",
   "type": "module",
   "bin": {