soba-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326730b848e785ad796cb40ce709a490abf079b297bf569b857a4cd6dd4ecab1
-  data.tar.gz: 971c583ce08bc3e63d078365896346ef3b57674034d75388aaac7f6014e69ac9
+  metadata.gz: a8267febd9095e47d80e11b731840e4b82dabd17310d2cf82599315dbf98fa40
+  data.tar.gz: c5cb07a9ae55bea658a6afdad842fcb8eed8c3576ed19ac8dab7ba8d5b7fd336
 SHA512:
-  metadata.gz: 23eab0546d6b61210647cc94e721803f5f7394ec3f57dfcdf1dcffcfe5f803cb369562f553ea6ab5d61151626fa68dad687d7ca43170ef21f3379eaf1549c274
-  data.tar.gz: 4dc56c2c3b2cdb468bef76d214b62c9ce251ae9d5f5ed5c2d485505a060df96a4efb2d69ab0f3474c9c992edc313a5c5dd4ca42528e7e1c0cc2e9e402b4c551a
+  metadata.gz: 163c95711c54b4ea7de1cc3bb0ff8d7a35108fbf4d8eac27cdde308e71b2a64d0c99f7e04fa455369d5a8b8e7526fff82092b60d0ed479980fd4818272b598e7
+  data.tar.gz: f9e3dbe879dcdb815542152ce5c6ec1efc40b4147b94bcdc5d55f1ad579b635eac8b1f7733b542898831d813edcf003a924bda4f3f45250120a37814882ae7e6

data/.rubocop.yml

@@ -48,6 +48,13 @@ Style/GlobalVars:
   Exclude:
     - 'bin/soba'
 
+# Disable Rails-specific rules (pure Ruby CLI, not Rails app)
+Rails/NegateInclude:
+  Enabled: false  # Use !include? instead of Rails' exclude?
+
+Rails/Present:
+  Enabled: false  # Use standard Ruby methods instead of Rails' present?
+
 # For RSpec
 RSpec/MultipleExpectations:
   Max: 3
@@ -62,7 +69,7 @@ RSpec/NestedGroups:
 Airbnb/ClassOrModuleDeclaredInWrongFile:
   Enabled: false
 
-# Rails-specific cops that don't apply to CLI applications
+# Disable ActiveRecord-related cops (not applicable to CLI)
 Rails/Pluck:
   Enabled: false
 

data/README.md

@@ -81,7 +81,11 @@ When using default settings, please take necessary precautions such as using dev
    Edit `.soba/config.yml`:
    ```yaml
    github:
-     token: ${GITHUB_TOKEN}
+     # Use gh command authentication (if available)
+     auth_method: gh
+     # Or use environment variable
+     # auth_method: env
+     # token: ${GITHUB_TOKEN}
      repository: owner/repo
    ```
 
@@ -97,13 +101,38 @@ When using default settings, please take necessary precautions such as using dev
 
 Configuration file location: `.soba/config.yml` (in project root)
 
+### GitHub Authentication
+
+soba supports multiple authentication methods:
+
+1. **GitHub CLI (gh command)** - Recommended
+   - Uses existing `gh` authentication
+   - No need to manage tokens in config files
+   - Set `auth_method: gh` in config
+
+2. **Environment Variable**
+   - Uses `GITHUB_TOKEN` environment variable
+   - Set `auth_method: env` in config
+
+3. **Auto-detect** (Default)
+   - Automatically tries `gh` command first
+   - Falls back to environment variable if `gh` is not available
+   - Omit `auth_method` field for auto-detection
+
 ### Full Configuration Example
 
 ```yaml
 # GitHub settings
 github:
-  # Personal Access Token (can use environment variable)
-  token: ${GITHUB_TOKEN}
+  # Authentication method: 'gh', 'env', or omit for auto-detect
+  # Use 'gh' to use GitHub CLI authentication (gh auth token)
+  # Use 'env' to use environment variable
+  auth_method: gh  # or 'env', or omit for auto-detect
+
+  # Personal Access Token (required when auth_method is 'env' or omitted)
+  # Can use environment variable
+  # token: ${GITHUB_TOKEN}
+
   # Target repository (format: owner/repo)
   repository: douhashi/soba-cli
 

data/README_ja.md

@@ -81,7 +81,11 @@ soba はAIによる自律的な開発を支援するため、デフォルトの
    `.soba/config.yml`を編集:
    ```yaml
    github:
