zames_pro 2.89.0 → 2.90.0

package/dist/glm-browser.js

@@ -15,6 +15,7 @@
 // A FIRST message from a fresh profile is gated by an Aliyun slider captcha,
 // which a headless browser cannot pass — hence the browser-based login
 // (src/browser-login.ts) and the explicit captcha error below.
+import { noteSwallowed } from './swallow.js';
 import fs from 'fs/promises';
 import path from 'path';
 import os from 'os';
@@ -42,6 +43,8 @@ function capNetBody(body) {
     return body.slice(0, head) + '\n...[truncated]...\n' + body.slice(-1024);
 }
 export class GlmBrowser {
+    /** The chat a send must join (set by the agent loop; see types.ts). */
+    resumeChatId = null;
     providerName = 'glm';
     headless;
     debug;
@@ -60,6 +63,8 @@ export class GlmBrowser {
     // Ask() budget for the context-limit recovery (a compaction, not a resend).
     maxContextLimitRetries;
     onContextLimit;
+    /** N8: switch to an authorized fallback provider (see agent-loop). */
+    onProviderExhausted = null;
     startWaitMs;
     sendButtonWaitMs;
     model;
@@ -212,7 +217,9 @@ export class GlmBrowser {
                 this.onNotice(text);
                 return;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_notice', e, this.debug);
+            }
         }
         console.error(text);
     }
