zames_pro 2.82.139 → 2.82.140

package/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.82.140] - 2026-10-25
+
+### Fixed
+
+- **scheduler:** stop the ticker on exit; correct the abort help line
+- **config:** say when a project config overrides the home one
+
 ## [2.82.139] - 2026-10-25
 
 ### Changed

package/dist/config-command.js

@@ -15,8 +15,22 @@ import { configGetValue, configValueHint } from './config-commands.js';
  * blindly from the main loop and from the live mid-run interception.
  */
 export async function handleConfigCommand(input, deps) {
-    const { t, print, printErr, getValue, setValue, resetField, showList, openMenu, currentLocale, normalizeLocale, localeDisplayName, homeConfigPath, projectConfigPath, } = deps;
+    const { t, print, printErr, getValue, setValue, resetField, showList, openMenu, currentLocale, normalizeLocale, localeDisplayName, homeConfigPath, projectConfigPath, shadowedKeys, } = deps;
     const schema = deps.schema;
+    // A HOME write is not always the value the next launch reads: the project
+    // `.zamesrc.json` is merged last, so a key present in both wins from the
+    // project file. Without this line the operator saw "saved" and then the OLD
+    // value after a restart (the stale `ui.locale: en` bug).
+    const warnShadowed = (key) => {
+        if (!shadowedKeys)
+            return;
+        if (!shadowedKeys().includes(key))
+            return;
+        printErr(theme.warn(t('cfg.shadowed', {
+            file: projectConfigPath,
+            keys: key,
+        })));
+    };
     // Accept BOTH spellings: the main loop passes the whole typed line
     // (`/config get ui.locale`), while tests and other callers pass the text
     // after the command (`get ui.locale`). Reading parts[1] blindly made the
@@ -60,6 +74,7 @@ export async function handleConfigCommand(input, deps) {
             return;
         }
         print(theme.assistant(t('cfg.lang_set', { v: localeDisplayName(loc) })));
+        warnShadowed('ui.locale');
         return;
     }
     if (sub === 'get') {
@@ -105,6 +120,7 @@ export async function handleConfigCommand(input, deps) {
             value: configGetValue(key, getValue(key), t),
             file: homeConfigPath,
         })));