-     token: ${GITHUB_TOKEN}
+     # ghコマンド認証を使用（利用可能な場合）
+     auth_method: gh
+     # または環境変数を使用
+     # auth_method: env
+     # token: ${GITHUB_TOKEN}
      repository: owner/repo
    ```
 
@@ -97,13 +101,38 @@ soba はAIによる自律的な開発を支援するため、デフォルトの
 
 設定ファイルの場所: `.soba/config.yml`（プロジェクトルート）
 
+### GitHub認証
+
+sobaは複数の認証方法をサポートしています：
+
+1. **GitHub CLI (ghコマンド)** - 推奨
+   - 既存の`gh`認証を利用
+   - 設定ファイルでトークンを管理する必要がない
+   - 設定で`auth_method: gh`を指定
+
+2. **環境変数**
+   - `GITHUB_TOKEN`環境変数を利用
+   - 設定で`auth_method: env`を指定
+
+3. **自動検出** (デフォルト)
+   - 最初に`gh`コマンドを試行
+   - `gh`が利用できない場合は環境変数にフォールバック
+   - 自動検出には`auth_method`フィールドを省略
+
 ### 完全な設定例
 
 ```yaml
 # GitHub設定
 github:
-  # Personal Access Token（環境変数可）
-  token: ${GITHUB_TOKEN}
+  # 認証方法: 'gh'、'env'、または省略して自動検出
+  # 'gh'を使用してGitHub CLI認証を利用（gh auth token）
+  # 'env'を使用して環境変数を利用
+  auth_method: gh  # または'env'、省略で自動検出
+
+  # Personal Access Token（auth_methodが'env'または省略時に必要）
+  # 環境変数を使用可能
+  # token: ${GITHUB_TOKEN}
+
   # ターゲットリポジトリ（形式: owner/repo）
   repository: douhashi/soba-cli
 

data/config/config.yml.example

@@ -1,7 +1,11 @@
 # soba CLI configuration example
 github:
-  # GitHub Personal Access Token
+  # Authentication method: 'gh', 'env', or omit for auto-detect
+  # auth_method: gh
+
+  # GitHub Personal Access Token (used when auth_method is 'env' or omitted)
   # Generate at: https://github.com/settings/tokens
+  # If auth_method is 'gh', this field can be omitted
   token: ${GITHUB_TOKEN}
 
   # Default repository to monitor (owner/repo format)

data/lib/soba/commands/init.rb

@@ -7,6 +7,7 @@ require "pathname"
 require "yaml"
 require "io/console"
 require_relative "../infrastructure/github_client"
+require_relative "../infrastructure/github_token_provider"
 
 module Soba
   module Commands
@@ -139,10 +140,29 @@ module Soba
           raise Soba::CommandError, "Cannot detect GitHub repository"
         end
 
+        # Detect best authentication method
+        token_provider = Soba::Infrastructure::GitHubTokenProvider.new
+        detected_method = token_provider.detect_best_method
+
         # Create configuration with default values
         config = DEFAULT_CONFIG.deep_dup
         config['github']['repository'] = repository
 
+        # Set authentication based on detection
+        if detected_method == 'gh'
+          config['github']['auth_method'] = 'gh'
+          config['github'].delete('token')
+          puts "✅ Using gh command authentication (detected)"
+        elsif detected_method == 'env'
+          config['github']['auth_method'] = 'env'
+          config['github']['token'] = '${GITHUB_TOKEN}'
+          puts "✅ Using environment variable authentication"
+        else
+          # Keep default token field for backward compatibility
+          config['github']['token'] = '${GITHUB_TOKEN}'
+          puts "⚠️  No authentication method detected. Please configure manually."
+        end
+
         # Add default phase configuration
         config['phase'] = DEFAULT_PHASE_CONFIG.deep_dup
 
@@ -187,28 +207,70 @@ module Soba
           repository = default_repo
         end
 
-        while repository.blank? || repository.exclude?('/')
+        while repository.blank? || !repository.include?('/')
           puts "❌ Invalid format. Please use: owner/repo"
           print "Enter GitHub repository: "
           repository = $stdin.gets.chomp
         end
 
-        # GitHub token
+        # GitHub authentication detection
         puts ""
