gbos 1.4.7 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gbos",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "GBOS - Command line interface for GBOS services",
   "main": "src/index.js",
   "bin": {

package/src/lib/api.js

@@ -193,6 +193,13 @@ class GbosApiClient {
     });
   }
 
+  // Agent config - fetch API keys from application settings
+  async getAgentConfig(applicationId) {
+    const app = await this.getApplication(applicationId);
+    const appData = app.data || app;
+    return appData?.settings?.agent_keys || {};
+  }
+
   // Activity logging
   async logActivity(activity) {
     return this.request('/cli/activity', {

package/src/orchestrator/adapters/gemini-adapter.js

@@ -1,6 +1,7 @@
 /**
  * Gemini Agent Adapter
- * Adapter for Google's Gemini CLI
+ * Uses `gemini -p` (print mode) which reads prompt from stdin,
+ * runs autonomously, streams output, and exits when done.
  */
 
 const BaseAdapter = require('./base-adapter');
@@ -36,42 +37,32 @@ class GeminiAdapter extends BaseAdapter {
   }
 
   getCommand(options = {}) {
-    const args = [];
+    const args = ['-p']; // Print mode: reads from stdin, outputs result, exits
 
-    // Sandbox mode for auto-approval
-    if (options.autoApprove) {
-      args.push('--sandbox');
-    }
-
-    // Yolo mode (no confirmations)
-    if (options.yolo) {
-      args.push('--yolo');
-    }
+    if (options.autoApprove) args.push('--yolo');
+    if (options.model) args.push('--model', options.model);
 
     return {
       command: 'gemini',
       args,
       env: {
         ...process.env,
-        GOOGLE_API_KEY: options.apiKey || process.env.GOOGLE_API_KEY,
-        GEMINI_API_KEY: options.apiKey || process.env.GEMINI_API_KEY,
+        GEMINI_API_KEY: options.apiKey || process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY,
       },
+      closeStdinOnWrite: true,
     };
   }
 
   formatPrompt(task, context = {}) {
     const lines = [];
 
-    // Simple, direct format for Gemini
     lines.push(`# ${task.title || task.name || 'Task'}`);
     lines.push('');
 
-    // Task reference
     lines.push(`> Task: ${task.task_key || task.id}`);
     if (task.priority) lines.push(`> Priority: ${task.priority}`);
     lines.push('');
 
-    // Main instructions
     lines.push('## Instructions');
     lines.push('');
     if (task.agent_prompt) {
@@ -83,7 +74,6 @@ class GeminiAdapter extends BaseAdapter {
     }
     lines.push('');
 
-    // Requirements
     if (task.acceptance_criteria && task.acceptance_criteria.length > 0) {
       lines.push('## Requirements');
       task.acceptance_criteria.forEach((c, i) => {
@@ -92,14 +82,12 @@ class GeminiAdapter extends BaseAdapter {
       lines.push('');
     }
 
-    // Files to modify
     if (task.target_files && task.target_files.length > 0) {
       lines.push('## Files');
       task.target_files.forEach(f => lines.push(`- \`${f}\``));
       lines.push('');
     }
 
-    // Testing
     lines.push('## Testing');
     lines.push('');
     if (context.cloudRunUrl) {
@@ -119,13 +107,19 @@ class GeminiAdapter extends BaseAdapter {
     }
     lines.push('');
 
-    // Important notes
     lines.push('## Important');
     lines.push('- Do NOT commit or push changes');
     lines.push('- Ensure all tests pass');
     lines.push('- The orchestrator handles git operations');
     lines.push('');
 
+    if (context.repoUrl) {
+      lines.push('## Repository');
+      lines.push(`- **URL:** ${context.repoUrl}`);
+      lines.push(`- **Branch:** ${context.branch || 'main'}`);
+      lines.push('');
+    }
+
     return lines.join('\n');
   }
 
@@ -136,9 +130,23 @@ class GeminiAdapter extends BaseAdapter {
       /done implementing/i,
       /finished the task/i,
       /implementation complete/i,
+      /I've completed/i,
+      /all tests pass/i,
+      /ready for review/i,
+      /I have completed/i,
     ];
     return patterns.some(p => p.test(output)) || super.detectCompletion(output);
   }
+
+  detectWaitingForInput(output) {
+    const patterns = [
+      /Do you want me to/i,
+      /Should I/i,
+      /Would you like me to/i,
+      /Shall I/i,
+    ];
+    return patterns.some(p => p.test(output)) || super.detectWaitingForInput(output);
+  }
 }
 
 module.exports = GeminiAdapter;

package/src/orchestrator/orchestrator.js

@@ -36,6 +36,7 @@ class Orchestrator extends EventEmitter {
 
     this.currentTask = null;
     this.application = null;
+    this.agentKeys = {}; // API keys fetched from server at runtime
     this.tasksCompleted = 0;
     this.isRunning = false;
     this.isPaused = false;
@@ -182,6 +183,16 @@ class Orchestrator extends EventEmitter {
       }
     }
 
+    // Fetch agent API keys from server
+    const effectiveAppId = this.application?.id || this.stateMachine.context.appId;
+    if (effectiveAppId) {
+      try {
+        this.agentKeys = await api.getAgentConfig(effectiveAppId);
+      } catch (e) {
+        // No server-side keys
+      }
+    }
+
     // Start status updates
     this.startStatusUpdates();
   }
@@ -323,6 +334,18 @@ class Orchestrator extends EventEmitter {
     this.adapter = getAdapter(this.options.agent);
     this.log(`Using agent: ${this.adapter.name} (${agentInfo.version})`);
 
+    // Fetch agent API keys from GBOS server (never stored locally)
+    if (this.application?.id) {
+      try {
+        this.agentKeys = await api.getAgentConfig(this.application.id);
+        if (this.agentKeys && Object.keys(this.agentKeys).length > 0) {
+          this.log('Agent API keys loaded from server');
+        }
+      } catch (e) {
+        this.log('No server-side agent keys configured');
+      }
+    }
+
     this.stateMachine.transition(STATES.AUTH_CONFIG, {
       appId: this.application?.id,
       nodeId: connection.node?.id,
@@ -462,10 +485,12 @@ class Orchestrator extends EventEmitter {
       throw new Error('No prompt generated');
     }
 
-    // Get command to run
+    // Get command to run (pass server-side API key for the agent)
+    const agentKey = this.agentKeys?.[this.adapter.name] || null;
     const cmdConfig = this.adapter.getCommand({
       nonInteractive: this.adapter.supportsNonInteractive,
       autoApprove: this.options.autoApprove,
+      apiKey: agentKey,
     });
 
     // Create session runner - agent works at repo root