language-operator 0.1.81 → 0.1.82

data/lib/language_operator/cli/commands/agent/base.rb

@@ -47,10 +47,10 @@ module LanguageOperator
             The operator will synthesize the agent from your description and deploy it to your cluster.
 
             Examples:
-              aictl agent create "review my spreadsheet at 4pm daily and email me any errors"
-              aictl agent create "summarize Hacker News top stories every morning at 8am"
-              aictl agent create "monitor my website uptime and alert me if it goes down"
-              aictl agent create --wizard    # Interactive wizard mode
+              langop agent create "review my spreadsheet at 4pm daily and email me any errors"
+              langop agent create "summarize Hacker News top stories every morning at 8am"
+              langop agent create "monitor my website uptime and alert me if it goes down"
+              langop agent create --wizard    # Interactive wizard mode
           DESC
           option :cluster, type: :string, desc: 'Override current cluster context'
           option :create_cluster, type: :string, desc: 'Create cluster if it doesn\'t exist'
@@ -116,7 +116,8 @@ module LanguageOperator
                 persona: options[:persona],
                 tools: options[:tools] || [],
                 models: models,
-                workspace: options[:workspace]
+                workspace: options[:workspace],
+                k8s_client: ctx.client
               )
 
               # Dry-run mode: preview without applying
@@ -392,9 +393,9 @@ module LanguageOperator
 
             puts
             puts 'Next steps:'
-            puts pastel.dim("aictl agent logs #{agent_name} -f")
-            puts pastel.dim("aictl agent code #{agent_name}")
-            puts pastel.dim("aictl agent inspect #{agent_name}")
+            puts pastel.dim("langop agent logs #{agent_name} -f")
+            puts pastel.dim("langop agent code #{agent_name}")
+            puts pastel.dim("langop agent inspect #{agent_name}")
             puts
           end
 
@@ -497,7 +498,7 @@ module LanguageOperator
             Formatters::ProgressFormatter.info('No changes made (dry-run mode)')
             puts
             puts 'To create this agent for real, run:'
-            cmd_parts = ["aictl agent create \"#{description}\""]
+            cmd_parts = ["langop agent create \"#{description}\""]
             cmd_parts << "--name #{name}" if options[:name]
             cmd_parts << "--persona #{persona}" if persona
             cmd_parts << "--tools #{tools.join(' ')}" if tools.any?
@@ -535,7 +536,7 @@ module LanguageOperator
               Formatters::ProgressFormatter.info('No agents found')
               puts
               puts 'Create an agent with:'
-              puts '  aictl agent create "<description>"'
+              puts '  langop agent create "<description>"'
               return
             end
 
@@ -564,7 +565,7 @@ module LanguageOperator
               Formatters::ProgressFormatter.info('No clusters found')
               puts
               puts 'Create a cluster first:'
-              puts '  aictl cluster create <name>'
+              puts '  langop cluster create <name>'
               return
             end
 
@@ -623,7 +624,7 @@ module LanguageOperator
                   Formatters::ProgressFormatter.warn('Synthesis taking longer than expected, continuing in background...')
                   puts
                   puts 'Check synthesis status with:'
-                  puts "  aictl agent inspect #{agent_name}"
+                  puts "  langop agent inspect #{agent_name}"
                   synthesis_result = { success: true, timeout: true }
                   break
                 end
@@ -751,8 +752,8 @@ module LanguageOperator
             end
 
             puts pastel.white.bold('Available Commands:')
-            puts pastel.dim("  aictl agent learning status #{agent_name}")
-            puts pastel.dim("  aictl agent inspect #{agent_name}")
+            puts pastel.dim("  langop agent learning status #{agent_name}")
+            puts pastel.dim("  langop agent inspect #{agent_name}")
           end
 
           def get_execution_data(agent_name, ctx)
@@ -916,7 +917,7 @@ module LanguageOperator
             Formatters::ProgressFormatter.warn("Could not verify deletion of agent '#{name}' within 30 seconds")
             puts
             puts "Check deletion status with:"
-            puts "  aictl agent list"
+            puts "  langop agent list"
             puts "  kubectl get languageagent #{name}"
             puts
             puts "If the agent shows 'Unknown' status, it may be pending deletion."

data/lib/language_operator/cli/commands/agent/code_operations.rb

@@ -29,7 +29,7 @@ module LanguageOperator
                     puts '  - Agent synthesis failed'
                     puts
                     puts 'Check agent status with:'
