zames_pro 2.88.2 → 2.90.0

package/dist/browser.js

@@ -1,4 +1,5 @@
 import { chromium, } from 'playwright';
+import { noteSwallowed } from './swallow.js';
 import { interactiveBrowserLogin, loginIsInteractive, canShowWindow, } from './browser-login.js';
 import { extractAnswer, extractTokenUsage, dumpNetBody, isFinishedWithoutAnswer, isFinishedWithAnswer, } from './net-capture.js';
 import { rewriteFailedAttachments } from './commands.js';
@@ -46,6 +47,8 @@ export class DeepSeekBrowser {
     // recovery is capped independently of askRetries.
     maxContextLimitRetries;
     onContextLimit;
+    /** N8: switch to an authorized fallback provider (see agent-loop). */
+    onProviderExhausted;
     serverBusyWaitMs;
     // Retries for a turn the server truncated (generation_err / INCOMPLETE).
     maxIncompleteRetries;
@@ -192,6 +195,7 @@ export class DeepSeekBrowser {
         this.incompleteWaitMs = incompleteWaitMs;
         this.maxContextLimitRetries = maxContextLimitRetries;
         this.onContextLimit = onContextLimit || null;
+        this.onProviderExhausted = null;
         this.autoContinue = autoContinue;
         this.continueMinGapMs = continueMinGapMs;
         this.loginTimeoutMs = loginTimeoutMs;
@@ -264,7 +268,9 @@ export class DeepSeekBrowser {
                 this.onNotice(text);
                 return;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_notice', e, this.debug);
+            }
         }
         console.error(text);
     }
@@ -275,7 +281,9 @@ export class DeepSeekBrowser {
             try {
                 this.onSendState(state);
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_emitSendState', e, this.debug);
+            }
         }
     }
     // Best-effort: a page error while marking the tab title must never break the