-        puts "GitHub Personal Access Token (PAT) setup:"
-        puts "  1. Use environment variable ${GITHUB_TOKEN} (recommended)"
-        puts "  2. Enter token directly (will be visible in config file)"
-        print "Choose option (1-2) [1]: "
-        token_option = $stdin.gets.chomp
-        token_option = '1' if token_option.empty?
-
-        token = if token_option == '2'
-                  print "Enter GitHub token: "
-                  # Hide input for security
-                  $stdin.noecho(&:gets).chomp.tap { puts }
-                else
-                  '${GITHUB_TOKEN}'
-                end
+        token_provider = Soba::Infrastructure::GitHubTokenProvider.new
+        gh_available = token_provider.gh_available?
+
+        if gh_available
+          puts "✅ gh command is available and authenticated"
+        elsif ENV['GITHUB_TOKEN']
+          puts "✅ GITHUB_TOKEN environment variable is set"
+        else
+          puts "⚠️  Neither gh command nor GITHUB_TOKEN environment variable is available"
+        end
+
+        # GitHub token setup
+        puts ""
+        puts "GitHub authentication setup:"
+
+        auth_method = nil
+        token = nil
+
+        if gh_available
+          puts "  1. Use environment variable ${GITHUB_TOKEN}"
+          puts "  2. Enter token directly (will be visible in config file)"
+          puts "  3. Use gh command authentication (detected)"
+          print "Choose option (1-3) [3]: "
+          token_option = $stdin.gets.chomp
+          token_option = '3' if token_option.empty?
+
+          case token_option
+          when '2'
+            print "Enter GitHub token: "
+            # Hide input for security
+            token = $stdin.noecho(&:gets).chomp.tap { puts }
+            auth_method = nil
+          when '3'
+            auth_method = 'gh'
+            token = nil
+          else
+            token = '${GITHUB_TOKEN}'
+            auth_method = 'env'
+          end
+        else
+          puts "  1. Use environment variable ${GITHUB_TOKEN} (recommended)"
+          puts "  2. Enter token directly (will be visible in config file)"
+          print "Choose option (1-2) [1]: "
+          token_option = $stdin.gets.chomp
+          token_option = '1' if token_option.empty?
+
+          if token_option == '2'
+            print "Enter GitHub token: "
+            # Hide input for security
+            token = $stdin.noecho(&:gets).chomp.tap { puts }
+            auth_method = nil
+          else
+            token = '${GITHUB_TOKEN}'
+            auth_method = 'env'
+          end
+        end
 
         # Polling interval
         puts ""
@@ -366,7 +428,6 @@ module Soba
         # Create configuration
         config = {
           'github' => {
-            'token' => token,
             'repository' => repository,
           },
           'workflow' => {
@@ -395,30 +456,44 @@ module Soba
           },
         }
 
-        # Add phase configuration if provided
+        # Add token/auth_method based on selection
+        if auth_method
+          config['github']['auth_method'] = auth_method
+          # For env auth method, we still need the token field
+          if auth_method == 'env' || token
+            config['github']['token'] = token
+          end
+        else
+          config['github']['token'] = token
+        end
+
+        # Add phase configuration only if any phase command is provided
         if plan_command || implement_command || review_command
           config['phase'] = {}
 
+          # Add plan phase if command is provided
           if plan_command
             config['phase']['plan'] = {
               'command' => plan_command,
-              'options' => plan_options,
+              'options' => plan_options || [],
               'parameter' => plan_parameter,
             }
           end
 
+          # Add implement phase if command is provided
           if implement_command
             config['phase']['implement'] = {
               'command' => implement_command,
-              'options' => implement_options,
+              'options' => implement_options || [],
               'parameter' => implement_parameter,
             }
           end
 
+          # Add review phase if command is provided
           if review_command
             config['phase']['review'] = {
               'command' => review_command,
-              'options' => review_options,
+              'options' => review_options || [],
               'parameter' => review_parameter,
             }
           end
@@ -445,125 +520,118 @@ module Soba
 
       def write_config_file(config_path, config)
         config_path.dirname.mkpath
