zames_pro 2.9.0 → 2.9.2

package/dist/agent-loop.js

@@ -171,7 +171,7 @@ export async function runAgentLoop({ browser, tools, task, workdir, maxIteration
                 trimmed.length < 2 ||
                 /^(reading|thinking|searching|analyzing|generating|stop|остановить|читаю|думаю|поиск|анализ)[\s.…]*$/i.test(trimmed) ||
                 (trimmed.length <= 200 &&
-                    /(messages? too frequent|too many requests|rate limit|слишком часто|try again later)/i.test(trimmed));
+                    /(messages? too frequent|too many requests|rate limit|server (is )?busy|service (is )?unavailable|слишком часто|try again later)/i.test(trimmed));
             if (looksService && stallRetries < MAX_STALL_RETRIES) {
                 stallRetries++;
                 transcript?.log('stall_retry', {

package/dist/attachments.js

@@ -2,6 +2,8 @@ import fs from 'fs/promises';
 import path from 'path';
 import os from 'os';
 import { execFileSync } from 'child_process';
+import { extractPathToken } from './path-token.js';
+export { extractPathToken };
 export const IMAGE_EXTS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.svg', '.ico'];
 export const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024;
 function sanitize(name) {
@@ -182,6 +184,15 @@ export async function saveToTemp(tmpDir, name, data) {
     await fs.writeFile(target, data);
     return target;
 }
+// True if any OS clipboard tool is available on this machine.
+export function hasClipboardTool() {
+    if (process.platform === 'win32' || process.platform === 'darwin')
+        return true;
+    if (process.platform === 'linux') {
+        return Boolean(tryCommand('xclip', ['-version']) || tryCommand('xsel', ['--version']) || tryCommand('wl-paste', ['--version']));
+    }
+    return false;
+}
 // Read an image from the OS clipboard. Tries, in order, every known tool for
 // the current platform. Returns the raw bytes plus a short note about which
 // tool was used (or the reason nothing was found) — the caller shows that note
@@ -189,38 +200,53 @@ export async function saveToTemp(tmpDir, name, data) {
 // True when running inside WSL. There the X11 clipboard is a SEPARATE
 // clipboard from the Windows one: the user copies an image in Windows, so we
 // must read it through powershell.exe, not xclip.
+export function windowsReachable() {
+    if (process.platform === 'win32')
+        return true;
+    if (process.platform !== 'linux')
+        return false;
+    try {
+        return require('fs').existsSync('/mnt/c/Windows');
+    }
+    catch {
+        return false;
+    }
+}
 export function isWsl() {
     if (process.platform !== 'linux')
         return false;
+    let kernelWsl = false;
     if (process.env.WSL_DISTRO_NAME || process.env.WSL_INTEROP)
-        return true;
-    try {
-        const rel = os.release().toLowerCase();
-        if (rel.includes('microsoft') || rel.includes('wsl'))
-            return true;
+        kernelWsl = true;
+    if (!kernelWsl) {
+        try {
+            const rel = os.release().toLowerCase();
+            if (rel.includes('microsoft') || rel.includes('wsl'))
+                kernelWsl = true;
+        }
+        catch { }
     }
-    catch { }
-    return false;
+    return kernelWsl && windowsReachable();
 }
-// PowerShell one-liner: write the clipboard image as raw PNG bytes to stdout.
-const PS_GET_IMAGE = 'Add-Type -AssemblyName System.Windows.Forms,System.Drawing; ' +
-    '$img=[System.Windows.Forms.Clipboard]::GetImage(); ' +
-    'if($img){$ms=New-Object System.IO.MemoryStream; ' +
-    '$img.Save($ms,[System.Drawing.Imaging.ImageFormat]::Png); ' +
-    '[Console]::OpenStandardOutput().Write($ms.ToArray(),0,$ms.Length)}';
+// PowerShell image grabber, embedded as a UTF-16LE base64 script and run
+// via powershell.exe -EncodedCommand: it saves the clipboard image to a
+// Windows temp .png and prints the Windows path; we read it from WSL.
+const PS_IMAGE_ENCODED = 'QQBkAGQALQBUAHkAcABlACAALQBBAHMAcwBlAG0AYgBsAHkATgBhAG0AZQAgAFMAeQBzAHQAZQBtAC4AVwBpAG4AZABvAHcAcwAuAEYAbwByAG0AcwAsAFMAeQBzAHQAZQBtAC4ARAByAGEAdwBpAG4AZwAKACQAaQBtAGcAPQBbAFMAeQBzAHQAZQBtAC4AVwBpAG4AZABvAHcAcwAuAEYAbwByAG0AcwAuAEMAbABpAHAAYgBvAGEAcgBkAF0AOgA6AEcAZQB0AEkAbQBhAGcAZQAoACkACgBpAGYAKAAkAGkAbQBnACkAewAkAHAAPQBKAG8AaQBuAC0AUABhAHQAaAAgACQAZQBuAHYAOgBUAEUATQBQACAAKAAiAHoAYQBtAGUAcwAtAGMAbABpAHAALQAiACsAWwBHAHUAaQBkAF0AOgA6AE4AZQB3AEcAdQBpAGQAKAApAC4AVABvAFMAdAByAGkAbgBnACgAKQArACIALgBwAG4AZwAiACkAOwAkAGkAbQBnAC4AUwBhAHYAZQAoACQAcAAsAFsAUwB5AHMAdABlAG0ALgBEAHIAYQB3AGkAbgBnAC4ASQBtAGEAZwBpAG4AZwAuAEkAbQBhAGcAZQBGAG8AcgBtAGEAdABdADoAOgBQAG4AZwApADsAVwByAGkAdABlAC0ATwB1AHQAcAB1AHQAIAAkAHAAfQAKAA==';
 // PowerShell one-liner: write the clipboard file paths (CF_HDROP) to stdout.
 const PS_GET_FILE_DROP = 'Add-Type -AssemblyName System.Windows.Forms; ' +
     '$d=[System.Windows.Forms.Clipboard]::GetDataObject(); ' +
     'if($d -and $d.GetDataPresent([System.Windows.Forms.DataFormats]::FileDrop)){' +
     '$f=$d.GetData([System.Windows.Forms.DataFormats]::FileDrop); $f -join [Environment]::NewLine}';
-export function readClipboardImageDetailed() {
+export async function readClipboardImageDetailed() {
     if (process.platform === 'linux' || process.platform === 'freebsd' || process.platform === 'openbsd') {
         const wayland = process.env.WAYLAND_DISPLAY;
         const x11 = process.env.DISPLAY;
         const attempts = [];
         // On WSL the Windows clipboard is what the user copies into — read it first.
         if (isWsl()) {
-            attempts.push({ bin: 'powershell.exe', args: ['-NoProfile', '-NonInteractive', '-Command', PS_GET_IMAGE], via: 'powershell.exe' });
+            const win = await readWindowsClipboardImage();
+            if (win)
+                return { data: win, via: 'powershell.exe' };
         }
         if (wayland || !x11)
             attempts.push({ bin: 'wl-paste', args: ['--type', 'image/png', '--no-newline'], via: 'wl-paste' });
@@ -261,8 +287,8 @@ export function readClipboardImageDetailed() {
     return { data: null, via: 'unsupported-platform' };
 }
 // Backwards-compatible wrapper used elsewhere.
-export function readClipboardImage() {
-    return readClipboardImageDetailed().data;
+export async function readClipboardImage() {
+    return (await readClipboardImageDetailed()).data;
 }
 function tryCommand(bin, args) {
     try {
@@ -303,7 +329,7 @@ export async function findFileByName(workdir, name) {
 export function readWindowsClipboardFiles() {
     if (!isWsl())
         return [];
-    const out = tryCommand('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', PS_GET_FILE_DROP]);
+    const out = tryCommand('powershell.exe', ['-STA', '-NoProfile', '-NonInteractive', '-Command', PS_GET_FILE_DROP]);
     if (!out)
         return [];
     const text = out.toString('utf-8');
@@ -330,3 +356,23 @@ export function winPathToWsl(winPath) {
     const rest = p.slice(3).split('\\').join('/');
     return '/mnt/' + drive + '/' + rest;
 }
+// Run the embedded PowerShell script and return the clipboard image bytes.
+export async function readWindowsClipboardImage() {
+    if (!isWsl())
+        return null;
+    const out = tryCommand('powershell.exe', ['-STA', '-NoProfile', '-NonInteractive', '-EncodedCommand', PS_IMAGE_ENCODED]);
+    if (!out)
+        return null;
+    const first = out.toString('utf-8').trim().split(String.fromCharCode(10))[0].trim();
+    if (!first)
+        return null;
+    const wslPath = winPathToWsl(first);
+    if (!wslPath)
+        return null;
+    try {
+        return await fs.readFile(wslPath);
+    }
+    catch {
+        return null;
+    }
+}

package/dist/browser.js

@@ -40,9 +40,20 @@ const STOP_SELECTORS = [
 const STATUS_RE = /^(reading|thinking|searching|analyzing|generating|stop|остановить|читаю|думаю|поиск|анализ)[\s.…]*$/i;
 // DeepSeek's answer when the rate limit is exceeded.
 const RATE_LIMIT_RE = /(messages? too frequent|too many requests|rate limit|слишком часто|повторите позже|try again later)/i;
+// Transient server-side hiccups (DeepSeek overloaded / hiccup). Unlike the
+// rate limit, these usually clear in seconds, so we retry quickly instead of
+// waiting minutes. "Server busy", 503, "temporarily unavailable", etc.
+const SERVER_BUSY_RE = /(server (is )?busy|server error|service (is )?unavailable|temporarily unavailable|internal server error|502|503|504|server overloaded|сервер занят|сервер перегружен|сервис недоступен|внутренняя ошибка|попробуйте позже)/i;
 export function isRateLimitText(text) {
     return RATE_LIMIT_RE.test(String(text || ''));
 }
+export function isServerBusyText(text) {
+    const t = String(text || '');
+    // Rate limit takes priority (it needs the long wait).
+    if (RATE_LIMIT_RE.test(t))
+        return false;
+    return SERVER_BUSY_RE.test(t);
+}
 // Normalize text for comparison: collapse whitespace so that tiny DOM
 // differences (nbsp, trailing spaces) don't count as "a new answer".
 export function normText(s) {
@@ -59,6 +70,13 @@ export class RateLimitError extends Error {
         this.name = 'RateLimitError';
     }
 }
+// DeepSeek transient server error (Server busy).
+export class ServerBusyError extends Error {
+    constructor(detail) {
+        super('Server busy. Try again later. ' + detail);
+        this.name = 'ServerBusyError';
+    }
+}
 // ---------- profile cleanup ----------
 async function killStaleChrome() {
     if (process.platform !== 'win32')
@@ -105,6 +123,8 @@ export class DeepSeekBrowser {
     minSendIntervalMs;
     rateLimitWaitMs;
     maxRateLimitRetries;
+    maxServerBusyRetries;
+    serverBusyWaitMs;
     _lastSentAt;
     _abort;
     // The user pressed Esc/Ctrl+C — a "stop" for the WHOLE current batch of
@@ -119,7 +139,7 @@ export class DeepSeekBrowser {
     _netSniff;
     _netSniffLimit;
     _netHookInstalled;
-    constructor({ headless = false, debug = false, channel = 'chrome', answerTimeoutMs = 180000, askRetries = 3, stabilityChecks = 3, stabilityDelayMs = 1000, minSendIntervalMs = 15000, rateLimitWaitMs = 300000, maxRateLimitRetries = 6, } = {}) {
+    constructor({ headless = false, debug = false, channel = 'chrome', answerTimeoutMs = 180000, askRetries = 3, stabilityChecks = 3, stabilityDelayMs = 1000, minSendIntervalMs = 15000, rateLimitWaitMs = 300000, maxRateLimitRetries = 6, maxServerBusyRetries = 5, serverBusyWaitMs = 3000, } = {}) {
         this.headless = headless;
         this.debug = debug;
         this.channel = channel;
@@ -130,6 +150,8 @@ export class DeepSeekBrowser {
         this.minSendIntervalMs = minSendIntervalMs;
         this.rateLimitWaitMs = rateLimitWaitMs;
         this.maxRateLimitRetries = maxRateLimitRetries;
+        this.maxServerBusyRetries = maxServerBusyRetries;
+        this.serverBusyWaitMs = serverBusyWaitMs;
         this._lastSentAt = 0;
         this._abort = false;
         this._stopped = false;
@@ -420,6 +442,7 @@ export class DeepSeekBrowser {
         let lastErr = null;
         let attempt = 0;
         let rateLimitRetries = 0;
+        let serverBusyRetries = 0;
         while (attempt < this.askRetries) {
             attempt++;
             try {
@@ -629,6 +652,9 @@ export class DeepSeekBrowser {
             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));
+                }
             }
             const cur = await this._readLastAnswerTextClean().catch(() => '');
             const bodyLen = await this.page
@@ -672,6 +698,9 @@ export class DeepSeekBrowser {
                 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));
+                    }
                 }
             }
             const cur = await this._readLastAnswerTextClean().catch(() => '');

package/dist/i18n.js

@@ -150,8 +150,12 @@ const CATALOG = {
         en: '⚠ No image found in the clipboard (tried: {via}).',
     },
     'msg.clip_hint': {
-        ru: '   Установите утилиту клипборда: Linux/X11 — xclip или xsel, Wayland — wl-clipboard; Windows/macOS — работает из коробки. Либо вставьте путь к файлу.',
-        en: '   Install a clipboard tool: Linux/X11 — xclip or xsel, Wayland — wl-clipboard; Windows/macOS — works out of the box. Or paste a file path.',
+        ru: '   Проще всего: вставьте путь к файлу (например tmp/pic.png) — файл приложится к сообщению. Для клипборда нужна утилита (Linux/X11 — xclip или xsel, Wayland — wl-clipboard; Windows — PowerShell, macOS — pngpaste).',
+        en: '   Easiest: paste a path to a file (e.g. tmp/pic.png) — it will be attached to the message. Clipboard paste needs a tool (Linux/X11 — xclip or xsel, Wayland — wl-clipboard; Windows — PowerShell, macOS — pngpaste).',
+    },
+    'msg.clip_container': {
+        ru: '   Похоже, вы в контейнере/Dev Container: клипборд Windows отсюда недоступен. Вставьте путь к файлу (например tmp/pic.png) — он приложится к сообщению.',
+        en: '   Looks like a container/Dev Container: the Windows clipboard is not reachable from here. Paste a path to a file (e.g. tmp/pic.png) — it will be attached to the message.',
     },
     'msg.from_queue': { ru: '▶ Из очереди: ', en: '▶ From queue: ' },
     'msg.agent_error': { ru: '✖ Ошибка агента:', en: '✖ Agent error:' },

package/dist/index.js

@@ -8,7 +8,7 @@ import { createTools } from './tools.js';
 import { runAgentLoop } from './agent-loop.js';
 import { createSpinner } from './spinner.js';
 import { LineEditor, expandPastes, pasteReplacement } from './input.js';
-import { parseImagePaste, extForMime, saveToTemp, guessMime, isImageName, formatSize, looksLikeFilePath, readClipboardImageDetailed, sniffMime, readWindowsClipboardFiles, } from './attachments.js';
+import { parseImagePaste, extForMime, saveToTemp, guessMime, isImageName, formatSize, looksLikeFilePath, readClipboardImageDetailed, sniffMime, readWindowsClipboardFiles, hasClipboardTool, } from './attachments.js';
 import { loadConfig, DEFAULTS, CONFIG_PATHS, ZAMES_HOME, CONFIG_SCHEMA, getByPath, validateConfigValue, writeConfigValue, resetConfigValue, } from './config.js';
 import { runConfigMenu } from './config-menu.js';
 import { translate, normalizeLocale, localeDisplayName, isLocale, } from './i18n.js';
@@ -995,7 +995,7 @@ async function main() {
             return att;
         };
         ed.onClipboard = async () => {
-            const res = readClipboardImageDetailed();
+            const res = await readClipboardImageDetailed();
             if (!res.data || !res.data.length) {
                 // On WSL the user may have copied a FILE in Windows (not an image):
                 // the Windows clipboard holds its path - attach it directly.
@@ -1021,7 +1021,9 @@ async function main() {
                     clipboardWarned = true;
                     ed.printAbove(theme.warn(t('msg.clip_empty', { via: res.via }) +
                         String.fromCharCode(10) +
-                        t('msg.clip_hint')));
+                        (process.platform === 'linux' && !hasClipboardTool()
+                            ? t('msg.clip_container')
+                            : t('msg.clip_hint'))));
                 }
                 return null;
             }

package/dist/path-token.js

@@ -0,0 +1,71 @@
+// Find a single file path inside arbitrary text (a pasted path surrounded by
+// words, e.g. a quoted path followed by a question). Returns the cleaned path
+// plus the text around it, or null. Implemented WITHOUT regular expressions so
+// the source has no escaping pitfalls.
+export function extractPathToken(text) {
+    const s = String(text || '');
+    const chars = Array.from(s);
+    const n = chars.length;
+    let i = 0;
+    while (i < n) {
+        const c = chars[i];
+        if (c === ' ' || c === '	') {
+            i++;
+            continue;
+        }
+        let quote = '';
+        let start = i;
+        if (c === String.fromCharCode(39) || c === String.fromCharCode(34)) {
+            quote = c;
+            start = i + 1;
+            i = start;
+            while (i < n && chars[i] !== quote)
+                i++;
+            const tok = chars.slice(start, i).join('');
+            if (looksLikeToken(tok)) {
+                const before = s.slice(0, start - 1);
+                const after = i < n ? s.slice(i + 1) : '';
+                return { path: tok, before, after };
+            }
+            if (i < n)
+                i++;
+            continue;
+        }
+        i = start;
+        while (i < n && chars[i] !== ' ' && chars[i] !== '	')
+            i++;
+        const tok = chars.slice(start, i).join('');
+        const cleaned = stripPunct(tok);
+        if (looksLikeToken(cleaned)) {
+            const before = s.slice(0, start);
+            const after = s.slice(start + tok.length);
+            return { path: cleaned, before, after };
+        }
+    }
+    return null;
+}
+function stripPunct(tok) {
+    let t = tok;
+    while (t.length && ',.!?;:)]'.includes(t[t.length - 1]))
+        t = t.slice(0, -1);
+    while (t.length && '(['.includes(t[0]))
+        t = t.slice(1);
+    return t;
+}
+function looksLikeToken(tok) {
+    const t = String(tok || '');
+    if (!t || t.length > 500)
+        return false;
+    const dot = t.lastIndexOf('.');
+    if (dot <= 0 || dot >= t.length - 1)
+        return false;
+    const ext = t.slice(dot + 1);
+    if (ext.length > 8)
+        return false;
+    for (const ch of ext) {
+        const ok = (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9');
+        if (!ok)
+            return false;
+    }
+    return true;
+}

package/package.json

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