shotgun-sh 0.2.11__py3-none-any.whl → 0.2.11.dev2__py3-none-any.whl

shotgun/tui/screens/provider_config.py

@@ -97,7 +97,7 @@ class ProviderConfigScreen(Screen[None]):
                 "Don't have an API Key? Use these links to get one: [OpenAI](https://platform.openai.com/api-keys) | [Anthropic](https://console.anthropic.com) | [Google Gemini](https://aistudio.google.com)",
                 id="provider-links",
             )
-        yield ListView(*self._build_provider_items_sync(), id="provider-list")
+        yield ListView(*self._build_provider_items(), id="provider-list")
         yield Input(
             placeholder=self._input_placeholder(self.selected_provider),
             password=True,
@@ -110,6 +110,8 @@ class ProviderConfigScreen(Screen[None]):
             yield Button("Done \\[ESC]", id="done")
 
     def on_mount(self) -> None:
+        self.refresh_provider_status()
+        self._update_done_button_visibility()
         list_view = self.query_one(ListView)
         if list_view.children:
             list_view.index = 0
@@ -119,20 +121,13 @@ class ProviderConfigScreen(Screen[None]):
         self.query_one("#authenticate", Button).display = False
         self.set_focus(self.query_one("#api-key", Input))
 
-        # Refresh UI asynchronously
-        self.run_worker(self._refresh_ui(), exclusive=False)
-
     def on_screenresume(self) -> None:
         """Refresh provider status when screen is resumed.
 
         This ensures the UI reflects any provider changes made elsewhere.
         """
-        self.run_worker(self._refresh_ui(), exclusive=False)
-
-    async def _refresh_ui(self) -> None:
-        """Refresh provider status and button visibility."""
-        await self.refresh_provider_status()
-        await self._update_done_button_visibility()
+        self.refresh_provider_status()
+        self._update_done_button_visibility()
 
     def action_done(self) -> None:
         self.dismiss()
@@ -175,11 +170,7 @@ class ProviderConfigScreen(Screen[None]):
         if not self.is_mounted:
             return
 
-        # Show/hide UI elements based on provider type asynchronously
-        self.run_worker(self._update_provider_ui(provider), exclusive=False)
-
-    async def _update_provider_ui(self, provider: ProviderType) -> None:
-        """Update UI elements based on selected provider."""
+        # Show/hide UI elements based on provider type
         is_shotgun = provider == "shotgun"
 
         input_widget = self.query_one("#api-key", Input)
@@ -192,7 +183,7 @@ class ProviderConfigScreen(Screen[None]):
             save_button.display = False
 
             # Only show Authenticate button if shotgun is NOT already configured
-            if await self._has_provider_key("shotgun"):
+            if self._has_provider_key("shotgun"):
                 auth_button.display = False
             else:
                 auth_button.display = True
@@ -209,29 +200,22 @@ class ProviderConfigScreen(Screen[None]):
         app = cast("ShotgunApp", self.app)
         return app.config_manager
 
-    async def refresh_provider_status(self) -> None:
+    def refresh_provider_status(self) -> None:
         """Update the list view entries to reflect configured providers."""
         for provider_id in get_configurable_providers():
             label = self.query_one(f"#label-{provider_id}", Label)
-            label.update(await self._provider_label(provider_id))
+            label.update(self._provider_label(provider_id))
 
-    async def _update_done_button_visibility(self) -> None:
+    def _update_done_button_visibility(self) -> None:
         """Show/hide Done button based on whether any provider keys are configured."""
         done_button = self.query_one("#done", Button)
-        has_keys = await self.config_manager.has_any_provider_key()
+        has_keys = self.config_manager.has_any_provider_key()
         done_button.display = has_keys
 
-    def _build_provider_items_sync(self) -> list[ListItem]:
-        """Build provider items synchronously for compose().
-
-        Labels will be populated with status asynchronously in on_mount().
-        """
+    def _build_provider_items(self) -> list[ListItem]:
         items: list[ListItem] = []
         for provider_id in get_configurable_providers():
-            # Create labels with placeholder text - will be updated in on_mount()
-            label = Label(
-                self._provider_display_name(provider_id), id=f"label-{provider_id}"
-            )
+            label = Label(self._provider_label(provider_id), id=f"label-{provider_id}")
             items.append(ListItem(label, id=f"provider-{provider_id}"))
         return items
 
@@ -241,10 +225,11 @@ class ProviderConfigScreen(Screen[None]):
         provider_id = item.id.removeprefix("provider-")
         return provider_id if provider_id in get_configurable_providers() else None
 
-    async def _provider_label(self, provider_id: str) -> str:
+    def _provider_label(self, provider_id: str) -> str:
         display = self._provider_display_name(provider_id)
-        has_key = await self._has_provider_key(provider_id)
-        status = "Configured" if has_key else "Not configured"
+        status = (
+            "Configured" if self._has_provider_key(provider_id) else "Not configured"
+        )
         return f"{display} · {status}"
 
     def _provider_display_name(self, provider_id: str) -> str:
@@ -259,25 +244,21 @@ class ProviderConfigScreen(Screen[None]):
     def _input_placeholder(self, provider_id: str) -> str:
         return f"{self._provider_display_name(provider_id)} API key"
 
-    async def _has_provider_key(self, provider_id: str) -> bool:
+    def _has_provider_key(self, provider_id: str) -> bool:
         """Check if provider has a configured API key."""
         if provider_id == "shotgun":
             # Check shotgun key directly
-            config = await self.config_manager.load()
+            config = self.config_manager.load()
             return self.config_manager._provider_has_api_key(config.shotgun)
         else:
             # Check LLM provider key
             try:
                 provider = ProviderType(provider_id)
-                return await self.config_manager.has_provider_key(provider)
+                return self.config_manager.has_provider_key(provider)
             except ValueError:
                 return False
 
     def _save_api_key(self) -> None:
-        self.run_worker(self._do_save_api_key(), exclusive=True)
-
-    async def _do_save_api_key(self) -> None:
-        """Async implementation of API key saving."""
         input_widget = self.query_one("#api-key", Input)
         api_key = input_widget.value.strip()
 
@@ -286,7 +267,7 @@ class ProviderConfigScreen(Screen[None]):
             return
 
         try:
-            await self.config_manager.update_provider(
+            self.config_manager.update_provider(
                 self.selected_provider,
                 api_key=api_key,
             )
@@ -295,25 +276,21 @@ class ProviderConfigScreen(Screen[None]):
             return
 
         input_widget.value = ""
-        await self.refresh_provider_status()
-        await self._update_done_button_visibility()
+        self.refresh_provider_status()
+        self._update_done_button_visibility()
         self.notify(
             f"Saved API key for {self._provider_display_name(self.selected_provider)}."
         )
 
     def _clear_api_key(self) -> None:
-        self.run_worker(self._do_clear_api_key(), exclusive=True)
-
-    async def _do_clear_api_key(self) -> None:
-        """Async implementation of API key clearing."""
         try:
-            await self.config_manager.clear_provider_key(self.selected_provider)
+            self.config_manager.clear_provider_key(self.selected_provider)
         except Exception as exc:  # pragma: no cover - defensive; textual path
             self.notify(f"Failed to clear key: {exc}", severity="error")
             return
 
-        await self.refresh_provider_status()
-        await self._update_done_button_visibility()
+        self.refresh_provider_status()
+        self._update_done_button_visibility()
         self.query_one("#api-key", Input).value = ""
 
         # If we just cleared shotgun, show the Authenticate button
@@ -334,5 +311,5 @@ class ProviderConfigScreen(Screen[None]):
 
         # Refresh provider status after auth completes
         if result:
-            await self.refresh_provider_status()
+            self.refresh_provider_status()
             # Notify handled by auth screen

shotgun/tui/screens/shotgun_auth.py

@@ -135,7 +135,7 @@ class ShotgunAuthScreen(Screen[bool]):
         """Start the authentication flow."""
         try:
             # Get shotgun instance ID from config
-            shotgun_instance_id = await self.config_manager.get_shotgun_instance_id()
+            shotgun_instance_id = self.config_manager.get_shotgun_instance_id()
             logger.info("Starting auth flow with instance ID: %s", shotgun_instance_id)
 
             # Update status
@@ -215,7 +215,7 @@ class ShotgunAuthScreen(Screen[bool]):
                     logger.info("Authentication completed successfully")
 
                     if status_response.litellm_key and status_response.supabase_key:
-                        await self.config_manager.update_shotgun_account(
+                        self.config_manager.update_shotgun_account(
                             api_key=status_response.litellm_key,
                             supabase_jwt=status_response.supabase_key,
                         )

shotgun/tui/screens/welcome.py

@@ -136,17 +136,14 @@ class WelcomeScreen(Screen[None]):
 
     def on_mount(self) -> None:
         """Focus the first button on mount."""
-        self.query_one("#shotgun-button", Button).focus()
-        # Update BYOK button text asynchronously
-        self.run_worker(self._update_byok_button_text(), exclusive=False)
-
-    async def _update_byok_button_text(self) -> None:
-        """Update BYOK button text based on whether user has existing providers."""
+        # Update BYOK button text based on whether user has existing providers
         byok_button = self.query_one("#byok-button", Button)
         app = cast("ShotgunApp", self.app)
-        if await app.config_manager.has_any_provider_key():
+        if app.config_manager.has_any_provider_key():
             byok_button.label = "I'll stick with my BYOK setup"
 
+        self.query_one("#shotgun-button", Button).focus()
+
     @on(Button.Pressed, "#shotgun-button")
     def _on_shotgun_pressed(self) -> None:
         """Handle Shotgun Account button press."""
@@ -159,12 +156,12 @@ class WelcomeScreen(Screen[None]):
 
     async def _start_byok_config(self) -> None:
         """Launch BYOK provider configuration flow."""
-        await self._mark_welcome_shown()
+        self._mark_welcome_shown()
 
         app = cast("ShotgunApp", self.app)
 
         # If user already has providers, just dismiss and continue to chat
-        if await app.config_manager.has_any_provider_key():
+        if app.config_manager.has_any_provider_key():
             self.dismiss()
             return
 
@@ -174,7 +171,7 @@ class WelcomeScreen(Screen[None]):
         await self.app.push_screen_wait(ProviderConfigScreen())
 
         # Dismiss welcome screen after config if providers are now configured
-        if await app.config_manager.has_any_provider_key():
+        if app.config_manager.has_any_provider_key():
             self.dismiss()
 
     async def _start_shotgun_auth(self) -> None:
@@ -182,7 +179,7 @@ class WelcomeScreen(Screen[None]):
         from .shotgun_auth import ShotgunAuthScreen
 
         # Mark welcome screen as shown before auth
-        await self._mark_welcome_shown()
+        self._mark_welcome_shown()
 
         # Push the auth screen and wait for result
         await self.app.push_screen_wait(ShotgunAuthScreen())
@@ -190,9 +187,9 @@ class WelcomeScreen(Screen[None]):
         # Dismiss welcome screen after auth
         self.dismiss()
 
-    async def _mark_welcome_shown(self) -> None:
+    def _mark_welcome_shown(self) -> None:
         """Mark the welcome screen as shown in config."""
         app = cast("ShotgunApp", self.app)
-        config = await app.config_manager.load()
+        config = app.config_manager.load()
         config.shown_welcome_screen = True
-        await app.config_manager.save(config)
+        app.config_manager.save(config)

shotgun/tui/services/conversation_service.py

@@ -8,8 +8,6 @@ import logging
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-import aiofiles.os
-
 from shotgun.agents.conversation_history import ConversationHistory, ConversationState
 from shotgun.agents.conversation_manager import ConversationManager
 from shotgun.agents.models import AgentType
@@ -50,7 +48,7 @@ class ConversationService:
         else:
             self.conversation_manager = ConversationManager()
 
-    async def save_conversation(self, agent_manager: "AgentManager") -> bool:
+    def save_conversation(self, agent_manager: "AgentManager") -> bool:
         """Save the current conversation to persistent storage.
 
         Args:
@@ -70,15 +68,15 @@ class ConversationService:
             conversation.set_agent_messages(state.agent_messages)
             conversation.set_ui_messages(state.ui_messages)
 
-            # Save to file (now async)
-            await self.conversation_manager.save(conversation)
+            # Save to file
+            self.conversation_manager.save(conversation)
             logger.debug("Conversation saved successfully")
             return True
         except Exception as e:
             logger.exception(f"Failed to save conversation: {e}")
             return False
 
-    async def load_conversation(self) -> ConversationHistory | None:
+    def load_conversation(self) -> ConversationHistory | None:
         """Load conversation from persistent storage.
 
         Returns:
@@ -86,7 +84,7 @@ class ConversationService:
             or if loading failed.
         """
         try:
-            conversation = await self.conversation_manager.load()
+            conversation = self.conversation_manager.load()
             if conversation is None:
                 logger.debug("No conversation file found")
                 return None
@@ -97,7 +95,7 @@ class ConversationService:
             logger.exception(f"Failed to load conversation: {e}")
             return None
 
-    async def check_for_corrupted_conversation(self) -> bool:
+    def check_for_corrupted_conversation(self) -> bool:
         """Check if a conversation backup exists (indicating corruption).
 
         Returns:
@@ -106,9 +104,9 @@ class ConversationService:
         backup_path = self.conversation_manager.conversation_path.with_suffix(
             ".json.backup"
         )
-        return await aiofiles.os.path.exists(str(backup_path))
+        return backup_path.exists()
 
-    async def restore_conversation(
+    def restore_conversation(
         self,
         agent_manager: "AgentManager",
         usage_manager: "SessionUsageManager | None" = None,
@@ -125,11 +123,11 @@ class ConversationService:
             - error_message: Error message if restoration failed, None otherwise
             - restored_agent_type: The agent type from restored conversation
         """
-        conversation = await self.load_conversation()
+        conversation = self.load_conversation()
 
         if conversation is None:
             # Check for corruption
-            if await self.check_for_corrupted_conversation():
+            if self.check_for_corrupted_conversation():
                 return (
                     False,
                     "⚠️ Previous session was corrupted and has been backed up. Starting fresh conversation.",
@@ -153,7 +151,7 @@ class ConversationService:
 
             # Restore usage state if manager provided
             if usage_manager:
-                await usage_manager.restore_usage_state()
+                usage_manager.restore_usage_state()
 
             restored_type = AgentType(conversation.last_agent_model)
             logger.info(f"Conversation restored successfully (mode: {restored_type})")
@@ -167,7 +165,7 @@ class ConversationService:
                 None,
             )
 
-    async def clear_conversation(self) -> bool:
+    def clear_conversation(self) -> bool:
         """Clear the saved conversation file.
 
         Returns:
@@ -175,8 +173,8 @@ class ConversationService:
         """
         try:
             conversation_path = self.conversation_manager.conversation_path
-            if await aiofiles.os.path.exists(str(conversation_path)):
-                await aiofiles.os.unlink(str(conversation_path))
+            if conversation_path.exists():
+                conversation_path.unlink()
                 logger.info("Conversation file cleared")
             return True
         except Exception as e:

shotgun/tui/utils/mode_progress.py

@@ -3,8 +3,6 @@
 import random
 from pathlib import Path
 
-import aiofiles
-
 from shotgun.agents.models import AgentType
 from shotgun.utils.file_system_utils import get_shotgun_base_path
 
@@ -32,7 +30,7 @@ class ModeProgressChecker:
         """
         self.base_path = base_path or get_shotgun_base_path()
 
-    async def has_mode_content(self, mode: AgentType) -> bool:
+    def has_mode_content(self, mode: AgentType) -> bool:
         """Check if a mode has meaningful content.
 
         Args:
@@ -54,8 +52,7 @@ class ModeProgressChecker:
                 for item in export_path.glob("*"):
                     if item.is_file() and not item.name.startswith("."):
                         try:
-                            async with aiofiles.open(item, encoding="utf-8") as f:
-                                content = await f.read()
+                            content = item.read_text(encoding="utf-8")
                             if len(content.strip()) > self.MIN_CONTENT_SIZE:
                                 return True
                         except (OSError, UnicodeDecodeError):
@@ -68,16 +65,13 @@ class ModeProgressChecker:
             return False
 
         try:
-            async with aiofiles.open(file_path, encoding="utf-8") as f:
-                content = await f.read()
+            content = file_path.read_text(encoding="utf-8")
             # Check if file has meaningful content
             return len(content.strip()) > self.MIN_CONTENT_SIZE
         except (OSError, UnicodeDecodeError):
             return False
 
-    async def get_next_suggested_mode(
-        self, current_mode: AgentType
-    ) -> AgentType | None:
+    def get_next_suggested_mode(self, current_mode: AgentType) -> AgentType | None:
         """Get the next suggested mode based on current progress.
 
         Args:
@@ -100,7 +94,7 @@ class ModeProgressChecker:
             return None
 
         # Check if current mode has content
-        if not await self.has_mode_content(current_mode):
+        if not self.has_mode_content(current_mode):
             # Current mode is empty, no suggestion for next mode
             return None
 
@@ -228,9 +222,8 @@ class PlaceholderHints:
         if current_mode not in self.HINTS:
             return f"Enter your {current_mode.value} mode prompt (SHIFT+TAB to switch modes)"
 
-        # For placeholder text, we default to "no content" state (initial hints)
-        # This avoids async file system checks in the UI rendering path
-        has_content = False
+        # Determine if mode has content
+        has_content = self.progress_checker.has_mode_content(current_mode)
 
         # Get hint variations for this mode and state
         hints_list = self.HINTS[current_mode][has_content]

shotgun/tui/widgets/widget_coordinator.py

@@ -245,18 +245,3 @@ class WidgetCoordinator:
                 spinner.text = text
         except Exception as e:
             logger.exception(f"Failed to update spinner text: {e}")
-
-    def set_context_streaming(self, streaming: bool) -> None:
-        """Enable or disable context indicator streaming animation.
-
-        Args:
-            streaming: Whether to show streaming animation.
-        """
-        if not self.screen.is_mounted:
-            return
-
-        try:
-            context_indicator = self.screen.query_one(ContextIndicator)
-            context_indicator.set_streaming(streaming)
-        except Exception as e:
-            logger.exception(f"Failed to set context streaming: {e}")

shotgun/utils/file_system_utils.py

@@ -2,8 +2,6 @@
 
 from pathlib import Path
 
-import aiofiles
-
 from shotgun.settings import settings
 
 
@@ -37,20 +35,3 @@ def ensure_shotgun_directory_exists() -> Path:
     shotgun_dir.mkdir(exist_ok=True)
     # Note: Removed logger to avoid circular dependency with logging_config
     return shotgun_dir
-
-
-async def async_copy_file(src: Path, dst: Path) -> None:
-    """Asynchronously copy a file from src to dst.
-
-    Args:
-        src: Source file path
-        dst: Destination file path
-
-    Raises:
-        FileNotFoundError: If source file doesn't exist
-        OSError: If copy operation fails
-    """
-    async with aiofiles.open(src, "rb") as src_file:
-        content = await src_file.read()
-    async with aiofiles.open(dst, "wb") as dst_file:
-        await dst_file.write(content)

{shotgun_sh-0.2.11.dist-info → shotgun_sh-0.2.11.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.11
+Version: 0.2.11.dev2
 Summary: AI-powered research, planning, and task management CLI tool
 Project-URL: Homepage, https://shotgun.sh/
 Project-URL: Repository, https://github.com/shotgun-sh/shotgun
@@ -21,7 +21,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.11
-Requires-Dist: aiofiles>=24.0.0
 Requires-Dist: anthropic>=0.39.0
 Requires-Dist: dependency-injector>=4.41.0
 Requires-Dist: genai-prices>=0.0.27