shotgun-sh 0.2.17__py3-none-any.whl → 0.3.3.dev1__py3-none-any.whl

shotgun/agents/agent_manager.py

@@ -17,7 +17,7 @@ from tenacity import (
 )
 
 if TYPE_CHECKING:
-    from shotgun.agents.conversation_history import ConversationState
+    from shotgun.agents.conversation import ConversationState
 
 from pydantic_ai import (
     Agent,
@@ -68,8 +68,8 @@ from shotgun.posthog_telemetry import track_event
 from shotgun.tui.screens.chat_screen.hint_message import HintMessage
 from shotgun.utils.source_detection import detect_source
 
+from .conversation.history.compaction import apply_persistent_compaction
 from .export import create_export_agent
-from .history.compaction import apply_persistent_compaction
 from .messages import AgentSystemPrompt
 from .models import AgentDeps, AgentRuntimeOptions
 from .plan import create_plan_agent
@@ -615,19 +615,33 @@ class AgentManager(Widget):
         self._stream_state = _PartialStreamState()
 
         model_name = ""
+        supports_streaming = True  # Default to streaming enabled
+
         if hasattr(deps, "llm_model") and deps.llm_model is not None:
             model_name = deps.llm_model.name
+            supports_streaming = deps.llm_model.supports_streaming
 
-        # Check if it's a Shotgun account
-        is_shotgun_account = (
-            hasattr(deps, "llm_model")
-            and deps.llm_model is not None
-            and deps.llm_model.key_provider == KeyProvider.SHOTGUN
-        )
-
-        # Only disable streaming for GPT-5 if NOT a Shotgun account
-        # Shotgun accounts support streaming for GPT-5
-        is_gpt5_byok = "gpt-5" in model_name.lower() and not is_shotgun_account
+            # Add hint message if streaming is disabled for BYOK GPT-5 models
+            if (
+                not supports_streaming
+                and deps.llm_model.key_provider == KeyProvider.BYOK
+            ):
+                self.ui_message_history.append(
+                    HintMessage(
+                        message=(
+                            "⚠️ **Streaming not available for GPT-5**\n\n"
+                            "Your OpenAI organization doesn't have streaming enabled for this model.\n\n"
+                            "**Options:**\n"
+                            "- Get a [Shotgun Account](https://shotgun.sh) - streaming works out of the box\n"
+                            "- Complete [Biometric Verification](https://platform.openai.com/settings/organization/general) with OpenAI, then:\n"
+                            "  1. Press `Ctrl+P` → Open Provider Setup\n"
+                            "  2. Select OpenAI → Clear key\n"
+                            "  3. Re-add your OpenAI API key\n\n"
+                            "Continuing without streaming (responses will appear all at once)."
+                        )
+                    )
+                )
+                self._post_messages_updated()
 
         # Track message send event
         event_name = f"message_send_{self._current_agent_type.value}"
@@ -647,7 +661,7 @@ class AgentManager(Widget):
                 usage_limits=usage_limits,
                 message_history=message_history,
                 event_stream_handler=self._handle_event_stream
-                if not is_gpt5_byok
+                if supports_streaming
                 else None,
                 **kwargs,
             )