-                    puts "  aictl agent inspect #{name}"
+                    puts "  langop agent inspect #{name}"
                     exit 1
                   end
 
@@ -90,7 +90,7 @@ module LanguageOperator
                     puts pastel.yellow('No versions have been created yet.')
                     puts
                     puts 'Versions are created automatically during agent synthesis.'
-                    puts "Check agent status: #{pastel.dim("aictl agent inspect #{name}")}"
+                    puts "Check agent status: #{pastel.dim("langop agent inspect #{name}")}"
                     return
                   end
 
@@ -133,8 +133,8 @@ module LanguageOperator
                   puts table(headers, rows)
                   puts
                   puts 'Usage:'
-                  puts "  #{pastel.dim("aictl agent code #{name}")}"
-                  puts "  #{pastel.dim("aictl agent code #{name} --version=X")}"
+                  puts "  #{pastel.dim("langop agent code #{name}")}"
+                  puts "  #{pastel.dim("langop agent code #{name} --version=X")}"
                 end
               end
 
@@ -175,7 +175,7 @@ module LanguageOperator
                       puts "  v#{version_num}"
                     end
                     puts
-                    puts "Use 'aictl agent versions #{agent_name}' to see all available versions"
+                    puts "Use 'langop agent versions #{agent_name}' to see all available versions"
                     exit 1
                   end
 
@@ -231,7 +231,7 @@ module LanguageOperator
                   puts 'The operator will automatically re-synthesize the agent code.'
                   puts
                   puts 'Watch synthesis progress with:'
-                  puts "  aictl agent inspect #{name}"
+                  puts "  langop agent inspect #{name}"
                 end
               end
             end

data/lib/language_operator/cli/commands/agent/helpers/synthesis_watcher.rb

@@ -34,7 +34,7 @@ module LanguageOperator
                     Formatters::ProgressFormatter.warn('Synthesis taking longer than expected, continuing in background...')
                     puts
                     puts 'Check synthesis status with:'
-                    puts "  aictl agent inspect #{agent_name}"
+                    puts "  langop agent inspect #{agent_name}"
                     synthesis_result = { success: true, timeout: true }
                     break
                   end

data/lib/language_operator/cli/commands/agent/lifecycle.rb

@@ -49,7 +49,7 @@ module LanguageOperator
                   puts 'The agent will not execute on its schedule until resumed.'
                   puts
                   puts 'Resume with:'
-                  puts "  aictl agent resume #{name}"
+                  puts "  langop agent resume #{name}"
                 end
               end
 
@@ -90,7 +90,7 @@ module LanguageOperator
                   puts 'The agent will now execute according to its schedule.'
                   puts
                   puts 'View next execution time with:'
-                  puts "  aictl agent inspect #{name}"
+                  puts "  langop agent inspect #{name}"
                 end
               end
             end

data/lib/language_operator/cli/commands/agent/logs.rb

@@ -18,8 +18,8 @@ module LanguageOperator
                 Use -f to follow logs continuously (like tail -f).
 
                 Examples:
-                  aictl agent logs my-agent
-                  aictl agent logs my-agent -f
+                  langop agent logs my-agent
+                  langop agent logs my-agent -f
               DESC
               option :cluster, type: :string, desc: 'Override current cluster context'
               option :follow, type: :boolean, aliases: '-f', default: false, desc: 'Follow logs'

data/lib/language_operator/cli/commands/agent/workspace.rb

@@ -21,9 +21,9 @@ module LanguageOperator
                 cache data, and remember information across executions.
 
                 Examples:
-                  aictl agent workspace my-agent                           # List all files
-                  aictl agent workspace my-agent --path /workspace/state.json  # View specific file
-                  aictl agent workspace my-agent --clean                   # Clear workspace
+                  langop agent workspace my-agent                           # List all files
+                  langop agent workspace my-agent --path /workspace/state.json  # View specific file
+                  langop agent workspace my-agent --clean                   # Clear workspace
               DESC
               option :cluster, type: :string, desc: 'Override current cluster context'
               option :path, type: :string, desc: 'View specific file contents'
@@ -94,7 +94,7 @@ module LanguageOperator
                   puts "  Namespace: #{debug_info[:namespace]}"
                   puts
                   puts 'Check agent status with:'
-                  puts "  aictl agent inspect #{agent_name}"
+                  puts "  langop agent inspect #{agent_name}"
                   puts
                   puts 'List all pods in namespace:'
                   puts "  kubectl get pods -n #{ctx.namespace} -l #{Constants::KubernetesLabels::COMPONENT}=#{Constants::KubernetesLabels::COMPONENT_AGENT}"
