instar 1.3.1345 → 1.3.1346

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAwGA,OAAO,EAAE,cAAc,EAAwD,MAAM,2BAA2B,CAAC;AAUjH,OAAO,EAAE,eAAe,EAAiC,MAAM,iCAAiC,CAAC;AA4BjG,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAyI7D,OAAO,KAAK,EAAW,oBAAoB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAmFtD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC1C,OAAO,CAUT;AA0ID,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAoDD,+EAA+E;AAC/E,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,IAAI,CAAC,OAAO,2BAA2B,EAAE,cAAc,EAAE,QAAQ,CAAC,GAAG,IAAI,EACpF,OAAO,EAAE,MAAM,GACd,IAAI,CAEN;AA8gBD,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,EACzB,WAAW,CAAC,EAAE,WAAW,EACzB,kBAAkB,CAAC,EAAE,MAAM;AAC3B;;qCAEqC;AACrC,WAAW,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE;AACzD;;wEAEwE;AACxE,SAAS,CAAC,EAAE;IACV,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;sEAGkE;IAClE,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GACA,OAAO,CAAC,MAAM,CAAC,CAqYjB;AA02BD;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,oBAAoB,GAAG,IAAI,GACxC;IACD,YAAY,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAqBA;AAED,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,EAQrD,oBAAoB,CAAC,EAAE,MAAM;IAC3B,YAAY,EAAE,OAAO,kBAAkB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACrE,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,IAAI,GACP,IAAI,CA42BN;AAgmBD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8/xBtE;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

@@ -242,7 +242,8 @@ import { ConversationStore } from '../threadline/ConversationStore.js';
 import { ThreadLog } from '../threadline/ThreadLog.js';
 import { ThreadMessageRecorder } from '../threadline/recordThreadMessage.js';
 import { recordInboundAck } from '../threadline/recordInboundAck.js';
-import { isAutoAckInbound, autoAckRecognition, looksLikeAutoAckText, createAckRateLimiter, runRelayAckStage } from '../threadline/autoAck.js';
+import { isAutoAckInbound, autoAckRecognition, looksLikeAutoAckText, createAckRateLimiter, runRelayAckStage, settleDeferredRelayAck } from '../threadline/autoAck.js';
+import { createThreadlineTopicRespawn } from '../threadline/topicRespawnHook.js';
 import { WarrantsReplyGate, evaluateAndRecordInbound } from '../threadline/WarrantsReplyGate.js';
 import { CollaborationSurfacer } from '../threadline/CollaborationSurfacer.js';
 import { ListenerSessionManager } from '../threadline/ListenerSessionManager.js';
@@ -586,6 +587,12 @@ let _sweptInboundStore = null;
 // The drain's local-delivery tail (§3.1 via:'drain') — assigned inside
 // wireTelegramRouting where the session primitives live in scope.
 let _drainLocalDeliver = null;
+// ACT-091: wake a topic's dead/reaped session for a topic-bound Threadline
+// reply — assigned inside wireTelegramRouting where the respawn primitives
+// (and the per-topic spawn guard) live in scope. Null ⇒ not wired.
+let _threadlineTopicRespawn = null;
+/** ACT-091: "is a spawn for this topic in flight?" — the spawningTopics read, for the handler. */
+let _threadlineTopicSpawning = null;
 // Emergency-stop integration (§3.6): marks a topic stopped for the drain's
 // pass/batch/chokepoint consults AND settles its custody (terminal
 // operator-stop + PIS cleanup + loss report). Set with the engine.
@@ -3049,6 +3056,72 @@ getHubClassifierDeps) {
             spawningTopics.clear(topicId, _spawnTokD);
         }
     };
