instar 1.3.254 → 1.3.256

package/dist/server/routes.js

@@ -30,6 +30,7 @@ import { CorrectionLedger } from '../monitoring/CorrectionLedger.js';
 import { scrubSecrets as scrubCorrectionSecrets } from '../monitoring/scrubSecrets.js';
 import { HumanAsDetectorLog, LEARNING_DETERMINISTIC_THRESHOLD } from '../monitoring/HumanAsDetectorLog.js';
 import { APPRENTICESHIP_CYCLE_CHANNELS } from '../monitoring/ApprenticeshipCycleStore.js';
+import { getTelegramInboundDir } from '../messaging/shared/telegramInboundFiles.js';
 import { parseVersion, compareVersions } from '../lifeline/versionHandshake.js';
 import { readLatestCodexUsage } from '../providers/adapters/openai-codex/observability/codexRateLimitReader.js';
 import { GATE_ROUTE_VERSION, GATE_ROUTE_MINIMUM_VERSION, getHotPathState, setKillSwitch, getKillSwitch, recordSessionStart, getMode, setMode, } from './stopGate.js';
@@ -8823,7 +8824,7 @@ export function createRoutes(ctx) {
                     ``,
                     systemMsg,
                 ];
-                const tmpDir = '/tmp/instar-telegram';
+                const tmpDir = getTelegramInboundDir(ctx.config.projectDir);
                 fs.mkdirSync(tmpDir, { recursive: true });
                 const ctxPath = path.join(tmpDir, `ctx-${topicId}-${Date.now()}.txt`);
                 fs.writeFileSync(ctxPath, contextLines.join('\n'));
@@ -9391,7 +9392,7 @@ export function createRoutes(ctx) {
                     ``,
                     `This session was auto-created for Telegram topic ${topicId}.`,
                 ];
-                const tmpDir = '/tmp/instar-telegram';
+                const tmpDir = getTelegramInboundDir(ctx.config.projectDir);
                 fs.mkdirSync(tmpDir, { recursive: true });
                 const ctxPath = path.join(tmpDir, `ctx-${topicId}-${Date.now()}.txt`);
                 fs.writeFileSync(ctxPath, contextLines.join('\n'));
@@ -13591,7 +13592,17 @@ export function createRoutes(ctx) {
          * existing commitment when one already exists for this threadId, so 4
          * call-sites below are safe.
          */
-        const captureOrigin = async (effThreadId, remoteAgentDisplay) => {
+        // `canonicalRemoteAgent` MUST be the peer's resolved FULL fingerprint (the
+        // same identity used for routing) — NOT a display name or a "name:fpPrefix"
+        // address. The inbound anti-hijack guard (ThreadlineRouter) compares a reply's
+        // senderFingerprint against the stored thread owner (`remoteAgent`); if we
+        // stored a composite/display string instead of the full fingerprint, a known
+        // peer's reply fails the match and gets false-isolated to a fresh cold-spawn
+        // thread — breaking A2A continuity (the "one coherent individual" property).
+        // The human-facing display name is preserved separately. Mirrors
+        // telegramBridge.mirrorOutbound, which already stores the resolved fingerprint
+        // as `remoteAgent` and the raw target as `remoteAgentName`.
+        const captureOrigin = async (effThreadId, canonicalRemoteAgent, displayName) => {
             if (!ctx.topicLinkageHandler)
                 return;
             if (!resolvedOriginTopicId)
@@ -13599,8 +13610,8 @@ export function createRoutes(ctx) {
             try {
                 ctx.topicLinkageHandler.captureOriginOnSend({
                     threadId: effThreadId,
-                    remoteAgent: remoteAgentDisplay,
-                    remoteAgentDisplayName: remoteAgentDisplay,
+                    remoteAgent: canonicalRemoteAgent,
+                    remoteAgentDisplayName: displayName ?? canonicalRemoteAgent,
                     originTopicId: resolvedOriginTopicId,
                     purpose: resolvedPurpose,
                     subject: 'Threadline conversation',
@@ -13905,7 +13916,10 @@ export function createRoutes(ctx) {
                                             outcome,
                                         }).catch(() => { });
                                     }
-                                    await captureOrigin(effectiveThreadId, localTarget.name);
+                                    // Store the resolved full fingerprint as the canonical thread
+                                    // owner (display = the local agent's name) so a reply matches
+                                    // the anti-hijack guard instead of being false-isolated.
+                                    await captureOrigin(effectiveThreadId, localTarget.fingerprint || localTarget.publicKey?.substring(0, 32) || localTarget.name, localTarget.name);
                                     if (waitForReply) {
                                         const reply = await waitForThreadlineReply(ctx, localTarget.name, effectiveThreadId, timeoutSeconds);
                                         res.json({
@@ -14018,7 +14032,12 @@ export function createRoutes(ctx) {
                     outcome: 'relay-sent',
                 }).catch(() => { });
             }
-            await captureOrigin(effectiveRelayThreadId, targetAgent);
+            // `resolvedId` is the peer's full routing fingerprint; store IT as the
+            // canonical thread owner (display = the raw target the caller typed) so a
+            // reply matches the anti-hijack guard instead of being false-isolated.
+            // This is the fix for the composite "name:fpPrefix" address being stored
+            // un-resolved and causing a known peer's replies to cold-spawn.
+            await captureOrigin(effectiveRelayThreadId, resolvedId, targetAgent);
             if (waitForReply) {
                 const reply = await waitForThreadlineReply(ctx, resolvedId, effectiveRelayThreadId, timeoutSeconds);
                 res.json({