@@ -221,14 +228,18 @@ export class GlmBrowser {
             try {
                 this.onSendState(state);
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_emitSendState', e, this.debug);
+            }
         }
     }
     async _setBusyTitle(busy) {
         try {
             await this.page.evaluate(setBusyTitleInDom, busy);
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_setBusyTitle', e, this.debug);
+        }
     }
     sendIntervalMs() {
         return this.sendRuntime.intervalMs();
@@ -317,13 +328,25 @@ export class GlmBrowser {
             .catch(() => { });
     }
     async restart() {
+        // Remember the dialogue BEFORE the context dies: a relaunch lands on the
+        // BASE url, so the id is lost and the next send started a NEW chat.
+        const chatBefore = (await this.getCurrentChatId().catch(() => null)) ?? null;
         try {
             if (this.context)
                 await this.context.close();
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('restart', e, this.debug);
+        }
         await this._launchOnce();
         await this._fixHeadlessUserAgent();
+        if (chatBefore) {
+            const ok = await this.openChat(chatBefore).catch(() => false);
+            if (ok)
+                this._netChatId = chatBefore;
+            else if (this.debug)
+                console.error('restart: could not reopen chat ' + chatBefore);
+        }
     }
     /**
      * Relaunch the SAME persistent profile in another headless mode — the
@@ -349,12 +372,16 @@ export class GlmBrowser {
                 }));
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('relaunchSafe', e, this.debug);
+        }
         try {
             if (this.context)
                 await this.context.close();
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('relaunchSafe', e, this.debug);
+        }
         await this._waitProfileUnlocked(15_000);
         this.headless = headless;
         const options = {
@@ -427,7 +454,9 @@ export class GlmBrowser {
                     const j = await res.json();
                     role = typeof j?.role === 'string' ? j.role : null;
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('probeLogin', e, this.debug);
+                }
                 const bodyText = document.body ? document.body.innerText : '';
                 const captcha = /security verification|drag the slider/i.test(bodyText);
                 const signInVisible = /\bsign in\b/i.test(bodyText) && !hasToken;
@@ -470,7 +499,9 @@ export class GlmBrowser {
                 .catch(() => { });
             await this.page.waitForTimeout(1500);
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_openLoginPage', e, this.debug);
+        }
     }
     /** Prefill the SAVED login (never the password — that is filled on submit). */
     async _prefillLogin() {
@@ -485,7 +516,9 @@ export class GlmBrowser {
                 await email.fill(saved, { timeout: 2000 }).catch(() => { });
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_prefillLogin', e, this.debug);
+        }
     }
     /**
      * Best-effort password login with the SAVED credentials. z.ai's form is
@@ -515,7 +548,9 @@ export class GlmBrowser {
                 try {
                     this.onAuthSave?.(this.auth.username, this.auth.password);
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_autoLogin', e, this.debug);
+                }
             }
             return ok;
         }
@@ -565,7 +600,9 @@ export class GlmBrowser {
                 try {
                     this.onAuthSave?.(u, p);
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_captureLoginCredentials', e, this.debug);
+                }
             });
             await this.page.evaluate(() => {
                 const w = window;
@@ -583,11 +620,15 @@ export class GlmBrowser {
                         if (email && fn)
                             fn(email.value || '', pwd ? pwd.value || '' : '');
                     }
-                    catch { }
+                    catch (e) {
+                        noteSwallowed('_captureLoginCredentials', e, this.debug);
+                    }
                 }, true);
             });
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_captureLoginCredentials', e, this.debug);
+        }
     }
     async _persistSessionIfNeeded() {
         if (!this.auth.saveSession)
@@ -676,12 +717,16 @@ export class GlmBrowser {
                 }
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('close', e, this.debug);
+        }
         try {
             if (this.context)
                 await this.context.close();
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('close', e, this.debug);
+        }
     }
     /**
      * Rewrite the completion REQUEST so z.ai's own agent runtime stays off.
@@ -750,7 +795,9 @@ export class GlmBrowser {
                 }
             });
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_installRuntimeRewrite', e, this.debug);
+        }
     }
     _installNetHook() {
         const pg = this.page;
@@ -778,7 +825,9 @@ export class GlmBrowser {
                 // (The features are recorded by _installRuntimeRewrite's route handler:
                 // the `request` event still carries the ORIGINAL body.)
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_installNetHook', e, this.debug);
+            }
         });
     }
     async _onResponse(resp) {
@@ -852,7 +901,9 @@ export class GlmBrowser {
                 this._netCaptureAt = Date.now();
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_onResponse', e, this.debug);
+        }
     }
     async newChat() {
         const before = await this.getCurrentChatId();
@@ -862,7 +913,9 @@ export class GlmBrowser {
             await btn.click({ timeout: 2500 });
             clicked = true;
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('newChat', e, this.debug);
+        }
         let ok = false;
         if (clicked) {
             const deadline = Date.now() + 5000;
@@ -901,7 +954,9 @@ export class GlmBrowser {
                 if (await loc.isVisible({ timeout }).catch(() => false))
                     return loc;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_findVisible', e, this.debug);
+            }
         }
         return null;
     }
@@ -937,7 +992,9 @@ export class GlmBrowser {
                 this._lastHistoryError = res.error;
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('listChats', e, this.debug);
+        }
         try {
             return await this.page.evaluate(scrapeGlmChatList, limit);
         }
@@ -1169,21 +1226,27 @@ export class GlmBrowser {
                 }
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('stopGeneration', e, this.debug);
+        }
         const btn = await this._findVisible(STOP_SELECTORS, 500);
         if (btn) {
             try {
                 await btn.click({ timeout: 1500 });
                 return true;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('stopGeneration', e, this.debug);
+            }
         }
         // No dedicated stop control was observed; Escape aborts the generation.
         try {
             await this.page.keyboard.press('Escape');
             return true;
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('stopGeneration', e, this.debug);
+        }
         return false;
     }
     /**
@@ -1232,7 +1295,9 @@ export class GlmBrowser {
             if (!clicked)
                 await this.page.keyboard.press('Escape').catch(() => { });
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_applyModel', e, this.debug);
+        }
     }
     getToggleStatesSync() {
         return this._toggles;
@@ -1337,7 +1402,9 @@ export class GlmBrowser {
                 try {
                     this.onSendPause(secs);
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_waitForSendSlot', e, this.debug);
+                }
             }
         };
         report(gap);
@@ -1378,6 +1445,8 @@ export class GlmBrowser {
         // The exhausted-context recovery is a COMPACTION (a new chat), not a
         // resend, so it has its own budget.
         let contextLimitRetries = 0;
+        // N8: the fallback switch is tried ONCE per ask().
+        let fallbackAttempted = false;
         this._askInFlight++;
         try {
             while (attempt < this.askRetries) {
@@ -1483,6 +1552,26 @@ export class GlmBrowser {
                             }));
                         }
                     }
+                    // N8: the active provider exhausted its budgets. Give the injected
+                    // hook ONE chance to continue on an AUTHORIZED fallback provider.
+                    if (!fallbackAttempted && this.onProviderExhausted) {
+                        fallbackAttempted = true;
+                        let switched = false;
+                        try {
+                            switched = await this.onProviderExhausted(lastErr);
+                        }
+                        catch (e) {
+                            noteSwallowed('_onProviderExhausted', e, this.debug);
+                        }
+                        if (switched) {
+                            attempt = 0;
+                            rateLimitRetries = 0;
+                            serverBusyRetries = 0;
+                            incompleteRetries = 0;
+                            contextLimitRetries = 0;
+                            continue;
+                        }
+                    }
                     this._notice(this._t('glm.ask_retry', {
                         attempt: attempt + 1,
                         max: this.askRetries,
@@ -1511,7 +1600,9 @@ export class GlmBrowser {
                 await input.fill(text, { timeout: 5000 });
                 return;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_setInputText', e, this.debug);
+            }
         }
         await input.click({ timeout: 3000 }).catch(() => { });
         await input
@@ -1547,7 +1638,9 @@ export class GlmBrowser {
             await this._awaitUploadPreview(files.map((f) => f.name), 5000);
             return failed;
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_attachFiles', e, this.debug);
+        }
         // Fallback: set the files directly on the hidden <input type=file>.
         for (const sel of ['input[type="file"]']) {
             const el = this.page.locator(sel).last();
@@ -1558,7 +1651,9 @@ export class GlmBrowser {
                 await this._awaitUploadPreview(files.map((f) => f.name), 3000);
                 return failed;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_attachFiles', e, this.debug);
+            }
         }
         this._notice(this._t('glm.attach_no_input'));
         for (const f of files)
@@ -1581,7 +1676,9 @@ export class GlmBrowser {
                 await this._awaitInput(10_000);
                 input = await this._findVisible(INPUT_SELECTORS, 3000);
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_askOnce', e, this.debug);
+            }
         }
         if (!input)
             throw new Error(this._t('glm.input_missing'));
@@ -1593,7 +1690,9 @@ export class GlmBrowser {
             try {
                 this.onSendStart();
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_askOnce', e, this.debug);
+            }
         }
         this._emitSendState('generating');
         void this._setBusyTitle(true);
@@ -1639,7 +1738,9 @@ export class GlmBrowser {
                     clicked = true;
                     break;
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_askOnce', e, this.debug);
+                }
             }
             if (!clicked) {
                 await this.page.keyboard.press('Enter').catch(() => { });

package/dist/i18n/common.js

@@ -393,8 +393,11 @@ export const commonMessages = {
         ru: '⚠ авто-reload: часть модулей не загрузилась, работаю на прежней версии:',
         en: '⚠ auto-reload: some modules failed, using previous version:',
     },
-    'reload.browser_restart': {
-        ru: '⚠ browser.ts изменился, но он НЕ перезагружается на лету (в нём Playwright-контекст). Перезапусти zames, иначе изменения не применятся.',
-        en: '⚠ browser.ts changed, but it is NOT hot-reloaded (it owns the Playwright context). Restart zames or the change will not apply.',
+    // A generic version of the row above: the WHOLE non-reloadable set is
+    // watched (index.ts, run-task.ts, the provider browsers, browser-login.ts,
+    // send-*.ts, src/tui/), and `{files}` names what changed.
+    'reload.non_reloadable_restart': {
+        ru: '⚠ изменились модули, которые НЕ перезагружаются на лету ({files}). Перезапусти zames, иначе изменения не применятся.',
+        en: '⚠ non-reloadable modules changed ({files}). Restart zames or the change will not apply.',
     },
 };

package/dist/i18n/config.js

@@ -258,6 +258,10 @@ export const configMessages = {
         ru: 'Логин DeepSeek для авто-входа',
         en: 'DeepSeek login for auto sign-in',
     },
+    'cfg.f.browser_passwordStore': {
+        ru: 'Где хранить пароль: config (в файле), none (не хранить), keychain (системное хранилище)',
+        en: 'Where to keep the password: config (in the file), none (never store), keychain (OS keychain)',
+    },
     'cfg.f.browser_authPassword': {
         ru: 'Пароль DeepSeek для авто-входа',
         en: 'DeepSeek password for auto sign-in',
@@ -373,4 +377,16 @@ export const configMessages = {
         ru: 'Esc — назад к группам',
         en: 'Esc — back to the groups',
     },
+    'provider.fallback_ask': {
+        ru: 'Лимит провайдера {from} исчерпан. Продолжить задачу на {to}? (browser.fallbackMode=auto переключает без вопроса)',
+        en: 'The {from} limit is exhausted. Continue the task on {to}? (browser.fallbackMode=auto switches without asking)',
+    },
+    'provider.fallback_none': {
+        ru: '✖ Лимит {from} исчерпан, а резервного провайдера нет. Авторизуй одного через /provider <id> (нужен настоящий вход, гостевой режим не подходит) и задай browser.fallbackProviders.',
+        en: '✖ {from} is exhausted and there is no fallback provider. Authorize one with /provider <id> (a real sign-in; a guest session is not enough) and set browser.fallbackProviders.',
+    },
+    'provider.fallback_switch': {
+        ru: 'Лимит {from} исчерпан — переключаюсь на {to} и продолжаю задачу.',
+        en: '{from} is exhausted — switching to {to} and continuing the task.',
+    },
 };

package/dist/i18n/wizard.js

@@ -0,0 +1,25 @@
+// First-run wizard (N19). A fresh install has no config yet, so these lines
+// are the FIRST the operator ever sees: they must explain the three choices
+// (language, backend, sign-in) without assuming any prior knowledge.
+export const wizardMessages = {
+    'wizard.welcome': {
+        ru: 'Первый запуск. Настроим три вещи: язык, провайдер и вход. Enter — значение по умолчанию.',
+        en: 'First run. Three quick choices: language, provider and sign-in. Enter accepts the default.',
+    },
+    'wizard.language': {
+        ru: 'Язык интерфейса [en/ru] (en):',
+        en: 'Interface language [en/ru] (en):',
+    },
+    'wizard.provider': {
+        ru: 'Провайдер [deepseek/qwen/glm] (deepseek): ',
+        en: 'Provider [deepseek/qwen/glm] (deepseek): ',
+    },
+    'wizard.hint': {
+        ru: 'Готово. Дальше — /help; сменить настройки можно через /config.',
+        en: 'Done. Next: /help; change these later with /config.',
+    },
+    'wizard.skipped': {
+        ru: 'Мастер пропущен — используются значения по умолчанию (английский, DeepSeek).',
+        en: 'Wizard skipped — using the defaults (English, DeepSeek).',
+    },
+};

package/dist/i18n.js

@@ -15,9 +15,13 @@ import { selfReviewMessages } from './i18n/self-review.js';
 import { mcpMessages } from './i18n/mcp.js';
 import { configMessages } from './i18n/config.js';
 import { promptMessages } from './i18n/prompt.js';
+import { wizardMessages } from './i18n/wizard.js';
 import { qwenMessages } from './i18n/qwen.js';
 import { glmMessages } from './i18n/glm.js';
-export const DEFAULT_LOCALE = 'ru';
+// English is the default for a fresh install: the package is published for an
+// international audience and the operator asked for English out of the box.
+// `ui.locale` still overrides it, and the first-run wizard offers Russian.
+export const DEFAULT_LOCALE = 'en';
 export const LOCALES = [
     { code: 'ru', name: 'Русский', englishName: 'Russian' },
     { code: 'en', name: 'English', englishName: 'English' },
@@ -48,6 +52,7 @@ export const CATALOG = {
     ...mcpMessages,
     ...configMessages,
     ...promptMessages,
+    ...wizardMessages,
     ...qwenMessages,
     ...glmMessages,
 };