-        config_content = <<~YAML
-          # soba CLI configuration
-          # Generated by: soba init
-          # Date: #{Time.now}
-
-          github:
-            # GitHub Personal Access Token
-            # Can use environment variable: ${GITHUB_TOKEN}
-            token: #{config['github']['token']}
-
-            # Target repository (format: owner/repo)
-            repository: #{config['github']['repository']}
-
-          workflow:
-            # Issue polling interval in seconds
-            interval: #{config['workflow']['interval']}
-
-            # Enable automatic merging of PRs with soba:lgtm label
-            auto_merge_enabled: #{config['workflow']['auto_merge_enabled']}
-
-            # Enable automatic cleanup of tmux windows for closed issues
-            closed_issue_cleanup_enabled: #{config['workflow']['closed_issue_cleanup_enabled']}
-
-            # Cleanup check interval in seconds
-            closed_issue_cleanup_interval: #{config['workflow']['closed_issue_cleanup_interval']}
-
-            # Delay (in seconds) before sending commands to new tmux panes/windows
-            tmux_command_delay: #{config['workflow']['tmux_command_delay']}
-
-            # Phase labels for tracking issue progress
-            phase_labels:
-              todo: #{config['workflow']['phase_labels']['todo']}
-              queued: #{config['workflow']['phase_labels']['queued']}
-              planning: #{config['workflow']['phase_labels']['planning']}
-              ready: #{config['workflow']['phase_labels']['ready']}
-              doing: #{config['workflow']['phase_labels']['doing']}
-              review_requested: #{config['workflow']['phase_labels']['review_requested']}
-              reviewing: #{config['workflow']['phase_labels']['reviewing']}
-              done: #{config['workflow']['phase_labels']['done']}
-              requires_changes: #{config['workflow']['phase_labels']['requires_changes']}
-              revising: #{config['workflow']['phase_labels']['revising']}
-              merged: #{config['workflow']['phase_labels']['merged']}
-
-          # Slack notification configuration
-          slack:
-            # Slack Webhook URL for notifications
-            # Can use environment variable: ${SLACK_WEBHOOK_URL}
-            webhook_url: #{config['slack']['webhook_url']}
-
-            # Enable Slack notifications for phase starts
-            notifications_enabled: #{config['slack']['notifications_enabled']}
-        YAML
+
+        # Build the complete configuration structure
+        yaml_config = {
+          'github' => {},
+          'workflow' => config['workflow'],
+          'slack' => config['slack'],
+        }
+
+        # Add github configuration with proper fields
+        if config['github']['auth_method']
+          yaml_config['github']['auth_method'] = config['github']['auth_method']
+        end
+
+        if config['github']['token']
+          yaml_config['github']['token'] = config['github']['token']
+        end
+
+        yaml_config['github']['repository'] = config['github']['repository']
 
         # Add phase configuration if present
-        if config['phase']
-          phase_content = "\n          # Phase command configuration\n          phase:\n"
-
-          if config['phase']['plan']
-            phase_content += "            plan:\n"
-            phase_content += "              command: #{config['phase']['plan']['command']}\n"
-            if config['phase']['plan']['options'].present?
-              phase_content += "              options:\n"
-              config['phase']['plan']['options'].each do |opt|
-                phase_content += "                - #{opt}\n"
-              end
-            end
-            if config['phase']['plan']['parameter']
-              phase_content += "              parameter: '#{config['phase']['plan']['parameter']}'\n"
-            end
-          end
+        if config['phase'] && !config['phase'].empty?
+          yaml_config['phase'] = config['phase']
+        end
 
-          if config['phase']['implement']
-            phase_content += "            implement:\n"
-            phase_content += "              command: #{config['phase']['implement']['command']}\n"
-            if config['phase']['implement']['options'].present?
-              phase_content += "              options:\n"
-              config['phase']['implement']['options'].each do |opt|
-                phase_content += "                - #{opt}\n"
-              end
-            end
-            if config['phase']['implement']['parameter']
-              phase_content += "              parameter: '#{config['phase']['implement']['parameter']}'\n"
-            end
-          end
+        # Generate YAML with comments
+        yaml_output = generate_yaml_with_comments(yaml_config)
 