@@ -112,7 +112,7 @@ module LanguageOperator
                   puts "Current pod status: #{pods.first.dig('status', 'phase')}"
                   puts
                   puts 'Check pod logs with:'
-                  puts "  aictl agent logs #{agent_name}"
+                  puts "  langop agent logs #{agent_name}"
                   exit 1
                 end
 
@@ -220,8 +220,8 @@ module LanguageOperator
 
                 puts
                 puts pastel.dim('Commands:')
-                puts pastel.dim("  aictl agent workspace #{agent_name} --path /workspace/<file>  # View file")
-                puts pastel.dim("  aictl agent workspace #{agent_name} --clean                   # Clear workspace")
+                puts pastel.dim("  langop agent workspace #{agent_name} --path /workspace/<file>  # View file")
+                puts pastel.dim("  langop agent workspace #{agent_name} --clean                   # Clear workspace")
                 puts
               end
 
@@ -235,7 +235,7 @@ module LanguageOperator
                   Formatters::ProgressFormatter.error("File not found: #{file_path}")
                   puts
                   puts 'List available files with:'
-                  puts "  aictl agent workspace #{agent_name}"
+                  puts "  langop agent workspace #{agent_name}"
                   exit 1
                 end
 

data/lib/language_operator/cli/commands/cluster.rb

@@ -13,7 +13,7 @@ module LanguageOperator
         include Helpers::UxHelper
 
         desc 'create NAME', 'Create a new language cluster'
-        option :namespace, type: :string, desc: 'Kubernetes namespace (defaults to current context namespace)'
+        option :organization_id, type: :string, desc: 'Organization ID for the cluster (auto-detected if only one exists)'
         option :kubeconfig, type: :string, desc: 'Path to kubeconfig file'
         option :context, type: :string, desc: 'Kubernetes context to use'
         option :switch, type: :boolean, default: true, desc: 'Switch to new cluster context'
@@ -23,34 +23,63 @@ module LanguageOperator
           handle_command_error('create cluster') do
             kubeconfig = options[:kubeconfig]
             context = options[:context]
+            org_id = options[:organization_id]
 
-            # Handle dry-run: output manifest and exit early
-            if options[:dry_run]
-              namespace = options[:namespace] || 'default'
-              resource = Kubernetes::ResourceBuilder.language_cluster(name, namespace: namespace, domain: options[:domain])
-              puts resource.to_yaml
-              return
+            # Create Kubernetes client to find organization namespace
+            k8s = Formatters::ProgressFormatter.with_spinner('Connecting to Kubernetes cluster') do
+              Kubernetes::Client.new(kubeconfig: kubeconfig, context: context)
+            end
+
+            # Auto-detect organization if not provided
+            unless org_id
+              org_id = detect_organization_id(k8s)
+              exit 1 unless org_id
+            end
+
+            # Find the organization namespace
+            namespace = Formatters::ProgressFormatter.with_spinner("Finding namespace for organization #{org_id[0..7]}") do
+              find_org_namespace(k8s, org_id)
             end
 
-            # Check if cluster already exists
-            if Config::ClusterConfig.cluster_exists?(name)
-              Formatters::ProgressFormatter.error("Cluster '#{name}' already exists")
+            unless namespace
+              Formatters::ProgressFormatter.error("Organization namespace not found for ID: #{org_id}")
+              puts "\nMake sure the organization exists and you have access to it."
+              puts "Available organization namespaces:"
+              list_org_namespaces(k8s)
               exit 1
             end
 
-            # Create Kubernetes client
-            k8s = Formatters::ProgressFormatter.with_spinner('Connecting to Kubernetes cluster') do
-              Kubernetes::Client.new(kubeconfig: kubeconfig, context: context)
+            # Handle dry-run: output manifest and exit early
+            if options[:dry_run]
+              # Create a mock client to pass org context for dry run
+              mock_client = Object.new
+              def mock_client.current_org_id; @org_id; end
+              mock_client.instance_variable_set(:@org_id, org_id)
+              
+              resource = Kubernetes::ResourceBuilder.language_cluster(name, namespace: namespace, domain: options[:domain], k8s_client: mock_client)
+              puts resource.to_yaml
+              return
             end
 