@@ -1300,7 +1314,7 @@ class AgentManager(Widget):
         Returns:
             ConversationState object containing UI and agent messages and current type
         """
-        from shotgun.agents.conversation_history import ConversationState
+        from shotgun.agents.conversation import ConversationState
 
         return ConversationState(
             agent_messages=self.message_history.copy(),

shotgun/agents/common.py

@@ -25,7 +25,7 @@ from shotgun.utils import ensure_shotgun_directory_exists
 from shotgun.utils.datetime_utils import get_datetime_context
 from shotgun.utils.file_system_utils import get_shotgun_base_path
 
-from .history import token_limit_compactor
+from .conversation.history import token_limit_compactor
 from .messages import AgentSystemPrompt, SystemStatusPrompt
 from .models import AgentDeps, AgentRuntimeOptions, PipelineConfigEntry
 from .tools import (

shotgun/agents/config/README.md

@@ -0,0 +1,89 @@
+# Configuration Management
+
+This directory contains the configuration management system for Shotgun, including models, migrations, and provider integration.
+
+## Config Version History
+
+### Version 1 (Config Versioning Introduced)
+
+- **Commit**: `f36defc` (Sep 19, 2025)
+- **Title**: "feat: add Sentry error tracking with anonymous user identification"
+- **Key Fields**: `user_id`, `config_version: 1`
+- **Note**: First version to include explicit versioning
+
+### Version 2 (Shotgun Account Provider)
+
+- **Commit**: `37a5add` (Oct 3, 2025)
+- **Title**: "feat: add Shotgun Account provider with LiteLLM proxy support"
+- **Key Fields**: `user_id`, `config_version: 2`, added `shotgun` provider config
+- **Note**: Configs without a version field default to v2 during migration
+
+### Version 3 (OAuth Authentication)
+
+- **Commit**: `39d2af9` (Oct 6, 2025)
+- **Title**: "feat: implement OAuth-style authentication flow for Shotgun Account"
+- **Key Changes**:
+  - Renamed `user_id` → `shotgun_instance_id`
+  - Added `supabase_jwt` field to Shotgun Account config
+- **Git Tags**: Both `0.2.11.dev1` and `0.2.11.dev2` are at this version
+
+### Version 4 (Marketing Messages)
+
+- **Commit**: `8638a6d` (Nov 4, 2025)
+- **Title**: "feat: add marketing message system for GitHub star promotion"
+- **Key Changes**:
+  - Added `marketing` configuration with message tracking
+  - Added `shown_welcome_screen` field (set to `False` for existing BYOK users)
+
+### Version 5 (Streaming Detection) - CURRENT
+
+- **Commit**: `fded351` (Nov 6, 2025)
+- **Title**: "feat: add config migration for streaming capability field (v4->v5)"
+- **Key Changes**:
+  - Added `supports_streaming` field to OpenAI config
+  - Added `shown_onboarding_popup` timestamp field
+  - Added `supabase_jwt` to Shotgun Account config
+
+## Migration System
+
+The migration system is designed to be sequential and idempotent. Migrations are defined in `manager.py`:
+
+- `_migrate_v2_to_v3()`: Renames `user_id` to `shotgun_instance_id`
+- `_migrate_v3_to_v4()`: Adds marketing config and welcome screen flag
+- `_migrate_v4_to_v5()`: Adds streaming support fields
+
+All migrations preserve user data (API keys, settings) and can be safely run multiple times.
+
+## Adding a New Config Version
+
+When adding a new config version:
+
+1. **Update `models.py`**:
+   - Increment `CURRENT_CONFIG_VERSION` constant
+   - Add new fields to appropriate config models
+
+2. **Create migration function in `manager.py`**:
+   ```python
+   def _migrate_vN_to_vN+1(data: dict[str, Any]) -> dict[str, Any]:
+       """Migrate config from version N to N+1."""
+       data["config_version"] = N + 1
+       # Add migration logic
+       return data
+   ```
+
+3. **Register migration**:
+   - Add to `migrations` dict in `_apply_migrations()`
+
+4. **Add tests in `test/unit/test_config_migrations.py`**:
+   - Create example config for version N
+   - Test individual migration function
+   - Test sequential migration from version N to current
+   - Test with populated configs (non-empty API keys, etc.)
+   - Test edge cases
+
+## Files
+
+- **`models.py`**: Pydantic models for configuration schema
+- **`manager.py`**: ConfigManager class and migration functions
+- **`provider.py`**: LLM provider integration and model creation
+- **`streaming_test.py`**: OpenAI streaming capability detection

shotgun/agents/config/__init__.py

@@ -1,11 +1,20 @@
 """Configuration module for Shotgun CLI."""
 
-from .manager import ConfigManager, get_config_manager
+from .manager import (
+    BACKUP_DIR_NAME,
+    ConfigManager,
+    ConfigMigrationError,
+    get_backup_dir,
+    get_config_manager,
+)
 from .models import ProviderType, ShotgunConfig
 from .provider import get_provider_model
 
 __all__ = [
+    "BACKUP_DIR_NAME",
     "ConfigManager",
+    "ConfigMigrationError",
+    "get_backup_dir",
     "get_config_manager",
     "ProviderType",
     "ShotgunConfig",