groove-dev 0.27.93 → 0.27.96

package/packages/daemon/src/introducer.js

@@ -48,6 +48,17 @@ export class Introducer {
       }
     }
 
+    if (newAgent.teamBuilderRoles && newAgent.teamBuilderRoles.length > 0) {
+      lines.push('');
+      lines.push('## Team Builder Pre-Selection');
+      lines.push('');
+      const roleDescs = newAgent.teamBuilderRoles.map(r => {
+        return r.provider ? `${r.role} (provider: ${r.provider})` : r.role;
+      });
+      lines.push(`The user selected these roles in the Team Builder UI: ${roleDescs.join(', ')}.`);
+      lines.push('When the user gives you a task, create a plan using EXACTLY these roles. Do not redesign the team composition.');
+    }
+
     lines.push('');
 
     if (others.length === 0) {
@@ -199,12 +210,16 @@ export class Introducer {
     // CLAUDE.md parity — non-Claude providers don't read CLAUDE.md natively,
     // so inject its project content (minus the GROOVE section) into introContext
     if (newAgent.provider && newAgent.provider !== 'claude-code') {
-      const claudeMdContent = this._loadClaudeMd(newAgent.workingDir);
-      if (claudeMdContent) {
-        lines.push('');
-        lines.push('## Project Context (from CLAUDE.md)');
-        lines.push('');
-        lines.push(claudeMdContent);
+      if (newAgent.role === 'planner') {
+        // Planners don't need full project context — codebase structure is injected separately
+      } else {
+        const claudeMdContent = this._loadClaudeMd(newAgent.workingDir);
+        if (claudeMdContent) {
+          lines.push('');
+          lines.push('## Project Context (from CLAUDE.md)');
+          lines.push('');
+          lines.push(claudeMdContent);
+        }
       }
     }
 

package/packages/daemon/src/process.js

@@ -315,7 +315,7 @@ function sanitizeFilename(name) {
 
 export function wrapWithRoleReminder(role, message) {
   if (role === 'planner' && !message.startsWith('ROLE REMINDER:')) {
-    return 'ROLE REMINDER: You are a PLANNING ONLY agent. Do NOT write code, edit files, or use Edit/Write/Bash tools. Route this task to your team by writing .groove/recommended-team.json.\n\nUser message: ' + message;
+    return 'ROLE REMINDER: You are a PLANNING ONLY agent. Do NOT write code, edit source files, or run build commands. Your ONLY file write should be .groove/recommended-team.json.\n\nUser message: ' + message;
   }
   return message;
 }
@@ -1336,13 +1336,31 @@ For normal file edits within your scope, proceed without review.
       if (existsSync(targetPath)) return;
 
       const log = readFileSync(logPath, 'utf8');
-      const match = log.match(/\{[\s\S]*?"agents"\s*:\s*\[[\s\S]*?\]\s*\}/);
+
+      // Extract text from JSON log events (Codex agent_message, Claude content blocks)
+      const textParts = [];
+      for (const line of log.split('\n')) {
+        try {
+          const evt = JSON.parse(line.trim());
+          if (evt.item?.type === 'agent_message' && evt.item?.text) textParts.push(evt.item.text);
+          if (evt.type === 'assistant' && evt.message?.content) {
+            for (const block of evt.message.content) {
+              if (block.type === 'text') textParts.push(block.text);
+            }
+          }
+        } catch { textParts.push(line); }
+      }
+      const fullText = textParts.join('\n');
+
+      const match = fullText.match(/\{[\s\S]*?"agents"\s*:\s*\[[\s\S]*?\]\s*\}/);
       if (!match) return;
 
       let parsed;
       try { parsed = JSON.parse(match[0]); } catch { return; }
       if (!parsed || !Array.isArray(parsed.agents) || parsed.agents.length === 0) return;
 
+      parsed._meta = { teamId: agent.teamId || null, agentId: agent.id || null };
+
       if (!existsSync(grooveDir)) mkdirSync(grooveDir, { recursive: true });
       writeFileSync(targetPath, JSON.stringify(parsed, null, 2));
     } catch { /* best effort */ }

package/packages/daemon/src/providers/gemini.js

@@ -147,11 +147,8 @@ export class GeminiProvider extends Provider {
     }
 
     switch (event.type) {
-      case 'agent_start':
-        return { type: 'activity', subtype: 'assistant', sessionId: event.streamId, data: [{ type: 'text', text: '' }] };
-
-      case 'session_update':
-        return null;
+      case 'init':
+        return { type: 'activity', subtype: 'assistant', sessionId: event.session_id, data: [{ type: 'text', text: '' }] };
 
       case 'message': {
         if (event.role === 'user') return null;
@@ -165,38 +162,39 @@ export class GeminiProvider extends Provider {
         return { type: 'activity', subtype: 'assistant', data: blocks };
       }
 
-      case 'tool_request': {
-        const toolName = (event.name || '').includes('shell') || (event.name || '').includes('exec')
-          ? 'Bash' : event.name || 'Tool';
-        const input = event.name === 'Bash' || (event.name || '').includes('shell')
-          ? { command: typeof event.args === 'string' ? event.args : JSON.stringify(event.args || {}) }
-          : (event.args || {});
+      case 'tool_use': {
+        const name = event.tool_name || '';
+        const toolName = name.includes('shell') || name.includes('exec')
+          ? 'Bash' : name || 'Tool';
+        const input = toolName === 'Bash'
+          ? { command: event.parameters?.command || (typeof event.parameters === 'string' ? event.parameters : JSON.stringify(event.parameters || {})) }
+          : (event.parameters || {});
         return {
           type: 'activity', subtype: 'assistant',
-          data: [{ type: 'tool_use', id: event.requestId || 'tool', name: toolName, input }],
+          data: [{ type: 'tool_use', id: event.tool_id || 'tool', name: toolName, input }],
         };
       }
 
-      case 'tool_response': {
-        const rawContent = event.content;
-        const contentParts = Array.isArray(rawContent) ? rawContent : (typeof rawContent === 'string' ? [{ text: rawContent }] : rawContent ? [rawContent] : []);
-        const content = contentParts.map((p) => p.text || '').join('').slice(0, 2000);
-        const toolName = (event.name || '').includes('shell') || (event.name || '').includes('exec')
-          ? 'Bash' : event.name || 'Tool';
+      case 'tool_result': {
+        const content = typeof event.output === 'string' ? event.output.slice(0, 2000) : '';
+        const toolId = event.tool_id || '';
+        const isShell = toolId.includes('shell') || toolId.includes('exec');
+        const toolName = isShell ? 'Bash' : 'Tool';
         return {
           type: 'activity', subtype: 'assistant',
           data: [
-            { type: 'tool_use', id: event.requestId || 'tool', name: toolName, input: {} },
+            { type: 'tool_use', id: toolId || 'tool', name: toolName, input: {} },
             ...(content ? [{ type: 'text', text: content }] : []),
           ],
         };
       }
 
-      case 'usage': {
-        const inputTokens = event.inputTokens || 0;
-        const outputTokens = event.outputTokens || 0;
-        const cachedTokens = event.cachedTokens || 0;
-        const totalTokens = inputTokens + outputTokens;
+      case 'result': {
+        const stats = event.stats || {};
+        const inputTokens = stats.input_tokens || 0;
+        const outputTokens = stats.output_tokens || 0;
+        const cachedTokens = stats.cached || 0;
+        const totalTokens = stats.total_tokens || (inputTokens + outputTokens);
 
         const model = GeminiProvider.models.find((m) => m.id === this._currentModel);
         const pricing = model?.pricing;
@@ -211,7 +209,8 @@ export class GeminiProvider extends Provider {
         }
 
         return {
-          type: 'activity', subtype: 'assistant',
+          type: 'result',
+          subtype: 'assistant',
           data: [{ type: 'text', text: '' }],
           tokensUsed: totalTokens,
           inputTokens,
@@ -220,12 +219,12 @@ export class GeminiProvider extends Provider {
           contextUsage: inputTokens / maxContext,
           estimatedCostUsd,
           costSource: pricing ? 'calculated' : 'estimated',
+          cost: estimatedCostUsd,
+          duration: stats.duration_ms,
+          turns: stats.tool_calls || 0,
         };
       }
 
-      case 'agent_end':
-        return { type: 'activity', subtype: 'assistant', data: [{ type: 'text', text: '' }] };
-
       case 'error':
         return { type: 'activity', subtype: 'assistant', data: [{ type: 'text', text: `Error: ${event.message || 'unknown'}` }] };