+        warnShadowed(key);
         return;
     }
     if (sub === 'reset' || sub === 'unset') {

package/dist/config.js

@@ -165,19 +165,72 @@ export const DEFAULTS = {
 };
 export function loadConfig() {
     const merged = JSON.parse(JSON.stringify(DEFAULTS));
-    for (const file of [HOME_CONFIG, projectConfigPath()]) {
-        try {
-            const data = JSON.parse(fs.readFileSync(file, 'utf-8'));
-            deepMerge(merged, data);
-        }
-        catch (e) {
-            const err = e;
-            if (err.code !== 'ENOENT') {
-                console.error(`config: failed to read ${file}: ${err.message}`);
+    // Keys the PROJECT file overrides in the HOME file. Kept so the editor can
+    // say "your change was saved but the project file still wins" — a live
+    // symptom was `/config lang ru` answering "saved", then English after a
+    // restart, because a stale project `.zamesrc.json` pinned `ui.locale: en`.
+    shadowedKeys = [];
+    const homeData = readConfigObject(HOME_CONFIG);
+    const projectData = readConfigObject(projectConfigPath());
+    if (projectData) {
+        shadowedKeys = overriddenKeys(homeData, projectData);
+    }
+    for (const data of [homeData, projectData]) {
+        if (!data)
+            continue;
+        deepMerge(merged, data);
+    }
+    return merged;
+}
+/** Keys the lower-priority file also sets, from the last loadConfig(). */
+let shadowedKeys = [];
+export function shadowedConfigKeys() {
+    return shadowedKeys.slice();
+}
+/**
+ * Every leaf path ("ui.locale", "browser.auth.username") present in BOTH
+ * objects — i.e. a value the PROJECT config overrides over the HOME one.
+ * PURE so the precedence puzzle can be tested without touching the disk.
+ */
+export function overriddenKeys(lower, higher) {
+    if (!lower || !higher)
+        return [];
+    const out = [];
+    const walk = (a, b, prefix) => {
+        for (const key of Object.keys(b)) {
+            if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+                continue;
+            }
+            const path2 = prefix ? prefix + '.' + key : key;
+            const av = a[key];
+            const bv = b[key];
+            if (isPlainObject(av) && isPlainObject(bv)) {
+                walk(av, bv, path2);
+            }
+            else if (av !== undefined && !isPlainObject(bv)) {
+                out.push(path2);
             }
         }
+    };
+    walk(lower, higher, '');
+    return out.sort();
+}
+function isPlainObject(v) {
+    return !!v && typeof v === 'object' && !Array.isArray(v);
+}
+/** Parse one config file; null when it is missing or unreadable. */
+function readConfigObject(file) {
+    try {
+        const data = JSON.parse(fs.readFileSync(file, 'utf-8'));
+        return isPlainObject(data) ? data : null;
+    }
+    catch (e) {
+        const err = e;
+        if (err.code !== 'ENOENT') {
+            console.error(`config: failed to read ${file}: ${err.message}`);
+        }
+        return null;
     }
-    return merged;
 }
 // The agent-loop watchdog deadline per provider. The loop default (240s) is
 // tuned for DeepSeek; a Qwen GUEST turn regularly takes 7-8 minutes (cold

package/dist/i18n/config.js

@@ -251,6 +251,13 @@ export const configMessages = {
         ru: 'Язык переключён на {v}.',
         en: 'Language switched to {v}.',
     },
+    // The project `.zamesrc.json` is merged AFTER the home config, so a key it
+    // also sets silently wins — the operator sees "saved", then the old value
+    // after a restart (a stale `ui.locale: en` looked like a lost setting).
+    'cfg.shadowed': {
+        ru: '⚠ Проектный конфиг {file} переопределяет: {keys} — после перезапуска будет его значение. Уберите эти ключи из проектного файла.',
+        en: '⚠ The project config {file} overrides: {keys} — after a restart its value wins. Remove these keys from the project file.',
+    },
     'cfg.lang_usage': {
         ru: 'Использование: /config lang <ru|en>',
         en: 'Usage: /config lang <ru|en>',

package/dist/i18n/help.js

@@ -94,8 +94,8 @@ export const helpMessages = {
         en: 'Ctrl+Shift+V image         paste an image/file (saved to tmp)',
     },
     'help.key.esc': {
-        ru: 'Esc, Ctrl+C              прервать текущую генерацию',
-        en: 'Esc, Ctrl+C               abort current generation',
+        ru: 'Esc, Ctrl+C              Esc — прервать генерацию; Ctrl+C — прервать инструмент, второй раз — весь прогон',
+        en: 'Esc, Ctrl+C               Esc — abort generation; Ctrl+C — abort the tool, twice — the whole run',
     },
     'help.key.scroll': {
         ru: 'PgUp / PgDn              вверх/вниз по диалогу (Home/End — в начало/конец) [full-screen]',

package/dist/index.js

@@ -20,7 +20,7 @@ import { LineEditor } from './input.js';
 import { TuiEditor } from './tui/TuiEditor.js';
 import { promptOnce } from './prompt.js';
 import { parseImagePaste, extForMime, saveToTemp, guessMime, formatSize, readClipboardImageDetailed, sniffMime, readWindowsClipboardFiles, hasClipboardTool, writeClipboardText, contentHash, } from './attachments.js';
-import { loadConfig, DEFAULTS, CONFIG_PATHS, ZAMES_HOME, CONFIG_SCHEMA, getByPath, validateConfigValue, writeConfigValue, resetConfigValue, providerAskDeadlineMs, } from './config.js';
+import { loadConfig, DEFAULTS, CONFIG_PATHS, ZAMES_HOME, CONFIG_SCHEMA, getByPath, validateConfigValue, writeConfigValue, resetConfigValue, providerAskDeadlineMs, shadowedConfigKeys, } from './config.js';
 import { runConfigMenu } from './config-menu.js';
 import { runConfigMenuInk } from './tui/run-config-menu.js';
 import { formatConfigList } from './config-commands.js';
@@ -126,6 +126,17 @@ let currentLocale = isLocale(config.ui?.locale)
 // Translation: reads currentLocale at call time, so a language change takes
 // effect immediately, without a restart (for lines printed afterwards).
 const t = (key, params) => translate(currentLocale)(key, params);
+// A project `.zamesrc.json` wins over the HOME config, so a key it ALSO sets
+// silently defeats `/config set` — the value looks saved and comes back stale
+// after a restart (the reported "language resets to English" case). Say it at
+// startup, before a task, instead of letting the operator hunt for it.
+const shadowedAtStartup = shadowedConfigKeys();
+if (shadowedAtStartup.length) {
+    console.error(theme.warn(t('cfg.shadowed', {
+        file: CONFIG_PATHS.PROJECT_CONFIG,
+        keys: shadowedAtStartup.join(', '),
+    })));
+}
 // Headless is the default. --headed forces a visible window (useful for the
 // first sign-in or debugging the DOM). --headless keeps it explicit.
 // DeepSeek/Qwen run headless by default; GLM CANNOT: z.ai answers a headless
@@ -1349,10 +1360,23 @@ async function main() {
     // never bypassing the send throttle). Started lazily on the first job.
     const scheduler = new Scheduler();
     let scheduleTimer = null;
+    // Ctrl+C on an idle agent EXITS the process. Without this latch a /loop job
+    // whose task was interrupted (and every later fire) would be dropped into
+    // the queue while nobody waits for it, and each tick printed "fired" into a
+    // dying terminal. A loop is meant to outlive a single task, not the agent.
+    let shuttingDown = false;
+    const stopScheduleTicker = () => {
+        if (scheduleTimer) {
+            clearInterval(scheduleTimer);
+            scheduleTimer = null;
+        }
+    };
     const startScheduleTicker = () => {
         if (scheduleTimer)
             return;
         scheduleTimer = setInterval(() => {
+            if (shuttingDown)
+                return;
             const due = scheduler.due(Date.now());
             for (const job of due) {
                 // Do not pile MANY copies of the same job while the agent is busy: if
@@ -1403,6 +1427,8 @@ async function main() {
     let reviewMode = null;
     process.on('SIGINT', async () => {
         running = false;
+        shuttingDown = true;
+        stopScheduleTicker();
         // Kill any background processes so no dev-server outlives the agent.
         killAllBackground();
         await browser.close().catch(() => { });
@@ -1827,8 +1853,12 @@ async function main() {
                 lastCtrlCAt = now;
             }
             else {
-                // Not busy — exit. We wake takeInput() so the loop finishes.
+                // Not busy — exit. We wake takeInput() so the loop finishes. The
+                // scheduler must stop too: a live /loop ticker keeps firing into the
+                // queue while the process is shutting down.
                 running = false;
+                shuttingDown = true;
+                stopScheduleTicker();
                 if (waiter) {
                     const r = waiter;
                     waiter = null;
@@ -2160,6 +2190,7 @@ async function main() {
             schema: CONFIG_SCHEMA,
             homeConfigPath: CONFIG_PATHS.HOME_CONFIG,
             projectConfigPath: CONFIG_PATHS.PROJECT_CONFIG,
+            shadowedKeys: shadowedConfigKeys,
         });
     }
     // Open a chat by its ChatInfo and print the restored dialogue. Shared by

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zames_pro",
-  "version": "2.82.139",
+  "version": "2.82.140",
   "description": "Terminal coding agent that drives a real browser to chat with DeepSeek, Qwen and other web LLMs — no API key required. Reads and edits files, runs commands, commits to git, like Claude Code / Codex CLI.",
   "type": "module",
   "bin": {