-          if config['phase']['review']
-            phase_content += "            review:\n"
-            phase_content += "              command: #{config['phase']['review']['command']}\n"
-            if config['phase']['review']['options'].present?
-              phase_content += "              options:\n"
-              config['phase']['review']['options'].each do |opt|
-                phase_content += "                - #{opt}\n"
-              end
-            end
-            if config['phase']['review']['parameter']
-              phase_content += "              parameter: '#{config['phase']['review']['parameter']}'\n"
-            end
-          end
+        File.write(config_path, yaml_output)
+      end
+
+      def generate_yaml_with_comments(config)
+        output = []
+        output << "# soba CLI configuration"
+        output << "# Generated by: soba init"
+        output << "# Date: #{Time.now}"
+        output << ""
+
+        # GitHub section
+        output << "github:"
+        if config['github']['auth_method']
+          output << "  # Authentication method (gh, env, or null)"
+          output << "  auth_method: #{config['github']['auth_method']}"
+        end
+
+        if config['github']['token']
+          output << "  # GitHub Personal Access Token"
+          output << "  # Can use environment variable: ${GITHUB_TOKEN}"
+          output << "  token: #{config['github']['token']}"
+        end
 
-          if config['phase']['revise']
-            phase_content += "            revise:\n"
-            phase_content += "              command: #{config['phase']['revise']['command']}\n"
-            if config['phase']['revise']['options'].present?
-              phase_content += "              options:\n"
-              config['phase']['revise']['options'].each do |opt|
-                phase_content += "                - #{opt}\n"
+        output << "  # Target repository (format: owner/repo)"
+        output << "  repository: #{config['github']['repository']}"
+        output << ""
+
+        # Workflow section
+        output << "workflow:"
+        output << "  # Issue polling interval in seconds"
+        output << "  interval: #{config['workflow']['interval']}"
+        output << ""
+        output << "  # Enable automatic merging of PRs with soba:lgtm label"
+        output << "  auto_merge_enabled: #{config['workflow']['auto_merge_enabled']}"
+        output << ""
+        output << "  # Enable automatic cleanup of tmux windows for closed issues"
+        output << "  closed_issue_cleanup_enabled: #{config['workflow']['closed_issue_cleanup_enabled']}"
+        output << ""
+        output << "  # Cleanup check interval in seconds"
+        output << "  closed_issue_cleanup_interval: #{config['workflow']['closed_issue_cleanup_interval']}"
+        output << ""
+        output << "  # Delay (in seconds) before sending commands to new tmux panes/windows"
+        output << "  tmux_command_delay: #{config['workflow']['tmux_command_delay']}"
+        output << ""
+        output << "  # Phase labels for tracking issue progress"
+        output << "  phase_labels:"
+        config['workflow']['phase_labels'].each do |key, value|
+          output << "    #{key}: #{value}"
+        end
+        output << ""
+
+        # Slack section
+        output << "# Slack notification configuration"
+        output << "slack:"
+        output << "  # Slack Webhook URL for notifications"
+        output << "  # Can use environment variable: ${SLACK_WEBHOOK_URL}"
+        output << "  webhook_url: #{config['slack']['webhook_url']}"
+        output << ""
+        output << "  # Enable Slack notifications for phase starts"
+        output << "  notifications_enabled: #{config['slack']['notifications_enabled']}"
+
+        # Phase section (if present)
+        if config['phase'] && !config['phase'].empty?
+          output << ""
+          output << "# Phase command configuration"
+          output << "phase:"
+
+          config['phase'].each do |phase_name, phase_config|
+            output << "  #{phase_name}:"
+            output << "    command: #{phase_config['command']}"
+
+            if phase_config['options'] && !phase_config['options'].empty?
+              output << "    options:"
+              phase_config['options'].each do |opt|
+                output << "      - #{opt}"
               end
             end
-            if config['phase']['revise']['parameter']
-              phase_content += "              parameter: '#{config['phase']['revise']['parameter']}'\n"
+
+            if phase_config['parameter']
+              output << "    parameter: '#{phase_config['parameter']}'"
             end
           end
-
-          # Remove extra indentation to match YAML structure
-          phase_content = phase_content.gsub(/^          /, '')
-          config_content += phase_content
         end
 
-        File.write(config_path, config_content)
+        output.join("\n") + "\n"
       end
 
       def check_github_token(token: '${GITHUB_TOKEN}')

data/lib/soba/configuration.rb

@@ -4,6 +4,7 @@ require 'active_support/core_ext/object/blank'
 require 'dry-configurable'
 require 'yaml'
 require 'pathname'
+require_relative 'infrastructure/github_token_provider'
 
 module Soba
   class Configuration
@@ -12,6 +13,7 @@ module Soba
     setting :github do
       setting :token, default: ENV.fetch('GITHUB_TOKEN', nil)
       setting :repository
+      setting :auth_method, default: nil # 'gh', 'env', or nil (auto-detect)
     end
 
     setting :workflow do
