loading agents

This reverts commit 1e9ff972d9.

.gitignore

@@ -6,6 +6,8 @@ target
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
+**/.DS_Store
+
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
 
@@ -19,3 +21,7 @@ target
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+# Session logs directory
+logs/
+*.json

DESIGN.md

@@ -1,157 +1,273 @@
-# G3 General Purpose AI Agent - Design Document
+# G3 - AI Coding Agent - Design Document
 
 ## Overview
-G3 is a **code-first AI agent** that helps you complete tasks by writing and executing code or scripts. Instead of just giving advice, G3 solves problems by generating executable code in the appropriate language.
+
+G3 is a **modular, composable AI coding agent** built in Rust that helps you complete tasks by writing and executing code. It provides a flexible architecture for interacting with various Large Language Model (LLM) providers while offering powerful code generation, file manipulation, and task automation capabilities.
+
+The agent follows a **tool-first philosophy**: instead of just providing advice, G3 actively uses tools to read files, write code, execute commands, and complete tasks autonomously.
 
 ## Core Principles
-1. **Code-First Philosophy**: Always try to solve problems with executable code
-2. **Multi-Language Support**: Generate scripts in Python, Bash, JavaScript, Rust, etc.
-3. **Unix Philosophy**: Small, focused tools that do one thing well
+
+1. **Tool-First Philosophy**: Solve problems by actively using tools rather than just providing advice
+2. **Modular Architecture**: Clear separation of concerns across multiple Rust crates
+3. **Provider Flexibility**: Support multiple LLM providers through a unified interface
 4. **Modularity**: Clear separation of concerns
 5. **Composability**: Components can be combined in different ways
-6. **Performance**: Blazing fast execution
+6. **Performance**: Built in Rust for speed and reliability
+7. **Context Intelligence**: Smart context window management with auto-summarization
+8. **Error Resilience**: Robust error handling with automatic retry logic
 
-## Architecture
+## Project Structure
 
-### High-Level Components
+G3 is organized as a Rust workspace with the following crates:
+
+```
+g3/
+├── src/main.rs                   # Main entry point (delegates to g3-cli)
+├── crates/
+│   ├── g3-cli/                   # Command-line interface, TUI, and retro mode
+│   ├── g3-core/                  # Core agent engine, tools, and streaming logic
+│   ├── g3-providers/             # LLM provider abstractions and implementations
+│   ├── g3-config/                # Configuration management
+│   └── g3-execution/             # Code execution engine
+├── logs/                         # Session logs (auto-created)
+├── README.md                     # Project documentation
+└── DESIGN.md                     # This design document
+```
+
+## Architecture Overview
+
+### High-Level Architecture
 
 ```
 ┌─────────────────┐    ┌─────────────────┐    ┌─────────────────┐
-│   CLI Module    │    │  Core Engine    │    │ LLM Providers   │
+│   g3-cli        │    │   g3-core       │    │ g3-providers    │
 │                 │    │                 │    │                 │
-│ - Task commands │◄──►│ - Task          │◄──►│ - OpenAI        │
-│ - Interactive   │    │   interpretation│    │ - Anthropic     │
-│   mode          │    │ - Code          │    │ - Embedded      │
-│ - Code exec     │    │   generation    │    │   (llama.cpp)   │
-│   approval      │    │ - Script        │    │ - Custom APIs   │
-│                 │    │   execution     │    │                 │
+│ • CLI parsing   │◄──►│ • Agent engine  │◄──►│ • Anthropic     │
+│ • Interactive   │    │ • Context mgmt  │    │ • Databricks    │
+│ • Retro TUI     │    │ • Tool system   │    │ • Embedded      │
+│ • Autonomous    │    │ • Streaming     │    │   (llama.cpp)   │
+│   mode          │    │ • Task exec     │    │ • OAuth flow    │
 └─────────────────┘    └─────────────────┘    └─────────────────┘
          │                       │                       │
          └───────────────────────┼───────────────────────┘
                                  │
-                    ┌─────────────────┐
-                    │   Execution     │
-                    │   Engine        │
-                    │                 │
-                    │ - Python        │
-                    │ - Bash/Shell    │
-                    │ - JavaScript    │
-                    │ - Rust          │
-                    │ - Sandboxing    │
-                    └─────────────────┘
+                    ┌─────────────────┐    ┌─────────────────┐
+                    │ g3-execution    │    │   g3-config     │
+                    │                 │    │                 │
+                    │ • Code exec     │    │ • TOML config   │
+                    │ • Shell cmds    │    │ • Env overrides │
+                    │ • Streaming     │    │ • Provider      │
+                    │ • Error hdlg    │    │   settings      │
+                    └─────────────────┘    └─────────────────┘
 ```
 
-### Module Breakdown
+## Core Components
 
-#### 1. CLI Module (`g3-cli`)
-- **Responsibility**: User interface and task interpretation
-- **New Features**:
-  - Progress indicators for script execution
+### 1. g3-core: Agent Engine
 
-#### 2. Core Engine (`g3-core`)
-- **Responsibility**: Task interpretation and code generation
-- **New Features**:
-  - Task analysis and decomposition
-  - Language selection based on task type
-  - Code generation with execution context
-  - Script template system
-  - Autonomous execution of generated code
+**Primary Responsibilities:**
+- Main orchestration logic for handling conversations and task execution
+- Context window management with intelligent token tracking
+- Built-in tool system for file operations and command execution
+- Streaming response parsing with real-time tool call detection
+- Error handling with automatic retry logic
 
-#### 3. LLM Providers (`g3-providers`)
-- **Responsibility**: LLM communication and model abstraction
-- **Supported Providers**:
-  - **OpenAI**: GPT-4, GPT-3.5-turbo via API
-  - **Anthropic**: Claude models via API  
-  - **Embedded**: Local open-weights models via llama.cpp
-- **Enhanced Prompts**:
-  - Code-first system prompts
-  - Language-specific generation instructions
+**Key Features:**
+- **Context Window Intelligence**: Automatic monitoring with percentage-based tracking (80% capacity triggers auto-summarization)
+- **Tool System**: Built-in tools for file operations (read, write, edit), shell commands, and structured output
+- **Streaming Parser**: Real-time parsing of LLM responses with tool call detection and execution
+- **Session Management**: Automatic session logging with detailed conversation history and token usage
+- **Error Recovery**: Sophisticated error classification and retry logic for recoverable errors
 
-#### 5. Embedded Provider (`g3-core/providers/embedded`) - NEW
-- **Responsibility**: Local model inference using llama.cpp
-- **Features**:
-  - GGUF model support (Llama, CodeLlama, Mistral, etc.)
-  - GPU acceleration via CUDA/Metal
-  - Configurable context length and generation parameters
-  - Async-compatible inference without blocking
-  - Thread-safe model access
-  - Stop sequence detection
+**Available Tools:**
+- `shell`: Execute shell commands with streaming output
+- `read_file`: Read file contents with optional character range support
+- `write_file`: Create or overwrite files with content
+- `str_replace`: Apply unified diffs to files with precise editing
+- `final_output`: Signal task completion with detailed summaries
+- **Project Management**: Workspace handling, requirements.md processing for autonomous mode
 
-#### 4. Execution Engine (`g3-execution`) - NEW
-- **Responsibility**: Safe code execution
-- **Features**:
-  - Multi-language script execution
-  - Sandboxing and security
-  - Resource limits
-  - Output capture and formatting
-  - Error handling and recovery
+### 2. g3-providers: LLM Provider Abstraction
 
-### Task Types and Language Selection
+**Primary Responsibilities:**
+- Unified interface for multiple LLM providers
+- Provider-specific optimizations and feature support
+- OAuth authentication flows
+- Streaming and non-streaming completion support
 
-| Task Type | Preferred Language | Use Cases |
-|-----------|-------------------|-----------|
-| Data Processing | Python | CSV/JSON analysis, data transformation |
-| File Operations | Bash/Shell | File manipulation, backups, organization |
-| System Admin | Bash/Shell | Process management, system monitoring |
-| Text Processing | Python/Bash | Log analysis, text transformation |
-| Database | Python/SQL | Data migration, queries, reporting |
-| Image/Media | Python | Image processing, format conversion |
-| Development | Rust | Code generation, project setup |
+**Supported Providers:**
+- **Anthropic**: Claude models via API with native tool calling support
+- **Databricks**: Foundation Model APIs with OAuth and token-based authentication (default provider)
+- **Embedded**: Local models via llama.cpp with GPU acceleration (Metal/CUDA)
+- **Provider Registry**: Dynamic provider management and hot-swapping
 
-## Implementation Plan
+**Key Features:**
+- **Native Tool Calling**: Full support for structured tool calls where available
+- **Fallback Parsing**: JSON tool call parsing for providers without native support
+- **OAuth Integration**: Built-in OAuth flow for secure provider authentication
+- **Context-Aware**: Provider-specific context length and token limit handling
+- **Streaming Support**: Real-time response streaming with tool call detection
 
-### Phase 1: Core Refactoring ✅
-1. ✅ Update CLI commands for task-oriented interface
-2. ✅ Enhance system prompts for code-first approach
-3. ✅ Add basic code execution capabilities
-4. ✅ Update interactive mode messaging
+### 3. g3-cli: Command-Line Interface
 
-### Phase 2: Enhanced Provider Support ✅
-1. ✅ Implement embedded model provider using llama.cpp
-2. ✅ Add GGUF model support for local inference
-3. ✅ Configure GPU acceleration and performance optimization
-4. ✅ Add comprehensive logging and debugging support
+**Primary Responsibilities:**
+- Command-line argument parsing and validation
+- Interactive terminal interface with history support
+- Retro-style terminal UI (80s sci-fi inspired)
+- Autonomous mode with coach-player feedback loops
+- Session management and workspace handling
 
-### Phase 3: Advanced Features (Future)
-1. Model quantization and optimization
-2. Multi-model ensemble support
-3. Advanced code execution sandboxing
-4. Plugin system for custom providers
-5. Web interface for remote access
+**Execution Modes:**
+- **Single-shot**: Execute one task and exit
+- **Interactive**: REPL-style conversation with the agent (default mode)
+- **Autonomous**: Coach-player feedback loop for complex projects
+- **Retro TUI**: Full-screen terminal interface with real-time updates
+
+**Key Features:**
+- **Multi-line Input**: Support for complex, multi-line prompts with backslash continuation
+- **Context Progress**: Real-time display of token usage and context window status
+- **Error Recovery**: Automatic retry logic for timeout and recoverable errors
+- **History Management**: Persistent command history across sessions
+- **Theme Support**: Customizable color themes for retro mode
+- **Cancellation**: Ctrl+C support for graceful operation cancellation
+
+### 4. g3-execution: Code Execution Engine
+
+**Primary Responsibilities:**
+- Safe execution of shell commands and scripts
+- Streaming output capture and display
+- Multi-language code execution support
+- Error handling and result formatting
+
+**Supported Execution:**
+- **Bash/Shell**: Direct command execution with streaming output (primary use case)
+- **Python**: Script execution via temporary files (legacy support)
+- **JavaScript**: Node.js-based execution (legacy support)
+
+**Key Features:**
+- **Streaming Output**: Real-time command output display
+- **Error Capture**: Comprehensive stderr and stdout handling
+- **Exit Code Tracking**: Proper success/failure detection
+- **Async Execution**: Non-blocking command execution
+- **Output Formatting**: Clean, user-friendly result presentation
+
+### 5. g3-config: Configuration Management
+
+**Primary Responsibilities:**
+- TOML-based configuration file management
+- Environment variable overrides
+- Provider-specific settings and credentials
+- CLI argument integration
+
+**Configuration Hierarchy:**
+1. Default configuration (Databricks provider with OAuth)
+2. Configuration files (`~/.config/g3/config.toml`, `./g3.toml`)
+3. Environment variables (`G3_*`)
+4. CLI arguments (highest priority)
+
+**Key Features:**
+- **Auto-generation**: Creates default configuration files if none exist
+- **Provider Overrides**: Runtime provider and model selection
+- **Validation**: Configuration validation with helpful error messages
+- **Flexible Paths**: Support for shell expansion (`~`, environment variables)
+
+## Advanced Features
+
+### Context Window Management
+
+G3 implements sophisticated context window management:
+
+- **Automatic Monitoring**: Tracks token usage with percentage-based thresholds
+- **Smart Summarization**: Auto-triggers at 80% capacity to prevent context overflow
+- **Conversation Preservation**: Maintains conversation continuity through intelligent summaries
+- **Provider-Specific Limits**: Adapts to different model context windows (4k to 200k+ tokens)
+- **Cumulative Tracking**: Monitors total token usage across entire sessions
+
+### Error Handling & Resilience
+
+Comprehensive error handling system:
+
+- **Error Classification**: Distinguishes between recoverable and non-recoverable errors
+- **Automatic Retry**: Exponential backoff with jitter for rate limits, timeouts, and server errors
+- **Detailed Logging**: Comprehensive error context including stack traces and session data
+- **Error Persistence**: Saves detailed error logs to `logs/errors/` for analysis
+- **Graceful Degradation**: Continues operation when possible, fails gracefully when not
+
+### Session Management
+
+Automatic session tracking and logging:
+
+- **Session IDs**: Generated based on initial prompts for easy identification
+- **Complete Logs**: Full conversation history, token usage, and timing data
+- **JSON Format**: Structured logs for easy parsing and analysis
+- **Automatic Cleanup**: Organized in `logs/` directory with timestamps
+- **Status Tracking**: Records session completion status (completed, cancelled, error)
+
+### Autonomous Mode
+
+Advanced autonomous operation with coach-player feedback:
+
+- **Requirements-Driven**: Reads `requirements.md` for project specifications
+- **Dual-Agent System**: Separate player (implementation) and coach (review) agents
+- **Iterative Improvement**: Multiple rounds of implementation and feedback
+- **Progress Tracking**: Detailed reporting of turns, token usage, and final status
+- **Workspace Management**: Automatic workspace setup and file organization
 
 ## Provider Comparison
 
-| Feature | OpenAI | Anthropic | Embedded |
-|---------|--------|-----------|----------|
+| Feature | Anthropic | Databricks (Default) | Embedded |
+|---------|-----------|------------|----------|
 | **Cost** | Pay per token | Pay per token | Free after download |
 | **Privacy** | Data sent to API | Data sent to API | Completely local |
 | **Performance** | Very fast | Very fast | Depends on hardware |
 | **Model Quality** | Excellent | Excellent | Good (varies by model) |
 | **Offline Support** | No | No | Yes |
-| **Setup Complexity** | API key only | API key only | Model download required |
+| **Setup Complexity** | API key only | OAuth or token | Model download required |
+| **Context Window** | 200k tokens | Varies by model | 4k-32k tokens |
+| **Tool Calling** | Native support | Native support | JSON fallback |
 | **Hardware Requirements** | None | None | 4-16GB RAM, optional GPU |
 
 ## Configuration Examples
 
-### Cloud-First Setup
+### Cloud-First Setup (Anthropic)
 ```toml
 [providers]
-default_provider = "openai"
+default_provider = "anthropic"
 
-[providers.openai]
-api_key = "sk-..."
-model = "gpt-4"
+[providers.anthropic]
+api_key = "sk-ant-..."
+model = "claude-3-5-sonnet-20241022"
+max_tokens = 8192
+temperature = 0.1
 ```
 
-### Privacy-First Setup  
+### Enterprise Setup (Databricks - Default)
+```toml
+[providers]
+default_provider = "databricks"
+
+[providers.databricks]
+host = "https://your-workspace.cloud.databricks.com"
+model = "databricks-claude-sonnet-4"
+max_tokens = 32000
+temperature = 0.1
+use_oauth = true
+```
+
+### Privacy-First Setup (Local Models)
 ```toml
 [providers]
 default_provider = "embedded"
 
 [providers.embedded]
-model_path = "~/.cache/g3/models/codellama-7b-instruct.Q4_K_M.gguf"
-model_type = "codellama"
+model_path = "~/.cache/g3/models/qwen2.5-7b-instruct-q3_k_m.gguf"
+model_type = "qwen"
+context_length = 32768
+max_tokens = 2048
+temperature = 0.1
 gpu_layers = 32
+threads = 8
 ```
 
 ### Hybrid Setup
@@ -159,14 +275,104 @@ gpu_layers = 32
 [providers]
 default_provider = "embedded"
 
-# Use embedded for most tasks
+# Local model for most tasks
 [providers.embedded]
 model_path = "~/.cache/g3/models/codellama-7b-instruct.Q4_K_M.gguf"
 model_type = "codellama"
+context_length = 16384
 gpu_layers = 32
 
