tuna-agent 0.1.172 → 0.1.174

package/dist/agents/claude-code-adapter.js

@@ -603,91 +603,89 @@ export class ClaudeCodeAdapter {
                 status: s.status,
             })),
         });
-        const roles = plan.subtasks.map((s) => s.role).join(', ');
-        ws.sendPMMessage(task.id, {
-            sender: 'pm',
-            content: `Plan ready: ${plan.summary}\n\nI'll coordinate ${plan.subtasks.length} session${plan.subtasks.length > 1 ? 's' : ''}: ${roles}.`,
-        });
-        await new Promise(resolve => setTimeout(resolve, 100));
-        // Step 2: Wait for user to approve the plan
-        console.log(`[ClaudeCode] Waiting for plan approval for task ${task.id}`);
-        ws.sendNeedsInput(task.id, {
-            subtaskId: 'plan',
-            question: plan.summary,
-            options: ['Approve', 'Request Changes'],
-            context: JSON.stringify(plan.subtasks.map((s) => ({
-                id: s.id,
-                role: s.role,
-                description: s.description,
-                dependencies: s.dependencies,
-            }))),
-        });
-        const { text: planApproval } = await waitForInput(task.id, pendingInputResolvers);
-        console.log(`[ClaudeCode] Plan approval response: ${planApproval.substring(0, 80)}`);
-        // If user requests changes, re-plan with feedback and loop
-        if (planApproval.toLowerCase() !== 'approve') {
-            console.log(`[ClaudeCode] User requested changes — re-planning with feedback`);
-            ws.sendPMMessage(task.id, {
-                sender: 'pm',
-                content: `Got it, adjusting the plan based on your feedback...`,
+        // Auto-approve single-subtask ('self') plans — no plan-review friction for
+        // simple own-domain work. Only complex multi-subtask builds ask for approval.
+        if (plan.subtasks.length > 1) {
+            // Step 2: Wait for user to approve the plan
+            console.log(`[ClaudeCode] Waiting for plan approval for task ${task.id}`);
+            ws.sendNeedsInput(task.id, {
+                subtaskId: 'plan',
+                question: plan.summary,
+                options: ['Approve', 'Request Changes'],
+                context: JSON.stringify(plan.subtasks.map((s) => ({
+                    id: s.id,
+                    role: s.role,
+                    description: s.description,
+                    dependencies: s.dependencies,
+                }))),
             });
-            ws.sendProgress(task.id, 'planning', { startedAt: new Date().toISOString() });
-            const replanResult = await chatWithPM(planResult.pmSessionId || '', task.repoPath, `The user wants changes to the plan. Their feedback: "${planApproval}"\n\nPlease create an updated execution plan as JSON.`, signal, (chunk) => { ws.sendPMStream(task.id, chunk); });
-            ws.sendPMStreamEnd(task.id, `pm-replan-${Date.now()}`);
-            if (replanResult.plan && replanResult.plan.subtasks.length > 0) {
-                // Replace plan with updated version
-                plan.summary = replanResult.plan.summary;
-                plan.subtasks = replanResult.plan.subtasks;
-                plan.contracts = replanResult.plan.contracts;
-                if (replanResult.sessionId) {
-                    planResult.pmSessionId = replanResult.sessionId;
-                }
-                // Send updated plan_ready and recurse approval
-                ws.sendPlanReady(task.id, {
-                    summary: plan.summary,
-                    contracts: plan.contracts,
-                    subtasks: plan.subtasks.map((s) => ({
-                        id: s.id, role: s.role, description: s.description,
-                        cwd: s.cwd, dependencies: s.dependencies, status: s.status,
-                    })),
-                });
-                const updatedRoles = plan.subtasks.map((s) => s.role).join(', ');
+            const { text: planApproval } = await waitForInput(task.id, pendingInputResolvers);
+            console.log(`[ClaudeCode] Plan approval response: ${planApproval.substring(0, 80)}`);
+            // If user requests changes, re-plan with feedback and loop
+            if (planApproval.toLowerCase() !== 'approve') {
+                console.log(`[ClaudeCode] User requested changes — re-planning with feedback`);
                 ws.sendPMMessage(task.id, {
                     sender: 'pm',
-                    content: `Updated plan: ${plan.summary}\n\n${plan.subtasks.length} session${plan.subtasks.length > 1 ? 's' : ''}: ${updatedRoles}.`,
+                    content: `Got it, adjusting the plan based on your feedback...`,
                 });
-                await new Promise(resolve => setTimeout(resolve, 100));
-                // Ask for approval again
-                ws.sendNeedsInput(task.id, {
-                    subtaskId: 'plan',
-                    question: plan.summary,
-                    options: ['Approve', 'Request Changes'],
-                    context: JSON.stringify(plan.subtasks.map((s) => ({
-                        id: s.id, role: s.role, description: s.description, dependencies: s.dependencies,
-                    }))),
-                });
-                const { text: secondApproval } = await waitForInput(task.id, pendingInputResolvers);
-                console.log(`[ClaudeCode] Second plan approval: ${secondApproval.substring(0, 80)}`);
-                if (secondApproval.toLowerCase() !== 'approve') {
+                ws.sendProgress(task.id, 'planning', { startedAt: new Date().toISOString() });
+                const replanResult = await chatWithPM(planResult.pmSessionId || '', task.repoPath, `The user wants changes to the plan. Their feedback: "${planApproval}"\n\nPlease create an updated execution plan as JSON.`, signal, (chunk) => { ws.sendPMStream(task.id, chunk); });
+                ws.sendPMStreamEnd(task.id, `pm-replan-${Date.now()}`);
+                if (replanResult.plan && replanResult.plan.subtasks.length > 0) {
+                    // Replace plan with updated version
+                    plan.summary = replanResult.plan.summary;
+                    plan.subtasks = replanResult.plan.subtasks;
+                    plan.contracts = replanResult.plan.contracts;
+                    if (replanResult.sessionId) {
+                        planResult.pmSessionId = replanResult.sessionId;
+                    }
+                    // Send updated plan_ready and recurse approval
+                    ws.sendPlanReady(task.id, {
+                        summary: plan.summary,
+                        contracts: plan.contracts,
+                        subtasks: plan.subtasks.map((s) => ({
+                            id: s.id, role: s.role, description: s.description,
+                            cwd: s.cwd, dependencies: s.dependencies, status: s.status,
+                        })),
+                    });
+                    const updatedRoles = plan.subtasks.map((s) => s.role).join(', ');
+                    ws.sendPMMessage(task.id, {
+                        sender: 'pm',
+                        content: `Updated plan: ${plan.summary}\n\n${plan.subtasks.length} session${plan.subtasks.length > 1 ? 's' : ''}: ${updatedRoles}.`,
+                    });
+                    await new Promise(resolve => setTimeout(resolve, 100));
+                    // Ask for approval again
+                    ws.sendNeedsInput(task.id, {
+                        subtaskId: 'plan',
+                        question: plan.summary,
+                        options: ['Approve', 'Request Changes'],
+                        context: JSON.stringify(plan.subtasks.map((s) => ({
+                            id: s.id, role: s.role, description: s.description, dependencies: s.dependencies,
+                        }))),
+                    });
+                    const { text: secondApproval } = await waitForInput(task.id, pendingInputResolvers);
+                    console.log(`[ClaudeCode] Second plan approval: ${secondApproval.substring(0, 80)}`);
+                    if (secondApproval.toLowerCase() !== 'approve') {
+                        ws.sendPMMessage(task.id, {
+                            sender: 'pm',
+                            content: `Understood. I'll cancel this task. You can create a new one when ready.`,
+                        });
+                        ws.sendTaskFailed(task.id, 'Plan not approved by user');
+                        console.log(`[ClaudeCode] Task ${task.id} — plan rejected twice, closing`);
+                        return;
+                    }
+                }
+                else {
+                    // Re-plan didn't produce subtasks — close
                     ws.sendPMMessage(task.id, {
                         sender: 'pm',
-                        content: `Understood. I'll cancel this task. You can create a new one when ready.`,
+                        content: replanResult.response || `I couldn't create an updated plan. Please try creating a new task.`,
                     });
-                    ws.sendTaskFailed(task.id, 'Plan not approved by user');
-                    console.log(`[ClaudeCode] Task ${task.id} — plan rejected twice, closing`);
+                    ws.sendTaskFailed(task.id, 'Re-planning failed');
                     return;
                 }
             }
-            else {
-                // Re-plan didn't produce subtasks — close
-                ws.sendPMMessage(task.id, {
-                    sender: 'pm',
-                    content: replanResult.response || `I couldn't create an updated plan. Please try creating a new task.`,
-                });
-                ws.sendTaskFailed(task.id, 'Re-planning failed');
-                return;
-            }
-        }
+        } // end approval gate (multi-subtask plans only)
         console.log(`[ClaudeCode] Plan approved — proceeding to execution`);
         // Step 3: Handle plan questions if any — collect answers to pass to subtasks
         const pmAnswers = [];
@@ -732,22 +730,12 @@ export class ClaudeCodeAdapter {
         // Step 4: Execute subtasks
         console.log(`[ClaudeCode] Starting execution for task ${task.id}`);
         ws.sendProgress(task.id, 'executing', { startedAt: new Date().toISOString() });
-        ws.sendPMMessage(task.id, {
-            sender: 'pm',
-            content: "Starting execution now. I'll keep you updated as each session progresses.",
-        });
         // Step 4-6: Execute plan with follow-up loop
         const allSessions = [];
         let lastStatus = 'done';
         const MAX_FOLLOW_UP_ROUNDS = 10;
         for (let followUpRound = 0; followUpRound <= MAX_FOLLOW_UP_ROUNDS; followUpRound++) {
             ws.sendProgress(task.id, 'executing', { startedAt: new Date().toISOString() });
-            if (followUpRound === 0) {
-                ws.sendPMMessage(task.id, {
-                    sender: 'pm',
-                    content: "Starting execution now. I'll keep you updated as each session progresses.",
-                });
-            }
             const result = await executePlanAndReport(task, plan, ws, pendingInputResolvers, signal, confirmBeforeEdit, onPermissionRequest);
             allSessions.push(...result.sessions);
             lastStatus = result.status;

package/dist/utils/execution-helpers.js

@@ -65,11 +65,15 @@ export function buildExecutionCallbacks(taskId, plan, ws, resolvers, onPermissio
                     role: subtask.role,
                     description: subtask.description,
                 });
-                await new Promise(resolve => setTimeout(resolve, 100));
-                ws.sendPMMessage(taskId, {
-                    sender: 'system',
-                    content: `${capitalize(subtask.role)} session started`,
-                });
+                // Only announce a "session started" for real multi-role dev teams.
+                // A single 'self' agent doing its own work needs no orchestration noise.
+                if (subtask.role !== 'self') {
+                    await new Promise(resolve => setTimeout(resolve, 100));
+                    ws.sendPMMessage(taskId, {
+                        sender: 'system',
+                        content: `${capitalize(subtask.role)} session started`,
+                    });
+                }
             }
         },
         onSubtaskLog: async (subtaskId, logData) => {
@@ -92,9 +96,13 @@ export function buildExecutionCallbacks(taskId, plan, ws, resolvers, onPermissio
                 const durationStr = durationMs ? `${(durationMs / 1000).toFixed(1)}s` : '';
                 const resultPreview = rawResult ? simplifyMarkdown(rawResult) : '';
                 await new Promise(resolve => setTimeout(resolve, 100));
+                const isSelf = subtask?.role === 'self';
                 ws.sendPMMessage(taskId, {
                     sender: 'pm',
-                    content: `${roleName} completed successfully${durationStr ? ` in ${durationStr}` : ''}${resultPreview ? `\n\n${resultPreview}` : ''}`,
+                    // Single 'self' agent: just deliver the result, no "X completed successfully" scaffolding.
+                    content: isSelf
+                        ? (resultPreview || 'Xong ạ.')
+                        : `${roleName} completed successfully${durationStr ? ` in ${durationStr}` : ''}${resultPreview ? `\n\n${resultPreview}` : ''}`,
                 });
             }
             else if (session.status === 'failed') {
@@ -109,9 +117,10 @@ export function buildExecutionCallbacks(taskId, plan, ws, resolvers, onPermissio
         onSubtaskNeedsInput: async (subtaskId, question) => {
             const subtask = plan.subtasks.find((s) => s.id === subtaskId);
             const roleName = subtask ? capitalize(subtask.role) : 'A session';
+            const askSelf = subtask?.role === 'self';
             ws.sendPMMessage(taskId, {
                 sender: 'pm',
-                content: `${roleName} is asking: ${question.question}`,
+                content: askSelf ? question.question : `${roleName} is asking: ${question.question}`,
                 options: question.options,
                 context: question.context,
             });
@@ -122,10 +131,13 @@ export function buildExecutionCallbacks(taskId, plan, ws, resolvers, onPermissio
                 context: question.context,
             });
             const { text: answer } = await waitForInput(taskId, resolvers);
-            ws.sendPMMessage(taskId, {
-                sender: 'pm',
-                content: `Got it! Passing this to ${roleName}...`,
-            });
+            // No "passing this to X" scaffolding for a single self agent.
+            if (!askSelf) {
+                ws.sendPMMessage(taskId, {
+                    sender: 'pm',
+                    content: `Got it! Passing this to ${roleName}...`,
+                });
+            }
             return answer;
         },
         onLayerStart: async (layerIndex, totalLayers, subtaskIds) => {

package/package.json

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