@@ -284,7 +292,9 @@ export class DeepSeekBrowser {
         try {
             await this.page.evaluate(setBusyTitleInDom, busy);
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_setBusyTitle', e, this.debug);
+        }
     }
     async launch() {
         // NOTE: we deliberately do NOT kill stray chrome processes here. Per the
@@ -417,7 +427,9 @@ export class DeepSeekBrowser {
                 if (h['x-ds-pow-response'])
                     this._apiPow = h['x-ds-pow-response'];
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_installNetHook', e, this.debug);
+            }
         });
     }
     async _onResponse(resp) {
@@ -506,14 +518,23 @@ export class DeepSeekBrowser {
                 }
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_onResponse', e, this.debug);
+        }
     }
     async restart() {
+        // The dialogue the operator was in. A relaunch lands on the BASE url, whose
+        // URL has no id, so getCurrentChatId() answers null and the next
+        // `freshChat` opened a SECOND chat — the resumed conversation vanished.
+        // Remember it BEFORE the context dies and re-open it after the launch.
+        const chatBefore = (await this.getCurrentChatId().catch(() => null)) ?? null;
         try {
             if (this.context)
                 await this.context.close();
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('restart', e, this.debug);
+        }
         // A restart must REUSE the existing profile. `launch()` would clean
         // Singleton files, which can race with a sibling agent on the same
         // profile; here we just relaunch the persistent context in place. A fresh
@@ -521,6 +542,16 @@ export class DeepSeekBrowser {
         // second window is created while one is alive.
         await this._launchOnce();
         await this._fixHeadlessUserAgent();
+        // Put the operator BACK into the chat instead of leaving them in a new one.
+        // A failure is not fatal: the caller (ask) retries the send and the loop's
+        // resumeChatId still points at the right chat.
+        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);
+        }
     }
     /**
      * PURE-ish gate: may the login open a visible window? False for --task, a
@@ -576,7 +607,9 @@ export class DeepSeekBrowser {
                     if (u)
                         await u.fill(this.auth.username).catch(() => { });
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_browserLogin', e, this.debug);
+                }
             },
             captureCredentials: async () => {
                 try {
@@ -591,7 +624,9 @@ export class DeepSeekBrowser {
                         try {
                             this.onAuthSave?.(user, pass);
                         }
-                        catch { }
+                        catch (e) {
+                            noteSwallowed('_browserLogin', e, this.debug);
+                        }
                     });
                     await this.page.evaluate(() => {
                         const w = window;
@@ -609,11 +644,15 @@ export class DeepSeekBrowser {
                                 if (fn)
                                     fn(u ? u.value || '' : '', p ? p.value || '' : '');
                             }
-                            catch { }
+                            catch (e) {
+                                noteSwallowed('_browserLogin', e, this.debug);
+                            }
                         }, true);
                     });
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_browserLogin', e, this.debug);
+                }
             },
             persistSession: () => this._persistSessionIfNeeded(),
             // Route login notices through the SAME notice hook as every other
@@ -660,7 +699,9 @@ export class DeepSeekBrowser {
                     });
                     api = res.ok;
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('probeLogin', e, this.debug);
+                }
                 const body = document.body ? document.body.innerText : '';
                 const signInVisible = /log ?in|sign ?in|войти/i.test(body);
                 return { hasToken, api, signInVisible };
@@ -691,12 +732,16 @@ export class DeepSeekBrowser {
             if (session.length)
                 this._carryCookies = session;
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('relaunchSafe', e, this.debug);
+        }
         try {
             if (this.context)
                 await this.context.close();
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('relaunchSafe', e, this.debug);
+        }
         const deadline = Date.now() + 15000;
         while (Date.now() < deadline) {
             if (!(await profileLooksLocked()))
@@ -748,7 +793,9 @@ export class DeepSeekBrowser {
                 }
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_openLoginPage', e, this.debug);
+        }
     }
     async waitForLogin() {
         // 1) Already signed in (session cookie in the persistent profile)?
@@ -1003,7 +1050,9 @@ export class DeepSeekBrowser {
                 if (await tryLogin())
                     return true;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_fillLoginForm', e, this.debug);
+            }
         }
         for (const sel of LOGIN_SUBMIT_SELECTORS) {
             const btn = this.page.locator(sel).last();
@@ -1016,7 +1065,9 @@ export class DeepSeekBrowser {
                 if (await tryLogin())
                     return true;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_fillLoginForm', e, this.debug);
+            }
         }
         // Button inside the same form as the password field.
         const formClicked = await this.page
@@ -1123,7 +1174,9 @@ export class DeepSeekBrowser {
                 submitted = true;
                 break;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_handleMfaIfPresent', e, this.debug);
+            }
         }
         if (!submitted)
             await codeInput.press('Enter').catch(() => { });
@@ -1159,7 +1212,9 @@ export class DeepSeekBrowser {
                 await btn.click({ timeout: 2000 });
                 return true;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_clickMfaSendCode', e, this.debug);
+            }
         }
         return false;
     }
@@ -1267,7 +1322,9 @@ export class DeepSeekBrowser {
                 await loc.waitFor({ state: 'visible', timeout });
                 return loc;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_findVisible', e, this.debug);
+            }
         }
         return null;
     }
@@ -1377,7 +1434,9 @@ export class DeepSeekBrowser {
                     return true;
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_continueButtonVisible', e, this.debug);
+        }
         // Fallback: the raw DOM scan (older/newer DeepSeek builds where the role
         // is absent).
         return this.page.evaluate(continueVisibleInDom).catch(() => false);
@@ -1418,7 +1477,9 @@ export class DeepSeekBrowser {
                 }
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_clickContinueIfVisible', e, this.debug);
+        }
         if (found) {
             // One Continue click per `continueMinGapMs`: a `chat/continue` request
             // hits the rate limit like a send, and a run that keeps getting
@@ -1439,7 +1500,9 @@ export class DeepSeekBrowser {
                             try {
                                 this.onSendPause(Math.max(0, Math.ceil(leftMs / 1000)));
                             }
-                            catch { }
+                            catch (e) {
+                                noteSwallowed('_clickContinueIfVisible', e, this.debug);
+                            }
                         }
                     });
                     if (aborted)
@@ -1455,7 +1518,9 @@ export class DeepSeekBrowser {
                 this._notice(this._t('ds.continue_clicked'));
                 return true;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_clickContinueIfVisible', e, this.debug);
+            }
         }
         // 2) Fallback: raw DOM scan + full pointer/mouse event sequence (an older
         //    build without a proper role, or a click intercepted by an overlay).
@@ -1493,7 +1558,9 @@ export class DeepSeekBrowser {
                     return { loc: b, pressed };
                 }
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_findToggle', e, this.debug);
+            }
         }
         return null;
     }
@@ -1508,7 +1575,9 @@ export class DeepSeekBrowser {
             }
             return;
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_setToggle', e, this.debug);
+        }
     }
     async _applyToggles() {
         await this._setToggle(DEEP_THINKING_RE, this.deepThinking);
@@ -1539,7 +1608,9 @@ export class DeepSeekBrowser {
                 if (found)
                     return found.pressed;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('getToggleStates', e, this.debug);
+            }
             return fallback;
         };
         return {
@@ -1568,7 +1639,9 @@ export class DeepSeekBrowser {
                 }
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('stopGeneration', e, this.debug);
+        }
         // 2) Legacy selector path.
         const btn = await this._findVisible(STOP_SELECTORS, 500);
         if (btn) {
@@ -1576,7 +1649,9 @@ export class DeepSeekBrowser {
                 await btn.click({ timeout: 1500 });
                 return true;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('stopGeneration', e, this.debug);
+            }
         }
         // 3) Raw DOM scan + the full pointer/mouse sequence (older builds without
         //    a proper role, or a click intercepted by an overlay).
@@ -1589,7 +1664,9 @@ export class DeepSeekBrowser {
             await this.page.keyboard.press('Escape');
             return true;
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('stopGeneration', e, this.debug);
+        }
         return false;
     }
     async ask(prompt, { timeout = this.answerTimeoutMs, agent = false, attachments = [], } = {}) {
@@ -1597,6 +1674,8 @@ export class DeepSeekBrowser {
         let attempt = 0;
         let rateLimitRetries = 0;
         let serverBusyRetries = 0;
+        // N8: the fallback switch is tried ONCE per ask(), not per family.
+        let fallbackAttempted = false;
         // Bumped when DeepSeek truncated the turn (`generation_err`/INCOMPLETE).
         // The retry does NOT consume a regular ask() attempt: it is a server-side
         // hiccup, not a failed send, and it is more likely in the reasoning
@@ -1733,6 +1812,32 @@ export class DeepSeekBrowser {
                         this._lastSentAt = Date.now();
                         continue;
                     }
+                    // The retry BUDGETS of the specific families are exhausted (or this
+                    // is a generic failure on the last attempt): give the injected N8
+                    // hook ONE chance to continue the task on an AUTHORIZED fallback
+                    // provider. It performs the switch and, when it succeeds, the SAME
+                    // prompt is resent on the new backend.
+                    if (!fallbackAttempted && this.onProviderExhausted) {
+                        const budgetLeft = rateLimitRetries < this.maxRateLimitRetries ||
+                            serverBusyRetries < this.maxServerBusyRetries ||
+                            attempt < this.askRetries - 1;
+                        if (!budgetLeft) {
+                            fallbackAttempted = true;
+                            let switched = false;
+                            try {
+                                switched = await this.onProviderExhausted(e);
+                            }
+                            catch (re) {
+                                noteSwallowed('_onProviderExhausted', re, this.debug);
+                            }
+                            if (switched) {
+                                attempt = 0;
+                                rateLimitRetries = 0;
+                                serverBusyRetries = 0;
+                                continue;
+                            }
+                        }
+                    }
                     this._notice(theme.warn(this._t('ds.ask_retry', {
                         attempt: attempt + 1,
                         max: this.askRetries,
@@ -1790,7 +1895,9 @@ export class DeepSeekBrowser {
                 await input.fill(text, { timeout: 5000 });
                 return;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_setInputText', e, this.debug);
+            }
         }
         await input.click();
         await this.page.keyboard.press('Control+A');
@@ -1852,7 +1959,9 @@ export class DeepSeekBrowser {
                 await this._awaitUploadPreview(files.map((f) => f.name), 2500);
                 return failed;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_attachFiles', e, this.debug);
+            }
         }
         // Fallback: set the files directly on the hidden <input type=file>.
         const input = this.page.locator('input[type="file"]').first();
@@ -1891,7 +2000,9 @@ export class DeepSeekBrowser {
                 try {
                     this.onSendPause(secs);
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_waitRateLimit', e, this.debug);
+                }
             }
         };
         this._emitSendState('paused');
@@ -1933,7 +2044,9 @@ export class DeepSeekBrowser {
                 try {
                     this.onSendPause(secs);
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_waitForSendSlot', e, this.debug);
+                }
             }
             else {
                 // Fallback when no UI hook is wired (a direct ask() from a script):
@@ -1984,7 +2097,9 @@ export class DeepSeekBrowser {
             const dir = path.join(os.homedir(), '.zames');
             void fs.appendFile(path.join(dir, 'ask-debug.log'), line).catch(() => { });
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_askDebug', e, this.debug);
+        }
     }
     async _askOnce(prompt, { timeout, agent, attachments = [], }) {
         // We reset the abort flag ONLY at the very start of the send.
@@ -2026,7 +2141,9 @@ export class DeepSeekBrowser {
             try {
                 this.onSendStart();
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_askOnce', e, this.debug);
+            }
         }
         this._emitSendState('generating');
         void this._setBusyTitle(true);
@@ -2080,7 +2197,9 @@ export class DeepSeekBrowser {
                     sent = true;
                     break;
                 }
-                catch { }
+                catch (e) {
+                    noteSwallowed('_askOnce', e, this.debug);
+                }
             }
             if (!sent)
                 await this.page.waitForTimeout(150);
@@ -2106,7 +2225,9 @@ export class DeepSeekBrowser {
                 this._lastSentAt = Date.now();
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('_askOnce', e, this.debug);
+        }
         // Wait for the start: either Stop appeared, or the answer text changed,
         // or the page grew (a new answer node / longer last answer). In parallel we
         // catch the rate-limit toast (only toasts, not the whole body).
@@ -2598,7 +2719,9 @@ export class DeepSeekBrowser {
                 await this.page.waitForTimeout(500);
                 return;
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('_ensureSidebarOpen', e, this.debug);
+            }
         }
     }
     async listChats(limit = 30) {
@@ -2626,7 +2749,9 @@ export class DeepSeekBrowser {
                     await this.page.waitForTimeout(100);
                 }
             }
-            catch { }
+            catch (e) {
+                noteSwallowed('openChat', e, this.debug);
+            }
         }
         try {
             await this.page.goto(chatUrl(id), {
@@ -2815,11 +2940,15 @@ export class DeepSeekBrowser {
                 }
             }
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('close', e, this.debug);
+        }
         try {
             if (this.context)
                 await this.context.close();
         }
-        catch { }
+        catch (e) {
+            noteSwallowed('close', e, this.debug);
+        }
     }
 }

package/dist/command-registry.js

@@ -0,0 +1,58 @@
+// N2: the slash-command REGISTRY.
+//
+// `main()` in index.ts used to be one long chain of `if (lower === '/x')`
+// branches (~60 of them), and help, the «/» hints, the dev-only guard and the
+// dispatch were built from DIFFERENT lists — a command could be dispatched but
+// missing from the help, or the other way round. A command is now a DATA
+// ENTRY: name, aliases, whether it is dev-only, and a handler that receives a
+// `CommandContext`. The registry below owns the informational group first; the
+// remaining groups move in as they are extracted (one group per commit), and
+// `printHelp`/`buildSlashCommands`/`isDevOnlyCommand` keep their existing
+// sources until the last group lands.
+/**
+ * Match a typed line against the registry. Returns the command and its
+ * arguments (everything after the matched name), or null. Matching is
+ * case-insensitive and requires a word boundary: `/statusx` must NOT match
+ * `/status`.
+ */
+export function matchCommand(commands, input) {
+    const trimmed = (input || '').trim();
+    if (!trimmed.startsWith('/'))
+        return null;
+    const body = trimmed.slice(1);
+    const space = body.search(/\s/);
+    const name = (space < 0 ? body : body.slice(0, space)).toLowerCase();
+    const rest = space < 0 ? '' : body.slice(space).trim();
+    for (const c of commands) {
+        if (c.name.toLowerCase() === name)
+            return { command: c, rest };
+        for (const a of c.aliases || []) {
+            if (a.toLowerCase() === name)
+                return { command: c, rest };
+        }
+    }
+    return null;
+}
+/**
+ * Dispatch a line through the registry. Returns false when nothing matched, so
+ * the caller can fall through to the next group (or the task path).
+ *
+ * A dev-only command typed by a regular user must be REJECTED with a clear
+ * message — hiding it from the help is not enough, the user can type it by
+ * hand. `devMode` and `onDevOnlyRejected` are injected for that.
+ */
+export async function dispatchCommand(commands, input, deps) {
+    const hit = matchCommand(commands, input);
+    if (!hit)
+        return false;
+    if (hit.command.devOnly && !deps.devMode) {
+        deps.onDevOnlyRejected?.(hit.command.name);
+        return true;
+    }
+    await hit.command.handler({
+        input: (input || '').trim(),
+        rest: hit.rest,
+        print: deps.print,
+    });
+    return true;
+}