@@ -62,6 +64,7 @@ module Soba
         configure do |c|
           c.github.token = ENV.fetch('GITHUB_TOKEN', nil)
           c.github.repository = nil
+          c.github.auth_method = nil
           c.workflow.interval = 20
           c.workflow.use_tmux = true
           c.workflow.auto_merge_enabled = true
@@ -141,6 +144,7 @@ module Soba
           if data['github']
             c.github.token = data.dig('github', 'token') || ENV.fetch('GITHUB_TOKEN', nil)
             c.github.repository = data.dig('github', 'repository')
+            c.github.auth_method = data.dig('github', 'auth_method')
           end
 
           if data['workflow']
@@ -160,7 +164,7 @@ module Soba
 
           if data['git']
             c.git.worktree_base_path = data.dig('git', 'worktree_base_path') || '.git/soba/worktrees'
-            c.git.setup_workspace = data.dig('git', 'setup_workspace') != false  # default true
+            c.git.setup_workspace = data.dig('git', 'setup_workspace') != false # default true
           end
 
           if data['phase']
@@ -194,7 +198,10 @@ module Soba
         default_content = <<~YAML
           # soba CLI configuration
           github:
-            # GitHub Personal Access Token
+            # Authentication method: 'gh', 'env', or omit for auto-detect
+            # auth_method: gh
+
+            # GitHub Personal Access Token (used when auth_method is 'env' or omitted)
             # Can use environment variable: ${GITHUB_TOKEN}
             token: ${GITHUB_TOKEN}
 
@@ -255,7 +262,33 @@ module Soba
       def validate!
         errors = []
 
-        errors << "GitHub token is not set" if config.github.token.blank?
+        # Validate auth_method if specified
+        if config.github.auth_method && !['gh', 'env'].include?(config.github.auth_method)
+          errors << "Invalid auth_method: #{config.github.auth_method}. Must be 'gh', 'env', or nil"
+        end
+
+        # Token validation now depends on auth_method
+        # Let GitHubTokenProvider handle token fetching and validation
+        # We only need to check if token can be obtained
+        begin
+          token_provider = Soba::Infrastructure::GitHubTokenProvider.new
+          if config.github.auth_method
+            # Try to fetch with specified method
+            token = token_provider.fetch(auth_method: config.github.auth_method)
+            # Store the fetched token if not already set
+            config.github.token ||= token
+          elsif config.github.token.blank?
+            # Auto-detect mode when no token is provided
+            token = token_provider.fetch(auth_method: nil)
+            config.github.token = token
+          end
+        rescue Soba::Infrastructure::GitHubTokenProvider::TokenFetchError => e
+          # Only add error if token is required and cannot be fetched
+          if config.github.token.blank?
+            errors << "GitHub token is not available: #{e.message}"
+          end
+        end
+
         errors << "GitHub repository is not set" if config.github.repository.blank?
         errors << "Workflow interval must be positive" if config.workflow.interval <= 0
 

data/lib/soba/infrastructure/github_client.rb

@@ -5,6 +5,7 @@ require "faraday"
 require "faraday/retry"
 require "semantic_logger"
 require_relative "errors"
+require_relative "github_token_provider"
 
 module Soba
   module Infrastructure
@@ -14,8 +15,27 @@ module Soba
       attr_reader :octokit
 
       def initialize(token: nil)
-        token ||= Configuration.config.github.token if defined?(Configuration)
-        token ||= ENV["GITHUB_TOKEN"]
+        # If token is explicitly provided, use it
+        if token.nil?
+          # Try to get token from configuration or token provider
+          if defined?(Configuration) && Configuration.respond_to?(:config) && Configuration.config
+            config = Configuration.config
+            if config.github.token.present?
+              token = config.github.token
+            elsif config.github.auth_method
+              # Use GitHubTokenProvider with specified auth_method
+              token_provider = GitHubTokenProvider.new
+              token = token_provider.fetch(auth_method: config.github.auth_method)
+            else
+              # Auto-detect mode
+              token_provider = GitHubTokenProvider.new
+              token = token_provider.fetch(auth_method: nil)
+            end
+          else
+            # Fallback to environment variable
+            token = ENV["GITHUB_TOKEN"]
+          end
+        end
 
         stack = build_middleware_stack
 

