tuna-agent 0.1.100 → 0.1.102

package/dist/daemon/index.js

@@ -461,8 +461,17 @@ ${skillContent.slice(0, 15000)}`;
                         // Check per-agent concurrency before resuming
                         const resumeAgentId = savedState.agentId || '__default__';
                         if (activeAgentTasks.has(resumeAgentId)) {
-                            console.warn(`[Daemon] Cannot resume task ${taskId} — agent ${resumeAgentId} is busy with task ${activeAgentTasks.get(resumeAgentId)}`);
-                            ws.send({ action: 'task_rejected', taskId, reason: 'agent_busy' });
+                            const busyTask = activeAgentTasks.get(resumeAgentId);
+                            console.warn(`[Daemon] Cannot resume task ${taskId} — agent ${resumeAgentId} is busy with task ${busyTask}`);
+                            // Notify user and revert task status so it doesn't get stuck at "executing"
+                            ws.sendPMMessage(taskId, {
+                                sender: 'pm',
+                                content: 'Agent is currently busy with another task. Please try again shortly.',
+                            });
+                            ws.sendTaskDone(taskId, {
+                                result: 'Agent busy — message not processed',
+                                durationMs: 0,
+                            });
                             break;
                         }
                         if (savedState.mode === 'agent_team') {
@@ -871,21 +880,44 @@ ${skillContent.slice(0, 15000)}`;
                     continue; // retry this round without --resume
                 }
                 // Send finalized message for the last turn's remaining text
+                // Skip if content is same as task result (avoid duplicate in chat + session)
+                const simplifiedResult = simplifyMarkdown(result.result);
+                const normalizeForCompare = (s) => s.replace(/[#*_`~\-|>]/g, '').replace(/\s+/g, ' ').trim().toLowerCase();
+                const isSameAsResult = (text) => {
+                    const a = normalizeForCompare(text), b = normalizeForCompare(simplifiedResult);
+                    if (!a || !b)
+                        return false;
+                    if (a === b)
+                        return true;
+                    if (a.length > 20 && b.length > 20 && (a.includes(b) || b.includes(a)))
+                        return true;
+                    return false;
+                };
                 if (turnAccumulatedText.trim()) {
-                    wsClient.sendPMMessage(taskId, {
-                        sender: 'pm',
-                        content: simplifyMarkdown(turnAccumulatedText),
-                        startedAt: firstChunkIso || undefined,
-                    });
+                    const simplified = simplifyMarkdown(turnAccumulatedText);
+                    if (!isSameAsResult(simplified)) {
+                        wsClient.sendPMMessage(taskId, {
+                            sender: 'pm',
+                            content: simplified,
+                            startedAt: firstChunkIso || undefined,
+                        });
+                    }
+                    else {
+                        console.log(`[Daemon] ⏭️ Skipping resume final message (duplicate of task result, ${simplified.length} chars)`);
+                    }
                 }
                 else if (resultText.length > 0 && messageCount === 0) {
-                    // No stream events but CLI returned a result (e.g. resumed session
-                    // where --verbose doesn't emit stream_event entries)
-                    console.log(`[Daemon] No stream events but got result (${resultText.length} chars) — sending as message`);
-                    wsClient.sendPMMessage(taskId, {
-                        sender: 'pm',
-                        content: simplifyMarkdown(resultText),
-                    });
+                    // No stream events but CLI returned a result — skip if same as task result
+                    if (!isSameAsResult(resultText)) {
+                        console.log(`[Daemon] No stream events but got result (${resultText.length} chars) — sending as message`);
+                        wsClient.sendPMMessage(taskId, {
+                            sender: 'pm',
+                            content: simplifyMarkdown(resultText),
+                        });
+                    }
+                    else {
+                        console.log(`[Daemon] ⏭️ Skipping no-stream result message (duplicate of task result, ${resultText.length} chars)`);
+                    }
                 }
                 lastResumeOutput = turnAccumulatedText.trim() || resultText || lastResumeOutput;
                 if (result.isError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tuna-agent",
-  "version": "0.1.100",
+  "version": "0.1.102",
   "description": "Tuna Agent - Run AI coding tasks on your machine",
   "bin": {
     "tuna-agent": "dist/cli/index.js"