instar 0.24.27 → 0.24.29

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;AAyPH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAimCD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA4pGtE;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;AAyPH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAimCD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAurGtE;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

@@ -2227,19 +2227,34 @@ export async function startServer(options) {
                     const ctxPath = path.join(tmpDir, `ctx-${channelId}-${Date.now()}.txt`);
                     const history = slackAdapter.getChannelMessages(channelId, 30);
                     const unansweredCount = slackAdapter.getUnansweredCount(channelId);
-                    const contextData = JSON.stringify({
-                        topicId: channelId,
-                        channelName: channelId,
-                        messages: history.map(m => ({
-                            ts: m.ts,
-                            sender: m.user,
-                            senderId: m.user,
-                            fromUser: true,
-                            text: m.text,
-                        })),
-                        unansweredCount,
-                        relayInstructions: `cat <<'EOF' | .claude/scripts/slack-reply.sh ${channelId}\nYour response text here\nEOF`,
-                    }, null, 2);
+                    const botUserId = slackAdapter.getBotUserId?.() ?? null;
+                    // Build human-readable thread history (matches Telegram's context format)
+                    const lines = [];
+                    lines.push(`--- Thread History (last ${history.length} messages) ---`);
+                    lines.push('IMPORTANT: Read this history carefully before taking any action.');
+                    lines.push('Your task is to continue THIS conversation, not start something new.');
+                    lines.push(`Channel: ${channelId}`);
+                    lines.push('');
+                    for (const m of history) {
+                        const date = new Date(parseFloat(m.ts) * 1000);
+                        const time = date.toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
+                        const isBot = botUserId && m.user === botUserId;
+                        const label = isBot ? 'Agent' : (senderName || m.user);
+                        lines.push(`[${time}] ${label}: ${m.text}`);
+                    }
+                    lines.push('');
+                    lines.push('--- End Thread History ---');
+                    lines.push('');
+                    lines.push('CRITICAL: You MUST relay your response back to Slack after responding.');
+                    lines.push('Use the relay script:');
+                    lines.push('');
+                    lines.push(`cat <<'EOF' | .claude/scripts/slack-reply.sh ${channelId}`);
+                    lines.push('Your response text here');
+                    lines.push('EOF');
+                    lines.push('');
+                    lines.push('Strip the [slack:] prefix before interpreting the message.');
+                    lines.push('Only relay conversational text — not tool output or internal reasoning.');
+                    const contextData = lines.join('\n');
                     fs.writeFileSync(ctxPath, contextData);
                     // Transform [image:path] and [document:path] tags into explicit read instructions
                     let transformedContent = message.content.replace(/\[image:([^\]]+)\]/g, (_, imagePath) => {
@@ -2265,21 +2280,32 @@ export async function startServer(options) {
                             // Wait for Claude to be ready (handles race with recently spawned sessions)
                             const ready = await sessionManager.waitForClaudeReady(existingSession, 15000);
                             if (!ready) {
-                                console.warn(`[slack→session] Session ${existingSession} not ready after 15s — injecting anyway`);
-                            }
-                            // Use tmux send-keys to inject the message (same as Telegram's injection pattern)
-                            try {
-                                const { execSync } = await import('node:child_process');
-                                // Write to a temp file and send via tmux to avoid escaping issues
-                                const msgFile = path.join(tmpDir, `inject-${Date.now()}.txt`);
-                                fs.writeFileSync(msgFile, bootstrapMessage);
-                                execSync(`tmux send-keys -t '=${existingSession}:' "$(cat '${msgFile}')" Enter`, { timeout: 5000 });
-                                fs.unlinkSync(msgFile);
+                                // Session is stuck (permissions prompt, tool hang, etc.)
+                                // Kill it and fall through to spawn a fresh session — never silently lose messages
+                                console.warn(`[slack→session] Session ${existingSession} not ready after 15s — killing and respawning`);
+                                try {
+                                    const stuckSession = sessionManager.listRunningSessions().find(s => s.tmuxSession === existingSession);
+                                    if (stuckSession) {
+                                        sessionManager.killSession(stuckSession.id);
+                                    }
+                                }
+                                catch { /* ok if already dead */ }
+                                // Fall through to respawn below — registerChannelSession will be called with new session name
                             }
-                            catch (injectErr) {
-                                console.error(`[slack→session] Injection failed: ${injectErr instanceof Error ? injectErr.message : injectErr}`);
+                            else {
+                                // Session is ready — inject the message
+                                try {
+                                    const { execSync } = await import('node:child_process');
+                                    const msgFile = path.join(tmpDir, `inject-${Date.now()}.txt`);
+                                    fs.writeFileSync(msgFile, bootstrapMessage);
+                                    execSync(`tmux send-keys -t '=${existingSession}:' "$(cat '${msgFile}')" Enter`, { timeout: 5000 });
+                                    fs.unlinkSync(msgFile);
+                                }
+                                catch (injectErr) {
+                                    console.error(`[slack→session] Injection failed: ${injectErr instanceof Error ? injectErr.message : injectErr}`);
+                                }
+                                return;
                             }
-                            return;
                         }
                         console.log(`[slack→session] Session "${existingSession}" died, respawning...`);
                     }
@@ -3210,6 +3236,7 @@ export async function startServer(options) {
                         if (!entry.channelId)
                             return;
                         const syntheticId = slackChannelToSyntheticId(String(entry.channelId));
+                        console.log(`[slack-proxy] onMessageLogged: channel=${entry.channelId} syntheticId=${syntheticId} fromUser=${entry.fromUser} text="${(entry.text || '').slice(0, 40)}"`);
                         presenceProxy.onMessageLogged({
                             messageId: typeof entry.messageId === 'number' ? entry.messageId : parseInt(String(entry.messageId), 10) || 0,
                             channelId: syntheticId.toString(),