polygram 0.12.0-rc.39 → 0.12.0-rc.40

package/lib/handlers/config-callback.js

@@ -17,7 +17,7 @@
 'use strict';
 
 const { toTelegramHtml } = require('../telegram/format');
-const { getTopicConfig } = require('../session-key');
+const { getTopicConfig, getConfigWriteScope } = require('../session-key');
 
 const MODEL_OPTIONS = ['opus', 'sonnet', 'haiku'];
 const EFFORT_OPTIONS = ['low', 'medium', 'high', 'xhigh', 'max'];
@@ -30,6 +30,7 @@ function createHandleConfigCallback({
   getSessionKey,
   formatConfigInfoText,
   buildConfigKeyboard,
+  saveConfig = () => {},
   botName,
   logger = console,
 } = {}) {
@@ -58,17 +59,29 @@ function createHandleConfigCallback({
       return;
     }
 
-    const oldValue = chatConfig[setting];
+    // Write to the scope the card belongs to: a topic card targets THAT topic
+    // (so Music ≠ General), a chat-level card the chat root. Resolving the
+    // thread BEFORE the already-set check so "Already X" compares against the
+    // topic's effective value, not the chat root (2026-06-12 bug).
+    const callbackThreadIdEarly = ctx.callbackQuery.message?.message_thread_id?.toString() || null;
+    const { scope: writeScope, threadId: writeThreadId } =
+      getConfigWriteScope(chatConfig, callbackThreadIdEarly);
+    const oldValue = writeScope[setting] != null ? writeScope[setting] : chatConfig[setting];
     if (oldValue === value) {
       await ctx.answerCallbackQuery({ text: `Already ${value}` }).catch(() => {});
       return;
     }
 
-    chatConfig[setting] = value;
+    writeScope[setting] = value;
+    // Persist to config.json so the change survives a restart — without this,
+    // every /model tap was lost on the next deploy (2026-06-12). Best-effort:
+    // never let a disk hiccup swallow the in-memory change + live application.
+    try { saveConfig(); }
+    catch (err) { logger.error?.(`[${botName}] config-callback saveConfig failed: ${err.message}`); }
     const cmdUserId = ctx.callbackQuery.from?.id || null;
     const cmdUser = ctx.callbackQuery.from?.first_name || ctx.callbackQuery.from?.username || null;
     dbWrite(() => db.logConfigChange({
-      chat_id: chatId, thread_id: null, field: setting,
+      chat_id: chatId, thread_id: writeThreadId, field: setting,
       old_value: oldValue, new_value: value,
       user: cmdUser, user_id: cmdUserId, source: 'inline-button',
     }), `log ${setting} change`);
@@ -77,7 +90,7 @@ function createHandleConfigCallback({
     // via setModel / applyFlagSettings; chatConfig is already updated
     // on disk above so a missing live session still picks up the new
     // value on its next cold spawn.
-    const callbackThreadId = ctx.callbackQuery.message?.message_thread_id?.toString() || null;
+    const callbackThreadId = callbackThreadIdEarly;
     const callbackSessionKey = getSessionKey(chatId, callbackThreadId, chatConfig);
     let applied = false;
     if (setting === 'effort') {

package/lib/handlers/slash-commands.js

@@ -27,6 +27,8 @@
 
 'use strict';
 
+const { getConfigWriteScope } = require('../session-key');
+
 function createSlashCommands({
   config,
   db,
@@ -40,6 +42,7 @@ function createSlashCommands({
   getOrSpawnForChat,
   parsePairCodeArgs,
   modelVersionsDesc,
+  saveConfig = () => {},
   botName,
   logEvent,
   logger = console,
@@ -214,10 +217,15 @@ function createSlashCommands({
     if (botAllowsCommands && text.startsWith('/model ')) {
       const newModel = text.slice(7).trim();
       if (['opus', 'sonnet', 'haiku'].includes(newModel)) {
-        const oldModel = chatConfig.model;
-        chatConfig.model = newModel;
+        // Write to the topic when in one (so Music ≠ General) and persist to
+        // config.json so it survives restarts — both were missing (2026-06-12).
+        const { scope: wScope, threadId: wThread } = getConfigWriteScope(chatConfig, threadIdStr);
+        const oldModel = wScope.model != null ? wScope.model : chatConfig.model;
+        wScope.model = newModel;
+        try { saveConfig(); }
+        catch (err) { logger.error?.(`[${botName}] /model saveConfig failed: ${err.message}`); }
         dbWrite(() => db.logConfigChange({
-          chat_id: chatId, thread_id: threadIdStr, field: 'model',
+          chat_id: chatId, thread_id: wThread, field: 'model',
           old_value: oldModel, new_value: newModel,
           user: cmdUser, user_id: cmdUserId, source: 'command',
         }), 'log model change');
@@ -234,10 +242,13 @@ function createSlashCommands({
     if (botAllowsCommands && text.startsWith('/effort ')) {
       const newEffort = text.slice(8).trim();
       if (['low', 'medium', 'high', 'xhigh', 'max'].includes(newEffort)) {
-        const oldEffort = chatConfig.effort;
-        chatConfig.effort = newEffort;
+        const { scope: wScope, threadId: wThread } = getConfigWriteScope(chatConfig, threadIdStr);
+        const oldEffort = wScope.effort != null ? wScope.effort : chatConfig.effort;
+        wScope.effort = newEffort;
+        try { saveConfig(); }
+        catch (err) { logger.error?.(`[${botName}] /effort saveConfig failed: ${err.message}`); }
         dbWrite(() => db.logConfigChange({
-          chat_id: chatId, thread_id: threadIdStr, field: 'effort',
+          chat_id: chatId, thread_id: wThread, field: 'effort',
           old_value: oldEffort, new_value: newEffort,
           user: cmdUser, user_id: cmdUserId, source: 'command',
         }), 'log effort change');

package/lib/session-key.js

@@ -106,10 +106,30 @@ function getTopicConfig(chatConfig, threadId) {
   return overrides;
 }
 
+/**
+ * Resolve the config object a per-chat/topic setting (model/effort) should be
+ * WRITTEN to, given where the command/card was used. When in a topic, return
+ * (creating if needed) that topic's override entry — so a /model in the Music
+ * topic targets Music alone and matches what the per-topic card displays,
+ * instead of leaking to the chat root and every other topic that inherits it
+ * (the 2026-06-12 "/model in Music does nothing" bug). At the chat level
+ * (no thread), the writable scope is the chat config itself.
+ *
+ * @returns {{ scope: object, threadId: (string|null) }}
+ */
+function getConfigWriteScope(chatConfig, threadId) {
+  const tid = (threadId == null || threadId === '') ? null : String(threadId);
+  if (!tid) return { scope: chatConfig, threadId: null };
+  chatConfig.topics = chatConfig.topics || {};
+  chatConfig.topics[tid] = chatConfig.topics[tid] || {};
+  return { scope: chatConfig.topics[tid], threadId: tid };
+}
+
 module.exports = {
   getSessionKey,
   getChatIdFromKey,
   getThreadIdFromKey,
   getTopicName,
   getTopicConfig,
+  getConfigWriteScope,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polygram",
-  "version": "0.12.0-rc.39",
+  "version": "0.12.0-rc.40",
   "description": "Telegram daemon for Claude Code that preserves the OpenClaw per-chat session model. Migration path for OpenClaw users moving to Claude Code.",
   "main": "lib/ipc/client.js",
   "bin": {

package/polygram.js

@@ -2459,7 +2459,7 @@ async function main() {
   });
   handleConfigCallback = createHandleConfigCallback({
     config, db, dbWrite, pm, getSessionKey,
-    formatConfigInfoText, buildConfigKeyboard,
+    formatConfigInfoText, buildConfigKeyboard, saveConfig,
     botName: BOT_NAME, logger: console,
   });
   handleAbortIfRequested = createHandleAbort({
@@ -2532,7 +2532,7 @@ async function main() {
     config, db, dbWrite, pm, pairings, parsePairingTtl,
     contextHintShown, formatContextReply, getClaudeSessionId,
     getOrSpawnForChat, parsePairCodeArgs,
-    modelVersionsDesc: MODEL_VERSIONS_DESC,
+    modelVersionsDesc: MODEL_VERSIONS_DESC, saveConfig,
     botName: BOT_NAME, logEvent, logger: console,
   });
   console.log('[polygram] using SDK ProcessManager');