data/lib/soba/infrastructure/github_token_provider.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'English'
+
+module Soba
+  module Infrastructure
+    # rubocop:disable Airbnb/ModuleMethodInWrongFile
+    class GitHubTokenProvider
+      class TokenFetchError < StandardError; end
+
+      def fetch(auth_method: nil)
+        case auth_method
+        when 'gh'
+          fetch_from_gh
+        when 'env'
+          fetch_from_env
+        when nil
+          fetch_auto
+        else
+          raise TokenFetchError, "Invalid auth_method: #{auth_method}"
+        end
+      end
+
+      def gh_available?
+        return false unless system('which gh > /dev/null 2>&1')
+
+        output = `gh auth token 2>/dev/null`
+        last_command_status.success? && !output.strip.empty?
+      end
+
+      def detect_best_method
+        return 'gh' if gh_available?
+        return 'env' if ENV['GITHUB_TOKEN']
+
+        nil
+      end
+
+      private
+
+      def fetch_from_gh
+        unless system('which gh > /dev/null 2>&1')
+          raise TokenFetchError, 'gh command not found. Please install GitHub CLI'
+        end
+
+        token = `gh auth token 2>/dev/null`.strip
+
+        unless last_command_status.success?
+          raise TokenFetchError, 'Failed to get token from gh command. Please run `gh auth login` first'
+        end
+
+        if token.empty?
+          raise TokenFetchError, 'gh auth token returned empty. Please run `gh auth login` first'
+        end
+
+        token
+      end
+
+      def last_command_status
+        # Return the child process status, with nil check
+        status = $CHILD_STATUS || $LAST_CHILD_STATUS
+
+        # If both are nil, create a fake failed status
+        if status.nil?
+          # Create a stub status object that responds to success?
+          Struct.new(:success?).new(false)
+        else
+          status
+        end
+      end
+
+      def fetch_from_env
+        token = ENV['GITHUB_TOKEN']
+
+        if token.nil?
+          raise TokenFetchError, 'GITHUB_TOKEN environment variable not set'
+        end
+
+        if token.empty?
+          raise TokenFetchError, 'GITHUB_TOKEN environment variable is empty'
+        end
+
+        token
+      end
+
+      def fetch_auto
+        if gh_available?
+          fetch_from_gh
+        elsif ENV['GITHUB_TOKEN']
+          fetch_from_env
+        else
+          raise TokenFetchError,
+                'No GitHub token available. Please set GITHUB_TOKEN environment variable or run `gh auth login`'
+        end
+      end
+    end
+    # rubocop:enable Airbnb/ModuleMethodInWrongFile
+  end
+end

data/lib/soba/services/auto_merge_service.rb

@@ -3,6 +3,8 @@
 require "semantic_logger"
 require_relative "../infrastructure/github_client"
 require_relative "../configuration"
+require_relative "slack_notifier"
+require_relative "git_workspace_manager"
 
 module Soba
   module Services
@@ -12,6 +14,7 @@ module Soba
       def initialize
         @github_client = Infrastructure::GitHubClient.new
         @repository = Configuration.config.github.repository
+        @git_workspace_manager = GitWorkspaceManager.new
       end
 
       def execute
@@ -41,7 +44,7 @@ module Soba
             if check_mergeable(pr_number)
               result = perform_merge(pr_number)
               if result[:merged]
-                handle_post_merge(pr_number)
+                handle_post_merge(pr_number, sha: result[:sha])
                 merged << { number: pr_number, title: pr[:title], sha: result[:sha] }
                 logger.info "PR merged successfully", pr_number: pr_number, sha: result[:sha]
               else
@@ -113,21 +116,61 @@ module Soba
         @github_client.merge_pull_request(@repository, pr_number, merge_method: "squash")
       end
 
-      def handle_post_merge(pr_number)
+      def handle_post_merge(pr_number, sha: nil)
         logger.debug "Handling post-merge actions", pr_number: pr_number
 
+        # Update main branch after successful merge
+        begin
+          logger.info "Updating main branch after merge", pr_number: pr_number
+          @git_workspace_manager.update_main_branch
+          logger.info "Main branch updated successfully"
+        rescue GitWorkspaceManager::GitOperationError => e
+          logger.error "Failed to update main branch", error: e.message
+        rescue => e
+          logger.error "Unexpected error updating main branch", error: e.message
+        end
+
         # Extract issue number from PR body
         issue_number = @github_client.get_pr_issue_number(@repository, pr_number)
 
         if issue_number
           logger.info "Closing related issue", pr_number: pr_number, issue_number: issue_number
           @github_client.close_issue_with_label(@repository, issue_number, label: "soba:merged")