+    // ── ACT-091: topic-bound Threadline reply into a dead/reaped topic session ──
+    // The decision lives in createThreadlineTopicRespawn (testable); this binds
+    // it to the REAL primitives the Telegram dead-session path uses: ownership,
+    // the G3 lease gate, the death classification, SpawnAdmission (its own
+    // journal-only callsite), the spawningTopics guard, respawnSessionForTopic
+    // (--resume) / spawnSessionForTopic, each awaited through the initial
+    // injection. A spawn already in flight is WAITED for, then the reply is typed
+    // into the live session — a second reply inside one respawn is never lost.
+    {
+        _threadlineTopicSpawning = (topicId) => spawningTopics.has(topicId);
+        _threadlineTopicRespawn = createThreadlineTopicRespawn({
+            spawning: spawningTopics,
+            ownedElsewhere: (topicId) => {
+                if (!_ownershipReadForDrain || !_meshSelfId)
+                    return false;
+                const ownRec = _ownershipReadForDrain(String(topicId));
+                return !!ownRec && ownRec.status === 'active' && ownRec.ownerMachineId !== _meshSelfId;
+            },
+            registeredSession: (topicId) => telegram.getSessionForTopic(topicId),
+            isSessionAlive: (name) => sessionManager.isSessionAlive(name),
+            injectConfirmed: (name, text) => sessionManager.injectPasteNotificationConfirmed(name, text),
+            leaseGate: (topicId) => g3ShouldSpawnLocally(topicId),
+            classifyDeath: (name) => {
+                try {
+                    const output = sessionManager.captureOutput(name, 100);
+                    if (!output)
+                        return null;
+                    const death = classifySessionDeath(output, quotaTracker?.getState() ?? null);
+                    if (death.cause === 'quota_exhaustion' && death.confidence !== 'low')
+                        return 'quota';
+                    if (death.cause === 'context_exhausted')
+                        return 'context-exhausted';
+                    return 'other';
+                }
+                catch {
+                    return null; /* @silent-fallback-ok: classification failed — respawn as the Telegram dead path does */
+                }
+            },
+            admit: (topicId) => {
+                if (!_spawnAdmission)
+                    return { allow: true };
+                try {
+                    const d = _spawnAdmission.admit({ sessionKey: String(topicId), callsite: 'threadline-topic-respawn' });
+                    if (d.allow)
+                        _ladderDryRunConsult(d, String(topicId), topicId);
+                    return { allow: d.allow, reason: d.reason };
+                }
+                catch (err) {
+                    // Same posture as the Telegram seam: an admission ERROR fails open.
+                    console.warn(`[spawn-admission] threadline-topic-respawn admit error (fail-open): ${err instanceof Error ? err.message : String(err)}`);
+                    return { allow: true };
+                }
+            },
+            respawn: async (name, topicId, text, fresh) => {
+                if (fresh)
+                    _topicResumeMap?.remove(topicId);
+                await respawnSessionForTopic(sessionManager, telegram, name, topicId, text, topicMemory, undefined, undefined, { silent: true, awaitInitialInjection: true });
+            },
+            coldSpawn: async (topicId, text) => {
+                const topicName = telegram.getTopicName(topicId) || `topic-${topicId}`;
+                const newSessionName = await spawnSessionForTopic(sessionManager, telegram, topicName, topicId, text, topicMemory, undefined, undefined, undefined, { awaitInitialInjection: true });
+                telegram.registerTopicSession(topicId, newSessionName, topicName);
+                return newSessionName;
+            },
+        });
+    }
 }
 /**
  * Wire WhatsApp message routing: incoming messages → Claude sessions.
@@ -16856,6 +16929,12 @@ export async function startServer(options) {
                 getSessionForTopic: telegram
                     ? (topicId) => telegram.getSessionForTopic(topicId)
                     : undefined,
+                // ACT-091: a reply into a reaped topic session wakes it (late-bound —
+                // Telegram routing is wired after this handler is constructed).
+                respawnTopicSession: (args) => _threadlineTopicRespawn
+                    ? _threadlineTopicRespawn(args)
+                    : Promise.resolve({ delivered: false, reason: 'telegram-routing-not-wired' }),
+                isTopicSpawning: (topicId) => _threadlineTopicSpawning?.(topicId) === true,
                 // A2A cross-machine route §5: a topic-bound reply is typed into the
                 // topic's live session on whichever machine has it. Late-bound: the
                 // mesh client exists only after the multi-machine wiring below.
@@ -17375,13 +17454,22 @@ export async function startServer(options) {
                     // Telegram mirror and the gate. Any other message gets our own ack
                     // (post-trust-verification, never for status messages, rate-limited).
                     const recordRelayDelivery = () => recordInboundAck({ a2aDeliveryTracker }, { threadId: msg.threadId, senderFingerprint, senderName: senderName ?? null });
-                    const ackStage = runRelayAckStage({
+                    // ACT-091: a topic-bound reply can reach no live session (its topic
+                    // session was reaped), so its ack — which promises a reply — waits for
+                    // the routing outcome (settleDeferredRelayAck below).
+                    const isTopicBoundReply = !!msg.threadId && threadResumeMap.get(msg.threadId)?.originTopicId !== undefined;
+                    const relayAckDeps = {
                         autoAckEnabled: config.threadline?.autoAck !== false,
                         autoAckMessage: config.threadline?.autoAckMessage,
                         isAckRateLimited,
                         sendAck: (to, text, threadId) => { threadlineRelayClient.sendAck(to, text, threadId); },
                         recordDelivery: recordRelayDelivery,
-                    }, { isAutoAck, trustLevel, msgType, senderFingerprint, threadId: msg.threadId, ticket: ledgerTicket });
+                    };
+                    const relayAckInput = {
+                        isAutoAck, trustLevel, msgType, senderFingerprint, threadId: msg.threadId, ticket: ledgerTicket,
+                        deferSend: isTopicBoundReply,
+                    };
+                    const ackStage = runRelayAckStage(relayAckDeps, relayAckInput);
                     if (ackStage === 'ack-consumed') {
                         console.log(`[relay] delivery ack from ${senderName} (thread: ${msg.threadId ?? 'none'}, by ${autoAckRecognition({ type: msgType, text: textContent })}) recorded — not acked, not routed`);
                         return;
@@ -17462,6 +17550,11 @@ export async function startServer(options) {
                                 else
                                     ledgerTicket?.recordNoReply();
                                 console.log(`[relay] warrants-reply gate suppressed reply (${decision.verdict.signal}) for ${senderName} thread ${gateThreadId.slice(0, 8)}`);
+                                // ACT-091: a deferred ack on a terminal no-reply exit becomes the
+                                // non-promising "Message received." — received, deliberately not
+                                // answered — so the sender's tracker never reads a stuck channel.
+                                if (relayAckInput.deferSend)
+                                    settleDeferredRelayAck(relayAckDeps, relayAckInput, { delivered: false, noReply: true });
                                 // On budget exhaustion, surface ONE status notice — never silently
                                 // drop. CMT-519: route it to the SILENT Threadline hub (not a
                                 // per-event attention topic, not the parent topic the operator is
@@ -17551,7 +17644,6 @@ export async function startServer(options) {
                     // for the user even though transport succeeded. (The pipe-spawn branch
                     // above is already excluded for topic-bound threads via its
                     // `!threadResumeMap.get(...)` guard, now that get() no longer nulls them.)
-                    const isTopicBoundReply = !!msg.threadId && threadResumeMap.get(msg.threadId)?.originTopicId !== undefined;
                     if (listenerManager && listenerManager.shouldUseListener(trustLevel, textContent.length) && !isTopicBoundReply) {
                         listenerManager.writeToInbox({ from: senderFingerprint, senderName, trustLevel, threadId: msg.threadId ?? getSyntheticThreadId(senderFingerprint), text: ledgerNotice ? `[server notice: ${ledgerNotice}]\n\n${textContent}` : textContent });
                         ledgerTicket?.recordHandoff('listener');
@@ -17596,6 +17688,15 @@ export async function startServer(options) {
                         console.log(`[relay] Spawned session for ${senderName} (trust: ${trustLevel}, thread: ${result.threadId})`);
                     if (result.resumed)
                         console.log(`[relay] Resumed session for ${senderName} (thread: ${result.threadId})`);
+                    if (result.handled && result.delivered === false) {
+                        console.warn(`[relay] Message from ${senderName} (thread: ${result.threadId}) accepted but not delivered to a live session${result.queued ? ' (queued)' : ''}`);
+                    }
+                    if (relayAckInput.deferSend) {
+                        const ackOutcome = settleDeferredRelayAck(relayAckDeps, relayAckInput, { delivered: result.delivered === true });
+                        if (ackOutcome === 'skipped-undelivered') {
+                            console.warn(`[relay] Auto-ack withheld for ${senderName} (thread: ${result.threadId}) — no live session received the message`);
+                        }
+                    }
                 }
                 // Relay client is passed to AgentServer → RouteContext for the /threadline/relay-send endpoint
                 // Report the client's ACTUAL state. This line used to say "connected"