-# Fallback to cloud for complex tasks
-[providers.openai]
-api_key = "sk-..."
-model = "gpt-4"
+# Cloud fallback for complex tasks
+[providers.anthropic]
+api_key = "sk-ant-..."
+model = "claude-3-5-sonnet-20241022"
 ```
+
+## Usage Examples
+
+### Single-Shot Mode
+```bash
+g3 "implement a fibonacci function in Rust"
+```
+
+### Interactive Mode
+```bash
+g3
+g3> read the README and suggest improvements
+g3> implement the suggestions you made
+```
+
+### Autonomous Mode
+```bash
+g3 --autonomous --max-turns 10
+# Reads requirements.md and implements iteratively
+```
+
+### Retro TUI Mode
+```bash
+g3 --retro --theme dracula
+# Full-screen terminal interface
+```
+
+## Implementation Details
+
+### Planned Features
+- **Plugin System**: Custom tool and provider plugins
+- **Web Interface**: Browser-based UI for remote access
+- **Model Quantization**: Optimized local model deployment
+- **Multi-Model Ensemble**: Combine multiple models for better results
+- **Advanced Sandboxing**: Enhanced security for code execution
+- **Collaborative Mode**: Multi-user sessions and shared workspaces
+
+### Technical Improvements
+- **Performance Optimization**: Faster streaming and tool execution
+- **Memory Management**: Better handling of large contexts and files
+- **Caching System**: Intelligent caching of model responses and computations
+- **Monitoring**: Built-in metrics and performance monitoring
+- **Testing**: Comprehensive test suite and CI/CD integration
+
+## Development Guidelines
+
+### Code Organization
+- **Modular Design**: Each crate has a single, well-defined responsibility
+- **Trait-Based**: Use traits for abstraction and testability
+- **Error Handling**: Comprehensive error types with context
+- **Documentation**: Inline docs and examples for all public APIs
+- **Testing**: Unit tests, integration tests, and property-based testing
+
+### Performance Considerations
+- **Async-First**: All I/O operations are asynchronous (Tokio runtime)
+- **Streaming**: Real-time response processing where possible
+- **Memory Efficiency**: Careful memory management for large contexts
+- **Caching**: Strategic caching of expensive operations
+- **Profiling**: Regular performance profiling and optimization
+
+This design document reflects the current state of G3 as a mature, production-ready AI coding agent with sophisticated architecture and comprehensive feature set.
+
+## Current Implementation Status
+
+### Fully Implemented
+- ✅ **Core Agent Engine**: Complete with streaming, tool execution, and context management
+- ✅ **Provider System**: Anthropic, Databricks, and Embedded providers with OAuth support
+- ✅ **Tool System**: All 5 core tools (shell, read_file, write_file, str_replace, final_output)
+- ✅ **CLI Interface**: Interactive mode, single-shot mode, retro TUI
+- ✅ **Autonomous Mode**: Coach-player feedback loop with requirements.md processing
+- ✅ **Configuration**: TOML-based config with environment overrides
+- ✅ **Error Handling**: Comprehensive retry logic and error classification
+- ✅ **Session Logging**: Automatic session tracking and JSON logs
+- ✅ **Context Management**: Auto-summarization at 80% capacity
+
+### Architecture Highlights
+- **Workspace**: 5 crates with clear separation of concerns
+- **Dependencies**: Modern Rust ecosystem (Tokio, Clap, Serde, etc.)
+- **Streaming**: Real-time response processing with tool call detection
+- **Cross-Platform**: Works on macOS, Linux, and Windows
+- **GPU Support**: Metal acceleration for local models on macOS
+
+### Key Files
+- `src/main.rs`: main entry point delegating to g3-cli
+- `crates/g3-core/src/lib.rs`: main agent implementation
+- `crates/g3-cli/src/lib.rs`: CLI and interaction modes
+- `crates/g3-providers/src/lib.rs`: provider trait and registry
+- `crates/g3-config/src/lib.rs`: configuration management
+- `crates/g3-execution/src/lib.rs`: code execution engine

README.md

@@ -1,3 +1,134 @@
-# G3
+# G3 - AI Coding Agent
 
-An experiment in a code-first AI agent that helps you complete tasks by writing and executing code.
+G3 is a coding AI agent designed to help you complete tasks by writing code and executing commands. Built in Rust, it provides a flexible architecture for interacting with various Large Language Model (LLM) providers while offering powerful code generation and task automation capabilities.
+
+## Architecture Overview
+
+G3 follows a modular architecture organized as a Rust workspace with multiple crates, each responsible for specific functionality:
+
+### Core Components
+
+#### **g3-core**
+The heart of the agent system, containing:
+- **Agent Engine**: Main orchestration logic for handling conversations, tool execution, and task management
+- **Context Window Management**: Intelligent tracking of token usage with auto-summarization capabilities when approaching context limits (~80% capacity)
+- **Tool System**: Built-in tools for file operations (read, write, edit), shell command execution, and structured output generation
+- **Streaming Response Parser**: Real-time parsing of LLM responses with tool call detection and execution
+- **Task Execution**: Support for single and iterative task execution with automatic retry logic
+
+#### **g3-providers**
+Abstraction layer for LLM providers:
+- **Provider Interface**: Common trait-based API for different LLM backends
+- **Multiple Provider Support**: 
+  - Anthropic (Claude models)
+  - Databricks (DBRX and other models)
+  - Local/embedded models via llama.cpp with Metal acceleration on macOS
+- **OAuth Authentication**: Built-in OAuth flow support for secure provider authentication
+- **Provider Registry**: Dynamic provider management and selection
+
+#### **g3-config**
+Configuration management system:
+- Environment-based configuration
+- Provider credentials and settings
+- Model selection and parameters
+- Runtime configuration options
+
+#### **g3-execution**
+Task execution framework:
+- Task planning and decomposition
+- Execution strategies (sequential, parallel)
+- Error handling and retry mechanisms
+- Progress tracking and reporting
+
+#### **g3-cli**
+Command-line interface:
+- Interactive terminal interface
+- Task submission and monitoring
+- Configuration management commands
+- Session management
+
+### Error Handling & Resilience
+
+G3 includes robust error handling with automatic retry logic:
+- **Recoverable Error Detection**: Automatically identifies recoverable errors (rate limits, network issues, server errors, timeouts)
+- **Exponential Backoff with Jitter**: Implements intelligent retry delays to avoid overwhelming services
+- **Detailed Error Logging**: Captures comprehensive error context including stack traces, request/response data, and session information
+- **Error Persistence**: Saves detailed error logs to `logs/errors/` for post-mortem analysis
+- **Graceful Degradation**: Non-recoverable errors are logged with full context before terminating
+
+## Key Features
+
+### Intelligent Context Management
+- Automatic context window monitoring with percentage-based tracking
+- Smart auto-summarization when approaching token limits
+- Conversation history preservation through summaries
+- Dynamic token allocation for different providers
+
+### Tool Ecosystem
+- **File Operations**: Read, write, and edit files with line-range precision
+- **Shell Integration**: Execute system commands with output capture
+- **Code Generation**: Structured code generation with syntax awareness
+- **Final Output**: Formatted result presentation
+
+### Provider Flexibility
+- Support for multiple LLM providers through a unified interface
+- Hot-swappable providers without code changes
+- Provider-specific optimizations and feature support
+- Local model support for offline operation
+
+### Task Automation
+- Single-shot task execution for quick operations
+- Iterative task mode for complex, multi-step workflows
+- Automatic error recovery and retry logic
+- Progress tracking and intermediate result handling
+
+## Language & Technology Stack
+
+- **Language**: Rust (2021 edition)
+- **Async Runtime**: Tokio for concurrent operations
+- **HTTP Client**: Reqwest for API communications
+- **Serialization**: Serde for JSON handling
+- **CLI Framework**: Clap for command-line parsing
+- **Logging**: Tracing for structured logging
+- **Local Models**: llama.cpp with Metal acceleration support
+
+## Use Cases
+
+G3 is designed for:
+- Automated code generation and refactoring
+- File manipulation and project scaffolding
+- System administration tasks
+- Data processing and transformation
+- API integration and testing
+- Documentation generation
+- Complex multi-step workflows
+
+## Getting Started
+
+```bash
+# Build the project
+cargo build --release
+
+# Run G3
+cargo run
+
+# Execute a task
+g3 "implement a function to calculate fibonacci numbers"
+```
+
+## Session Logs
+
+G3 automatically saves session logs for each interaction in the `logs/` directory. These logs contain:
+- Complete conversation history
+- Token usage statistics
+- Timestamps and session status
+
+The `logs/` directory is created automatically on first use and is excluded from version control.
+
+## License
+
+MIT License - see LICENSE file for details
+
+## Contributing
+
+G3 is an open-source project. Contributions are welcome! Please see CONTRIBUTING.md for guidelines.

TODO

@@ -0,0 +1,19 @@
+next tasks
+
+x get something working with autonomous mode
+- g3d
+- bug where it prints everything in a conversation turn all over again before final_output
+x ui abstraction from core
+- context token counting bug
+- embedded model
+  - prompt rewriting
+  - generates status messages "ruffling feathers..."
+  - project description?
+- treesitter + friends
+x error where it just gives up turn
+- "project" behaviors (read readme first)
+- advance project mgmt
+  - git for reverting
+  - swarm
+  - ui tests / computer controller
+

config.example.toml

@@ -1,36 +1,13 @@
-# Example configuration file for G3
-# Copy to ~/.config/g3/config.toml and customize
-
 [providers]
-default_provider = "embedded"
+default_provider = "databricks"
 
-[providers.openai]
-# Get your API key from https://platform.openai.com/api-keys
-api_key = "sk-your-openai-api-key-here"
-model = "gpt-4"
-# Optional: custom base URL for OpenAI-compatible APIs
-# base_url = "https://api.openai.com/v1"
-max_tokens = 2048
-temperature = 0.1
-
-[providers.anthropic]
-# Get your API key from https://console.anthropic.com/
-api_key = "your-anthropic-api-key-here"
-model = "claude-3-5-sonnet-20241022"
+[providers.databricks]
+host = "https://your-workspace.cloud.databricks.com"
+# token = "your-databricks-token"  # Optional - will use OAuth if not provided
+model = "databricks-claude-sonnet-4"
 max_tokens = 4096
 temperature = 0.1
-
-[providers.embedded]
-# Path to your GGUF model file
-model_path = "~/.cache/g3/models/codellama-7b-instruct.Q4_K_M.gguf"
-model_type = "codellama"
-context_length = 16384  # Use CodeLlama's full context capability
-max_tokens = 2048  # Default fallback, but will be calculated dynamically
-temperature = 0.1
-# Number of layers to offload to GPU (0 for CPU only)
-gpu_layers = 32
-# Number of CPU threads to use
-threads = 8
+use_oauth = true
 
 [agent]
 max_context_length = 8192

crates/g3-cli/Cargo.toml

@@ -12,9 +12,13 @@ tokio = { workspace = true }
 anyhow = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-serde = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 rustyline = "17.0.1"
 dirs = "5.0"
 tokio-util = "0.7"
 indicatif = "0.17"
+chrono = { version = "0.4", features = ["serde"] }
+crossterm = "0.29.0"
+ratatui = "0.29"
+termimad = "0.34.0"

crates/g3-cli/src/theme.rs

@@ -0,0 +1,147 @@
+use ratatui::style::Color;
+use serde::{Deserialize, Serialize};
+use std::fs;
+use std::path::Path;
+use anyhow::Result;
+
+/// Color theme configuration for the retro TUI
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ColorTheme {
+    /// Name of the theme
+    pub name: String,
+    
+    /// Main terminal text color (for general output)
+    pub terminal_green: ColorValue,
+    
+    /// Warning/system messages color
+    pub terminal_amber: ColorValue,
+    
+    /// Border and dim text color
+    pub terminal_dim_green: ColorValue,
+    
+    /// Background color
+    pub terminal_bg: ColorValue,
+    
+    /// Highlight/emphasis color
+    pub terminal_cyan: ColorValue,
+    
+    /// Error/negative diff color
+    pub terminal_red: ColorValue,
+    
+    /// READY status color
+    pub terminal_pale_blue: ColorValue,
+    
+    /// PROCESSING status color
+    pub terminal_dark_amber: ColorValue,
+    
+    /// Bright/punchy text color
+    pub terminal_white: ColorValue,
+    
+    /// Success status color (for tool completions)
+    pub terminal_success: ColorValue,
+}
+
+/// Represents a color value that can be serialized/deserialized
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum ColorValue {
+    /// RGB color with r, g, b components
+    Rgb { r: u8, g: u8, b: u8 },
+    /// Named color
+    Named(String),
+}
+
+impl ColorValue {
+    /// Convert to ratatui Color
+    pub fn to_color(&self) -> Color {
+        match self {
+            ColorValue::Rgb { r, g, b } => Color::Rgb(*r, *g, *b),
+            ColorValue::Named(name) => match name.to_lowercase().as_str() {
+                "black" => Color::Black,
+                "red" => Color::Red,
+                "green" => Color::Green,
+                "yellow" => Color::Yellow,
+                "blue" => Color::Blue,
+                "magenta" => Color::Magenta,
+                "cyan" => Color::Cyan,
+                "gray" | "grey" => Color::Gray,
+                "darkgray" | "darkgrey" => Color::DarkGray,
+                "lightred" => Color::LightRed,
+                "lightgreen" => Color::LightGreen,
+                "lightyellow" => Color::LightYellow,
+                "lightblue" => Color::LightBlue,
+                "lightmagenta" => Color::LightMagenta,
+                "lightcyan" => Color::LightCyan,
+                "white" => Color::White,
+                _ => Color::White, // Default fallback
+            },
+        }
+    }
+}
+
+impl ColorTheme {
+    /// Load a theme from a JSON file
+    pub fn from_file<P: AsRef<Path>>(path: P) -> Result<Self> {
+        let content = fs::read_to_string(path)?;
+        let theme: ColorTheme = serde_json::from_str(&content)?;
+        Ok(theme)
+    }
+    
+    /// Get the default retro sci-fi theme (inspired by Alien terminals)
+    pub fn default() -> Self {
+        ColorTheme {
+            name: "Retro Sci-Fi".to_string(),
+            terminal_green: ColorValue::Rgb { r: 136, g: 244, b: 152 },
+            terminal_amber: ColorValue::Rgb { r: 242, g: 204, b: 148 },
+            terminal_dim_green: ColorValue::Rgb { r: 154, g: 174, b: 135 },
+            terminal_bg: ColorValue::Rgb { r: 0, g: 10, b: 0 },
+            terminal_cyan: ColorValue::Rgb { r: 0, g: 255, b: 255 },
+            terminal_red: ColorValue::Rgb { r: 239, g: 119, b: 109 },
+            terminal_pale_blue: ColorValue::Rgb { r: 173, g: 234, b: 251 },
+            terminal_dark_amber: ColorValue::Rgb { r: 204, g: 119, b: 34 },
+            terminal_white: ColorValue::Rgb { r: 218, g: 218, b: 219 },
+            terminal_success: ColorValue::Rgb { r: 136, g: 244, b: 152 }, // Same as terminal_green for retro theme
+        }
+    }
+    
+    /// Get the Dracula theme
+    pub fn dracula() -> Self {
+        ColorTheme {
+            name: "Dracula".to_string(),
+            terminal_green: ColorValue::Rgb { r: 248, g: 248, b: 242 }, // Use Dracula foreground (white) for main text
+            terminal_amber: ColorValue::Rgb { r: 255, g: 184, b: 108 }, // Dracula orange
+            terminal_dim_green: ColorValue::Rgb { r: 98, g: 114, b: 164 }, // Dracula comment
+            terminal_bg: ColorValue::Rgb { r: 40, g: 42, b: 54 },      // Dracula background
+            terminal_cyan: ColorValue::Rgb { r: 139, g: 233, b: 253 },  // Dracula cyan
+            terminal_red: ColorValue::Rgb { r: 255, g: 85, b: 85 },     // Dracula red
+            terminal_pale_blue: ColorValue::Rgb { r: 189, g: 147, b: 249 }, // Dracula purple
+            terminal_dark_amber: ColorValue::Rgb { r: 255, g: 121, b: 198 }, // Dracula pink
+            terminal_white: ColorValue::Rgb { r: 248, g: 248, b: 242 }, // Dracula foreground
+            terminal_success: ColorValue::Rgb { r: 80, g: 250, b: 123 }, // Dracula green for success
+        }
+    }
+    
+    /// Get a theme by name or from file
+    pub fn load(theme_name: Option<&str>) -> Result<Self> {
+        match theme_name {
+            None => Ok(Self::default()),
+            Some("default") | Some("retro") => Ok(Self::default()),
+            Some("dracula") => Ok(Self::dracula()),
+            Some(path) => {
+                // Try to load from file
+                if Path::new(path).exists() {
+                    Self::from_file(path)
+                } else {
+                    // Try to find in standard locations
+                    let home = dirs::home_dir().ok_or_else(|| anyhow::anyhow!("Could not find home directory"))?;
+                    let theme_file = home.join(".config").join("g3").join("themes").join(format!("{}.json", path));
+                    if theme_file.exists() {
+                        Self::from_file(theme_file)
+                    } else {
+                        Err(anyhow::anyhow!("Theme '{}' not found", path))
+                    }
+                }
+            }
+        }
+    }
+}

crates/g3-cli/src/tui.rs

@@ -0,0 +1,126 @@
+use crossterm::style::Color;
+use crossterm::style::{SetForegroundColor, ResetColor};
+use termimad::MadSkin;
+
+/// Simple output handler with markdown support
+pub struct SimpleOutput {
+    mad_skin: MadSkin,
+}
+
+impl SimpleOutput {
+    pub fn new() -> Self {
+        let mut mad_skin = MadSkin::default();
+        // Dracula color scheme
+        // Background: #282a36, Foreground: #f8f8f2
+        // Colors: Cyan #8be9fd, Green #50fa7b, Orange #ffb86c, Pink #ff79c6, Purple #bd93f9, Red #ff5555, Yellow #f1fa8c
+        
+        mad_skin.set_headers_fg(Color::Rgb { r: 189, g: 147, b: 249 }); // Purple for headers
+        mad_skin.bold.set_fg(Color::Rgb { r: 255, g: 121, b: 198 });    // Pink for bold
+        mad_skin.italic.set_fg(Color::Rgb { r: 139, g: 233, b: 253 });  // Cyan for italic
+        mad_skin.code_block.set_bg(Color::Rgb { r: 68, g: 71, b: 90 }); // Dracula background variant
+        mad_skin.code_block.set_fg(Color::Rgb { r: 80, g: 250, b: 123 }); // Green for code text
+        mad_skin.inline_code.set_bg(Color::Rgb { r: 68, g: 71, b: 90 }); // Same background for inline code
+        mad_skin.inline_code.set_fg(Color::Rgb { r: 241, g: 250, b: 140 }); // Yellow for inline code
+        mad_skin.quote_mark.set_fg(Color::Rgb { r: 98, g: 114, b: 164 }); // Comment purple for quote marks
+        mad_skin.strikeout.set_fg(Color::Rgb { r: 255, g: 85, b: 85 });  // Red for strikethrough
+        
+        Self { mad_skin }
+    }
+
+    /// Detect if text contains markdown formatting
+    fn has_markdown(&self, text: &str) -> bool {
+        // Check for common markdown patterns
+        text.contains("**") ||
+        text.contains("```") ||
+        text.contains("`") ||
+        text.lines().any(|line| {
+            let trimmed = line.trim();
+            trimmed.starts_with('#') ||
+            trimmed.starts_with("- ") ||
+            trimmed.starts_with("* ") ||
+            trimmed.starts_with("+ ") ||
+            (trimmed.len() > 2 && 
+             trimmed.chars().next().map_or(false, |c| c.is_ascii_digit()) &&
+             trimmed.chars().nth(1) == Some('.') &&
+             trimmed.chars().nth(2) == Some(' ')) ||
+            (trimmed.contains('[') && trimmed.contains("]("))
+        }) ||
+        (text.matches('*').count() >= 2 && !text.contains("/*") && !text.contains("*/"))
+    }
+
+    pub fn print(&self, text: &str) {
+        println!("{}", text);
+    }
+
+    /// Smart print that automatically detects and renders markdown
+    pub fn print_smart(&self, text: &str) {
+        if self.has_markdown(text) {
+            self.print_markdown(text);
+        } else {
+            self.print(text);
+        }
+    }
+
+    pub fn print_markdown(&self, markdown: &str) {
+        self.mad_skin.print_text(markdown);
+    }
+
+    pub fn _print_status(&self, status: &str) {
+        println!("📊 {}", status);
+    }
+
+    pub fn print_context(&self, used: u32, total: u32, percentage: f32) {
+        let bar_width: usize = 10;
+        let filled_width = ((percentage / 100.0) * bar_width as f32) as usize;
+        let empty_width = bar_width.saturating_sub(filled_width);
+
+        let filled_chars = "●".repeat(filled_width);
+        let empty_chars = "○".repeat(empty_width);
+        
+        // Determine color based on percentage
+        let color = if percentage < 60.0 {
+            crossterm::style::Color::Green
+        } else if percentage < 80.0 {
+            crossterm::style::Color::Yellow
+        } else {
+            crossterm::style::Color::Red
+        };
+
+        // Print with colored progress bar
+        print!("Context: ");
+        print!("{}", SetForegroundColor(color));
+        print!("{}{}", filled_chars, empty_chars);
+        print!("{}", ResetColor);
+        println!(" {:.1}% | {}/{} tokens", percentage, used, total);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_markdown_detection() {
+        let output = SimpleOutput::new();
+        
+        // Should detect markdown
+        assert!(output.has_markdown("**bold text**"));
+        assert!(output.has_markdown("`code`"));
+        assert!(output.has_markdown("```\ncode block\n```"));
+        assert!(output.has_markdown("# Header"));
+        assert!(output.has_markdown("- list item"));
+        assert!(output.has_markdown("* list item"));
+        assert!(output.has_markdown("+ list item"));
+        assert!(output.has_markdown("1. numbered item"));
+        assert!(output.has_markdown("[link](url)"));
+        assert!(output.has_markdown("*italic* text"));
+        
+        // Should NOT detect markdown
+        assert!(!output.has_markdown("plain text"));
+        assert!(!output.has_markdown("file.txt"));
+        assert!(!output.has_markdown("/* comment */"));
+        assert!(!output.has_markdown("just one * asterisk"));
+        assert!(!output.has_markdown("📁 Workspace: /path/to/dir"));
+        assert!(!output.has_markdown("✅ Success message"));
+    }
+}

crates/g3-cli/src/ui_writer_impl.rs

