zames_pro 2.68.0 → 2.69.0

package/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.69.0] - 2026-10-08
+
+### Changed
+
+- **ui:** ONE content width for every block, from a new single source of
+  truth `src/width.ts`. The model answers, the echo of the operator text,
+  the tool previews, the service warnings and the divider now all stop at
+  the same margin (`min(ui.answerWidth, terminal - 1)`, capped at 100 by
+  default). Before, answers and the divider were capped at 100 while the
+  echoed operator text and warnings ran to the full terminal width — the
+  mismatch looked ragged after a resize.
+- **config:** `ui.answerWidth` now sets the SHARED content width (label
+  updated). `0` = auto (terminal width, capped at 100).
+
+## [2.68.1] - 2026-10-08
+
+### Fixed
+
+- **ui:** long service messages (send failures, rate limits) are now
+  word-wrapped to the same margin as the tool previews (`cols - 1`).
+  Before, they were printed at the full terminal width and the terminal
+  wrapped them mid-word, so some lines ran to the edge and some stopped
+  short. Applies to `LineEditor.warning()` and the non-TTY spinner.
+
 ## [2.68.0] - 2026-10-08
 
 ### Changed

package/dist/i18n/config.js

@@ -15,8 +15,8 @@ export const configMessages = {
         en: 'Interface and agent reply language',
     },
     'cfg.f.ui_answerWidth': {
-        ru: 'Максимальная ширина ответа в колонках (0 — авто, до 100)',
-        en: 'Max answer width in columns (0 = auto, capped at 100)',
+        ru: 'Ширина контента в колонках: ответы, ввод, инструменты (0 — авто, до 100)',
+        en: 'Content width in columns: answers, input, tools (0 = auto, capped at 100)',
     },
     'cfg.f.maxIterations': {
         ru: 'Лимит итераций на задачу',

package/dist/input/layout.js

@@ -154,6 +154,61 @@ export function charWidth(cp) {
 // appending an ellipsis when it was cut. Used for one-line previews (tool call
 // args, tool results) so a long argument cannot print a line wider than the
 // terminal — which made some terminals show a horizontal scrollbar.
+// Word-wrap a PLAIN (no-ANSI) string to at most `maxCols` visible columns per
+// line. Used for service messages printed above the input (warnings): the
+// terminal's OWN wrap breaks at the full width and mid-word, while our previews
+// stop at cols-1 — the mismatch looked ragged. Wrapping here keeps every line
+// inside the same margin. A single word longer than the width is hard-split so
+// it never overflows.
+export function wrapToWidth(s, maxCols) {
+    const width = Math.max(1, Math.floor(maxCols));
+    const text = String(s ?? '');
+    const out = [];
+    for (const raw of text.split(NL)) {
+        if (raw === '') {
+            out.push('');
+            continue;
+        }
+        let line = '';
+        let lineW = 0;
+        for (const word of raw.split(' ')) {
+            const w = visLen(word);
+            // Hard-split a word longer than a whole line.
+            if (w > width) {
+                if (line) {
+                    out.push(line);
+                }
+                let piece = '';
+                let pieceW = 0;
+                for (const ch of word) {
+                    const cw = charWidth(ch.codePointAt(0));
+                    if (pieceW + cw > width) {
+                        out.push(piece);
+                        piece = '';
+                        pieceW = 0;
+                    }
+                    piece += ch;
+                    pieceW += cw;
+                }
+                line = piece;
+                lineW = pieceW;
+                continue;
+            }
+            const sep = line ? 1 : 0;
+            if (lineW + sep + w > width) {
+                out.push(line);
+                line = word;
+                lineW = w;
+            }
+            else {
+                line = line ? line + ' ' + word : word;
+                lineW += sep + w;
+            }
+        }
+        out.push(line);
+    }
+    return out.join(NL);
+}
 export function truncateToWidth(s, maxCols) {
     const width = Math.max(1, Math.floor(maxCols));
     const text = String(s ?? '');

package/dist/input.js

@@ -1,14 +1,15 @@
 import { theme, divider } from './theme.js';
 import { renderMarkdown } from './markdown.js';
+import { contentWidth } from './width.js';
 import { randomThinkingPhrase, stripEllipsis, DOTS, renderDots, } from './spinner.js';
 import { translate } from './i18n.js';
 import { AttachmentStore, parseImagePaste, looksLikeFilePath, } from './attachments.js';
-import { NL, CR, ESC, PASTE_START, PASTE_END, SUGGEST_PAGE, isSubsequence, pasteReplacement, expandPastes, safeJson, visRows, visLen, charWidth, layoutInput, formatTokenStatus, tokenStatusLevel, truncateToWidth, CONTEXT_LIMIT, } from './input/layout.js';
+import { NL, CR, ESC, PASTE_START, PASTE_END, SUGGEST_PAGE, isSubsequence, pasteReplacement, expandPastes, safeJson, visRows, visLen, charWidth, layoutInput, formatTokenStatus, tokenStatusLevel, truncateToWidth, wrapToWidth, CONTEXT_LIMIT, } from './input/layout.js';
 // The pure layout/formatting helpers (visual rows, cursor position, visible
 // width, paste markers, token formatting) live in ./input/layout.js. They are
 // re-exported here so every existing import from './input.js' keeps working,
 // and so tests can import them from either module (C3 step 3).
-export { PASTE_MIN_LINES, SUGGEST_PAGE, isSubsequence, countPasteLines, formatPasteMarker, pasteReplacement, expandPastes, visRows, visLen, charWidth, layoutInput, tokenStatusLevel, formatTokenStatus, formatCompactTokens, truncateToWidth, CONTEXT_LIMIT, CONTEXT_YELLOW_PCT, CONTEXT_RED_PCT, } from './input/layout.js';
+export { PASTE_MIN_LINES, SUGGEST_PAGE, isSubsequence, countPasteLines, formatPasteMarker, pasteReplacement, expandPastes, visRows, visLen, charWidth, layoutInput, tokenStatusLevel, formatTokenStatus, formatCompactTokens, truncateToWidth, wrapToWidth, CONTEXT_LIMIT, CONTEXT_YELLOW_PCT, CONTEXT_RED_PCT, } from './input/layout.js';
 // How long a lone ESC is held before it is treated as the Escape key (and not
 // as the head of a control sequence split across two reads). 40ms is below a
 // human "two Escapes" interval but above typical chunk-split latency.
@@ -1075,7 +1076,7 @@ export class LineEditor {
         // Clip by VISIBLE WIDTH, not character count: a long arg line used to print
         // wider than the terminal and some terminals then showed a horizontal
         // scrollbar. Keep one column free (autowrap safety), same as the status.
-        const maxW = Math.max(20, (process.stdout.columns || 80) - 1);
+        const maxW = contentWidth();
         const preview = truncateToWidth(full, maxW);
         this.printAbove(theme.tool('🔧 ' + name) + ' ' + theme.dim(preview));
         // A tool may run for a long time (Bash, npm test, MCP). Without an active
@@ -1094,7 +1095,7 @@ export class LineEditor {
     toolResult(result) {
         this.stop();
         const text = typeof result === 'string' ? result : safeJson(result);
-        const maxW = Math.max(20, (process.stdout.columns || 80) - 1);
+        const maxW = contentWidth();
         const preview = truncateToWidth(text.split(NL).join(' ↵ '), maxW);
         this.printAbove(theme.toolResult('   → ' + preview));
     }
@@ -1115,7 +1116,12 @@ export class LineEditor {
     // Warning to the operator (e.g. the agent stopped suspiciously).
     // Printed above the input line without overwriting it.
     warning(msg) {
-        this.printAbove(NL + theme.warn('⚠ ' + msg));
+        // Wrap long service messages (send failures, rate limits) to the same
+        // margin the tool previews use, instead of letting the terminal wrap them
+        // at the full width and mid-word — that mismatch looked ragged.
+        const maxW = contentWidth();
+        const wrapped = wrapToWidth('⚠ ' + msg, maxW);
+        this.printAbove(NL + theme.warn(wrapped));
     }
     // ---------- input ----------
     _submit() {
@@ -1187,7 +1193,7 @@ export class LineEditor {
         // Attachments collected for this message (images/files). They are handed
         // to the browser layer to be attached to the chat.
         const attached = this.attachments.items.slice();
-        this.printAbove(theme.user('❯ ') + display);
+        this.printAbove(theme.user('❯ ') + wrapToWidth(display, contentWidth()));
         this.pastes = [];
         this.attachments.reset();
         if (this.onSubmit)

package/dist/markdown.js

@@ -26,21 +26,19 @@ function highlighter(code, lang) {
         return code;
     }
 }
-// Configured maximum answer width (columns). 0 = auto: terminal width, capped
-// at 100. Set once from config (ui.answerWidth) so every render path honors it
-// without threading the option through every call site.
-let configuredWidth = 0;
+// The answer width is the SHARED content width (src/width.ts), the same one
+// the operator's echoed text, the tool previews, the warnings and the divider
+// use — so nothing is rendered at a different margin. `setAnswerWidth` is kept
+// as a thin alias for callers that still use the old name.
+import { contentWidth, setContentWidth } from './width.js';
 export function setAnswerWidth(width) {
-    configuredWidth = typeof width === 'number' && width > 0 ? width : 0;
+    setContentWidth(width);
 }
 export function renderMarkdown(text) {
     if (!text)
         return '';
     try {
-        const cols = process.stdout.columns || 80;
-        const width = configuredWidth > 0
-            ? Math.min(configuredWidth, cols)
-            : Math.min(cols, 100);
+        const width = contentWidth();
         return render(String(text), {
             width,
             theme: theme,

package/dist/spinner.js

@@ -2,7 +2,8 @@ import ora from 'ora';
 import { theme, divider } from './theme.js';
 import { renderMarkdown } from './markdown.js';
 import { translate } from './i18n.js';
-import { truncateToWidth } from './input/layout.js';
+import { truncateToWidth, wrapToWidth } from './input/layout.js';
+import { contentWidth } from './width.js';
 // Phrases for the "agent is working" spinner. Chosen in random order.
 // The text comes from i18n via the key 'spinner.phrases' (strings separated by "|").
 export function randomThinkingPhrase(locale = 'ru') {
@@ -171,7 +172,7 @@ export function createSpinner(locale = 'ru') {
         },
         toolCall: (name, args) => {
             stop();
-            const maxW = Math.max(20, (process.stdout.columns || 80) - 1);
+            const maxW = contentWidth();
             const preview = truncateToWidth(JSON.stringify(args), maxW);
             console.log(theme.tool('🔧 ' + name), theme.dim(preview));
             // Keep an animated status while the tool runs (Bash/npm/MCP can take a
@@ -183,7 +184,7 @@ export function createSpinner(locale = 'ru') {
         toolResult: (result) => {
             stop();
             const text = typeof result === 'string' ? result : JSON.stringify(result);
-            const maxW = Math.max(20, (process.stdout.columns || 80) - 1);
+            const maxW = contentWidth();
             const preview = truncateToWidth(text.split(String.fromCharCode(10)).join(' ↵ '), maxW);
             console.log(theme.toolResult('   → ' + preview + String.fromCharCode(10)));
         },
@@ -199,7 +200,8 @@ export function createSpinner(locale = 'ru') {
         },
         warning: (msg) => {
             stop();
-            console.log(String.fromCharCode(10) + theme.warn('⚠ ' + msg));
+            const maxW = contentWidth();
+            console.log(String.fromCharCode(10) + theme.warn(wrapToWidth('⚠ ' + msg, maxW)));
         },
         stop,
         succeed: () => { },

package/dist/theme.js

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { contentWidth } from './width.js';
 // A calm palette for a dark terminal.
 // Muted, slightly "faded" tones without high saturation
 // (in the spirit of Tokyo Night / Nord). The goal is comfortable reading of
@@ -32,13 +33,11 @@ export const theme = {
     bold: chalk.bold,
 };
 // Horizontal rule that separates the model's answer from the next block. It
-// spans the terminal width (capped at `max`) so it does not look stubby on a
-// wide terminal. Falls back to 60 columns when the width is unknown (non-TTY).
-// One column is kept free, like everywhere else in the status/input layout, so
-// a full-width rule cannot trigger autowrap.
-export function divider(max = 100) {
-    const cols = process.stdout.columns || 0;
-    const width = Math.max(20, Math.min(max, cols ? cols - 1 : 60));
+// spans the SHARED content width (src/width.ts) so the rule, the answers and
+// the tool previews all line up at the same margin. The `max` argument is kept
+// for a shorter rule in special call sites; by default it is the content width.
+export function divider(max) {
+    const width = max && max > 0 ? Math.min(max, contentWidth()) : contentWidth();
     return '─'.repeat(width);
 }
 export default theme;

package/dist/width.js

@@ -0,0 +1,25 @@
+// Single source of truth for the CONTENT column width used by every part
+// of the terminal UI: the model's answers, the operator's echoed text,
+// tool previews and service warnings. One width for all of them means nothing
+// is printed at the full terminal width while something else stops at 100 --
+// the mismatch looked ragged after a resize.
+//
+// 0 (default) = auto: the terminal width, capped at DEFAULT_CONTENT_WIDTH.
+// A longer line is harder to read and the eye loses the start of the next
+// line on a wide terminal, so there is a cap.
+// > 0 = an explicit cap (still never wider than the terminal).
+export const DEFAULT_CONTENT_WIDTH = 100;
+let configured = 0;
+/** Set the configured content width (0 or a non-positive value = auto). */
+export function setContentWidth(width) {
+    configured = typeof width === 'number' && width > 0 ? width : 0;
+}
+/**
+ * The effective content width in columns. One column is kept free (autowrap
+ * safety), like the status/input layout. Never shorter than 20 columns.
+ */
+export function contentWidth() {
+    const cols = process.stdout.columns || 80;
+    const cap = configured > 0 ? configured : DEFAULT_CONTENT_WIDTH;
+    return Math.max(20, Math.min(cap, cols - 1));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zames_pro",
-  "version": "2.68.0",
+  "version": "2.69.0",
   "description": "Terminal coding agent that drives chat.deepseek.com through Playwright — no API key required. Reads and edits files, runs commands, commits to git, like Claude Code / Codex CLI.",
   "type": "module",
   "bin": {