-            # Determine namespace: use --namespace flag, or current context namespace, or 'default'
-            namespace = options[:namespace] || k8s.current_namespace || 'default'
+            # Check if cluster already exists in Kubernetes
+            begin
+              existing_cluster = k8s.get_resource('LanguageCluster', name, namespace)
+              if existing_cluster
+                Formatters::ProgressFormatter.error("Cluster '#{name}' already exists in namespace '#{namespace}'")
+                exit 1
+              end
+            rescue StandardError => e
+              # If we get a 404 or API error, the cluster doesn't exist - that's fine
+              unless e.message.include?('404') || e.message.include?('Not Found')
+                warn "Warning: Could not check for existing cluster: #{e.message}" if ENV['DEBUG']
+              end
+            end
 
             # Check if operator is installed
             unless k8s.operator_installed?
               Formatters::ProgressFormatter.error('Language Operator not found in cluster')
               puts "\nInstall the operator first:"
-              puts '  aictl install'
+              puts '  langop install'
               exit 1
             end
 
@@ -65,7 +94,8 @@ module LanguageOperator
 
             # Create LanguageCluster resource
             Formatters::ProgressFormatter.with_spinner('Creating LanguageCluster resource') do
-              resource = Kubernetes::ResourceBuilder.language_cluster(name, namespace: namespace, domain: options[:domain])
+              labels = { 'langop.io/organization-id' => org_id }
+              resource = Kubernetes::ResourceBuilder.language_cluster(name, namespace: namespace, domain: options[:domain], labels: labels, k8s_client: k8s)
               k8s.apply_resource(resource)
               resource
             end
@@ -92,6 +122,7 @@ module LanguageOperator
               namespace: namespace,
               context: actual_context,
               domain: options[:domain],
+              org_id: org_id,
               status: 'Ready',
               created: Time.now.strftime('%Y-%m-%dT%H:%M:%SZ')
             )
@@ -100,7 +131,7 @@ module LanguageOperator
             unless options[:switch]
               puts
               puts 'Switch to this cluster with:'
-              puts pastel.dim("  aictl use #{name}")
+              puts pastel.dim("  langop use #{name}")
             end
           end
         end
@@ -109,167 +140,76 @@ module LanguageOperator
         option :all, type: :boolean, default: false, desc: 'Show all clusters including inactive'
         def list
           handle_command_error('list clusters') do
-            clusters = Config::ClusterConfig.list_clusters
-            current = Config::ClusterConfig.current_cluster
+            # Query Kubernetes directly for all LanguageCluster resources (like kubectl get languageclusters -A)
+            k8s = Kubernetes::Client.new
+            
+            # List all LanguageCluster resources across all namespaces
+            language_clusters = k8s.list_resources('LanguageCluster', namespace: nil)
 
-            if clusters.empty?
+            if language_clusters.empty?
               Formatters::ProgressFormatter.info('No clusters found')
               puts "\nCreate a cluster with:"
-              puts '  aictl cluster create <name>'
+              puts '  langop cluster create <name>'
               return
             end
 
-            # Cache clients by kubeconfig:context to prevent resource leaks
-            clients_cache = {}
+            current = Config::ClusterConfig.current_cluster
 
-            # Build table data
-            table_data = clusters.map do |cluster|
+            # Build table data from LanguageCluster resources
+            table_data = language_clusters.map do |cluster_resource|
               begin
