actionagent 1.8.0 → 1.9.0

data/app/services/action_agent/dashboard_assistant_service.rb

@@ -90,8 +90,11 @@ module ActionAgent
       }
     ].freeze
 
-    def initialize(owner:, message: nil, history: [], provider: nil, model: nil, allow_provider_processing: false)
+    # +actor+ is the signed-in user, whose effective provider key the
+    # assistant generates with (see ProviderCredentials).
+    def initialize(owner:, actor: nil, message: nil, history: [], provider: nil, model: nil, allow_provider_processing: false)
       @owner = owner
+      @actor = actor
       @message = message
       @history = history
       @provider = provider
@@ -107,7 +110,7 @@ module ActionAgent
 
     def configuration
       {
-        providers: DEFAULT_MODELS.map { |id, model| { id: id, configured: provider_configured?(id), default_model: model } },
+        providers: DEFAULT_MODELS.map { |id, model| { id: id, configured: configuration_provider_configured?(id), default_model: model } },
         defaults: { provider: nil, model: nil },
         processing: { consent_required: true, disclosure: PROCESSING_DISCLOSURE },
         connections: connections,
@@ -200,17 +203,22 @@ module ActionAgent
     # sessions are started from that view (see LIMITATIONS).
     #
     # Claude Code is connected by ClaudeCodeAuth's rule, as the sandbox
-    # listing reports it: an API key the owner connected (auth "api_key"), or
-    # this machine's own login (auth "local_login", with its status).
+    # listing reports it: an API key the owner connected (auth "api_key"),
+    # this machine's own login (auth "local_login", with its status), or a
+    # login inside each checkout sandbox (auth "sandbox_login", with the
+    # actor's per-sandbox state under sandboxes).
     def connections
-      claude_code = ClaudeCodeAuth.status(ProviderKey.for_owner(@owner))
+      claude_code = ClaudeCodeAuth.status(ProviderKey.for_owner(@owner),
+        sandboxes: SandboxSession.for_owner(@owner).where(sandbox_type: "app_runtime").recent.limit(20),
+        user_id: @actor.respond_to?(:id) ? @actor.id : nil)
       {
         github: { supported: true, connected: GithubConnection.for_owner(@owner).exists? },
         claude_code: {
           supported: code_sessions_supported?,
           connected: claude_code[:connected],
           auth: claude_code[:mode],
-          login: claude_code[:login]
+          login: claude_code[:login],
+          sandboxes: claude_code[:sandboxes]
         }.compact,
         coi: { supported: false }
       }
@@ -278,10 +286,16 @@ module ActionAgent
 
     def provider_options(provider)
       @provider_options ||= {}
-      @provider_options[provider] ||= begin
-        host = ActionAgent.provider_credentials(@owner, provider)
-        (host.presence || ProviderKey.for_owner(@owner).find_by(provider: provider)&.generation_options || {}).symbolize_keys
-      end
+      @provider_options[provider] ||=
+        ProviderCredentials.resolve(owner: @owner, actor: @actor, provider: provider).options.symbolize_keys
+    end
+
+    # The configuration lists a provider whose credentials cannot be
+    # resolved as not configured; a request for it fails in #validate!.
+    def configuration_provider_configured?(provider)
+      provider_configured?(provider)
+    rescue ProviderCredentials::Unresolved
+      false
     end
 
     def provider_configured?(provider)