@@ -0,0 +1,405 @@
+use crate::retro_tui::RetroTui;
+use g3_core::ui_writer::UiWriter;
+use std::io::{self, Write};
+use std::sync::Mutex;
+use std::time::Instant;
+
+/// Console implementation of UiWriter that prints to stdout
+pub struct ConsoleUiWriter {
+    current_tool_name: Mutex<Option<String>>,
+    current_tool_args: Mutex<Vec<(String, String)>>,
+    current_output_line: Mutex<Option<String>>,
+    output_line_printed: Mutex<bool>,
+}
+
+impl ConsoleUiWriter {
+    pub fn new() -> Self {
+        Self {
+            current_tool_name: Mutex::new(None),
+            current_tool_args: Mutex::new(Vec::new()),
+            current_output_line: Mutex::new(None),
+            output_line_printed: Mutex::new(false),
+        }
+    }
+}
+
+impl UiWriter for ConsoleUiWriter {
+    fn print(&self, message: &str) {
+        print!("{}", message);
+    }
+
+    fn println(&self, message: &str) {
+        println!("{}", message);
+    }
+
+    fn print_inline(&self, message: &str) {
+        print!("{}", message);
+        let _ = io::stdout().flush();
+    }
+
+    fn print_system_prompt(&self, prompt: &str) {
+        println!("🔍 System Prompt:");
+        println!("================");
+        println!("{}", prompt);
+        println!("================");
+        println!();
+    }
+
+    fn print_context_status(&self, message: &str) {
+        println!("{}", message);
+    }
+
+    fn print_tool_header(&self, tool_name: &str) {
+        // Store the tool name and clear args for collection
+        *self.current_tool_name.lock().unwrap() = Some(tool_name.to_string());
+        self.current_tool_args.lock().unwrap().clear();
+    }
+
+    fn print_tool_arg(&self, key: &str, value: &str) {
+        // Collect arguments instead of printing immediately
+        // Filter out any keys that look like they might be agent message content
+        // (e.g., keys that are suspiciously long or contain message-like content)
+        let is_valid_arg_key = key.len() < 50
+            && !key.contains('\n')
+            && !key.contains("I'll")
+            && !key.contains("Let me")
+            && !key.contains("Here's")
+            && !key.contains("I can");
+
+        if is_valid_arg_key {
+            self.current_tool_args
+                .lock()
+                .unwrap()
+                .push((key.to_string(), value.to_string()));
+        }
+    }
+
+    fn print_tool_output_header(&self) {
+        println!();
+        // Now print the tool header with the most important arg in bold green
+        if let Some(tool_name) = self.current_tool_name.lock().unwrap().as_ref() {
+            let args = self.current_tool_args.lock().unwrap();
+
+            // Find the most important argument - prioritize file_path if available
+            let important_arg = args
+                .iter()
+                .find(|(k, _)| k == "file_path")
+                .or_else(|| args.iter().find(|(k, _)| k == "command" || k == "path"))
+                .or_else(|| args.first());
+
+            if let Some((_, value)) = important_arg {
+                // For multi-line values, only show the first line
+                let first_line = value.lines().next().unwrap_or("");
+
+                // Truncate long values for display
+                let display_value = if first_line.len() > 80 {
+                    format!("{}...", &first_line[..77])
+                } else {
+                    first_line.to_string()
+                };
+
+                // Add range information for read_file tool calls
+                let header_suffix = if tool_name == "read_file" {
+                    // Check if start or end parameters are present
+                    let has_start = args.iter().any(|(k, _)| k == "start");
+                    let has_end = args.iter().any(|(k, _)| k == "end");
+                    
+                    if has_start || has_end {
+                        let start_val = args.iter().find(|(k, _)| k == "start").map(|(_, v)| v.as_str()).unwrap_or("0");
+                        let end_val = args.iter().find(|(k, _)| k == "end").map(|(_, v)| v.as_str()).unwrap_or("end");
+                        format!(" [{}..{}]", start_val, end_val)
+                    } else {
+                        String::new()
+                    }
+                } else {
+                    String::new()
+                };
+
+                // Print with bold green formatting using ANSI escape codes
+                println!("┌─\x1b[1;32m {} | {}{}\x1b[0m", tool_name, display_value, header_suffix);
+            } else {
+                // Print with bold green formatting using ANSI escape codes
+                println!("┌─\x1b[1;32m {}\x1b[0m", tool_name);
+            }
+        }
+    }
+
+    fn update_tool_output_line(&self, line: &str) {
+        let mut current_line = self.current_output_line.lock().unwrap();
+        let mut line_printed = self.output_line_printed.lock().unwrap();
+
+        // If we've already printed a line, clear it first
+        if *line_printed {
+            // Move cursor up one line and clear it
+            print!("\x1b[1A\x1b[2K");
+        }
+
+        // Print the new line
+        println!("│ \x1b[2m{}\x1b[0m", line);
+        let _ = io::stdout().flush();
+
+        // Update state
+        *current_line = Some(line.to_string());
+        *line_printed = true;
+    }
+
+    fn print_tool_output_line(&self, line: &str) {
+        println!("│ \x1b[2m{}\x1b[0m", line);
+    }
+
+    fn print_tool_output_summary(&self, count: usize) {
+        println!(
+            "│ \x1b[2m({} line{})\x1b[0m",
+            count,
+            if count == 1 { "" } else { "s" }
+        );
+    }
+
+    fn print_tool_timing(&self, duration_str: &str) {
+        println!("└─ ⚡️ {}", duration_str);
+        println!();
+        // Clear the stored tool info
+        *self.current_tool_name.lock().unwrap() = None;
+        self.current_tool_args.lock().unwrap().clear();
+        *self.current_output_line.lock().unwrap() = None;
+        *self.output_line_printed.lock().unwrap() = false;
+    }
+
+    fn print_agent_prompt(&self) {
+        let _ = io::stdout().flush();
+    }
+
+    fn print_agent_response(&self, content: &str) {
+        print!("{}", content);
+        let _ = io::stdout().flush();
+    }
+
+    fn notify_sse_received(&self) {
+        // No-op for console - we don't track SSEs in console mode
+    }
+
+    fn flush(&self) {
+        let _ = io::stdout().flush();
+    }
+}
+
+/// RetroTui implementation of UiWriter that sends output to the TUI
+pub struct RetroTuiWriter {
+    tui: RetroTui,
+    current_tool_name: Mutex<Option<String>>,
+    current_tool_output: Mutex<Vec<String>>,
+    current_tool_start: Mutex<Option<Instant>>,
+    current_tool_caption: Mutex<String>,
+}
+
+impl RetroTuiWriter {
+    pub fn new(tui: RetroTui) -> Self {
+        Self {
+            tui,
+            current_tool_name: Mutex::new(None),
+            current_tool_output: Mutex::new(Vec::new()),
+            current_tool_start: Mutex::new(None),
+            current_tool_caption: Mutex::new(String::new()),
+        }
+    }
+}
+
+impl UiWriter for RetroTuiWriter {
+    fn print(&self, message: &str) {
+        self.tui.output(message);
+    }
+
+    fn println(&self, message: &str) {
+        self.tui.output(message);
+    }
+
+    fn print_inline(&self, message: &str) {
+        // For inline printing, we'll just append to the output
+        self.tui.output(message);
+    }
+
+    fn print_system_prompt(&self, prompt: &str) {
+        self.tui.output("🔍 System Prompt:");
+        self.tui.output("================");
+        for line in prompt.lines() {
+            self.tui.output(line);
+        }
+        self.tui.output("================");
+        self.tui.output("");
+    }
+
+    fn print_context_status(&self, message: &str) {
+        self.tui.output(message);
+    }
+
+    fn print_tool_header(&self, tool_name: &str) {
+        // Start collecting tool output
+        *self.current_tool_start.lock().unwrap() = Some(Instant::now());
+        *self.current_tool_name.lock().unwrap() = Some(tool_name.to_string());
+        self.current_tool_output.lock().unwrap().clear();
+        self.current_tool_output
+            .lock()
+            .unwrap()
+            .push(format!("Tool: {}", tool_name));
+
+        // Initialize caption
+        *self.current_tool_caption.lock().unwrap() = String::new();
+    }
+
+    fn print_tool_arg(&self, key: &str, value: &str) {
+        // Filter out any keys that look like they might be agent message content
+        // (e.g., keys that are suspiciously long or contain message-like content)
+        let is_valid_arg_key = key.len() < 50
+            && !key.contains('\n')
+            && !key.contains("I'll")
+            && !key.contains("Let me")
+            && !key.contains("Here's")
+            && !key.contains("I can");
+
+        if is_valid_arg_key {
+            self.current_tool_output
+                .lock()
+                .unwrap()
+                .push(format!("{}: {}", key, value));
+        }
+
+        // Build caption from first argument (usually the most important one)
+        let mut caption = self.current_tool_caption.lock().unwrap();
+        if caption.is_empty() && (key == "file_path" || key == "command" || key == "path") {
+            // Truncate long values for the caption
+            let truncated = if value.len() > 50 {
+                format!("{}...", &value[..47])
+            } else {
+                value.to_string()
+            };
+            
+            // Add range information for read_file tool calls
+            let tool_name = self.current_tool_name.lock().unwrap();
+            let range_suffix = if tool_name.as_ref().map_or(false, |name| name == "read_file") {
+                // We need to check if start/end args will be provided - for now just check if this is a partial read
+                // This is a simplified approach since we're building the caption incrementally
+                String::new() // We'll handle this in print_tool_output_header instead
+            } else {
+                String::new()
+            };
+            
+            *caption = format!("{}{}", truncated, range_suffix);
+        }
+    }
+
+    fn print_tool_output_header(&self) {
+        // This is called right before tool execution starts
+        // Send the initial tool header to the TUI now
+        if let Some(tool_name) = self.current_tool_name.lock().unwrap().as_ref() {
+            let mut caption = self.current_tool_caption.lock().unwrap().clone();
+            
+            // Add range information for read_file tool calls
+            if tool_name == "read_file" {
+                // Check the tool output for start/end parameters
+                let output = self.current_tool_output.lock().unwrap();
+                let has_start = output.iter().any(|line| line.starts_with("start:"));
+                let has_end = output.iter().any(|line| line.starts_with("end:"));
+                
+                if has_start || has_end {
+                    let start_val = output.iter().find(|line| line.starts_with("start:")).map(|line| line.split(':').nth(1).unwrap_or("0").trim()).unwrap_or("0");
+                    let end_val = output.iter().find(|line| line.starts_with("end:")).map(|line| line.split(':').nth(1).unwrap_or("end").trim()).unwrap_or("end");
+                    caption = format!("{} [{}..{}]", caption, start_val, end_val);
+                }
+            }
+
+            // Send the tool output with initial header
+            self.tui.tool_output(tool_name, &caption, "");
+        }
+
+        self.current_tool_output.lock().unwrap().push(String::new());
+        self.current_tool_output
+            .lock()
+            .unwrap()
+            .push("Output:".to_string());
+    }
+
+    fn update_tool_output_line(&self, line: &str) {
+        // For retro mode, we'll just add to the output buffer
+        self.current_tool_output
+            .lock()
+            .unwrap()
+            .push(line.to_string());
+    }
+
+    fn print_tool_output_line(&self, line: &str) {
+        self.current_tool_output
+            .lock()
+            .unwrap()
+            .push(line.to_string());
+    }
+
+    fn print_tool_output_summary(&self, hidden_count: usize) {
+        self.current_tool_output.lock().unwrap().push(format!(
+            "... ({} more line{})",
+            hidden_count,
+            if hidden_count == 1 { "" } else { "s" }
+        ));
+    }
+
+    fn print_tool_timing(&self, duration_str: &str) {
+        self.current_tool_output
+            .lock()
+            .unwrap()
+            .push(format!("⚡️ {}", duration_str));
+
+        // Calculate the actual duration
+        let duration_ms = if let Some(start) = *self.current_tool_start.lock().unwrap() {
+            start.elapsed().as_millis()
+        } else {
+            0
+        };
+
+        // Get the tool name and caption
+        if let Some(tool_name) = self.current_tool_name.lock().unwrap().as_ref() {
+            let content = self.current_tool_output.lock().unwrap().join("\n");
+            let caption = self.current_tool_caption.lock().unwrap().clone();
+            let caption = if caption.is_empty() {
+                "Completed".to_string()
+            } else {
+                caption
+            };
+
+            // Update the tool detail panel with the complete output without adding a new header
+            // This keeps the original header in place to be updated by tool_complete
+            self.tui.update_tool_detail(tool_name, &content);
+
+            // Determine success based on whether there's an error in the output
+            // This is a simple heuristic - you might want to make this more sophisticated
+            let success = !content.contains("error")
+                && !content.contains("Error")
+                && !content.contains("ERROR");
+
+            // Send the completion status to update the header
+            self.tui
+                .tool_complete(tool_name, success, duration_ms, &caption);
+        }
+
+        // Clear the buffers
+        *self.current_tool_name.lock().unwrap() = None;
+        self.current_tool_output.lock().unwrap().clear();
+        *self.current_tool_start.lock().unwrap() = None;
+        *self.current_tool_caption.lock().unwrap() = String::new();
+    }
+
+    fn print_agent_prompt(&self) {
+        self.tui.output("\n💬 ");
+    }
+
+    fn print_agent_response(&self, content: &str) {
+        self.tui.output(content);
+    }
+
+    fn notify_sse_received(&self) {
+        // Notify the TUI that an SSE was received
+        self.tui.sse_received();
+    }
+
+    fn flush(&self) {
+        // No-op for TUI since it handles its own rendering
+    }
+}

crates/g3-config/src/lib.rs

