instar 0.28.2 → 0.28.3

package/dist/server/routes.js

@@ -2148,7 +2148,7 @@ export function createRoutes(ctx) {
                     result.platform = 'telegram';
                     result.platformId = topicId;
                     const topicName = ctx.telegram.getTopicName?.(topicId);
-                    if (topicName)
+                    if (topicName && !/^topic-\d+$/.test(topicName))
                         result.platformName = topicName;
                 }
             }
@@ -4330,7 +4330,7 @@ export function createRoutes(ctx) {
         res.send(html);
     });
     // Receive a secret submission (user-facing, NO auth — token + CSRF is the auth)
-    router.post('/secrets/drop/:token', (req, res) => {
+    router.post('/secrets/drop/:token', async (req, res) => {
         const { _csrf, ...values } = req.body;
         if (!_csrf || typeof _csrf !== 'string') {
             res.status(400).json({ error: 'Missing CSRF token' });
@@ -4384,15 +4384,32 @@ export function createRoutes(ctx) {
             else {
                 // No live session — spawn one to handle the secret receipt
                 let topicName = `topic-${topicId}`;
-                try {
-                    if (fs.existsSync(sdRegistryPath)) {
-                        const reg = JSON.parse(fs.readFileSync(sdRegistryPath, 'utf-8'));
-                        const stored = reg.topicToName?.[String(topicId)];
-                        if (stored)
-                            topicName = stored;
+                // Try live adapter first, then disk registry, then active probe
+                if (ctx.telegram) {
+                    const liveName = ctx.telegram.getTopicName(topicId);
+                    if (liveName && !/^topic-\d+$/.test(liveName)) {
+                        topicName = liveName;
                     }
                 }
-                catch { /* fall through to default */ }
+                if (/^topic-\d+$/.test(topicName)) {
+                    try {
+                        if (fs.existsSync(sdRegistryPath)) {
+                            const reg = JSON.parse(fs.readFileSync(sdRegistryPath, 'utf-8'));
+                            const stored = reg.topicToName?.[String(topicId)];
+                            if (stored && !/^topic-\d+$/.test(stored))
+                                topicName = stored;
+                        }
+                    }
+                    catch { /* fall through */ }
+                }
+                if (/^topic-\d+$/.test(topicName) && ctx.telegram) {
+                    try {
+                        const resolved = await ctx.telegram.resolveTopicName(topicId);
+                        if (resolved)
+                            topicName = resolved;
+                    }
+                    catch { /* fall through to default */ }
+                }
                 // Build context with thread history
                 const historyLines = [];
                 if (ctx.telegram) {
@@ -4564,7 +4581,7 @@ export function createRoutes(ctx) {
     // ── Internal: Lifeline Telegram Forward ─────────────────────────
     // Receives messages from the Telegram Lifeline process and injects
     // them into the appropriate session, just like TelegramAdapter would.
-    router.post('/internal/telegram-forward', (req, res) => {
+    router.post('/internal/telegram-forward', async (req, res) => {
         const { topicId, text, fromUserId, fromUsername, fromFirstName, messageId } = req.body;
         if (!topicId || !text) {
             res.status(400).json({ error: 'topicId and text required' });
@@ -4680,15 +4697,32 @@ export function createRoutes(ctx) {
                 // tmux names include the project prefix (e.g., "ai-guy-lifeline"), and
                 // spawnInteractiveSession prepends it again → cascading names.
                 let topicName = `topic-${topicId}`;
-                try {
-                    if (fs.existsSync(registryPath)) {
-                        const reg = JSON.parse(fs.readFileSync(registryPath, 'utf-8'));
-                        const stored = reg.topicToName?.[String(topicId)];
-                        if (stored)
-                            topicName = stored;
+                // Try live adapter first, then disk registry, then active probe
+                if (ctx.telegram) {
+                    const liveName = ctx.telegram.getTopicName(topicId);
+                    if (liveName && !/^topic-\d+$/.test(liveName)) {
+                        topicName = liveName;
                     }
                 }
-                catch { /* fall through to default */ }
+                if (/^topic-\d+$/.test(topicName)) {
+                    try {
+                        if (fs.existsSync(registryPath)) {
+                            const reg = JSON.parse(fs.readFileSync(registryPath, 'utf-8'));
+                            const stored = reg.topicToName?.[String(topicId)];
+                            if (stored && !/^topic-\d+$/.test(stored))
+                                topicName = stored;
+                        }
+                    }
+                    catch { /* fall through */ }
+                }
+                if (/^topic-\d+$/.test(topicName) && ctx.telegram) {
+                    try {
+                        const resolved = await ctx.telegram.resolveTopicName(topicId);
+                        if (resolved)
+                            topicName = resolved;
+                    }
+                    catch { /* fall through to default */ }
+                }
                 console.log(`[telegram-forward] No live session for topic ${topicId}, spawning "${topicName}"...`);
                 // Fetch thread history so auto-spawned sessions have full conversational context
                 const historyLines = [];
@@ -7656,7 +7690,30 @@ export function createRoutes(ctx) {
             if (fs.existsSync(knownAgentsPath)) {
                 const knownData = JSON.parse(fs.readFileSync(knownAgentsPath, 'utf-8'));
                 const agents = knownData.agents ?? [];
-                const localTarget = agents.find(a => a.name === targetAgent || a.name?.toLowerCase() === targetAgent?.toLowerCase());
+                // Support "name:fingerprintPrefix" disambiguation syntax
+                let targetName = targetAgent;
+                let targetFpPrefix;
+                const colonIdx = targetAgent.lastIndexOf(':');
+                if (colonIdx > 0 && colonIdx < targetAgent.length - 1) {
+                    const suffix = targetAgent.substring(colonIdx + 1);
+                    if (/^[0-9a-f]{4,32}$/i.test(suffix)) {
+                        targetName = targetAgent.substring(0, colonIdx);
+                        targetFpPrefix = suffix.toLowerCase();
+                    }
+                }
+                const nameMatches = agents.filter(a => a.name === targetName || a.name?.toLowerCase() === targetName?.toLowerCase());
+                // If multiple same-named agents, disambiguate by fingerprint prefix
+                let localTarget = nameMatches.length === 1 ? nameMatches[0] : undefined;
+                if (nameMatches.length > 1 && targetFpPrefix) {
+                    localTarget = nameMatches.find(a => {
+                        const fp = a.fingerprint || a.publicKey?.substring(0, 32);
+                        return fp?.toLowerCase().startsWith(targetFpPrefix);
+                    });
+                }
+                else if (nameMatches.length > 1 && !targetFpPrefix) {
+                    // Ambiguous — skip local delivery, let relay handle it
+                    localTarget = undefined;
+                }
                 if (localTarget?.port && localTarget.name !== ctx.config.projectName) {
                     // Check if the local agent is actually running
                     try {
@@ -8409,7 +8466,7 @@ export function createRoutes(ctx) {
             res.status(501).json({ error: 'FeatureRegistry not initialized' });
             return;
         }
-        const { to, userId: bodyUserId, trigger, consentRecord, context } = req.body || {};
+        const { to, userId: bodyUserId, trigger, consentRecord, context, activationChallenge } = req.body || {};
         if (!to) {
             res.status(400).json({ error: { code: 'MISSING_TARGET', message: 'Request body must include "to" (target state)' } });
             return;
@@ -8419,6 +8476,7 @@ export function createRoutes(ctx) {
             trigger,
             consentRecord,
             context,
+            activationChallenge,
         });
         if (!result.success) {
             const status = result.error?.code === 'FEATURE_NOT_FOUND' ? 404