instar 1.3.680 → 1.3.682

package/dist/commands/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA8CH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAU3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAwBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAwH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA+EtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA84CD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,GACpD,IAAI,CAmfN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA+rhBtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA8CH,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAU3D,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AAyBjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAwH7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA+EtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AAyID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA84CD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,YAAY,EAC3B,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAGvE,UAAU,CAAC,EAAE,MAAM,OAAO,8BAA8B,EAAE,WAAW,GAAG,IAAI,EAK5E,qBAAqB,CAAC,EAAE,MAAM,OAAO,gCAAgC,EAAE,kBAAkB,GAAG,IAAI,EAKhG,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,GACpD,IAAI,CAigBN;AA2lBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqshBtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}

package/dist/commands/server.js

@@ -51,6 +51,7 @@ import { AgentServer } from '../server/AgentServer.js';
 import { BootHealthBeacon } from '../server/BootHealthBeacon.js';
 import { TelegramAdapter, TOPIC_STYLE, selectTopicEmoji } from '../messaging/TelegramAdapter.js';
 import { getTelegramInboundDir } from '../messaging/shared/telegramInboundFiles.js';
+import { buildColdStartFallbackReply } from '../messaging/ColdStartFallbackReply.js';
 import { RelationshipManager } from '../core/RelationshipManager.js';
 import { getFeatureMetricsRecorder } from '../core/CircuitBreakingIntelligenceProvider.js';
 import { configureLlmCircuitBreaker, llmCircuitAvailable } from '../core/LlmCircuitBreaker.js';
@@ -2070,11 +2071,18 @@ getAttentionTopicId) {
                     respawnSessionForTopic(sessionManager, telegram, targetSession, topicId, text, topicMemory, resolvedUser ?? undefined)
                         .catch(err => {
                         console.error(`[telegram→session] Respawn failed:`, err);
-                        const errMsg = err instanceof Error ? err.message : String(err);
-                        const userMsg = errMsg.includes('session limit') || errMsg.includes('limit')
-                            ? `❌ Session restart failed — session limit reached. Close an existing session or increase maxSessions in your config, then try again.`
-                            : `❌ Session restart failed. Try sending your message again in a moment.`;
-                        telegram.sendToTopic(topicId, userMsg).catch(() => { });
+                        // G1 "Agent Is Always Reachable" corollary (2): no silent resource
+                        // rejection. On a restart failure, hand the user WHY + a pointer to the
+                        // always-alive Lifeline topic + a copy-paste debug message — on the
+                        // deterministic delivery path (sendToTopic, never the LLM tone gate).
+                        const { userMessage } = buildColdStartFallbackReply({
+                            error: err,
+                            topicId,
+                            topicName: storedTopicName,
+                            lifelineTopicId: telegram.getLifelineTopicId() ?? null,
+                            kind: 'restart',
+                        });
+                        telegram.sendToTopic(topicId, userMessage).catch(() => { });
                     })
                         .finally(() => {
                         spawningTopics.clear(topicId, _spawnTokB);
@@ -2109,11 +2117,18 @@ getAttentionTopicId) {
                 console.log(`[telegram→session] Auto-spawned "${newSessionName}" for topic ${topicId}`);
             }).catch((err) => {
                 console.error(`[telegram→session] Auto-spawn failed:`, err);
-                const errMsg = err instanceof Error ? err.message : String(err);
-                const userMsg = errMsg.includes('session limit') || errMsg.includes('limit')
-                    ? `❌ Unable to start session — session limit reached. Close an existing session or increase maxSessions in your config, then try again.`
-                    : 'Having trouble starting a session right now. Try sending your message again in a moment.';
-                telegram.sendToTopic(topicId, userMsg).catch(() => { });
+                // G1 "Agent Is Always Reachable" corollary (2): no silent resource rejection.
+                // On a cold-start failure, hand the user WHY + a pointer to the always-alive
+                // Lifeline topic + a copy-paste debug message — on the deterministic delivery
+                // path (sendToTopic, never the LLM tone gate that can fail closed under load).
+                const { userMessage } = buildColdStartFallbackReply({
+                    error: err,
+                    topicId,
+                    topicName: spawnName,
+                    lifelineTopicId: telegram.getLifelineTopicId() ?? null,
+                    kind: 'spawn',
+                });
+                telegram.sendToTopic(topicId, userMessage).catch(() => { });
             }).finally(() => {
                 spawningTopics.clear(topicId, _spawnTokC);
             });
@@ -14767,7 +14782,13 @@ export async function startServer(options) {
         const { AgentWorktreeReaper } = await import('../monitoring/AgentWorktreeReaper.js');
         const { makeAgentWorktreeReaperDeps } = await import('../monitoring/agentWorktreeGit.js');
         const _agentWorktreesDir = path.join(path.dirname(config.stateDir), '.worktrees');
-        const agentWorktreeReaper = new AgentWorktreeReaper(makeAgentWorktreeReaperDeps({ instarRepo: config.projectDir, worktreesDir: _agentWorktreesDir }), config.monitoring?.agentWorktreeReaper);
+        const agentWorktreeReaper = new AgentWorktreeReaper(makeAgentWorktreeReaperDeps({
+            instarRepo: config.projectDir,
+            worktreesDir: _agentWorktreesDir,
+            // Multi-commit squash-merge detection via GitHub merged-PR state (default
+            // on; fail-safe to cherry-only). Off only if explicitly disabled in config.
+            githubMergeCheck: config.monitoring?.agentWorktreeReaper?.githubMergeCheck ?? true,
+        }), config.monitoring?.agentWorktreeReaper);
         agentWorktreeReaper.start();
         if (config.monitoring?.agentWorktreeReaper?.enabled) {
             console.log(pc.green(config.monitoring.agentWorktreeReaper.dryRun === false