instar 1.3.1664 → 1.3.1665

package/dist/core/SessionManager.js

@@ -75,6 +75,7 @@ import { AgeKillBackoff } from './AgeKillBackoff.js';
 import { governor, consumeAdmissionToken } from '../monitoring/selfaction/governor.js';
 import { VetoedKillBackoff, normalizeReasonKey, IDLE_ZOMBIE_ESCALATION_REASONS } from './VetoedKillBackoff.js';
 import { ensureAgentOwnedMemory, defaultClaudeConfigHome } from './AgentOwnedMemory.js';
+import { topicRef } from '../messaging/shared/topicRef.js';
 import { CLAUDE_MCP_TOOL_TIMEOUT_ENV_FLAGS, } from './threadlineMcpSpawn.js';
 /* @self-action-controller: age-kill-backoff */
 // Unified self-action backpressure (Increment B, OBSERVE-ONLY): the age-limit
@@ -1698,7 +1699,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
                 session,
                 topicId,
                 reasonKey,
-                message: `Session "${session.name}" on topic ${topicId ?? 'n/a'} is permanently vetoed from idle-zombie cleanup (reason: ${reasonKey}) — likely a stuck open-commitment or a resume-loop; investigate.`,
+                message: `Session "${session.name}" on ${topicId != null ? topicRef(topicId) : 'no topic'} is permanently vetoed from idle-zombie cleanup (reason: ${reasonKey}) — likely a stuck open-commitment or a resume-loop; investigate.`,
             });
         }
     }
@@ -2763,7 +2764,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
                 : matches[0];
             return {
                 topicId,
-                topicName: topicToName[String(topicId)] || `Topic ${topicId}`,
+                topicName: topicToName[String(topicId)] || topicRef(topicId),
                 channel: 'telegram', // Currently only Telegram uses the registry
                 sessionName: tmuxSession,
             };
@@ -2889,7 +2890,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
                     // Check if this session had a pending Telegram injection that never got a response
                     const pendingInjection = this.pendingInjections.get(session.tmuxSession);
                     if (pendingInjection) {
-                        console.warn(`[SessionManager] Session "${session.name}" died with unanswered Telegram injection for topic ${pendingInjection.topicId} (injected ${Math.round((Date.now() - pendingInjection.injectedAt) / 1000)}s ago)`);
+                        console.warn(`[SessionManager] Session "${session.name}" died with unanswered Telegram injection for ${topicRef(pendingInjection.topicId)} (injected ${Math.round((Date.now() - pendingInjection.injectedAt) / 1000)}s ago)`);
                         this.pendingInjections.delete(session.tmuxSession);
                         this.emit('injectionDropped', {
                             topicId: pendingInjection.topicId,
@@ -3152,7 +3153,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
                             // Check for unanswered injection before timeout kill
                             const pendingInjection = this.pendingInjections.get(session.tmuxSession);
                             if (pendingInjection) {
-                                console.warn(`[SessionManager] Timed-out session "${session.name}" had unanswered injection for topic ${pendingInjection.topicId}`);
+                                console.warn(`[SessionManager] Timed-out session "${session.name}" had unanswered injection for ${topicRef(pendingInjection.topicId)}`);
                                 this.pendingInjections.delete(session.tmuxSession);
                                 this.emit('injectionDropped', {
                                     topicId: pendingInjection.topicId,
@@ -3421,7 +3422,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
                                 // Check for unanswered injection before killing
                                 const pendingInjection = this.pendingInjections.get(session.tmuxSession);
                                 if (pendingInjection) {
-                                    console.warn(`[SessionManager] Zombie session "${session.name}" had unanswered injection for topic ${pendingInjection.topicId}`);
+                                    console.warn(`[SessionManager] Zombie session "${session.name}" had unanswered injection for ${topicRef(pendingInjection.topicId)}`);
                                     this.pendingInjections.delete(session.tmuxSession);
                                     this.emit('injectionDropped', {
                                         topicId: pendingInjection.topicId,
@@ -3737,7 +3738,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
             }
             catch (err) {
                 if (err && err.code === 'LOCK_HELD') {
-                    throw new Error(`Cannot spawn session for topic ${options.topicId}: lock held by ${JSON.stringify(err.holder)}`);
+                    throw new Error(`Cannot spawn session for ${topicRef(options.topicId)}: lock held by ${JSON.stringify(err.holder)}`);
                 }
                 throw err;
             }
@@ -7478,7 +7479,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
                     feature: 'SessionManager.recoverPendingInjects',
                     primary: 'Re-deliver an inject orphaned by a server restart',
                     fallback: `Pending inject for "${record.tmuxSession}" not re-delivered: ${reason}`,
-                    reason: `Why: queued ${record.createdAt}${record.telegramTopicId !== undefined ? ` for topic ${record.telegramTopicId}` : ''}`,
+                    reason: `Why: queued ${record.createdAt}${record.telegramTopicId !== undefined ? ` for ${topicRef(record.telegramTopicId)}` : ''}`,
                     impact: 'A queued initial message may not have reached its session; the bridge respawns on the next inbound message.',
                 });
             },
@@ -7918,7 +7919,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
             const priorAt = this.recentTelegramDeliveries.get(dedupKey);
             if (priorAt !== undefined) {
                 console.warn(`[SessionManager] Suppressed duplicate Telegram delivery to "${tmuxSession}" ` +
-                    `(topic ${topicId}, messageId ${messageId}, ${Math.round((now - priorAt) / 1000)}s after first) — ` +
+                    `(${topicRef(topicId)}, messageId ${messageId}, ${Math.round((now - priorAt) / 1000)}s after first) — ` +
                     `a single user message was forwarded more than once; delivering only once.`);
                 return true; // already delivered on the first call — success without re-injecting
             }
@@ -7965,7 +7966,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
         // to ride here too — the observed 2026-08-20 re-deliveries were all long
         // messages, i.e. exactly this branch. buildInjectionTag(topicId) with a
         // falsy flag returns `[telegram:N]`, byte-identical to the previous literal.
-        const refTag = buildInjectionTag(topicId, undefined, undefined, undefined, opts?.reDelivered, opts?.signedByAgent);
+        const refTag = buildInjectionTag(topicId, safeTopic, undefined, undefined, opts?.reDelivered, opts?.signedByAgent);
         const ref = `${refTag} [Long message saved to ${filepath} — read it to see the full message]`;
         return this.injectMessage(tmuxSession, ref) !== false;
     }
@@ -8124,7 +8125,7 @@ rm()  { "${shimRunner}" rm  "$@"; }
                 if (provenance === 'mismatched-tag') {
                     // Wrong topic — log, alert, and drop
                     console.error(`[InputGuard] BLOCKED cross-topic injection: message bound for different topic, ` +
-                        `session "${tmuxSession}" is bound to topic ${binding.topicId}`);
+                        `session "${tmuxSession}" is bound to ${topicRef(binding.topicId)}`);
                     this.inputGuard.logSecurityEvent({
                         event: 'input-provenance-block',
                         session: tmuxSession,