package/dist/commands.js

@@ -2,7 +2,8 @@ import { providerLabel, providerHasModelPicker } from './providers.js';
 import path from 'path';
 import os from 'os';
 import { isImageName } from './attachments.js';
-import { translate } from './i18n.js';
+import { SYSTEM_PROMPT_BUDGET_BYTES, kb, overBudget } from './prompt-budget.js';
+import { translate, DEFAULT_LOCALE, } from './i18n.js';
 // Helpers for the slash commands (/diff, /cost, /export, /doctor, /review,
 // /add-dir, /queue, /goal, custom commands). Pure functions, unit-tested
 // without a live agent/browser; index.ts only renders their output.
@@ -345,6 +346,28 @@ export function renderDoctor(d, t = translate('en')) {
         tools: String(d.mcpTools),
     }));
     row(d.transcriptOk, 'transcript', onoff(d.transcriptOk));
+    if (d.passwordStore) {
+        row(!d.passwordStore.degraded, 'password', d.passwordStore.store +
+            (d.passwordStore.degraded ? ' (keychain unavailable)' : ''));
+    }
+    if (d.swallowedTop && d.swallowedTop.length) {
+        const txt = d.swallowedTop.map((x) => x.tag + ':' + x.count).join(', ');
+        // WARN, not OK: a swallowed failure is a SELECTOR (or a page read) that
+        // broke and was hidden - exactly what this row exists to surface.
+        row(false, 'swallowed', txt);
+    }
+    if (typeof d.systemPromptBytes === 'number') {
+        const budget = d.systemPromptBudget ?? SYSTEM_PROMPT_BUDGET_BYTES;
+        const size = kb(d.systemPromptBytes);
+        const ctx = typeof d.contextBytes === 'number' && d.contextBytes > 0
+            ? ' + ' + kb(d.contextBytes) + ' context'
+            : '';
+        row(!overBudget(d.systemPromptBytes, budget), 'prompt', size +
+            ctx +
+            (overBudget(d.systemPromptBytes, budget)
+                ? ' > ' + kb(budget) + ' budget'
+                : ' (budget ' + kb(budget) + ')'));
+    }
     if (typeof d.contextLimit === 'number' && d.contextLimit > 0) {
         row(true, 'context', t('doctor.tokens', {
             v: d.contextLimit.toLocaleString('en-US'),
@@ -595,7 +618,7 @@ export function formatRestoredHistory(messages, opts = {}) {
  * the system prompt), so the model is told to keep facts, decisions, file
  * paths, commands and the exact current state of the work.
  */
-export function buildCompactPrompt(locale = 'ru') {
+export function buildCompactPrompt(locale = DEFAULT_LOCALE) {
     if (locale === 'en') {
         return ('Compact the conversation so far into a handover summary for a NEW chat. ' +
             'This summary is the ONLY context the new chat will start with, so it must be self-sufficient. ' +