+
+          # Send Slack notification for merged issue
+          send_merge_notification(issue_number, pr_number, sha)
         else
           logger.warn "No related issue found in PR body", pr_number: pr_number
         end
       rescue => e
         logger.error "Failed to handle post-merge actions", pr_number: pr_number, error: e.message
       end
+
+      def send_merge_notification(issue_number, pr_number, sha)
+        slack_notifier = SlackNotifier.from_config
+        return unless slack_notifier&.enabled?
+
+        begin
+          pr_data = @github_client.get_pull_request(@repository, pr_number)
+          issue_data = @github_client.issue(@repository, issue_number)
+
+          merge_data = {
+            issue_number: issue_number,
+            issue_title: issue_data[:title],
+            pr_number: pr_number,
+            pr_title: pr_data[:title],
+            sha: sha,
+            repository: @repository,
+          }
+
+          slack_notifier.notify_issue_merged(merge_data)
+          logger.debug "Slack notification sent for merged issue", issue_number: issue_number
+        rescue => e
+          logger.warn "Failed to send Slack notification for merged issue",
+                      issue_number: issue_number,
+                      error: e.message
+        end
+      end
     end
   end
 end

data/lib/soba/services/slack_notifier.rb

@@ -34,6 +34,30 @@ module Soba
         end
       end
 
+      def notify_issue_merged(merge_data)
+        return false unless enabled?
+
+        logger.debug "Starting Slack notification for merged issue ##{merge_data[:issue_number]}"
+
+        begin
+          message = build_merged_message(merge_data)
+          logger.debug "Sending notification to Slack webhook"
+
+          response = send_notification(message)
+
+          if response.success?
+            logger.debug "Slack notification sent successfully (HTTP #{response.status})"
+            true
+          else
+            logger.warn("Failed to send Slack notification: HTTP #{response.status}")
+            false
+          end
+        rescue StandardError => e
+          logger.warn("Error sending Slack notification: #{e.message}")
+          false
+        end
+      end
+
       def enabled?
         @webhook_url.present?
       end
@@ -109,6 +133,60 @@ module Soba
         }
       end
 
+      def build_merged_message(merge_data)
+        issue_url = if merge_data[:repository]
+                      "https://github.com/#{merge_data[:repository]}/issues/#{merge_data[:issue_number]}"
+                    else
+                      "##{merge_data[:issue_number]}"
+                    end
+
+        issue_value = if merge_data[:repository]
+                        "<#{issue_url}|##{merge_data[:issue_number]}>"
+                      else
+                        "##{merge_data[:issue_number]}"
+                      end
+
+        fields = [
+          {
+            title: "Issue",
+            value: issue_value,
+            short: true,
+          },
+        ]
+
+        if merge_data[:pr_number] && merge_data[:repository]
+          pr_url = "https://github.com/#{merge_data[:repository]}/pull/#{merge_data[:pr_number]}"
+          pr_value = "<#{pr_url}|##{merge_data[:pr_number]}>"
+          fields << {
+            title: "PR",
+            value: pr_value,
+            short: true,
+          }
+        end
+
+        if merge_data[:sha]
+          fields << {
+            title: "SHA",
+            value: merge_data[:sha],
+            short: true,
+          }
+        end
+
+        {
+          text: "✅ Soba merged: Issue ##{merge_data[:issue_number]}",
+          attachments: [
+            {
+              color: "good",
+              title: merge_data[:issue_title],
+              fields: fields,
+              footer: "Soba CLI",
+              footer_icon: "https://github.com/favicon.ico",
+              ts: Time.now.to_i,
+            },
+          ],
+        }
+      end
+
       def logger
         @logger ||= if defined?(Soba.logger)
                       Soba.logger

data/lib/soba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Soba
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soba-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - douhashi
@@ -371,6 +371,7 @@ files:
 - lib/soba/domain/phase_strategy.rb
 - lib/soba/infrastructure/errors.rb
 - lib/soba/infrastructure/github_client.rb
+- lib/soba/infrastructure/github_token_provider.rb
 - lib/soba/infrastructure/lock_manager.rb
 - lib/soba/infrastructure/tmux_client.rb
 - lib/soba/services/ansi_processor.rb