@@ -12,6 +12,7 @@ pub struct Config {
 pub struct ProvidersConfig {
     pub openai: Option<OpenAIConfig>,
     pub anthropic: Option<AnthropicConfig>,
+    pub databricks: Option<DatabricksConfig>,
     pub embedded: Option<EmbeddedConfig>,
     pub default_provider: String,
 }
@@ -33,6 +34,16 @@ pub struct AnthropicConfig {
     pub temperature: Option<f32>,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DatabricksConfig {
+    pub host: String,
+    pub token: Option<String>, // Optional - will use OAuth if not provided
+    pub model: String,
+    pub max_tokens: Option<u32>,
+    pub temperature: Option<f32>,
+    pub use_oauth: Option<bool>, // Default to true if token not provided
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct EmbeddedConfig {
     pub model_path: String,
@@ -57,8 +68,16 @@ impl Default for Config {
             providers: ProvidersConfig {
                 openai: None,
                 anthropic: None,
+                databricks: Some(DatabricksConfig {
+                    host: "https://your-workspace.cloud.databricks.com".to_string(),
+                    token: None, // Will use OAuth by default
+                    model: "databricks-claude-sonnet-4".to_string(),
+                    max_tokens: Some(4096),
+                    temperature: Some(0.1),
+                    use_oauth: Some(true),
+                }),
                 embedded: None,
-                default_provider: "anthropic".to_string(),
+                default_provider: "databricks".to_string(),
             },
             agent: AgentConfig {
                 max_context_length: 8192,
@@ -88,9 +107,9 @@ impl Config {
             })
         };
         
-        // If no config exists, create and save a default Qwen config
+        // If no config exists, create and save a default Databricks config
         if !config_exists {
-            let qwen_config = Self::default_qwen_config();
+            let databricks_config = Self::default();
             
             // Save to default location
             let config_dir = dirs::home_dir()
@@ -105,13 +124,13 @@ impl Config {
             std::fs::create_dir_all(&config_dir).ok();
             
             let config_file = config_dir.join("config.toml");
-            if let Err(e) = qwen_config.save(config_file.to_str().unwrap()) {
+            if let Err(e) = databricks_config.save(config_file.to_str().unwrap()) {
                 eprintln!("Warning: Could not save default config: {}", e);
             } else {
-                println!("Created default Qwen configuration at: {}", config_file.display());
+                println!("Created default Databricks configuration at: {}", config_file.display());
             }
             
-            return Ok(qwen_config);
+            return Ok(databricks_config);
         }
         
         // Existing config loading logic
@@ -151,12 +170,14 @@ impl Config {
         let config = settings.build()?.try_deserialize()?;
         Ok(config)
     }
-    
+
+    #[allow(dead_code)]
     fn default_qwen_config() -> Self {
         Self {
             providers: ProvidersConfig {
                 openai: None,
                 anthropic: None,
+                databricks: None,
                 embedded: Some(EmbeddedConfig {
                     model_path: "~/.cache/g3/models/qwen2.5-7b-instruct-q3_k_m.gguf".to_string(),
                     model_type: "qwen".to_string(),
@@ -181,4 +202,64 @@ impl Config {
         std::fs::write(path, toml_string)?;
         Ok(())
     }
+    
+    pub fn load_with_overrides(
+        config_path: Option<&str>,
+        provider_override: Option<String>,
+        model_override: Option<String>,
+    ) -> Result<Self> {
+        // Load the base configuration
+        let mut config = Self::load(config_path)?;
+        
+        // Apply provider override
+        if let Some(provider) = provider_override {
+            config.providers.default_provider = provider;
+        }
+        
+        // Apply model override to the active provider
+        if let Some(model) = model_override {
+            match config.providers.default_provider.as_str() {
+                "anthropic" => {
+                    if let Some(ref mut anthropic) = config.providers.anthropic {
+                        anthropic.model = model;
+                    } else {
+                        return Err(anyhow::anyhow!(
+                            "Provider 'anthropic' is not configured. Please add anthropic configuration to your config file."
+                        ));
+                    }
+                }
+                "databricks" => {
+                    if let Some(ref mut databricks) = config.providers.databricks {
+                        databricks.model = model;
+                    } else {
+                        return Err(anyhow::anyhow!(
+                            "Provider 'databricks' is not configured. Please add databricks configuration to your config file."
+                        ));
+                    }
+                }
+                "embedded" => {
+                    if let Some(ref mut embedded) = config.providers.embedded {
+                        embedded.model_path = model;
+                    } else {
+                        return Err(anyhow::anyhow!(
+                            "Provider 'embedded' is not configured. Please add embedded configuration to your config file."
+                        ));
+                    }
+                }
+                "openai" => {
+                    if let Some(ref mut openai) = config.providers.openai {
+                        openai.model = model;
+                    } else {
+                        return Err(anyhow::anyhow!(
+                            "Provider 'openai' is not configured. Please add openai configuration to your config file."
+                        ));
+                    }
+                }
+                _ => return Err(anyhow::anyhow!("Unknown provider: {}", 
+                    config.providers.default_provider)),
+            }
+        }
+        
+        Ok(config)
+    }
 }

crates/g3-core/Cargo.toml

@@ -18,7 +18,8 @@ serde_json = { workspace = true }
 uuid = { workspace = true }
 async-trait = "0.1"
 tokio-stream = "0.1"
-llama_cpp = { version = "0.3.2", features = ["metal"] }
-shellexpand = "3.1"
 tokio-util = "0.7"
 futures-util = "0.3"
+chrono = { version = "0.4", features = ["serde"] }
+rand = "0.8"
+regex = "1.0"

crates/g3-core/src/error_handling.rs

@@ -0,0 +1,501 @@
+//! Error handling module for G3 with retry logic and detailed logging
+//!
+//! This module provides:
+//! - Classification of errors as recoverable or non-recoverable
+//! - Retry logic with exponential backoff and jitter for recoverable errors
+//! - Detailed error logging with context information
+//! - Request/response capture for debugging
+
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
+use std::time::Duration;
+use tracing::{error, info, warn};
+
+/// Maximum number of retry attempts for recoverable errors (default mode)
+const DEFAULT_MAX_RETRY_ATTEMPTS: u32 = 3;
+
+/// Maximum number of retry attempts for autonomous mode
+const AUTONOMOUS_MAX_RETRY_ATTEMPTS: u32 = 6;
+
+/// Base delay for exponential backoff (in milliseconds)
+const BASE_RETRY_DELAY_MS: u64 = 1000;
+
+/// Maximum delay between retries (in milliseconds) for default mode
+const DEFAULT_MAX_RETRY_DELAY_MS: u64 = 10000;
+
+/// Maximum delay between retries (in milliseconds) for autonomous mode
+/// Spread over 10 minutes (600 seconds) with 6 retries
+const AUTONOMOUS_MAX_RETRY_DELAY_MS: u64 = 120000; // 2 minutes max per retry
+
+// Removed unused constants AUTONOMOUS_RETRY_BUDGET_MS and DEFAULT_JITTER_FACTOR
+
+/// Jitter factor for autonomous mode (higher for better distribution)
+const JITTER_FACTOR: f64 = 0.3;
+
+/// Error context information for detailed logging
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ErrorContext {
+    /// The operation that was being performed
+    pub operation: String,
+    /// The provider being used
+    pub provider: String,
+    /// The model being used
+    pub model: String,
+    /// The last prompt sent (truncated for logging)
+    pub last_prompt: String,
+    /// Raw request data (if available)
+    pub raw_request: Option<String>,
+    /// Raw response data (if available)
+    pub raw_response: Option<String>,
+    /// Stack trace
+    pub stack_trace: String,
+    /// Timestamp
+    pub timestamp: u64,
+    /// Number of tokens in context
+    pub context_tokens: u32,
+    /// Session ID if available
+    pub session_id: Option<String>,
+    /// Whether to skip file logging (quiet mode)
+    pub quiet: bool,
+}
+
+impl ErrorContext {
+    pub fn new(
+        operation: String,
+        provider: String,
+        model: String,
+        last_prompt: String,
+        session_id: Option<String>,
+        context_tokens: u32,
+        quiet: bool,
+    ) -> Self {
+        let timestamp = std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .unwrap_or_default()
+            .as_secs();
+
+        // Capture stack trace
+        let stack_trace = std::backtrace::Backtrace::force_capture().to_string();
+
+        Self {
+            operation,
+            provider,
+            model,
+            last_prompt: truncate_for_logging(&last_prompt, 1000),
+            raw_request: None,
+            raw_response: None,
+            stack_trace,
+            timestamp,
+            context_tokens,
+            session_id,
+            quiet,
+        }
+    }
+
+    pub fn with_request(mut self, request: String) -> Self {
+        self.raw_request = Some(truncate_for_logging(&request, 5000));
+        self
+    }
+
+    pub fn with_response(mut self, response: String) -> Self {
+        self.raw_response = Some(truncate_for_logging(&response, 5000));
+        self
+    }
+
+    /// Log the error context with ERROR level
+    pub fn log_error(&self, error: &anyhow::Error) {
+        error!("=== G3 ERROR DETAILS ===");
+        error!("Operation: {}", self.operation);
+        error!("Provider: {} | Model: {}", self.provider, self.model);
+        error!("Error: {}", error);
+        error!("Timestamp: {}", self.timestamp);
+        error!("Session ID: {:?}", self.session_id);
+        error!("Context Tokens: {}", self.context_tokens);
+        error!("Last Prompt: {}", self.last_prompt);
+        
+        if let Some(ref req) = self.raw_request {
+            error!("Raw Request: {}", req);
+        }
+        
+        if let Some(ref resp) = self.raw_response {
+            error!("Raw Response: {}", resp);
+        }
+        
+        error!("Stack Trace:\n{}", self.stack_trace);
+        error!("=== END ERROR DETAILS ===");
+
+        // Also save to error log file
+        self.save_to_file();
+    }
+
+    /// Save error context to a file for later analysis
+    fn save_to_file(&self) {
+        // Skip file logging if quiet mode is enabled
+        if self.quiet {
+            return;
+        }
+
+        let logs_dir = std::path::Path::new("logs/errors");
+        if !logs_dir.exists() {
+            if let Err(e) = std::fs::create_dir_all(logs_dir) {
+                error!("Failed to create error logs directory: {}", e);
+                return;
+            }
+        }
+
+        let filename = format!(
+            "logs/errors/error_{}_{}.json",
+            self.timestamp,
+            self.session_id.as_deref().unwrap_or("unknown")
+        );
+
+        match serde_json::to_string_pretty(self) {
+            Ok(json_content) => {
+                if let Err(e) = std::fs::write(&filename, json_content) {
+                    error!("Failed to save error context to {}: {}", filename, e);
+                } else {
+                    info!("Error details saved to: {}", filename);
+                }
+            }
+            Err(e) => {
+                error!("Failed to serialize error context: {}", e);
+            }
+        }
+    }
+}
+
+/// Classification of error types
+#[derive(Debug, Clone, PartialEq)]
+pub enum ErrorType {
+    /// Recoverable errors that should be retried
+    Recoverable(RecoverableError),
+    /// Non-recoverable errors that should terminate execution
+    NonRecoverable,
+}
+
+/// Types of recoverable errors
+#[derive(Debug, Clone, PartialEq)]
+pub enum RecoverableError {
+    /// Rate limit exceeded
+    RateLimit,
+    /// Temporary network error
+    NetworkError,
+    /// Server error (5xx)
+    ServerError,
+    /// Model is busy/overloaded
+    ModelBusy,
+    /// Timeout
+    Timeout,
+    /// Token limit exceeded (might be recoverable with summarization)
+    TokenLimit,
+}
+
+/// Classify an error as recoverable or non-recoverable
+pub fn classify_error(error: &anyhow::Error) -> ErrorType {
+    let error_str = error.to_string().to_lowercase();
+
+    // Check for recoverable error patterns
+    if error_str.contains("rate limit") || error_str.contains("rate_limit") || error_str.contains("429") {
+        return ErrorType::Recoverable(RecoverableError::RateLimit);
+    }
+
+    if error_str.contains("network") || error_str.contains("connection") || 
+       error_str.contains("dns") || error_str.contains("refused") {
+        return ErrorType::Recoverable(RecoverableError::NetworkError);
+    }
+
+    if error_str.contains("500") || error_str.contains("502") || 
+       error_str.contains("503") || error_str.contains("504") ||
+       error_str.contains("server error") || error_str.contains("internal error") {
+        return ErrorType::Recoverable(RecoverableError::ServerError);
+    }
+
+    if error_str.contains("busy") || error_str.contains("overloaded") || 
+       error_str.contains("capacity") || error_str.contains("unavailable") {
+        return ErrorType::Recoverable(RecoverableError::ModelBusy);
+    }
+
+    // Enhanced timeout detection - check for various timeout patterns
+    if error_str.contains("timeout") || 
+       error_str.contains("timed out") || 
+       error_str.contains("operation timed out") ||
+       error_str.contains("request or response body error") ||  // Common timeout pattern
+       error_str.contains("stream error") && error_str.contains("timed out") {
+        return ErrorType::Recoverable(RecoverableError::Timeout);
+    }
+
+    if error_str.contains("token") && (error_str.contains("limit") || error_str.contains("exceeded")) {
+        return ErrorType::Recoverable(RecoverableError::TokenLimit);
+    }
+
+    // Default to non-recoverable for unknown errors
+    ErrorType::NonRecoverable
+}
+
+/// Calculate retry delay for autonomous mode with better distribution over 10 minutes
+fn calculate_autonomous_retry_delay(attempt: u32) -> Duration {
+    use rand::Rng;
+    let mut rng = rand::thread_rng();
+    
+    // Distribute 6 retries over 10 minutes (600 seconds)
+    // Base delays: 10s, 30s, 60s, 120s, 180s, 200s = 600s total
+    let base_delays_ms = [10000, 30000, 60000, 120000, 180000, 200000];
+    let base_delay = base_delays_ms.get(attempt.saturating_sub(1) as usize).unwrap_or(&200000);
+    
+    // Add jitter of ±30% to prevent thundering herd
+    let jitter = (*base_delay as f64 * 0.3 * rng.gen::<f64>()) as u64;
+    let final_delay = if rng.gen_bool(0.5) {
+        base_delay + jitter
+    } else {
+        base_delay.saturating_sub(jitter)
+    };
+    
+    Duration::from_millis(final_delay)
+}
+
+/// Calculate retry delay with exponential backoff and jitter
+pub fn calculate_retry_delay(attempt: u32, is_autonomous: bool) -> Duration {
+    if is_autonomous {
+        return calculate_autonomous_retry_delay(attempt);
+    }
+    
+    use rand::Rng;
+    let max_retry_delay_ms = if is_autonomous { AUTONOMOUS_MAX_RETRY_DELAY_MS } else { DEFAULT_MAX_RETRY_DELAY_MS };
+    
+    // Exponential backoff: delay = base * 2^attempt
+    let base_delay = BASE_RETRY_DELAY_MS * (2_u64.pow(attempt.saturating_sub(1)));
+    let capped_delay = base_delay.min(max_retry_delay_ms);
+    
+    // Add jitter to prevent thundering herd
+    let mut rng = rand::thread_rng();
+    let jitter = (capped_delay as f64 * JITTER_FACTOR * rng.gen::<f64>()) as u64;
+    let final_delay = if rng.gen_bool(0.5) {
+        capped_delay + jitter
+    } else {
+        capped_delay.saturating_sub(jitter)
+    };
+    
+    Duration::from_millis(final_delay)
+}
+
+/// Retry logic for async operations
+pub async fn retry_with_backoff<F, Fut, T>(
+    operation_name: &str,
+    mut operation: F,
+    context: &ErrorContext,
+    is_autonomous: bool,
+) -> Result<T>
+where
+    F: FnMut() -> Fut,
+    Fut: std::future::Future<Output = Result<T>>,
+{
+    let mut attempt = 0;
+    let mut _last_error = None;
+
+    loop {
+        attempt += 1;
+        
+        match operation().await {
+            Ok(result) => {
+                if attempt > 1 {
+                    info!(
+                        "Operation '{}' succeeded after {} attempts",
+                        operation_name, attempt
+                    );
+                }
+                return Ok(result);
+            }
+            Err(error) => {
+                let error_type = classify_error(&error);
+                let max_attempts = if is_autonomous { AUTONOMOUS_MAX_RETRY_ATTEMPTS } else { DEFAULT_MAX_RETRY_ATTEMPTS };
+                
+                match error_type {
+                    ErrorType::Recoverable(recoverable_type) => {
+                        if attempt >= max_attempts {
+                            error!(
+                                "Operation '{}' failed after {} attempts. Giving up.",
+                                operation_name, attempt
+                            );
+                            context.clone().log_error(&error);
+                            return Err(error);
+                        }
+                        
+                        let delay = calculate_retry_delay(attempt, is_autonomous);
+                        warn!(
+                            "Recoverable error ({:?}) in '{}' (attempt {}/{}). Retrying in {:?}...",
+                            recoverable_type, operation_name, attempt, max_attempts, delay
+                        );
+                        warn!("Error details: {}", error);
+                        
+                        // Special handling for token limit errors
+                        if matches!(recoverable_type, RecoverableError::TokenLimit) {
+                            info!("Token limit error detected. Consider triggering summarization.");
+                        }
+                        
+                        tokio::time::sleep(delay).await;
+                        _last_error = Some(error);
+                    }
+                    ErrorType::NonRecoverable => {
+                        error!(
+                            "Non-recoverable error in '{}' (attempt {}). Terminating.",
+                            operation_name, attempt
+                        );
+                        context.clone().log_error(&error);
+                        return Err(error);
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Helper function to truncate strings for logging
+fn truncate_for_logging(s: &str, max_len: usize) -> String {
+    if s.len() <= max_len {
+        s.to_string()
+    } else {
+        // Find a safe UTF-8 boundary to truncate at
+        // We need to ensure we don't cut in the middle of a multi-byte character
+        let mut truncate_at = max_len;
+        
+        // Walk backwards from max_len to find a character boundary
+        while truncate_at > 0 && !s.is_char_boundary(truncate_at) {
+            truncate_at -= 1;
+        }
+        
+        // If we couldn't find a boundary (shouldn't happen), use a safe default
+        if truncate_at == 0 {
+            truncate_at = max_len.min(s.len());
+        }
+        
+        format!("{}... (truncated, {} total bytes)", &s[..truncate_at], s.len())
+    }
+}
+
+/// Macro for creating error context easily
+#[macro_export]
+macro_rules! error_context {
+    ($operation:expr, $provider:expr, $model:expr, $prompt:expr, $session_id:expr, $tokens:expr) => {
+        $crate::error_handling::ErrorContext::new(
+            $operation.to_string(),
+            $provider.to_string(),
+            $model.to_string(),
+            $prompt.to_string(),
+            $session_id,
+            $tokens,
+        )
+    };
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use anyhow::anyhow;
+
+    #[test]
+    fn test_error_classification() {
+        // Rate limit errors
+        let error = anyhow!("Rate limit exceeded");
+        assert_eq!(classify_error(&error), ErrorType::Recoverable(RecoverableError::RateLimit));
+        
+        let error = anyhow!("HTTP 429 Too Many Requests");
+        assert_eq!(classify_error(&error), ErrorType::Recoverable(RecoverableError::RateLimit));
+        
+        // Network errors
+        let error = anyhow!("Network connection failed");
+        assert_eq!(classify_error(&error), ErrorType::Recoverable(RecoverableError::NetworkError));
+        
+        // Server errors
+        let error = anyhow!("HTTP 503 Service Unavailable");
+        assert_eq!(classify_error(&error), ErrorType::Recoverable(RecoverableError::ServerError));
+        
+        // Model busy
+        let error = anyhow!("Model is busy, please try again");
+        assert_eq!(classify_error(&error), ErrorType::Recoverable(RecoverableError::ModelBusy));
+        
+        // Timeout
+        let error = anyhow!("Request timed out");
+        assert_eq!(classify_error(&error), ErrorType::Recoverable(RecoverableError::Timeout));
+        
+        // Token limit
+        let error = anyhow!("Token limit exceeded");
+        assert_eq!(classify_error(&error), ErrorType::Recoverable(RecoverableError::TokenLimit));
+        
+        // Non-recoverable
+        let error = anyhow!("Invalid API key");
+        assert_eq!(classify_error(&error), ErrorType::NonRecoverable);
+        
+        let error = anyhow!("Malformed request");
+        assert_eq!(classify_error(&error), ErrorType::NonRecoverable);
+    }
+
+    #[test]
+    fn test_retry_delay_calculation() {
+        // Test that delays increase exponentially
+        let delay1 = calculate_retry_delay(1, false);
+        let delay2 = calculate_retry_delay(2, false);
+        let delay3 = calculate_retry_delay(3, false);
+        
+        // Due to jitter, we can't test exact values, but the base should increase
+        assert!(delay1.as_millis() >= (BASE_RETRY_DELAY_MS as f64 * 0.7) as u128);
+        assert!(delay1.as_millis() <= (BASE_RETRY_DELAY_MS as f64 * 1.3) as u128);
+        
+        // Delay 2 should be roughly 2x delay 1 (minus jitter)
+        assert!(delay2.as_millis() >= delay1.as_millis());
+        
+        // Delay 3 should be roughly 2x delay 2 (minus jitter)
+        assert!(delay3.as_millis() >= delay2.as_millis());
+        
+        // Test max cap
+        let delay_max = calculate_retry_delay(10, false);
+        assert!(delay_max.as_millis() <= (DEFAULT_MAX_RETRY_DELAY_MS as f64 * 1.3) as u128);
+    }
+
+    #[test]
+    fn test_autonomous_retry_delay_calculation() {
+        // Test autonomous mode delays are distributed over 10 minutes
+        let delay1 = calculate_retry_delay(1, true);
+        let delay2 = calculate_retry_delay(2, true);
+        let delay3 = calculate_retry_delay(3, true);
+        let delay4 = calculate_retry_delay(4, true);
+        let delay5 = calculate_retry_delay(5, true);
+        let delay6 = calculate_retry_delay(6, true);
+        
+        // Base delays should be around: 10s, 30s, 60s, 120s, 180s, 200s
+        // With ±30% jitter
+        assert!(delay1.as_millis() >= 7000 && delay1.as_millis() <= 13000);
+        assert!(delay2.as_millis() >= 21000 && delay2.as_millis() <= 39000);
+        assert!(delay3.as_millis() >= 42000 && delay3.as_millis() <= 78000);
+        assert!(delay4.as_millis() >= 84000 && delay4.as_millis() <= 156000);
+        assert!(delay5.as_millis() >= 126000 && delay5.as_millis() <= 234000);
+        assert!(delay6.as_millis() >= 140000 && delay6.as_millis() <= 260000);
+    }
+
+    #[test]
+    fn test_truncate_for_logging() {
+        let short_text = "Hello, world!";
+        assert_eq!(truncate_for_logging(short_text, 20), "Hello, world!");
+        
+        let long_text = "This is a very long text that should be truncated for logging purposes";
+        let truncated = truncate_for_logging(long_text, 20);
+        assert!(truncated.starts_with("This is a very long "));
+        assert!(truncated.contains("truncated"));
+        assert!(truncated.contains("total bytes"));
+    }
+    
+    #[test]
+    fn test_truncate_with_multibyte_chars() {
+        // Test with multi-byte UTF-8 characters
+        let text_with_emoji = "Hello 👋 World 🌍 Test ✨ More text here";
+        let truncated = truncate_for_logging(text_with_emoji, 10);
+        // Should truncate at a valid UTF-8 boundary
+        assert!(truncated.starts_with("Hello "));
+        
+        // Test with box-drawing characters like the one causing the panic
+        let text_with_box = "Some text ┌─────┐ more text";
+        let truncated = truncate_for_logging(text_with_box, 12);
+        // Should not panic and should truncate at a valid boundary
+        assert!(truncated.contains("Some text"));
+        assert!(truncated.contains("truncated"));
+    }
+}

crates/g3-core/src/error_handling_test.rs

@@ -0,0 +1,154 @@
+//! Integration tests for error handling with retry logic
+
+#[cfg(test)]
+mod tests {
+    use crate::error_handling::*;
+    use std::sync::atomic::{AtomicU32, Ordering};
+    use std::sync::Arc;
+
+    #[tokio::test]
+    async fn test_retry_with_recoverable_error() {
+        let attempt_count = Arc::new(AtomicU32::new(0));
+
+        let context = ErrorContext::new(
+            "test_operation".to_string(),
+            "test_provider".to_string(),
+            "test_model".to_string(),
+            "test prompt".to_string(),
+            None,
+            100,
+            false,  // quiet parameter
+        );
+
+        let result = retry_with_backoff(
+            "test_operation",
+            || {
+                let counter = Arc::clone(&attempt_count);
+                async move {
+                    let count = counter.fetch_add(1, Ordering::SeqCst);
+                    if count < 2 {
+                        // Fail with recoverable error on first two attempts
+                        Err(anyhow::anyhow!("Rate limit exceeded"))
+                    } else {
+                        // Succeed on third attempt
+                        Ok("Success")
+                    }
+                }
+            },
+            &context,
+            false, // not autonomous mode
+        )
+        .await;
+
+        assert!(result.is_ok());
+        assert_eq!(result.unwrap(), "Success");
+        assert_eq!(attempt_count.load(Ordering::SeqCst), 3);
+    }
+
+    #[tokio::test]
+    async fn test_retry_with_non_recoverable_error() {
+        let attempt_count = Arc::new(AtomicU32::new(0));
+
+        let context = ErrorContext::new(
+            "test_operation".to_string(),
+            "test_provider".to_string(),
+            "test_model".to_string(),
+            "test prompt".to_string(),
+            None,
+            100,
+            false,  // quiet parameter
+        );
+
+        let result: Result<&str, _> = retry_with_backoff(
+            "test_operation",
+            || {
+                let counter = Arc::clone(&attempt_count);
+                async move {
+                    counter.fetch_add(1, Ordering::SeqCst);
+                    // Always fail with non-recoverable error
+                    Err(anyhow::anyhow!("Invalid API key"))
+                }
+            },
+            &context,
+            false, // not autonomous mode
+        )
+        .await;
+
+        assert!(result.is_err());
+        assert_eq!(attempt_count.load(Ordering::SeqCst), 1); // Should only try once
+    }
+
+    #[tokio::test]
+    async fn test_retry_exhaustion() {
+        let attempt_count = Arc::new(AtomicU32::new(0));
+
+        let context = ErrorContext::new(
+            "test_operation".to_string(),
+            "test_provider".to_string(),
+            "test_model".to_string(),
+            "test prompt".to_string(),
+            None,
+            100,
+            false,  // quiet parameter
+        );
+
+        let result: Result<&str, _> = retry_with_backoff(
+            "test_operation",
+            || {
+                let counter = Arc::clone(&attempt_count);
+                async move {
+                    counter.fetch_add(1, Ordering::SeqCst);
+                    // Always fail with recoverable error
+                    Err(anyhow::anyhow!("Network connection failed"))
+                }
+            },
+            &context,
+            false, // not autonomous mode
+        )
+        .await;
+
+        assert!(result.is_err());
+        assert_eq!(attempt_count.load(Ordering::SeqCst), 3); // Should try MAX_RETRY_ATTEMPTS times
+    }
+
+    #[test]
+    fn test_error_context_truncation() {
+        let long_prompt = "a".repeat(2000);
+        let context = ErrorContext::new(
+            "test_op".to_string(),
+            "provider".to_string(),
+            "model".to_string(),
+            long_prompt,
+            None,
+            100,
+            false,  // quiet parameter
+        );
+
+        // The prompt should be truncated to 1000 chars
+        assert!(context.last_prompt.len() < 1100); // Some buffer for the truncation message
+        assert!(context.last_prompt.contains("truncated"));
+    }
+
+    #[test]
+    fn test_retry_delay_increases() {
+        let delay1 = calculate_retry_delay(1, false);
+        let delay2 = calculate_retry_delay(2, false);
+        let delay3 = calculate_retry_delay(3, false);
+
+        // Delays should generally increase (though jitter can affect this)
+        // We'll test the base delays without jitter
+        let base1 = 1000u64; // BASE_RETRY_DELAY_MS
+        let base2 = 1000u64 * 2;
+        let base3 = 1000u64 * 4;
+
+        // Check that delays are within expected ranges (accounting for jitter)
+        assert!(delay1.as_millis() >= (base1 as f64 * 0.7) as u128);
+        assert!(delay1.as_millis() <= (base1 as f64 * 1.3) as u128);
+
+        assert!(delay2.as_millis() >= (base2 as f64 * 0.7) as u128);
+        assert!(delay2.as_millis() <= (base2 as f64 * 1.3) as u128);
+
+        assert!(delay3.as_millis() >= (base3 as f64 * 0.7) as u128);
+        assert!(delay3.as_millis() <= (base3 as f64 * 1.3) as u128);
+    }
+}

crates/g3-core/src/fixed_filter_json.rs

@@ -0,0 +1,222 @@
+// FINAL CORRECTED implementation of filter_json_tool_calls function according to specification
+// 1. Detect tool call start with regex '\w*{\w*"tool"\w*:\w*"' on the very next newline
+// 2. Enter suppression mode and use brace counting to find complete JSON
+// 3. Only elide JSON content between first '{' and last '}' (inclusive)
+// 4. Return everything else as the final filtered string
+
+use regex::Regex;
+use std::cell::RefCell;
+use tracing::debug;
+
+// Thread-local state for tracking JSON tool call suppression
+thread_local! {
+    static FIXED_JSON_TOOL_STATE: RefCell<FixedJsonToolState> = RefCell::new(FixedJsonToolState::new());
+}
+
+#[derive(Debug, Clone)]
+struct FixedJsonToolState {
+    suppression_mode: bool,
+    brace_depth: i32,
+    buffer: String,
+    json_start_in_buffer: Option<usize>,
+    content_returned_up_to: usize, // Track how much content we've already returned
+}
+
+impl FixedJsonToolState {
+    fn new() -> Self {
+        Self {
+            suppression_mode: false,
+            brace_depth: 0,
+            buffer: String::new(),
+            json_start_in_buffer: None,
+            content_returned_up_to: 0,
+        }
+    }
+
+    fn reset(&mut self) {
+        self.suppression_mode = false;
+        self.brace_depth = 0;
+        self.buffer.clear();
+        self.json_start_in_buffer = None;
+        self.content_returned_up_to = 0;
+    }
+}
+
+// FINAL CORRECTED implementation according to specification
+
+pub fn fixed_filter_json_tool_calls(content: &str) -> String {
+    if content.is_empty() {
+        return String::new();
+    }
+
+    FIXED_JSON_TOOL_STATE.with(|state| {
+        let mut state = state.borrow_mut();
+
+        // Add new content to buffer
+        state.buffer.push_str(content);
+
+        // If we're already in suppression mode, continue brace counting
+        if state.suppression_mode {
+            // Count braces in the new content only
+            for ch in content.chars() {
+                match ch {
+                    '{' => state.brace_depth += 1,
+                    '}' => {
+                        state.brace_depth -= 1;
+                        // Exit suppression mode when all braces are closed
+                        if state.brace_depth <= 0 {
+                            debug!("JSON tool call completed - exiting suppression mode");
+
+                            // Extract the complete result with JSON filtered out
+                            let result = extract_fixed_content(
+                                &state.buffer,
+                                state.json_start_in_buffer.unwrap_or(0),
+                            );
+
+                            // Return only the part we haven't returned yet
+                            let new_content = if result.len() > state.content_returned_up_to {
+                                result[state.content_returned_up_to..].to_string()
+                            } else {
+                                String::new()
+                            };
+
+                            state.reset();
+                            return new_content;
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            // Still in suppression mode, return empty string (content is being accumulated)
+            return String::new();
+        }
+
+        // Check for tool call pattern using corrected regex
+        // More flexible than the strict specification to handle real-world JSON
+        let tool_call_regex = Regex::new(r#"(?m)^\s*\{\s*"tool"\s*:\s*""#).unwrap();
+
+        if let Some(captures) = tool_call_regex.find(&state.buffer) {
+            let match_text = captures.as_str();
+
+            // Find the position of the opening brace in the match
+            if let Some(brace_offset) = match_text.find('{') {
+                let json_start = captures.start() + brace_offset;
+
+                debug!(
+                    "Detected JSON tool call at position {} - entering suppression mode",
+                    json_start
+                );
+
+                // Return content before JSON that we haven't returned yet
+                let content_before_json = if json_start >= state.content_returned_up_to {
+                    state.buffer[state.content_returned_up_to..json_start].to_string()
+                } else {
+                    String::new()
+                };
+
+                state.content_returned_up_to = json_start;
+
+                // Enter suppression mode
+                state.suppression_mode = true;
+                state.brace_depth = 0;
+                state.json_start_in_buffer = Some(json_start);
+
+                // Count braces from the JSON start to see if it's complete
+                let buffer_clone = state.buffer.clone();
+                for ch in buffer_clone[json_start..].chars() {
+                    match ch {
+                        '{' => state.brace_depth += 1,
+                        '}' => {
+                            state.brace_depth -= 1;
+                            if state.brace_depth <= 0 {
+                                // JSON is complete in this chunk
+                                debug!("JSON tool call completed in same chunk");
+                                let result = extract_fixed_content(&buffer_clone, json_start);
+
+                                // Return content before JSON plus content after JSON
+                                let content_after_json = if result.len() > json_start {
+                                    &result[json_start..]
+                                } else {
+                                    ""
+                                };
+
+                                let final_result =
+                                    format!("{}{}", content_before_json, content_after_json);
+                                state.reset();
+                                return final_result;
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+
+                // JSON is incomplete, return only the content before JSON
+                return content_before_json;
+            }
+        }
+
+        // No JSON tool call detected, return only the new content we haven't returned yet
+        let new_content = if state.buffer.len() > state.content_returned_up_to {
+            let result = state.buffer[state.content_returned_up_to..].to_string();
+            state.content_returned_up_to = state.buffer.len();
+            result
+        } else {
+            String::new()
+        };
+
+        new_content
+    })
+}
+
+// Helper function to extract content with JSON tool call filtered out
+// Returns everything except the JSON between the first '{' and last '}' (inclusive)
+
+fn extract_fixed_content(full_content: &str, json_start: usize) -> String {
+    // Find the end of the JSON using proper brace counting with string handling
+    let mut brace_depth = 0;
+    let mut json_end = json_start;
+    let mut in_string = false;
+    let mut escape_next = false;
+
+    for (i, ch) in full_content[json_start..].char_indices() {
+        if escape_next {
+            escape_next = false;
+            continue;
+        }
+
+        match ch {
+            '\\' if in_string => escape_next = true,
+            '"' if !escape_next => in_string = !in_string,
+            '{' if !in_string => {
+                brace_depth += 1;
+            }
+            '}' if !in_string => {
+                brace_depth -= 1;
+                if brace_depth == 0 {
+                    json_end = json_start + i + 1; // +1 to include the closing brace
+                    break;
+                }
+            }
+            _ => {}
+        }
+    }
+
+    // Return content before and after the JSON (excluding the JSON itself)
+    let before = &full_content[..json_start];
+    let after = if json_end < full_content.len() {
+        &full_content[json_end..]
+    } else {
+        ""
+    };
+
+    format!("{}{}", before, after)
+}
+
+// Reset function for testing
+
+pub fn reset_fixed_json_tool_state() {
+    FIXED_JSON_TOOL_STATE.with(|state| {
+        let mut state = state.borrow_mut();
+        state.reset();
+    });
+}

crates/g3-core/src/fixed_filter_tests.rs

@@ -0,0 +1,332 @@
+#[cfg(test)]
+mod fixed_filter_tests {
+    use crate::fixed_filter_json::{fixed_filter_json_tool_calls, reset_fixed_json_tool_state};
+    use regex::Regex;
+
+    #[test]
+    fn test_no_tool_call_passthrough() {
+        reset_fixed_json_tool_state();
+        let input = "This is regular text without any tool calls.";
+        let result = fixed_filter_json_tool_calls(input);
+        assert_eq!(result, input);
+    }
+
+    #[test]
+    fn test_simple_tool_call_detection() {
+        reset_fixed_json_tool_state();
+        let input = r#"Some text before
+{"tool": "shell", "args": {"command": "ls"}}
+Some text after"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "Some text before\n\nSome text after";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_streaming_chunks() {
+        reset_fixed_json_tool_state();
+
+        // Simulate streaming where the tool call comes in multiple chunks
+        let chunks = vec![
+            "Some text before\n",
+            "{\"tool\": \"",
+            "shell\", \"args\": {",
+            "\"command\": \"ls\"",
+            "}}\nText after",
+        ];
+
+        let mut results = Vec::new();
+        for chunk in chunks {
+            let result = fixed_filter_json_tool_calls(chunk);
+            results.push(result);
+        }
+
+        // The final accumulated result should have the JSON filtered out
+        let final_result: String = results.join("");
+        let expected = "Some text before\n\nText after";
+        assert_eq!(final_result, expected);
+    }
+
+    #[test]
+    fn test_nested_braces_in_tool_call() {
+        reset_fixed_json_tool_state();
+
+        let input = r#"Text before
+{"tool": "write_file", "args": {"file_path": "test.json", "content": "{\"nested\": \"value\"}"}}
+Text after"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "Text before\n\nText after";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_regex_pattern_specification() {
+        // Test the corrected regex pattern that's more flexible with whitespace
+        let pattern = Regex::new(r#"(?m)^\s*\{\s*"tool"\s*:"#).unwrap();
+
+        let test_cases = vec![
+            (
+                r#"line
+{"tool":"#,
+                true,
+            ),
+            (
+                r#"line
+{"tool" :"#,
+                true,
+            ),
+            (
+                r#"line
+{ "tool":"#,
+                true,
+            ), // Space after { DOES match with \s*
+            (
+                r#"line
+abc{"tool":"#,
+                true,
+            ),
+            (
+                r#"line
+{"tool123":"#,
+                false,
+            ), // "tool123" is not exactly "tool"
+            (
+                r#"line
+{"tool" : "#,
+                true,
+            ),
+        ];
+
+        for (input, should_match) in test_cases {
+            let matches = pattern.is_match(input);
+            assert_eq!(
+                matches, should_match,
+                "Pattern matching failed for: {}",
+                input
+            );
+        }
+    }
+
+    #[test]
+    fn test_newline_requirement() {
+        reset_fixed_json_tool_state();
+
+        // According to spec, tool call should be detected "on the very next newline"
+        // Our current regex matches any line that contains the pattern, not just after newlines
+        let input_with_newline = "Text\n{\"tool\": \"shell\", \"args\": {\"command\": \"ls\"}}";
+        let input_without_newline = "Text {\"tool\": \"shell\", \"args\": {\"command\": \"ls\"}}";
+
+        let result1 = fixed_filter_json_tool_calls(input_with_newline);
+        reset_fixed_json_tool_state();
+        let result2 = fixed_filter_json_tool_calls(input_without_newline);
+
+        // Both cases currently trigger suppression due to regex pattern
+        // TODO: Fix regex to only match after actual newlines
+        assert_eq!(result1, "Text\n");
+        // This currently fails because our regex matches both cases
+        assert_eq!(result2, "Text ");
+    }
+
+    #[test]
+    fn test_json_with_escaped_quotes() {
+        reset_fixed_json_tool_state();
+
+        let input = r#"Text
+{"tool": "write_file", "args": {"content": "He said \"hello\" to me"}}
+More text"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "Text\n\nMore text";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_edge_case_malformed_json() {
+        reset_fixed_json_tool_state();
+
+        // Test what happens with malformed JSON that starts like a tool call
+        let input = r#"Text
+{"tool": "shell", "args": {"command": "ls"
+More text"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        // Should handle gracefully - since JSON is incomplete, it should return content before JSON
+        let expected = "Text\n";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_multiple_tool_calls_sequential() {
+        reset_fixed_json_tool_state();
+
+        // Test processing multiple tool calls one at a time
+        let input1 = r#"First text
+{"tool": "shell", "args": {"command": "ls"}}
+Middle text"#;
+        let result1 = fixed_filter_json_tool_calls(input1);
+        let expected1 = "First text\n\nMiddle text";
+        assert_eq!(result1, expected1);
+
+        // Reset and process second tool call
+        reset_fixed_json_tool_state();
+        let input2 = r#"More text
+{"tool": "read_file", "args": {"file_path": "test.txt"}}
+Final text"#;
+        let result2 = fixed_filter_json_tool_calls(input2);
+        let expected2 = "More text\n\nFinal text";
+        assert_eq!(result2, expected2);
+    }
+
+    #[test]
+    fn test_tool_call_with_complex_args() {
+        reset_fixed_json_tool_state();
+
+        let input = r#"Before
+{"tool": "str_replace", "args": {"file_path": "test.rs", "diff": "--- old\n-old line\n+++ new\n+new line", "start": 0, "end": 100}}
+After"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "Before\n\nAfter";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_tool_call_only() {
+        reset_fixed_json_tool_state();
+
+        let input = r#"
+{"tool": "final_output", "args": {"summary": "Task completed successfully"}}"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "\n";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_brace_counting_accuracy() {
+        reset_fixed_json_tool_state();
+
+        // Test complex nested structure
+        let input = r#"Start
+{"tool": "write_file", "args": {"content": "function() { return {a: 1, b: {c: 2}}; }", "file_path": "test.js"}}
+End"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "Start\n\nEnd";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_string_escaping_in_json() {
+        reset_fixed_json_tool_state();
+
+        // Test JSON with escaped quotes and braces in strings
+        let input = r#"Text
+{"tool": "shell", "args": {"command": "echo \"Hello {world}\" > file.txt"}}
+More"#;
+
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "Text\n\nMore";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_specification_compliance() {
+        reset_fixed_json_tool_state();
+
+        // Test the exact specification requirements:
+        // 1. Detect start with regex '\w*{\w*"tool"\w*:\w*"' on newline
+        // 2. Enter suppression mode and use brace counting
+        // 3. Elide only JSON between first '{' and last '}' (inclusive)
+        // 4. Return everything else
+
+        let input = "Before text\nSome more text\n{\"tool\": \"test\", \"args\": {}}\nAfter text\nMore after";
+        let result = fixed_filter_json_tool_calls(input);
+        let expected = "Before text\nSome more text\n\nAfter text\nMore after";
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_no_false_positives() {
+        reset_fixed_json_tool_state();
+
+        // Test that we don't incorrectly identify non-tool JSON as tool calls
+        let input = r#"Some text
+{"not_tool": "value", "other": "data"}
+More text"#;
+        let result = fixed_filter_json_tool_calls(input);
+        // Should pass through unchanged since it doesn't match the tool pattern
+        assert_eq!(result, input);
+    }
+
+    #[test]
+    fn test_partial_tool_patterns() {
+        reset_fixed_json_tool_state();
+
+        // Test patterns that look like tool calls but aren't complete
+        let test_cases = vec![
+            "Text\n{\"too\": \"value\"}",   // "too" not "tool"
+            "Text\n{\"tools\": \"value\"}", // "tools" not "tool"
+            "Text\n{\"tool\": }",           // Missing value after colon
+        ];
+
+        for input in test_cases {
+            reset_fixed_json_tool_state();
+            let result = fixed_filter_json_tool_calls(input);
+            // These should all pass through unchanged
+            assert_eq!(result, input, "Input should pass through: {}", input);
+        }
+    }
+
+    #[test]
+    fn test_streaming_edge_cases() {
+        reset_fixed_json_tool_state();
+
+        // Test streaming with very small chunks
+        let chunks = vec![
+            "Text\n", "{", "\"", "tool", "\"", ":", " ", "\"", "test", "\"", "}", "\nAfter",
+        ];
+
+        let mut results = Vec::new();
+        for chunk in chunks {
+            let result = fixed_filter_json_tool_calls(chunk);
+            results.push(result);
+        }
+
+        let final_result: String = results.join("");
+        // This test currently fails because the JSON is incomplete across chunks
+        // The function doesn't handle this edge case properly yet
+        let expected = "Text\n{\"tool\": \nAfter";
+        assert_eq!(final_result, expected);
+    }
+
+    #[test]
+    fn test_streaming_debug() {
+        reset_fixed_json_tool_state();
+
+        // Debug the exact failing case
+        let chunks = vec![
+            "Some text before\n",
+            "{\"tool\": \"",
+            "shell\", \"args\": {",
+            "\"command\": \"ls\"",
+            "}}\nText after",
+        ];
+
+        let mut results = Vec::new();
+        for (i, chunk) in chunks.iter().enumerate() {
+            let result = fixed_filter_json_tool_calls(chunk);
+            println!("Chunk {}: {:?} -> {:?}", i, chunk, result);
+            results.push(result);
+        }
+
+        let final_result: String = results.join("");
+        println!("Final result: {:?}", final_result);
+        println!("Expected: {:?}", "Some text before\n\nText after");
+
+        let expected = "Some text before\n\nText after";
+        assert_eq!(final_result, expected);
+    }
+}

crates/g3-core/src/project.rs

@@ -0,0 +1,183 @@
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
+use std::path::{Path, PathBuf};
+
+/// Represents a G3 project with workspace configuration
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Project {
+    /// The workspace directory for the project
+    pub workspace_dir: PathBuf,
+    
+    /// Path to the requirements document (for autonomous mode)
+    pub requirements_path: Option<PathBuf>,
+    
+    /// Override requirements text (takes precedence over requirements_path)
+    pub requirements_text: Option<String>,
+    
+    /// Whether the project is in autonomous mode
+    pub autonomous: bool,
+    
+    /// Project name (derived from workspace directory name)
+    pub name: String,
+    
+    /// Session ID for tracking
+    pub session_id: Option<String>,
+}
+
+impl Project {
+    /// Create a new project with the given workspace directory
+    pub fn new(workspace_dir: PathBuf) -> Self {
+        let name = workspace_dir
+            .file_name()
+            .and_then(|n| n.to_str())
+            .unwrap_or("unnamed")
+            .to_string();
+        
+        Self {
+            workspace_dir,
+            requirements_path: None,
+            requirements_text: None,
+            autonomous: false,
+            name,
+            session_id: None,
+        }
+    }
+    
+    /// Create a project for autonomous mode
+    pub fn new_autonomous(workspace_dir: PathBuf) -> Result<Self> {
+        let mut project = Self::new(workspace_dir.clone());
+        project.autonomous = true;
+        
+        // Look for requirements.md in the workspace directory
+        let requirements_path = workspace_dir.join("requirements.md");
+        if requirements_path.exists() {
+            project.requirements_path = Some(requirements_path);
+        }
+        
+        Ok(project)
+    }
+    
+    /// Create a project for autonomous mode with requirements text override
+    pub fn new_autonomous_with_requirements(workspace_dir: PathBuf, requirements_text: String) -> Result<Self> {
+        let mut project = Self::new(workspace_dir.clone());
+        project.autonomous = true;
+        project.requirements_text = Some(requirements_text);
+        
+        // Don't look for requirements.md file when text is provided
+        // The text override takes precedence
+        
+        Ok(project)
+    }
+    
+    /// Set the workspace directory and update related paths
+    pub fn set_workspace(&mut self, workspace_dir: PathBuf) {
+        self.workspace_dir = workspace_dir.clone();
+        self.name = workspace_dir
+            .file_name()
+            .and_then(|n| n.to_str())
+            .unwrap_or("unnamed")
+            .to_string();
+        
+        // Update requirements path if in autonomous mode
+        if self.autonomous {
+            let requirements_path = workspace_dir.join("requirements.md");
+            if requirements_path.exists() {
+                self.requirements_path = Some(requirements_path);
+            }
+        }
+    }
+    
+    /// Get the workspace directory
+    pub fn workspace(&self) -> &Path {
+        &self.workspace_dir
+    }
+    
+    /// Check if requirements file exists
+    pub fn has_requirements(&self) -> bool {
+        // Has requirements if either text override is provided or requirements file exists
+        self.requirements_text.is_some() || self.requirements_path.is_some()
+    }
+    
+    /// Check if implementation files exist in the workspace
+    pub fn has_implementation_files(&self) -> bool {
+        self.check_dir_for_implementation_files(&self.workspace_dir)
+    }
+    
+    /// Recursively check a directory for implementation files
+    fn check_dir_for_implementation_files(&self, dir: &Path) -> bool {
+        // Common source file extensions
+        let extensions = vec![
+            "swift", "rs", "py", "js", "ts", "java", "cpp", "c",
+            "go", "rb", "php", "cs", "kt", "scala", "m", "h"
+        ];
+        
+        if let Ok(entries) = std::fs::read_dir(dir) {
+            for entry in entries.flatten() {
+                let path = entry.path();
+                
+                if path.is_file() {
+                    // Check if it's a source file
+                    if let Some(ext) = path.extension() {
+                        if let Some(ext_str) = ext.to_str() {
+                            if extensions.contains(&ext_str) {
+                                return true;
+                            }
+                        }
+                    }
+                } else if path.is_dir() {
+                    // Skip hidden directories and common non-source directories
+                    if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
+                        if !name.starts_with('.') && name != "logs" && name != "target" && name != "node_modules" {
+                            // Recursively check subdirectories
+                            if self.check_dir_for_implementation_files(&path) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        false
+    }
+    
+    /// Read the requirements file content
+    pub fn read_requirements(&self) -> Result<Option<String>> {
+        // Prioritize requirements text override
+        if let Some(ref text) = self.requirements_text {
+            Ok(Some(text.clone()))
+        } else if let Some(ref path) = self.requirements_path {
+            // Fall back to reading from file
+            Ok(Some(std::fs::read_to_string(path)?))
+        } else {
+            Ok(None)
+        }
+    }
+    
+    /// Create the workspace directory if it doesn't exist
+    pub fn ensure_workspace_exists(&self) -> Result<()> {
+        if !self.workspace_dir.exists() {
+            std::fs::create_dir_all(&self.workspace_dir)?;
+        }
+        Ok(())
+    }
+    
+    /// Change to the workspace directory
+    pub fn enter_workspace(&self) -> Result<()> {
+        std::env::set_current_dir(&self.workspace_dir)?;
+        Ok(())
+    }
+    
+    /// Get the logs directory for the project
+    pub fn logs_dir(&self) -> PathBuf {
+        self.workspace_dir.join("logs")
+    }
+    
+    /// Ensure the logs directory exists
+    pub fn ensure_logs_dir(&self) -> Result<()> {
+        let logs_dir = self.logs_dir();
+        if !logs_dir.exists() {
+            std::fs::create_dir_all(&logs_dir)?;
+        }
+        Ok(())
+    }
+}

crates/g3-core/src/providers/mod.rs

@@ -1 +0,0 @@
-

crates/g3-core/src/task_result.rs

@@ -0,0 +1,168 @@
+use crate::ContextWindow;
+
+/// Result of a task execution containing both the response and the context window
+#[derive(Debug, Clone)]
+pub struct TaskResult {
+    /// The actual response content from the task execution
+    pub response: String,
+    /// The complete context window at the time of completion
+    pub context_window: ContextWindow,
+}
+
+impl TaskResult {
+    pub fn new(response: String, context_window: ContextWindow) -> Self {
+        Self {
+            response,
+            context_window,
+        }
+    }
+
+    /// Extract the final_output content from the response (for coach feedback in autonomous mode)
+    /// This looks for the complete final_output content, not just the last block
+    pub fn extract_final_output(&self) -> String {
+        // Remove any timing information at the end
+        let content_without_timing = if let Some(timing_pos) = self.response.rfind("\n⏱️") {
+            &self.response[..timing_pos]
+        } else {
+            &self.response
+        };
+
+        // Look for the final_output marker pattern
+        // The final_output content typically appears after the tool is called
+        // and is the substantive content that follows
+        
+        // First, try to find if there's a clear final_output section
+        // This would be the content after the last tool execution
+        if let Some(final_output_pos) = content_without_timing.rfind("final_output") {
+            // Find the content that follows the final_output call
+            // Skip past the tool call line and any immediate formatting
+            if let Some(content_start) = content_without_timing[final_output_pos..].find('\n') {
+                let start_pos = final_output_pos + content_start + 1;
+                let final_content = &content_without_timing[start_pos..];
+                
+                // Trim and return the complete content
+                let trimmed = final_content.trim();
+                if !trimmed.is_empty() {
+                    return trimmed.to_string();
+                }
+            }
+        }
+        
+        // Fallback to the original extract_last_block behavior if we can't find final_output
+        // This maintains backward compatibility
+        self.extract_last_block()
+    }
+
+    /// Extract the last block from the response (for coach feedback in autonomous mode)
+    /// This looks for the final_output content which is the last substantial block
+    pub fn extract_last_block(&self) -> String {
+        // Remove any timing information at the end
+        let content_without_timing = if let Some(timing_pos) = self.response.rfind("\n⏱️") {
+            &self.response[..timing_pos]
+        } else {
+            &self.response
+        };
+        
+        // Split by double newlines to find the last substantial block
+        let blocks: Vec<&str> = content_without_timing.split("\n\n").collect();
+        
+        // Find the last non-empty block that isn't just whitespace
+        blocks.iter()
+            .rev()
+            .find(|block| !block.trim().is_empty())
+            .map(|block| block.trim().to_string())
+            .unwrap_or_else(|| {
+                // Fallback: if we can't find a clear block, take the whole thing
+                content_without_timing.trim().to_string()
+            })
+    }
+
+    /// Check if the response contains an approval (for autonomous mode)
+    pub fn is_approved(&self) -> bool {
+        self.extract_final_output().contains("IMPLEMENTATION_APPROVED")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_extract_last_block() {
+        // Test case 1: Response with timing info
+        let context_window = ContextWindow::new(1000);
+        let response_with_timing = "Some initial content\n\nFinal block content\n\n⏱️ 2.3s | 💭 1.2s".to_string();
+        let result = TaskResult::new(response_with_timing, context_window.clone());
+        assert_eq!(result.extract_last_block(), "Final block content");
+        
+        // Test case 2: Response without timing
+        let response_no_timing = "Some initial content\n\nFinal block content".to_string();
+        let result = TaskResult::new(response_no_timing, context_window.clone());
+        assert_eq!(result.extract_last_block(), "Final block content");
+        
+        // Test case 3: Response with IMPLEMENTATION_APPROVED
+        let response_approved = "Some content\n\nIMPLEMENTATION_APPROVED".to_string();
+        let result = TaskResult::new(response_approved, context_window.clone());
+        assert!(result.is_approved());
+        
+        // Test case 4: Response without approval
+        let response_not_approved = "Some content\n\nNeeds more work".to_string();
+        let result = TaskResult::new(response_not_approved, context_window);
+        assert!(!result.is_approved());
+    }
+
+    #[test]
+    fn test_extract_last_block_edge_cases() {
+        let context_window = ContextWindow::new(1000);
+        
+        // Test empty response
+        let empty_response = "".to_string();
+        let result = TaskResult::new(empty_response, context_window.clone());
+        assert_eq!(result.extract_last_block(), "");
+        
+        // Test single block
+        let single_block = "Just one block".to_string();
+        let result = TaskResult::new(single_block, context_window.clone());
+        assert_eq!(result.extract_last_block(), "Just one block");
+        
+        // Test multiple empty blocks
+        let multiple_empty = "\n\n\n\nSome content\n\n\n\n".to_string();
+        let result = TaskResult::new(multiple_empty, context_window);
+        assert_eq!(result.extract_last_block(), "Some content");
+    }
+
+    #[test]
+    fn test_extract_final_output() {
+        let context_window = ContextWindow::new(1000);
+        
+        // Test case 1: Response with final_output tool call
+        let response_with_final_output = "Analyzing files...\n\nCalling final_output\n\nThis is the complete feedback\nwith multiple lines\nand important details\n\n⏱️ 2.3s".to_string();
+        let result = TaskResult::new(response_with_final_output, context_window.clone());
+        assert_eq!(result.extract_final_output(), "This is the complete feedback\nwith multiple lines\nand important details");
+        
+        // Test case 2: Response with IMPLEMENTATION_APPROVED in final_output
+        let response_approved = "Review complete\n\nfinal_output called\n\nIMPLEMENTATION_APPROVED".to_string();
+        let result = TaskResult::new(response_approved, context_window.clone());
+        assert_eq!(result.extract_final_output(), "IMPLEMENTATION_APPROVED");
+        assert!(result.is_approved());
+        
+        // Test case 3: Response with detailed feedback in final_output
+        let response_feedback = "Checking implementation...\n\nfinal_output\n\nThe following issues need to be addressed:\n1. Missing error handling in main.rs\n2. Tests are not comprehensive\n3. Documentation needs improvement\n\nPlease fix these issues.".to_string();
+        let result = TaskResult::new(response_feedback, context_window.clone());
+        let extracted = result.extract_final_output();
+        assert!(extracted.contains("The following issues need to be addressed:"));
+        assert!(extracted.contains("1. Missing error handling"));
+        assert!(extracted.contains("Please fix these issues."));
+        assert!(!result.is_approved());
+        
+        // Test case 4: Response without final_output (fallback to extract_last_block)
+        let response_no_final_output = "Some analysis\n\nFinal thoughts here".to_string();
+        let result = TaskResult::new(response_no_final_output, context_window.clone());
+        assert_eq!(result.extract_final_output(), "Final thoughts here");
+        
+        // Test case 5: Empty response
+        let empty_response = "".to_string();
+        let result = TaskResult::new(empty_response, context_window);
+        assert_eq!(result.extract_final_output(), "");
+    }
+}

crates/g3-core/src/task_result_comprehensive_tests.rs

@@ -0,0 +1,247 @@
+use crate::{ContextWindow, TaskResult};
+use g3_providers::{Message, MessageRole};
+use std::sync::Arc;
+
+#[test]
+fn test_task_result_basic_functionality() {
+    // Create a context window with some messages
+    let mut context = ContextWindow::new(10000);
+    context.add_message(Message {
+        role: MessageRole::User,
+        content: "Test message 1".to_string(),
+    });
+    context.add_message(Message {
+        role: MessageRole::Assistant,
+        content: "Response 1".to_string(),
+    });
+    
+    // Create a TaskResult
+    let response = "This is the response\n\nFinal output block".to_string();
+    let result = TaskResult::new(response.clone(), context.clone());
+    
+    // Test basic properties
+    assert_eq!(result.response, response);
+    assert_eq!(result.context_window.conversation_history.len(), 2);
+    assert_eq!(result.context_window.total_tokens, 10000);
+}
+
+#[test]
+fn test_extract_last_block_various_formats() {
+    let context = ContextWindow::new(1000);
+    
+    // Test 1: Standard format with multiple blocks
+    let response1 = "First block\n\nSecond block\n\nThird block".to_string();
+    let result1 = TaskResult::new(response1, context.clone());
+    assert_eq!(result1.extract_last_block(), "Third block");
+    
+    // Test 2: With timing information
+    let response2 = "Content\n\nFinal block\n\n⏱️ 2.3s | 💭 1.2s".to_string();
+    let result2 = TaskResult::new(response2, context.clone());
+    assert_eq!(result2.extract_last_block(), "Final block");
+    
+    // Test 3: Single line response
+    let response3 = "Single line response".to_string();
+    let result3 = TaskResult::new(response3, context.clone());
+    assert_eq!(result3.extract_last_block(), "Single line response");
+    
+    // Test 4: Empty response
+    let response4 = "".to_string();
+    let result4 = TaskResult::new(response4, context.clone());
+    assert_eq!(result4.extract_last_block(), "");
+    
+    // Test 5: Only whitespace
+    let response5 = "\n\n\n   \n\n".to_string();
+    let result5 = TaskResult::new(response5, context.clone());
+    assert_eq!(result5.extract_last_block(), "");
+    
+    // Test 6: Multiple blocks with empty ones
+    let response6 = "First\n\n\n\n\n\nLast block here".to_string();
+    let result6 = TaskResult::new(response6, context.clone());
+    assert_eq!(result6.extract_last_block(), "Last block here");
+}
+
+#[test]
+fn test_is_approved_detection() {
+    let context = ContextWindow::new(1000);
+    
+    // Test approved cases
+    let approved_responses = vec![
+        "Analysis complete\n\nIMPLEMENTATION_APPROVED",
+        "Some content\n\nThe implementation is good. IMPLEMENTATION_APPROVED",
+        "IMPLEMENTATION_APPROVED",
+        "Review done\n\n✅ IMPLEMENTATION_APPROVED - All tests pass",
+    ];
+    
+    for response in approved_responses {
+        let result = TaskResult::new(response.to_string(), context.clone());
+        assert!(result.is_approved(), "Failed to detect approval in: {}", response);
+    }
+    
+    // Test not approved cases
+    let not_approved_responses = vec![
+        "Needs more work",
+        "Implementation needs fixes",
+        "IMPLEMENTATION_REJECTED",
+        "Almost there but not APPROVED",
+        "",
+    ];
+    
+    for response in not_approved_responses {
+        let result = TaskResult::new(response.to_string(), context.clone());
+        assert!(!result.is_approved(), "Incorrectly detected approval in: {}", response);
+    }
+}
+
+#[test]
+fn test_context_window_preservation() {
+    // Create a context window with specific state
+    let mut context = ContextWindow::new(5000);
+    context.used_tokens = 1234;
+    
+    // Add some messages
+    for i in 0..5 {
+        context.add_message(Message {
+            role: if i % 2 == 0 { MessageRole::User } else { MessageRole::Assistant },
+            content: format!("Message {}", i),
+        });
+    }
+    
+    // Create TaskResult
+    let result = TaskResult::new("Response".to_string(), context.clone());
+    
+    // Verify context is preserved
+    assert_eq!(result.context_window.total_tokens, 5000);
+    assert!(result.context_window.used_tokens > 1234); // Should have increased
+    assert_eq!(result.context_window.conversation_history.len(), 5);
+    
+    // Verify messages are preserved correctly
+    for i in 0..5 {
+        let is_user = matches!(result.context_window.conversation_history[i].role, MessageRole::User);
+        let expected_is_user = i % 2 == 0;
+        assert_eq!(is_user, expected_is_user, "Message {} has wrong role", i);
+        assert_eq!(result.context_window.conversation_history[i].content, format!("Message {}", i));
+    }
+}
+
+#[test]
+fn test_coach_feedback_extraction_scenarios() {
+    let context = ContextWindow::new(1000);
+    
+    // Scenario 1: Coach feedback with file operations and analysis
+    let coach_response = r#"Reading file: src/main.rs
+📄 File content (23 lines):
+fn main() {
+    println!("Hello");
+}
+
+Analyzing implementation...
+
+The implementation needs the following fixes:
+1. Add error handling
+2. Implement missing functions
+3. Add tests"#;
+    
+    let result = TaskResult::new(coach_response.to_string(), context.clone());
+    let feedback = result.extract_last_block();
+    assert!(feedback.contains("Add error handling"));
+    assert!(feedback.contains("Implement missing functions"));
+    assert!(feedback.contains("Add tests"));
+    
+    // Scenario 2: Coach approval
+    let approval_response = r#"Checking compilation...
+✅ Build successful
+
+Running tests...
+✅ All tests pass
+
+IMPLEMENTATION_APPROVED"#;
+    
+    let result = TaskResult::new(approval_response.to_string(), context.clone());
+    assert!(result.is_approved());
+    assert_eq!(result.extract_last_block(), "IMPLEMENTATION_APPROVED");
+    
+    // Scenario 3: Complex feedback with timing
+    let complex_response = r#"Tool execution log...
+
+Analysis complete.
+
+The following issues were found:
+- Memory leak in process_data()
+- Missing input validation
+
+⏱️ 5.2s | 💭 2.1s"#;
+    
+    let result = TaskResult::new(complex_response.to_string(), context.clone());
+    let feedback = result.extract_last_block();
+    assert!(feedback.contains("Memory leak"));
+    assert!(feedback.contains("Missing input validation"));
+    assert!(!feedback.contains("⏱️")); // Timing should be stripped
+}
+
+#[test]
+fn test_edge_cases_and_special_characters() {
+    let context = ContextWindow::new(1000);
+    
+    // Test with special characters and emojis
+    let response_with_emojis = "First part 🚀\n\n✅ Final part with emojis 🎉".to_string();
+    let result = TaskResult::new(response_with_emojis, context.clone());
+    assert_eq!(result.extract_last_block(), "✅ Final part with emojis 🎉");
+    
+    // Test with code blocks
+    let response_with_code = "Explanation\n\n```rust\nfn main() {}\n```\n\nFinal comment".to_string();
+    let result = TaskResult::new(response_with_code, context.clone());
+    assert_eq!(result.extract_last_block(), "Final comment");
+    
+    // Test with mixed newlines
+    let mixed_newlines = "Part 1\r\n\r\nPart 2\n\nPart 3".to_string();
+    let result = TaskResult::new(mixed_newlines, context.clone());
+    assert_eq!(result.extract_last_block(), "Part 3");
+}
+
+#[test]
+fn test_large_response_handling() {
+    let context = ContextWindow::new(100000);
+    
+    // Create a large response
+    let mut large_response = String::new();
+    for i in 0..100 {
+        large_response.push_str(&format!("Block {} with some content\n\n", i));
+    }
+    large_response.push_str("This is the final block after 100 other blocks");
+    
+    let result = TaskResult::new(large_response, context);
+    assert_eq!(result.extract_last_block(), "This is the final block after 100 other blocks");
+}
+
+#[test]
+fn test_concurrent_access() {
+    use std::thread;
+    
+    let context = ContextWindow::new(1000);
+    let result = Arc::new(TaskResult::new(
+        "Concurrent test\n\nFinal block".to_string(),
+        context,
+    ));
+    
+    let mut handles = vec![];
+    
+    // Spawn multiple threads to access the TaskResult
+    for _ in 0..10 {
+        let result_clone = Arc::clone(&result);
+        let handle = thread::spawn(move || {
+            // Each thread extracts the last block
+            let block = result_clone.extract_last_block();
+            assert_eq!(block, "Final block");
+            
+            // Check approval status
+            assert!(!result_clone.is_approved());
+        });
+        handles.push(handle);
+    }
+    
+    // Wait for all threads to complete
+    for handle in handles {
+        handle.join().unwrap();
+    }
+}
+

crates/g3-core/src/task_result_tests.rs

@@ -0,0 +1,48 @@
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_extract_last_block() {
+        // Test case 1: Response with timing info
+        let context_window = ContextWindow::new(1000);
+        let response_with_timing = "Some initial content\n\nFinal block content\n\n⏱️ 2.3s | 💭 1.2s".to_string();
+        let result = TaskResult::new(response_with_timing, context_window.clone());
+        assert_eq!(result.extract_last_block(), "Final block content");
+        
+        // Test case 2: Response without timing
+        let response_no_timing = "Some initial content\n\nFinal block content".to_string();
+        let result = TaskResult::new(response_no_timing, context_window.clone());
+        assert_eq!(result.extract_last_block(), "Final block content");
+        
+        // Test case 3: Response with IMPLEMENTATION_APPROVED
+        let response_approved = "Some content\n\nIMPLEMENTATION_APPROVED".to_string();
+        let result = TaskResult::new(response_approved, context_window.clone());
+        assert!(result.is_approved());
+        
+        // Test case 4: Response without approval
+        let response_not_approved = "Some content\n\nNeeds more work".to_string();
+        let result = TaskResult::new(response_not_approved, context_window);
+        assert!(!result.is_approved());
+    }
+
+    #[test]
+    fn test_extract_last_block_edge_cases() {
+        let context_window = ContextWindow::new(1000);
+        
+        // Test empty response
+        let empty_response = "".to_string();
+        let result = TaskResult::new(empty_response, context_window.clone());
+        assert_eq!(result.extract_last_block(), "");
+        
+        // Test single block
+        let single_block = "Just one block".to_string();
+        let result = TaskResult::new(single_block, context_window.clone());
+        assert_eq!(result.extract_last_block(), "Just one block");
+        
+        // Test multiple empty blocks
+        let multiple_empty = "\n\n\n\nSome content\n\n\n\n".to_string();
+        let result = TaskResult::new(multiple_empty, context_window);
+        assert_eq!(result.extract_last_block(), "Some content");
+    }
+}

crates/g3-core/src/ui_writer.rs

@@ -0,0 +1,74 @@
+/// Interface for UI output operations
+/// This trait abstracts all UI operations to allow different implementations
+/// (console, TUI, web, etc.) without coupling the core logic to specific output methods.
+pub trait UiWriter: Send + Sync {
+    /// Print a simple message
+    fn print(&self, message: &str);
+    
+    /// Print a message with a newline
+    fn println(&self, message: &str);
+    
+    /// Print without newline (for progress indicators)
+    fn print_inline(&self, message: &str);
+    
+    /// Print a system prompt section
+    fn print_system_prompt(&self, prompt: &str);
+    
+    /// Print a context window status message
+    fn print_context_status(&self, message: &str);
+    
+    /// Print a tool execution header
+    fn print_tool_header(&self, tool_name: &str);
+    
+    /// Print a tool argument
+    fn print_tool_arg(&self, key: &str, value: &str);
+    
+    /// Print tool output header
+    fn print_tool_output_header(&self);
+    
+    /// Update the current tool output line (replaces previous line)
+    fn update_tool_output_line(&self, line: &str);
+    
+    /// Print a tool output line
+    fn print_tool_output_line(&self, line: &str);
+    
+    /// Print tool output summary (when output is truncated)
+    fn print_tool_output_summary(&self, hidden_count: usize);
+    
+    /// Print tool execution timing
+    fn print_tool_timing(&self, duration_str: &str);
+    
+    /// Print the agent prompt indicator
+    fn print_agent_prompt(&self);
+    
+    /// Print agent response inline (for streaming)
+    fn print_agent_response(&self, content: &str);
+    
+    /// Notify that an SSE event was received (including pings)
+    fn notify_sse_received(&self);
+    
+    /// Flush any buffered output
+    fn flush(&self);
+}
+
+/// A no-op implementation for when UI output is not needed
+pub struct NullUiWriter;
+
+impl UiWriter for NullUiWriter {
+    fn print(&self, _message: &str) {}
+    fn println(&self, _message: &str) {}
+    fn print_inline(&self, _message: &str) {}
+    fn print_system_prompt(&self, _prompt: &str) {}
+    fn print_context_status(&self, _message: &str) {}
+    fn print_tool_header(&self, _tool_name: &str) {}
+    fn print_tool_arg(&self, _key: &str, _value: &str) {}
+    fn print_tool_output_header(&self) {}
+    fn update_tool_output_line(&self, _line: &str) {}
+    fn print_tool_output_line(&self, _line: &str) {}
+    fn print_tool_output_summary(&self, _hidden_count: usize) {}
+    fn print_tool_timing(&self, _duration_str: &str) {}
+    fn print_agent_prompt(&self) {}
+    fn print_agent_response(&self, _content: &str) {}
+    fn notify_sse_received(&self) {}
+    fn flush(&self) {}
+}

crates/g3-core/tests/test_token_counting.rs

@@ -0,0 +1,94 @@
+use g3_core::ContextWindow;
+use g3_providers::Usage;
+
+#[test]
+fn test_token_accumulation() {
+    let mut window = ContextWindow::new(10000);
+    
+    // First API call: 100 prompt + 50 completion = 150 total
+    let usage1 = Usage {
+        prompt_tokens: 100,
+        completion_tokens: 50,
+        total_tokens: 150,
+    };
+    window.update_usage_from_response(&usage1);
+    assert_eq!(window.used_tokens, 150, "First call should have 150 tokens");
+    assert_eq!(window.cumulative_tokens, 150, "Cumulative should be 150");
+
+    // Second API call: 200 prompt + 75 completion = 275 total
+    let usage2 = Usage {
+        prompt_tokens: 200,
+        completion_tokens: 75,
+        total_tokens: 275,
+    };
+    window.update_usage_from_response(&usage2);
+    assert_eq!(window.used_tokens, 425, "Second call should accumulate to 425 tokens");
+    assert_eq!(window.cumulative_tokens, 425, "Cumulative should be 425");
+
+    // Third API call with SMALLER token count: 50 prompt + 25 completion = 75 total
+    let usage3 = Usage {
+        prompt_tokens: 50,
+        completion_tokens: 25,
+        total_tokens: 75,
+    };
+    window.update_usage_from_response(&usage3);
+    assert_eq!(window.used_tokens, 500, "Third call should accumulate to 500 tokens");
+    assert_eq!(window.cumulative_tokens, 500, "Cumulative should be 500");
+    
+    // Verify tokens never decrease
+    assert!(window.used_tokens >= 425, "Token count should never decrease!");
+}
+
+#[test]
+fn test_add_streaming_tokens() {
+    let mut window = ContextWindow::new(10000);
+    
+    // Add some streaming tokens
+    window.add_streaming_tokens(100);
+    assert_eq!(window.used_tokens, 100);
+    assert_eq!(window.cumulative_tokens, 100);
+    
+    // Add more
+    window.add_streaming_tokens(50);
+    assert_eq!(window.used_tokens, 150);
+    assert_eq!(window.cumulative_tokens, 150);
+    
+    // Now update from provider response
+    let usage = Usage {
+        prompt_tokens: 80,
+        completion_tokens: 40,
+        total_tokens: 120,
+    };
+    window.update_usage_from_response(&usage);
+    
+    // Should ADD to existing, not replace
+    assert_eq!(window.used_tokens, 270, "Should add 120 to existing 150");
+    assert_eq!(window.cumulative_tokens, 270);
+}
+
+#[test]
+fn test_percentage_calculation() {
+    let mut window = ContextWindow::new(1000);
+    
+    // Add tokens via provider response
+    let usage = Usage {
+        prompt_tokens: 150,
+        completion_tokens: 100,
+        total_tokens: 250,
+    };
+    window.update_usage_from_response(&usage);
+    
+    assert_eq!(window.percentage_used(), 25.0);
+    assert_eq!(window.remaining_tokens(), 750);
+    
+    // Add more tokens
+    let usage2 = Usage {
+        prompt_tokens: 300,
+        completion_tokens: 200,
+        total_tokens: 500,
+    };
+    window.update_usage_from_response(&usage2);
+    
+    assert_eq!(window.percentage_used(), 75.0);
+    assert_eq!(window.remaining_tokens(), 250);
+}

crates/g3-execution/Cargo.toml

@@ -7,6 +7,7 @@ description = "Code execution engine for G3 AI agent"
 [dependencies]
 tokio = { workspace = true }
 anyhow = { workspace = true }
+futures = "0.3"
 thiserror = { workspace = true }
 tracing = { workspace = true }
 regex = "1.0"

crates/g3-execution/src/lib.rs

@@ -203,3 +203,82 @@ impl Default for CodeExecutor {
         Self::new()
     }
 }
+
+/// Trait for receiving streaming output from command execution
+pub trait OutputReceiver: Send + Sync {
+    /// Called when a new line of output is available
+    fn on_output_line(&self, line: &str);
+}
+
+impl CodeExecutor {
+    /// Execute bash command with streaming output
+    pub async fn execute_bash_streaming<R: OutputReceiver>(
+        &self, 
+        code: &str, 
+        receiver: &R
+    ) -> Result<ExecutionResult> {
+        use std::process::Stdio;
+        use tokio::io::{AsyncBufReadExt, BufReader};
+        use tokio::process::Command as TokioCommand;
+        
+        let mut child = TokioCommand::new("bash")
+            .arg("-c")
+            .arg(code)
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped())
+            .spawn()?;
+        
+        let stdout = child.stdout.take().unwrap();
+        let stderr = child.stderr.take().unwrap();
+        
+        let stdout_reader = BufReader::new(stdout);
+        let stderr_reader = BufReader::new(stderr);
+        
+        let mut stdout_lines = stdout_reader.lines();
+        let mut stderr_lines = stderr_reader.lines();
+        
+        let mut stdout_output = Vec::new();
+        let mut stderr_output = Vec::new();
+        
+        // Read output lines as they come
+        loop {
+            tokio::select! {
+                line = stdout_lines.next_line() => {
+                    match line {
+                        Ok(Some(line)) => {
+                            receiver.on_output_line(&line);
+                            stdout_output.push(line);
+                        }
+                        Ok(None) => break, // EOF
+                        Err(e) => {
+                            error!("Error reading stdout: {}", e);
+                            break;
+                        }
+                    }
+                }
+                line = stderr_lines.next_line() => {
+                    match line {
+                        Ok(Some(line)) => {
+                            receiver.on_output_line(&format!("{}", line));
+                            stderr_output.push(line);
+                        }
+                        Ok(None) => {}, // stderr EOF, continue
+                        Err(e) => {
+                            error!("Error reading stderr: {}", e);
+                        }
+                    }
+                }
+                else => break
+            }
+        }
+        
+        let status = child.wait().await?;
+        
+        Ok(ExecutionResult {
+            stdout: stdout_output.join("\n"),
+            stderr: stderr_output.join("\n"),
+            exit_code: status.code().unwrap_or(-1),
+            success: status.success(),
+        })
+    }
+}

crates/g3-providers/Cargo.toml

@@ -16,3 +16,16 @@ async-trait = "0.1"
 tokio-stream = "0.1"
 futures-util = "0.3"
 bytes = "1.0"
+# OAuth dependencies
+axum = "0.7"
+base64 = "0.22"
+chrono = { version = "0.4", features = ["serde"] }
+sha2 = "0.10"
+url = "2.5"
+webbrowser = "1.0"
+nanoid = "0.4"
+serde_urlencoded = "0.7"
+tokio-util = "0.7"
+dirs = "5.0"
+llama_cpp = { version = "0.3.2", features = ["metal"] }
+shellexpand = "3.1"

crates/g3-providers/src/anthropic.rs

@@ -41,6 +41,7 @@
 //!         max_tokens: Some(1000),
 //!         temperature: Some(0.7),
 //!         stream: false,
+//!         tools: None,
 //!     };
 //!
 //!     // Get a completion
@@ -74,6 +75,7 @@
 //!         max_tokens: Some(1000),
 //!         temperature: Some(0.7),
 //!         stream: true,
+//!         tools: None,
 //!     };
 //!
 //!     let mut stream = provider.stream(request).await?;
@@ -194,20 +196,6 @@ impl AnthropicProvider {
             .collect()
     }
 
-    fn convert_anthropic_tool_calls(&self, content: &[AnthropicContent]) -> Vec<ToolCall> {
-        content
-            .iter()
-            .filter_map(|c| match c {
-                AnthropicContent::ToolUse { id, name, input } => Some(ToolCall {
-                    id: id.clone(),
-                    tool: name.clone(),
-                    args: input.clone(),
-                }),
-                _ => None,
-            })
-            .collect()
-    }
-
     fn convert_messages(&self, messages: &[Message]) -> Result<(Option<String>, Vec<AnthropicMessage>)> {
         let mut system_message = None;
         let mut anthropic_messages = Vec::new();
@@ -281,26 +269,42 @@ impl AnthropicProvider {
         &self,
         mut stream: impl futures_util::Stream<Item = reqwest::Result<Bytes>> + Unpin,
         tx: mpsc::Sender<Result<CompletionChunk>>,
-    ) {
+    ) -> Option<Usage> {
         let mut buffer = String::new();
         let mut current_tool_calls: Vec<ToolCall> = Vec::new();
         let mut partial_tool_json = String::new(); // Accumulate partial JSON for tool calls
-
+        let mut accumulated_usage: Option<Usage> = None;
+        let mut byte_buffer = Vec::new(); // Buffer for incomplete UTF-8 sequences
+        
         while let Some(chunk_result) = stream.next().await {
             match chunk_result {
                 Ok(chunk) => {
-                    let chunk_str = match std::str::from_utf8(&chunk) {
-                        Ok(s) => s,
+                    // Append new bytes to our buffer
+                    byte_buffer.extend_from_slice(&chunk);
+                    
+                    // Try to convert the entire buffer to UTF-8
+                    let chunk_str = match std::str::from_utf8(&byte_buffer) {
+                        Ok(s) => {
+                            // Successfully converted entire buffer, clear it and use the string
+                            let result = s.to_string();
+                            byte_buffer.clear();
+                            result
+                        }
                         Err(e) => {
-                            error!("Invalid UTF-8 in stream chunk: {}", e);
-                            let _ = tx
-                                .send(Err(anyhow!("Invalid UTF-8 in stream chunk: {}", e)))
-                                .await;
-                            return;
+                            // Check if this is an incomplete sequence at the end
+                            let valid_up_to = e.valid_up_to();
+                            if valid_up_to > 0 {
+                                // We have some valid UTF-8, extract it and keep the rest for next iteration
+                                let valid_bytes = byte_buffer.drain(..valid_up_to).collect::<Vec<_>>();
+                                std::str::from_utf8(&valid_bytes).unwrap().to_string()
+                            } else {
+                                // No valid UTF-8 at all, skip this chunk and continue
+                                continue;
+                            }
                         }
                     };
 
-                    buffer.push_str(chunk_str);
+                    buffer.push_str(&chunk_str);
 
                     // Process complete lines
                     while let Some(line_end) = buffer.find('\n') {
@@ -318,20 +322,34 @@ impl AnthropicProvider {
                                 let final_chunk = CompletionChunk {
                                     content: String::new(),
                                     finished: true,
+                                    usage: accumulated_usage.clone(),
                                     tool_calls: if current_tool_calls.is_empty() { None } else { Some(current_tool_calls.clone()) },
                                 };
                                 if tx.send(Ok(final_chunk)).await.is_err() {
                                     debug!("Receiver dropped, stopping stream");
                                 }
-                                return;
+                                return accumulated_usage;
                             }
 
                             debug!("Raw Claude API JSON: {}", data);
 
                             match serde_json::from_str::<AnthropicStreamEvent>(data) {
                                 Ok(event) => {
-                                    debug!("Parsed event: {:?}", event);
+                                    debug!("Parsed event type: {}, event: {:?}", event.event_type, event);
                                     match event.event_type.as_str() {
+                                        "message_start" => {
+                                            // Extract usage data from message_start event
+                                            if let Some(message) = event.message {
+                                                if let Some(usage) = message.usage {
+                                                    accumulated_usage = Some(Usage {
+                                                        prompt_tokens: usage.input_tokens,
+                                                        completion_tokens: usage.output_tokens,
+                                                        total_tokens: usage.input_tokens + usage.output_tokens,
+                                                    });
+                                                    debug!("Captured usage from message_start: {:?}", accumulated_usage);
+                                                }
+                                            }
+                                        }
                                         "content_block_start" => {
                                             debug!("Received content_block_start event: {:?}", event);
                                             if let Some(content_block) = event.content_block {
@@ -354,11 +372,12 @@ impl AnthropicProvider {
                                                             let chunk = CompletionChunk {
                                                                 content: String::new(),
                                                                 finished: false,
+                                                                usage: None,
                                                                 tool_calls: Some(vec![tool_call]),
                                                             };
                                                             if tx.send(Ok(chunk)).await.is_err() {
                                                                 debug!("Receiver dropped, stopping stream");
-                                                                return;
+                                                                return accumulated_usage;
                                                             }
                                                         } else {
                                                             // Arguments are empty, we'll accumulate them from partial_json
@@ -380,11 +399,12 @@ impl AnthropicProvider {
                                                     let chunk = CompletionChunk {
                                                         content: text,
                                                         finished: false,
+                                                        usage: None,
                                                         tool_calls: None,
                                                     };
                                                     if tx.send(Ok(chunk)).await.is_err() {
                                                         debug!("Receiver dropped, stopping stream");
-                                                        return;
+                                                        return accumulated_usage;
                                                     }
                                                 }
                                                 // Handle partial JSON for tool calls
@@ -419,11 +439,12 @@ impl AnthropicProvider {
                                                 let chunk = CompletionChunk {
                                                     content: String::new(),
                                                     finished: false,
+                                                    usage: None,
                                                     tool_calls: Some(current_tool_calls.clone()),
                                                 };
                                                 if tx.send(Ok(chunk)).await.is_err() {
                                                     debug!("Receiver dropped, stopping stream");
-                                                    return;
+                                                    return accumulated_usage;
                                                 }
                                             }
                                         }
@@ -432,12 +453,13 @@ impl AnthropicProvider {
                                             let final_chunk = CompletionChunk {
                                                 content: String::new(),
                                                 finished: true,
+                                                usage: accumulated_usage.clone(),
                                                 tool_calls: if current_tool_calls.is_empty() { None } else { Some(current_tool_calls.clone()) },
                                             };
                                             if tx.send(Ok(final_chunk)).await.is_err() {
                                                 debug!("Receiver dropped, stopping stream");
                                             }
-                                            return;
+                                            return accumulated_usage;
                                         }
                                         "error" => {
                                             if let Some(error) = event.error {
@@ -445,7 +467,7 @@ impl AnthropicProvider {
                                                 let _ = tx
                                                     .send(Err(anyhow!("Anthropic API error: {:?}", error)))
                                                     .await;
-                                                return;
+                                                return accumulated_usage;
                                             }
                                         }
                                         _ => {
@@ -464,7 +486,7 @@ impl AnthropicProvider {
                 Err(e) => {
                     error!("Stream error: {}", e);
                     let _ = tx.send(Err(anyhow!("Stream error: {}", e))).await;
-                    return;
+                    return accumulated_usage;
                 }
             }
         }
@@ -473,9 +495,11 @@ impl AnthropicProvider {
         let final_chunk = CompletionChunk {
             content: String::new(),
             finished: true,
+            usage: accumulated_usage.clone(),
             tool_calls: if current_tool_calls.is_empty() { None } else { Some(current_tool_calls) },
         };
         let _ = tx.send(Ok(final_chunk)).await;
+        accumulated_usage
     }
 }
 
@@ -596,7 +620,14 @@ impl LLMProvider for AnthropicProvider {
         // Spawn task to process the stream
         let provider = self.clone();
         tokio::spawn(async move {
-            provider.parse_streaming_response(stream, tx).await;
+            let usage = provider.parse_streaming_response(stream, tx).await;
+            // Log the final usage if available
+            if let Some(usage) = usage {
+                debug!(
+                    "Stream completed with usage - prompt: {}, completion: {}, total: {}",
+                    usage.prompt_tokens, usage.completion_tokens, usage.total_tokens
+                );
+            }
         });
 
         Ok(ReceiverStream::new(rx))
@@ -668,14 +699,8 @@ enum AnthropicContent {
 
 #[derive(Debug, Deserialize)]
 struct AnthropicResponse {
-    id: String,
-    #[serde(rename = "type")]
-    response_type: String,
-    role: String,
     content: Vec<AnthropicContent>,
     model: String,
-    stop_reason: Option<String>,
-    stop_sequence: Option<String>,
     usage: AnthropicUsage,
 }
 
@@ -697,12 +722,18 @@ struct AnthropicStreamEvent {
     error: Option<AnthropicError>,
     #[serde(default)]
     content_block: Option<AnthropicContent>,
+    #[serde(default)]
+    message: Option<AnthropicStreamMessage>,
+}
+
+#[derive(Debug, Deserialize)]
+struct AnthropicStreamMessage {
+    #[serde(default)]
+    usage: Option<AnthropicUsage>,
 }
 
 #[derive(Debug, Deserialize)]
 struct AnthropicDelta {
-    #[serde(rename = "type")]
-    delta_type: Option<String>,
     text: Option<String>,
     partial_json: Option<String>,
 }
@@ -710,7 +741,9 @@ struct AnthropicDelta {
 #[derive(Debug, Deserialize)]
 struct AnthropicError {
     #[serde(rename = "type")]
+    #[allow(dead_code)]
     error_type: String,
+    #[allow(dead_code)]
     message: String,
 }
 
@@ -813,32 +846,4 @@ mod tests {
         assert!(anthropic_tools[0].input_schema.required.is_some());
         assert_eq!(anthropic_tools[0].input_schema.required.as_ref().unwrap()[0], "location");
     }
-
-    #[test]
-    fn test_tool_call_conversion() {
-        let provider = AnthropicProvider::new(
-            "test-key".to_string(),
-            None,
-            None,
-            None,
-        ).unwrap();
-
-        let content = vec![
-            AnthropicContent::Text {
-                text: "I'll help you get the weather.".to_string(),
-            },
-            AnthropicContent::ToolUse {
-                id: "toolu_123".to_string(),
-                name: "get_weather".to_string(),
-                input: serde_json::json!({"location": "San Francisco, CA"}),
-            },
-        ];
-
-        let tool_calls = provider.convert_anthropic_tool_calls(&content);
-
-        assert_eq!(tool_calls.len(), 1);
-        assert_eq!(tool_calls[0].id, "toolu_123");
-        assert_eq!(tool_calls[0].tool, "get_weather");
-        assert_eq!(tool_calls[0].args["location"], "San Francisco, CA");
-    }
 }

crates/g3-providers/src/embedded.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use g3_providers::{
+use crate::{
     CompletionChunk, CompletionRequest, CompletionResponse, CompletionStream, LLMProvider, Message,
     MessageRole, Usage,
 };
@@ -8,22 +8,18 @@ use llama_cpp::{
     LlamaModel, LlamaParams, LlamaSession, SessionParams,
 };
 use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::Arc;
-use std::time::Duration;
 use tokio::sync::mpsc;
 use tokio::sync::Mutex;
 use tokio_stream::wrappers::ReceiverStream;
-use tracing::{debug, error, info, warn};
+use tracing::{debug, error, info};
 
 pub struct EmbeddedProvider {
-    model: Arc<LlamaModel>,
     session: Arc<Mutex<LlamaSession>>,
     model_name: String,
     max_tokens: u32,
     temperature: f32,
     context_length: u32,
-    generation_active: Arc<AtomicBool>,
 }
 
 impl EmbeddedProvider {
@@ -71,8 +67,10 @@ impl EmbeddedProvider {
             .map_err(|e| anyhow::anyhow!("Failed to load model: {}", e))?;
 
         // Create session with parameters
-        let mut session_params = SessionParams::default();
-        session_params.n_ctx = context_size;
+        let mut session_params = SessionParams {
+            n_ctx: context_size,
+            ..Default::default()
+        };
         if let Some(threads) = threads {
             session_params.n_threads = threads;
         }
@@ -84,13 +82,11 @@ impl EmbeddedProvider {
         info!("Successfully loaded {} model", model_type);
 
         Ok(Self {
-            model: Arc::new(model),
             session: Arc::new(Mutex::new(session)),
             model_name: format!("embedded-{}", model_type),
             max_tokens: max_tokens.unwrap_or(2048),
             temperature: temperature.unwrap_or(0.1),
             context_length: context_size,
-            generation_active: Arc::new(AtomicBool::new(false)),
         })
     }
 
@@ -143,7 +139,7 @@ impl EmbeddedProvider {
                         in_conversation = false;
                     }
                     MessageRole::Assistant => {
-                        formatted.push_str(" ");
+                        formatted.push(' ');
                         formatted.push_str(&message.content);
                         formatted.push_str("</s> ");
                         in_conversation = false;
@@ -152,8 +148,8 @@ impl EmbeddedProvider {
             }
             
             // If the last message was from user, add a space for the assistant's response
-            if messages.last().map_or(false, |m| matches!(m.role, MessageRole::User)) {
-                formatted.push_str(" ");
+            if messages.last().is_some_and(|m| matches!(m.role, MessageRole::User)) {
+                formatted.push(' ');
             }
             
             formatted
@@ -429,7 +425,6 @@ impl EmbeddedProvider {
     // Download the Qwen 2.5 7B model if it doesn't exist
     fn download_qwen_model(model_path: &Path) -> Result<()> {
         use std::fs;
-        use std::io::Write;
         use std::process::Command;
         
         const MODEL_URL: &str = "https://huggingface.co/Qwen/Qwen2.5-7B-Instruct-GGUF/resolve/main/qwen2.5-7b-instruct-q3_k_m.gguf";
@@ -446,7 +441,7 @@ impl EmbeddedProvider {
         
         // Use curl with progress bar for download
         let output = Command::new("curl")
-            .args(&[
+            .args([
                 "-L",  // Follow redirects
                 "-#",  // Show progress bar
                 "-f",  // Fail on HTTP errors
@@ -662,6 +657,7 @@ impl LLMProvider for EmbeddedProvider {
                                     let chunk = CompletionChunk {
                                         content: remaining_to_send.to_string(),
                                         finished: false,
+                                        usage: None,
                                         tool_calls: None,
                                     };
                                     let _ = tx.blocking_send(Ok(chunk));
@@ -688,6 +684,7 @@ impl LLMProvider for EmbeddedProvider {
                             let chunk = CompletionChunk {
                                 content: remaining_to_send.to_string(),
                                 finished: false,
+                                usage: None,
                                 tool_calls: None,
                             };
                             let _ = tx.blocking_send(Ok(chunk));
@@ -721,6 +718,7 @@ impl LLMProvider for EmbeddedProvider {
                             let chunk = CompletionChunk {
                                 content: to_send.to_string(),
                                 finished: false,
+                                usage: None,
                                 tool_calls: None,
                             };
                             if tx.blocking_send(Ok(chunk)).is_err() {
@@ -736,6 +734,7 @@ impl LLMProvider for EmbeddedProvider {
                         let chunk = CompletionChunk {
                             content: unsent_tokens.clone(),
                             finished: false,
+                            usage: None,
                             tool_calls: None,
                         };
                         if tx.blocking_send(Ok(chunk)).is_err() {
@@ -756,6 +755,7 @@ impl LLMProvider for EmbeddedProvider {
             let final_chunk = CompletionChunk {
                 content: String::new(),
                 finished: true,
+                usage: None,  // Embedded models calculate usage differently
                 tool_calls: None,
             };
             let _ = tx.blocking_send(Ok(final_chunk));

crates/g3-providers/src/lib.rs

@@ -67,6 +67,7 @@ pub struct CompletionChunk {
     pub content: String,
     pub finished: bool,
     pub tool_calls: Option<Vec<ToolCall>>,
+    pub usage: Option<Usage>,  // Add usage tracking for streaming
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -84,8 +85,13 @@ pub struct Tool {
 }
 
 pub mod anthropic;
+pub mod databricks;
+pub mod embedded;
+pub mod oauth;
 
 pub use anthropic::AnthropicProvider;
+pub use databricks::DatabricksProvider;
+pub use embedded::EmbeddedProvider;
 
 /// Provider registry for managing multiple LLM providers
 pub struct ProviderRegistry {

crates/g3-providers/src/oauth.rs

@@ -0,0 +1,463 @@
+use anyhow::Result;
+use axum::{extract::Query, response::Html, routing::get, Router};
+use base64::Engine;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use sha2::Digest;
+use std::{collections::HashMap, fs, net::SocketAddr, path::PathBuf, sync::Arc};
+use tokio::sync::{oneshot, Mutex as TokioMutex};
+use url::Url;
+
+#[derive(Debug, Clone)]
+struct OidcEndpoints {
+    authorization_endpoint: String,
+    token_endpoint: String,
+}
+
+#[derive(Serialize, Deserialize)]
+struct TokenData {
+    /// The access token used to authenticate API requests
+    access_token: String,
+
+    /// Optional refresh token that can be used to obtain a new access token
+    /// when the current one expires, enabling offline access without user interaction
+    refresh_token: Option<String>,
+
+    /// When the access token expires (if known)
+    /// Used to determine when a token needs to be refreshed
+    expires_at: Option<DateTime<Utc>>,
+}
+
+struct TokenCache {
+    cache_path: PathBuf,
+}
+
+fn get_base_path() -> PathBuf {
+    // Use a similar pattern to Goose but for g3
+    // macOS/Linux: ~/.config/g3/databricks/oauth
+    // Windows: ~\AppData\Roaming\g3\config\databricks\oauth\
+    let mut path = dirs::config_dir().unwrap_or_else(|| PathBuf::from("."));
+    path.push("g3");
+    path.push("databricks");
+    path.push("oauth");
+    path
+}
+
+impl TokenCache {
+    fn new(host: &str, client_id: &str, scopes: &[String]) -> Self {
+        let mut hasher = sha2::Sha256::new();
+        hasher.update(host.as_bytes());
+        hasher.update(client_id.as_bytes());
+        hasher.update(scopes.join(",").as_bytes());
+        let hash = format!("{:x}", hasher.finalize());
+
+        fs::create_dir_all(get_base_path()).unwrap_or(());
+        let cache_path = get_base_path().join(format!("{}.json", hash));
+
+        Self { cache_path }
+    }
+
+    fn load_token(&self) -> Option<TokenData> {
+        if let Ok(contents) = fs::read_to_string(&self.cache_path) {
+            if let Ok(token_data) = serde_json::from_str::<TokenData>(&contents) {
+                // Only return tokens that have a refresh token
+                if token_data.refresh_token.is_some() {
+                    // If token is not expired, return it for immediate use
+                    if let Some(expires_at) = token_data.expires_at {
+                        if expires_at > Utc::now() {
+                            return Some(token_data);
+                        }
+                        // If token is expired but has refresh token, return it so we can refresh
+                        return Some(token_data);
+                    }
+                    // No expiration time but has refresh token, return it
+                    return Some(token_data);
+                }
+                // Token doesn't have a refresh token, ignore it to force a new OAuth flow
+            }
+        }
+        None
+    }
+
+    fn save_token(&self, token_data: &TokenData) -> Result<()> {
+        if let Some(parent) = self.cache_path.parent() {
+            fs::create_dir_all(parent)?;
+        }
+        let contents = serde_json::to_string(token_data)?;
+        fs::write(&self.cache_path, contents)?;
+        Ok(())
+    }
+}
+
+async fn get_workspace_endpoints(host: &str) -> Result<OidcEndpoints> {
+    let base_url = Url::parse(host).expect("Invalid host URL");
+    let oidc_url = base_url
+        .join("oidc/.well-known/oauth-authorization-server")
+        .expect("Invalid OIDC URL");
+
+    let client = reqwest::Client::new();
+    let resp = client.get(oidc_url.clone()).send().await?;
+
+    if !resp.status().is_success() {
+        return Err(anyhow::anyhow!(
+            "Failed to get OIDC configuration from {}",
+            oidc_url.to_string()
+        ));
+    }
+
+    let oidc_config: Value = resp.json().await?;
+
+    let authorization_endpoint = oidc_config
+        .get("authorization_endpoint")
+        .and_then(|v| v.as_str())
+        .ok_or_else(|| anyhow::anyhow!("authorization_endpoint not found in OIDC configuration"))?
+        .to_string();
+
+    let token_endpoint = oidc_config
+        .get("token_endpoint")
+        .and_then(|v| v.as_str())
+        .ok_or_else(|| anyhow::anyhow!("token_endpoint not found in OIDC configuration"))?
+        .to_string();
+
+    Ok(OidcEndpoints {
+        authorization_endpoint,
+        token_endpoint,
+    })
+}
+
+struct OAuthFlow {
+    endpoints: OidcEndpoints,
+    client_id: String,
+    redirect_url: String,
+    scopes: Vec<String>,
+    state: String,
+    verifier: String,
+}
+
+impl OAuthFlow {
+    fn new(
+        endpoints: OidcEndpoints,
+        client_id: String,
+        redirect_url: String,
+        scopes: Vec<String>,
+    ) -> Self {
+        Self {
+            endpoints,
+            client_id,
+            redirect_url,
+            scopes,
+            state: nanoid::nanoid!(16),
+            verifier: nanoid::nanoid!(64),
+        }
+    }
+
+    /// Extracts token data from an OAuth 2.0 token response.
+    fn extract_token_data(
+        &self,
+        token_response: &Value,
+        old_refresh_token: Option<&str>,
+    ) -> Result<TokenData> {
+        // Extract access token (required)
+        let access_token = token_response
+            .get("access_token")
+            .and_then(|v| v.as_str())
+            .ok_or_else(|| anyhow::anyhow!("access_token not found in token response"))?
+            .to_string();
+
+        // Extract refresh token if available
+        let refresh_token = token_response
+            .get("refresh_token")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string())
+            .or_else(|| old_refresh_token.map(|s| s.to_string()));
+
+        // Handle token expiration
+        let expires_at =
+            if let Some(expires_in) = token_response.get("expires_in").and_then(|v| v.as_u64()) {
+                // Traditional OAuth flow with expires_in seconds
+                Some(Utc::now() + chrono::Duration::seconds(expires_in as i64))
+            } else {
+                // If the server doesn't provide any expiration info, log it but don't set an expiration
+                tracing::debug!(
+                    "No expiration information provided by server, token expiration unknown."
+                );
+                None
+            };
+
+        Ok(TokenData {
+            access_token,
+            refresh_token,
+            expires_at,
+        })
+    }
+
+    fn get_authorization_url(&self) -> String {
+        let challenge = {
+            let digest = sha2::Sha256::digest(self.verifier.as_bytes());
+            base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(digest)
+        };
+
+        let params = [
+            ("response_type", "code"),
+            ("client_id", &self.client_id),
+            ("redirect_uri", &self.redirect_url),
+            ("scope", &self.scopes.join(" ")),
+            ("state", &self.state),
+            ("code_challenge", &challenge),
+            ("code_challenge_method", "S256"),
+        ];
+
+        format!(
+            "{}?{}",
+            self.endpoints.authorization_endpoint,
+            serde_urlencoded::to_string(params).unwrap()
+        )
+    }
+
+    async fn exchange_code_for_token(&self, code: &str) -> Result<TokenData> {
+        let params = [
+            ("grant_type", "authorization_code"),
+            ("code", code),
+            ("redirect_uri", &self.redirect_url),
+            ("code_verifier", &self.verifier),
+            ("client_id", &self.client_id),
+        ];
+
+        let client = reqwest::Client::new();
+        let resp = client
+            .post(&self.endpoints.token_endpoint)
+            .header("Content-Type", "application/x-www-form-urlencoded")
+            .form(&params)
+            .send()
+            .await?;
+
+        if !resp.status().is_success() {
+            let err_text = resp.text().await?;
+            return Err(anyhow::anyhow!(
+                "Failed to exchange code for token: {}",
+                err_text
+            ));
+        }
+
+        let token_response: Value = resp.json().await?;
+        self.extract_token_data(&token_response, None)
+    }
+
+    async fn refresh_token(&self, refresh_token: &str) -> Result<TokenData> {
+        let params = [
+            ("grant_type", "refresh_token"),
+            ("refresh_token", refresh_token),
+            ("client_id", &self.client_id),
+        ];
+
+        tracing::debug!("Refreshing token using refresh_token");
+
+        let client = reqwest::Client::new();
+        let resp = client
+            .post(&self.endpoints.token_endpoint)
+            .header("Content-Type", "application/x-www-form-urlencoded")
+            .form(&params)
+            .send()
+            .await?;
+
+        if !resp.status().is_success() {
+            let err_text = resp.text().await?;
+            return Err(anyhow::anyhow!("Failed to refresh token: {}", err_text));
+        }
+
+        let token_response: Value = resp.json().await?;
+        self.extract_token_data(&token_response, Some(refresh_token))
+    }
+
+    async fn execute(&self) -> Result<TokenData> {
+        // Create a channel that will send the auth code from the app process
+        let (tx, rx) = oneshot::channel();
+        let state = self.state.clone();
+        let tx = Arc::new(TokioMutex::new(Some(tx)));
+
+        // Setup a server that will receive the redirect, capture the code, and display success/failure
+        let app = Router::new().route(
+            "/",
+            get(move |Query(params): Query<HashMap<String, String>>| {
+                let tx = Arc::clone(&tx);
+                let state = state.clone();
+                async move {
+                    let code = params.get("code").cloned();
+                    let received_state = params.get("state").cloned();
+
+                    if let (Some(code), Some(received_state)) = (code, received_state) {
+                        if received_state == state {
+                            if let Some(sender) = tx.lock().await.take() {
+                                if sender.send(code).is_ok() {
+                                    return Html(
+                                        "<h2>G3 Authentication Success</h2><p>You can close this window and return to your terminal.</p>",
+                                    );
+                                }
+                            }
+                            Html("<h2>Error</h2><p>Authentication already completed.</p>")
+                        } else {
+                            Html("<h2>Error</h2><p>State mismatch.</p>")
+                        }
+                    } else {
+                        Html("<h2>Error</h2><p>Authentication failed.</p>")
+                    }
+                }
+            }),
+        );
+
+        // Start the server to accept the oauth code
+        let redirect_url = Url::parse(&self.redirect_url)?;
+        let port = redirect_url.port().unwrap_or(80);
+        let addr = SocketAddr::from(([127, 0, 0, 1], port));
+
+        let listener = tokio::net::TcpListener::bind(addr).await?;
+
+        let server_handle = tokio::spawn(async move {
+            let server = axum::serve(listener, app);
+            server.await.unwrap();
+        });
+
+        // Open the browser which will redirect with the code to the server
+        let authorization_url = self.get_authorization_url();
+        if std::env::var("G3_RETRO_MODE").is_err() {
+            println!("🔐 Opening browser for Databricks authentication...");
+        }
+        if webbrowser::open(&authorization_url).is_err() {
+            println!(
+                "Please open this URL in your browser:\n{}",
+                authorization_url
+            );
+        }
+
+        // Wait for the authorization code with a timeout
+        let code = tokio::time::timeout(
+            std::time::Duration::from_secs(120), // 2 minute timeout
+            rx,
+        )
+        .await
+        .map_err(|_| anyhow::anyhow!("Authentication timed out after 2 minutes"))??;
+
+        // Stop the server
+        server_handle.abort();
+
+        if std::env::var("G3_RETRO_MODE").is_err() {
+            println!("✅ Authentication successful! Exchanging code for token...");
+        }
+
+        // Exchange the code for a token
+        self.exchange_code_for_token(&code).await
+    }
+}
+
+pub async fn get_oauth_token_async(
+    host: &str,
+    client_id: &str,
+    redirect_url: &str,
+    scopes: &[String],
+) -> Result<String> {
+    let token_cache = TokenCache::new(host, client_id, scopes);
+
+    // Try cache first
+    if let Some(token) = token_cache.load_token() {
+        // If token has an expiration time, check if it's expired
+        if let Some(expires_at) = token.expires_at {
+            if expires_at > Utc::now() {
+                tracing::debug!("Using cached token");
+                return Ok(token.access_token);
+            }
+            // Token is expired, will try to refresh below
+            tracing::debug!("Token is expired, attempting to refresh");
+        } else {
+            // No expiration time was provided by the server
+            tracing::debug!("Token has no expiration time, using cached token");
+            return Ok(token.access_token);
+        }
+
+        // Token is expired or has no expiration, try to refresh if we have a refresh token
+        if let Some(refresh_token) = token.refresh_token {
+            // Get endpoints for token refresh
+            match get_workspace_endpoints(host).await {
+                Ok(endpoints) => {
+                    let flow = OAuthFlow::new(
+                        endpoints,
+                        client_id.to_string(),
+                        redirect_url.to_string(),
+                        scopes.to_vec(),
+                    );
+
+                    // Try to refresh the token
+                    match flow.refresh_token(&refresh_token).await {
+                        Ok(new_token) => {
+                            if let Err(e) = token_cache.save_token(&new_token) {
+                                tracing::warn!("Failed to save refreshed token: {}", e);
+                            }
+                            tracing::info!("Successfully refreshed token");
+                            return Ok(new_token.access_token);
+                        }
+                        Err(e) => {
+                            tracing::warn!(
+                                "Failed to refresh token, will try new auth flow: {}",
+                                e
+                            );
+                            // Continue to new auth flow
+                        }
+                    }
+                }
+                Err(e) => {
+                    tracing::warn!("Failed to get endpoints for token refresh: {}", e);
+                    // Continue to new auth flow
+                }
+            }
+        }
+    }
+
+    // Get endpoints and execute flow for a new token
+    let endpoints = get_workspace_endpoints(host).await?;
+    let flow = OAuthFlow::new(
+        endpoints,
+        client_id.to_string(),
+        redirect_url.to_string(),
+        scopes.to_vec(),
+    );
+
+    // Execute the OAuth flow and get token
+    let token = flow.execute().await?;
+
+    // Cache and return
+    token_cache.save_token(&token)?;
+    if std::env::var("G3_RETRO_MODE").is_err() {
+        println!("🎉 Databricks authentication complete!");
+    }
+    Ok(token.access_token)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_token_cache() -> Result<()> {
+        let cache = TokenCache::new(
+            "https://example.com",
+            "test-client",
+            &["scope1".to_string()],
+        );
+
+        // Test with expiration time
+        let token_data = TokenData {
+            access_token: "test-token".to_string(),
+            refresh_token: Some("test-refresh-token".to_string()),
+            expires_at: Some(Utc::now() + chrono::Duration::hours(1)),
+        };
+
+        cache.save_token(&token_data)?;
+
+        let loaded_token = cache.load_token().unwrap();
+        assert_eq!(loaded_token.access_token, token_data.access_token);
+        assert_eq!(loaded_token.refresh_token, token_data.refresh_token);
+        assert!(loaded_token.expires_at.is_some());
+
+        Ok(())
+    }
+}