-                # Get cluster config for cache key and reuse clients
-                cluster_config = Config::ClusterConfig.get_cluster(cluster[:name])
-                cache_key = "#{cluster_config[:kubeconfig]}:#{cluster_config[:context]}"
-
-                # Reuse existing client or create new one
-                k8s = clients_cache[cache_key] ||= begin
-                  # Validate kubeconfig exists before creating client
-                  Helpers::ClusterValidator.validate_kubeconfig!(cluster_config)
-                  require_relative '../../kubernetes/client'
-                  Kubernetes::Client.new(
-                    kubeconfig: cluster_config[:kubeconfig],
-                    context: cluster_config[:context]
-                  )
-                end
-              rescue StandardError
-                # Handle cluster config or client creation errors
-                name_display = cluster[:name]
-                name_display += ' *' if cluster[:name] == current
-
-                next {
+                name = cluster_resource.dig('metadata', 'name')
+                namespace = cluster_resource.dig('metadata', 'namespace')
+                status = cluster_resource.dig('status', 'phase') || 'Unknown'
+                domain = cluster_resource.dig('spec', 'domain')
+                
+                # Get organization information from the cluster resource itself
+                org_id = cluster_resource.dig('metadata', 'labels', 'langop.io/organization-id')
+                organization = org_id ? org_id[0..7] : 'legacy'
+                
+                # Check if this cluster matches the current selection
+                name_display = name
+                name_display = "#{pastel.bold(name)} (selected)" if name == current
+
+                # Get related resources in the same namespace
+                agents = k8s.list_resources(RESOURCE_AGENT, namespace: namespace)
+                tools = k8s.list_resources(RESOURCE_TOOL, namespace: namespace)  
+                models = k8s.list_resources(RESOURCE_MODEL, namespace: namespace)
+
+                {
                   name: name_display,
-                  namespace: cluster[:namespace],
+                  namespace: namespace,
+                  organization: organization,
+                  agents: agents.count,
+                  tools: tools.count,
+                  models: models.count,
+                  status: status,
+                  domain: domain || ''
+                }
+              rescue StandardError => e
+                # Handle any errors gracefully
+                name = cluster_resource.dig('metadata', 'name') || 'unknown'
+                namespace = cluster_resource.dig('metadata', 'namespace') || 'unknown'
+                
+                {
+                  name: name,
+                  namespace: namespace,
+                  organization: '?',
                   agents: '?',
                   tools: '?',
                   models: '?',
-                  status: 'Config Error',
+                  status: 'Error',
                   domain: '?'
                 }
               end
-
-              # Get cluster stats
-              agents = k8s.list_resources(RESOURCE_AGENT, namespace: cluster[:namespace])
-              tools = k8s.list_resources(RESOURCE_TOOL, namespace: cluster[:namespace])
-              models = k8s.list_resources(RESOURCE_MODEL, namespace: cluster[:namespace])
-
-              # Get cluster status and domain
-              cluster_resource = k8s.get_resource('LanguageCluster', cluster[:name], cluster[:namespace])
-              status = cluster_resource.dig('status', 'phase') || 'Unknown'
-              domain = cluster_resource.dig('spec', 'domain')
-
-              name_display = cluster[:name]
-              name_display = "#{pastel.bold(cluster[:name])} (selected)" if cluster[:name] == current
-
-              {
-                name: name_display,
-                namespace: cluster[:namespace],
-                agents: agents.count,
-                tools: tools.count,
-                models: models.count,
-                status: status,
-                domain: domain
-              }
-            rescue K8s::Error::NotFound
-              # Cluster exists in local config but not in Kubernetes
-              name_display = cluster[:name]
-              name_display += ' *' if cluster[:name] == current
-
-              {
-                name: name_display,
-                namespace: cluster[:namespace],
-                agents: '-',
-                tools: '-',
-                models: '-',
-                status: 'Not Found',
-                domain: '-'
-              }
-            rescue StandardError
-              # Other errors (connection issues, auth problems, etc.)
-              name_display = cluster[:name]
-              name_display += ' *' if cluster[:name] == current
-
-              {
-                name: name_display,
-                namespace: cluster[:namespace],
-                agents: '?',
-                tools: '?',
-                models: '?',
-                status: 'Error',
-                domain: '?'
-              }
             end
 
             Formatters::TableFormatter.clusters(table_data)
 
-            puts "\nNo cluster selected. Use 'aictl use <cluster>' to select one." unless current
-
-            # Show helpful message if any clusters are not found
-            not_found_clusters = table_data.select { |c| c[:status] == 'Not Found' }
-            if not_found_clusters.any?
-              puts
-              Formatters::ProgressFormatter.warn('Some clusters exist in local config but not in Kubernetes')
-              puts
-              puts 'Clusters with "Not Found" status are defined in ~/.aictl/config.yaml'
-              puts 'but the corresponding LanguageCluster resource does not exist in Kubernetes.'
-              puts
-              puts 'To fix this:'
-              not_found_clusters.each do |cluster|
-                cluster_name = cluster[:name].gsub(' *', '')
-                puts "  • Remove from config:  aictl cluster delete #{cluster_name}"
-                puts "  • Or recreate:         aictl cluster create #{cluster_name}"
-              end
-            end
+            puts "\nNo cluster selected. Use 'langop use <cluster>' to select one." unless current
           end
         end
 
-        desc 'current', 'Show current cluster context'
-        def current
-          handle_command_error('show current cluster') do
-            cluster_name = Config::ClusterConfig.current_cluster
-
-            unless cluster_name
-              Formatters::ProgressFormatter.info('No cluster selected')
-              puts "\nSelect a cluster with:"
-              puts '  aictl use <cluster>'
-              return
-            end
-
-            cluster = Config::ClusterConfig.get_cluster(cluster_name)
-
-            unless cluster
-              Formatters::ProgressFormatter.error("Cluster '#{cluster_name}' not found in config")
-              exit 1
-            end
-
-            puts 'Current Cluster:'
-            puts "  Name:      #{cluster[:name]}"
-            puts "  Namespace: #{cluster[:namespace]}"
-            puts "  Context:   #{cluster[:context] || 'default'}"
-            puts "  Created:   #{cluster[:created]}"
-
-            # Check cluster health
-            begin
-              k8s = Helpers::ClusterValidator.kubernetes_client(cluster_name)
-
-              if k8s.operator_installed?
-                version = k8s.operator_version
-                Formatters::ProgressFormatter.success("Operator: #{version || 'installed'}")
-              else
-                Formatters::ProgressFormatter.warn('Operator: not found')
-              end
-            rescue StandardError => e
-              Formatters::ProgressFormatter.error("Connection: #{e.message}")
-            end
-          end
-        end
 
         desc 'delete NAME', 'Delete a cluster'
         option :force, type: :boolean, default: false, desc: 'Skip confirmation'
@@ -306,7 +246,7 @@ module LanguageOperator
                 puts '  • The cluster resource no longer exists'
                 puts
                 puts 'To force removal from local configuration only, use:'
-                puts pastel.dim("  aictl cluster delete #{name} --force-local")
+                puts pastel.dim("  langop cluster delete #{name} --force-local")
                 exit 1
               end
             end
@@ -394,6 +334,80 @@ module LanguageOperator
             end
           end
         end
+
+        private
+
+        # Auto-detect organization ID when not provided
+        # @param k8s_client [Kubernetes::Client] Kubernetes client  
+        # @return [String, nil] Organization ID or nil if detection failed
+        def detect_organization_id(k8s_client)
+          # List all organization namespaces
+          org_namespaces = k8s_client.list_namespaces(
+            label_selector: 'langop.io/type=organization'
+          )
+
+          case org_namespaces.length
+          when 0
+            Formatters::ProgressFormatter.error('No organizations found in cluster')
+            puts "\nRun 'langop organization list' to see available organizations."
+            nil
+          when 1
+            org_id = org_namespaces.first.dig('metadata', 'labels', 'langop.io/organization-id')
+            org_id
+          else
+            Formatters::ProgressFormatter.error('Multiple organizations found')
+            puts "\nPlease specify which organization to use:"
+            puts "  langop cluster create #{ARGV.last} --organization-id <ORG_ID>"
+            puts
+            puts "Available organizations:"
+            list_org_namespaces(k8s_client)
+            nil
+          end
+        end
+
+        # Find the namespace for a given organization ID
+        #
+        # @param k8s_client [Kubernetes::Client] Kubernetes client
+        # @param org_id [String] Organization ID
+        # @return [String, nil] Namespace name or nil if not found
+        def find_org_namespace(k8s_client, org_id)
+          # List all namespaces with organization labels
+          namespaces = k8s_client.list_namespaces(
+            label_selector: "langop.io/organization-id=#{org_id}"
+          )
+
+          # Find the first namespace for this org ID
+          org_namespace = namespaces.find do |ns|
+            ns.dig('metadata', 'labels', 'langop.io/organization-id') == org_id
+          end
+
+          org_namespace&.dig('metadata', 'name')
+        rescue StandardError => e
+          warn "Warning: Could not find organization namespace: #{e.message}" if ENV['DEBUG']
+          nil
+        end
+
+        # List available organization namespaces for error messages
+        #
+        # @param k8s_client [Kubernetes::Client] Kubernetes client
+        def list_org_namespaces(k8s_client)
+          namespaces = k8s_client.list_namespaces(
+            label_selector: 'langop.io/type=organization'
+          )
+
+          if namespaces.any?
+            namespaces.each do |ns|
+              name = ns.dig('metadata', 'name')
+              org_id = ns.dig('metadata', 'labels', 'langop.io/organization-id')
+              plan = ns.dig('metadata', 'labels', 'langop.io/plan')
+              puts "  • #{name} (#{org_id}) [#{plan}]"
+            end
+          else
+            puts "  None found"
+          end
+        rescue StandardError => e
+          puts "  Error listing namespaces: #{e.message}"
+        end
       end
     end
   end