collavre_github 0.4.1 → 0.5.1

data/app/services/collavre_github/tools/github_pr_commits_service.rb

@@ -23,17 +23,14 @@ module CollavreGithub
 
       sig { params(creative_id: Integer, repo: String, pr_number: Integer).returns(T::Hash[Symbol, T.untyped]) }
       def call(creative_id:, repo:, pr_number:)
-        client = find_github_client(creative_id, repo)
-        return { error: "GitHub account not found for this creative and repository" } unless client
+        with_github_client(creative_id: creative_id, repo: repo, error_context: "fetch PR commits") do |client|
+          messages = client.pull_request_commit_messages(repo, pr_number)
 
-        messages = client.pull_request_commit_messages(repo, pr_number)
-
-        {
-          commits: messages.map.with_index(1) { |msg, i| { index: i, message: msg } },
-          count: messages.size
-        }
-      rescue StandardError => e
-        { error: "Failed to fetch PR commits: #{e.message}" }
+          {
+            commits: messages.map.with_index(1) { |msg, i| { index: i, message: msg } },
+            count: messages.size
+          }
+        end
       end
     end
   end

data/app/services/collavre_github/tools/github_pr_details_service.rb

@@ -22,31 +22,28 @@ module CollavreGithub
 
       sig { params(creative_id: Integer, repo: String, pr_number: Integer).returns(T::Hash[Symbol, T.untyped]) }
       def call(creative_id:, repo:, pr_number:)
-        client = find_github_client(creative_id, repo)
-        return { error: "GitHub account not found for this creative and repository" } unless client
+        with_github_client(creative_id: creative_id, repo: repo, error_context: "fetch PR details") do |client|
+          pr = client.pull_request_details(repo, pr_number)
+          return { error: "Pull request not found" } unless pr
 
-        pr = client.pull_request_details(repo, pr_number)
-        return { error: "Pull request not found" } unless pr
-
-        {
-          number: pr.number,
-          title: pr.title,
-          body: pr.body.to_s.truncate(2000),
-          state: pr.state,
-          merged: pr.merged,
-          author: pr.user&.login,
-          created_at: pr.created_at&.iso8601,
-          updated_at: pr.updated_at&.iso8601,
-          merged_at: pr.merged_at&.iso8601,
-          additions: pr.additions,
-          deletions: pr.deletions,
-          changed_files: pr.changed_files,
-          html_url: pr.html_url,
-          base_branch: pr.base&.ref,
-          head_branch: pr.head&.ref
-        }
-      rescue StandardError => e
-        { error: "Failed to fetch PR details: #{e.message}" }
+          {
+            number: pr.number,
+            title: pr.title,
+            body: pr.body.to_s.truncate(2000),
+            state: pr.state,
+            merged: pr.merged,
+            author: pr.user&.login,
+            created_at: pr.created_at&.iso8601,
+            updated_at: pr.updated_at&.iso8601,
+            merged_at: pr.merged_at&.iso8601,
+            additions: pr.additions,
+            deletions: pr.deletions,
+            changed_files: pr.changed_files,
+            html_url: pr.html_url,
+            base_branch: pr.base&.ref,
+            head_branch: pr.head&.ref
+          }
+        end
       end
     end
   end

data/app/services/collavre_github/tools/github_pr_diff_service.rb

@@ -35,22 +35,19 @@ module CollavreGithub
       def call(creative_id:, repo:, pr_number:, max_length: nil)
         max_length ||= DIFF_MAX_LENGTH
 
-        client = find_github_client(creative_id, repo)
-        return { error: "GitHub account not found for this creative and repository" } unless client
-
-        diff = client.pull_request_diff(repo, pr_number)
-        return { error: "Could not fetch diff", diff: nil } unless diff
-
-        truncated = diff.length > max_length
-        diff_text = truncated ? "#{diff[0, max_length]}\n...\n[Diff truncated to #{max_length} characters]" : diff
-
-        {
-          diff: diff_text,
-          truncated: truncated,
-          original_length: diff.length
-        }
-      rescue StandardError => e
-        { error: "Failed to fetch PR diff: #{e.message}" }
+        with_github_client(creative_id: creative_id, repo: repo, error_context: "fetch PR diff") do |client|
+          diff = client.pull_request_diff(repo, pr_number)
+          return { error: "Could not fetch diff", diff: nil } unless diff
+
+          truncated = diff.length > max_length
+          diff_text = truncated ? "#{diff[0, max_length]}\n...\n[Diff truncated to #{max_length} characters]" : diff
+
+          {
+            diff: diff_text,
+            truncated: truncated,
+            original_length: diff.length
+          }
+        end
       end
     end
   end

data/app/services/collavre_github/webhook_provisioner.rb

@@ -1,6 +1,7 @@
 module CollavreGithub
   class WebhookProvisioner
     EVENTS = %w[pull_request].freeze
+    EVENTS_WITH_PUSH = %w[pull_request push].freeze
     CONTENT_TYPE = "json".freeze
 
     def self.ensure_for_links(account:, links:, webhook_url:)
@@ -23,8 +24,15 @@ module CollavreGithub
     end
 
     def remove_for_repositories(repositories)
+      # Batch-query to avoid N+1: find all repo names that still have links
+      linked_names = CollavreGithub::RepositoryLink
+        .where(repository_full_name: repositories)
+        .distinct
+        .pluck(:repository_full_name)
+        .to_set
+
       repositories.each do |repository_full_name|
-        next if CollavreGithub::RepositoryLink.where(repository_full_name: repository_full_name).exists?
+        next if linked_names.include?(repository_full_name)
 
         remove_webhook(repository_full_name)
       end
@@ -84,7 +92,7 @@ module CollavreGithub
         repository_full_name,
         url: webhook_url,
         secret: secret,
-        events: EVENTS,
+        events: events_for(repository_full_name),
         content_type: CONTENT_TYPE
       )
     end
@@ -95,11 +103,18 @@ module CollavreGithub
         hook_id,
         url: webhook_url,
         secret: secret,
-        events: EVENTS,
+        events: events_for(repository_full_name),
         content_type: CONTENT_TYPE
       )
     end
 
+    def events_for(repository_full_name)
+      has_markdown_sync = CollavreGithub::RepositoryLink
+        .where(repository_full_name: repository_full_name, markdown_sync_enabled: true)
+        .exists?
+      has_markdown_sync ? EVENTS_WITH_PUSH : EVENTS
+    end
+
     def primary_link_for(repository_full_name)
       CollavreGithub::RepositoryLink
         .where(repository_full_name: repository_full_name)

data/app/views/collavre_github/auth/setup.html.erb

@@ -101,7 +101,13 @@
       </div>
     </div>
 
-    <!-- Step 3: Summary -->
+    <!-- Step 3: Markdown Sync -->
+    <div class="step" id="step-markdown-sync">
+      <p class="step-subtext"><%= t('collavre_github.markdown_sync.step_description', default: 'Enable Markdown Sync to import .md files as read-only creatives. Auto-synced on push.') %></p>
+      <div id="markdown-sync-list" class="list-box"></div>
+    </div>
+
+    <!-- Step 4: Summary -->
     <div class="step" id="step-summary">
       <p class="step-subtext"><%= t('collavre_github.integration.summary') %></p>
       <p id="webhook-instructions" class="step-subtext" style="display:none;"><%= t('collavre_github.integration.webhook_instructions') %></p>
@@ -139,10 +145,11 @@
       var loadReposError = wizard.dataset.loadReposError;
       var saveErrorMsg = wizard.dataset.saveError;
 
-      var steps = ['organization', 'repositories', 'summary', 'done'];
+      var steps = ['organization', 'repositories', 'markdown-sync', 'summary', 'done'];
       var currentStepIndex = 0;
       var selectedOrg = null;
       var selectedRepos = new Set();
+      var markdownSyncRepos = new Set();
       var webhookDetails = {};
 
       var prevBtn = document.getElementById('prev-btn');
@@ -278,6 +285,39 @@
           });
       }
 
+      function populateMarkdownSync() {
+        var syncList = document.getElementById('markdown-sync-list');
+        syncList.innerHTML = '';
+        var repos = Array.from(selectedRepos);
+        if (!repos.length) {
+          syncList.innerHTML = '<p style="padding:0.5em;color:#999;">No repositories selected.</p>';
+          return;
+        }
+        repos.forEach(function(fullName) {
+          var label = document.createElement('label');
+          label.className = 'list-item';
+
+          var input = document.createElement('input');
+          input.type = 'checkbox';
+          input.value = fullName;
+          input.checked = markdownSyncRepos.has(fullName);
+          input.addEventListener('change', function() {
+            if (input.checked) {
+              markdownSyncRepos.add(fullName);
+            } else {
+              markdownSyncRepos.delete(fullName);
+            }
+          });
+
+          var span = document.createElement('span');
+          span.textContent = fullName + ' — Markdown Sync';
+
+          label.appendChild(input);
+          label.appendChild(span);
+          syncList.appendChild(label);
+        });
+      }
+
       function updateSummary() {
         var summaryList = document.getElementById('summary-repos');
         var summaryEmpty = document.getElementById('summary-empty');
@@ -320,7 +360,11 @@
 
       function saveSelection() {
         clearError();
-        var payload = { repositories: Array.from(selectedRepos) };
+        var markdownSync = {};
+        Array.from(selectedRepos).forEach(function(repo) {
+          markdownSync[repo] = markdownSyncRepos.has(repo);
+        });
+        var payload = { repositories: Array.from(selectedRepos), markdown_sync: markdownSync };
 
         fetch('/github/creatives/' + creativeId + '/integration', {
           method: 'PATCH',
@@ -371,6 +415,7 @@
         var nextIndex = currentStepIndex + 1;
         showStep(nextIndex);
         if (steps[nextIndex] === 'repositories') loadRepositories();
+        if (steps[nextIndex] === 'markdown-sync') populateMarkdownSync();
       });
 
       finishBtn.addEventListener('click', function() {

data/app/views/collavre_github/integrations/_modal.html.erb

@@ -10,6 +10,11 @@
      data-delete-error="<%= t('collavre_github.integration.delete_error', default: 'Failed to remove the Github integration.') %>"
      data-delete-button-label="<%= t('collavre_github.integration.delete_button', default: 'Remove integration') %>"
      data-delete-select-warning="<%= t('collavre_github.integration.delete_select_warning', default: 'Select repositories to delete.') %>"
+     data-resync-button-label="<%= t('collavre_github.integration.resync_button', default: 'Resync all') %>"
+     data-resync-confirm="<%= t('collavre_github.integration.resync_confirm', default: 'Re-import all markdown files from the selected repositories?') %>"
+     data-resync-success="<%= t('collavre_github.integration.resync_success', default: 'Re-sync started. The tree will update shortly.') %>"
+     data-resync-error="<%= t('collavre_github.integration.resync_error', default: 'Failed to start re-sync.') %>"
+     data-resync-select-warning="<%= t('collavre_github.integration.resync_select_warning', default: 'Select repositories to resync.') %>"
      style="display:none;position:fixed;top:0;left:0;width:100vw;height:100vh;z-index:10000;align-items:center;justify-content:center;">
   <div class="popup-box" style="min-width:360px;max-width:90vw;">
     <button type="button" id="close-github-modal" class="popup-close-btn">&times;</button>
@@ -27,9 +32,14 @@
       <div id="github-existing-connections" style="display:none;margin-top:1.25em;">
         <p style="margin-bottom:0.5em;"><%= t('collavre_github.integration.existing_intro', default: 'Connected repositories:') %></p>
         <ul id="github-existing-repo-list" style="padding-left:1.2em;margin-bottom:0.75em;color:var(--color-text);"></ul>
-        <button type="button" id="github-delete-btn" class="btn btn-danger" style="display:none;">
-          <%= t('collavre_github.integration.delete_button', default: 'Remove integration') %>
-        </button>
+        <div style="display:flex;gap:0.5em;flex-wrap:wrap;">
+          <button type="button" id="github-delete-btn" class="btn btn-danger" style="display:none;">
+            <%= t('collavre_github.integration.delete_button', default: 'Remove integration') %>
+          </button>
+          <button type="button" id="github-resync-btn" class="btn btn-secondary" style="display:none;">
+            <%= t('collavre_github.integration.resync_button', default: 'Resync all') %>
+          </button>
+        </div>
       </div>
     </div>
 
@@ -43,6 +53,11 @@
       <div id="github-repository-list" class="github-list github-modal-list-box" style="max-height:240px;overflow:auto;"></div>
     </div>
 
+    <div class="github-wizard-step" id="github-step-markdown-sync" style="display:none;">
+      <p class="github-modal-subtext"><%= t('collavre_github.markdown_sync.step_description', default: 'Enable Markdown Sync to import .md files as read-only creatives. Changes are auto-synced on push to the default branch.') %></p>
+      <div id="github-markdown-sync-list" class="github-list github-modal-list-box" style="max-height:240px;overflow:auto;"></div>
+    </div>
+
     <div class="github-wizard-step" id="github-step-summary" style="display:none;">
       <p class="github-modal-subtext"><%= t('collavre_github.integration.summary', default: 'The following repositories will be linked to this Creative:') %></p>
       <p id="github-webhook-instructions" class="github-modal-subtext" style="display:none;margin-bottom:0.5em;"><%= t('collavre_github.integration.webhook_instructions', default: 'Configure each repository with the webhook details below.') %></p>

data/config/locales/en.yml

@@ -16,6 +16,11 @@ en:
       delete_error: "Failed to remove the Github integration."
       delete_button: "Remove integration"
       delete_select_warning: "Select repositories to delete."
+      resync_button: "Resync all"
+      resync_confirm: "Re-import all markdown files from the selected repositories?"
+      resync_success: "Re-sync started. The tree will update shortly."
+      resync_error: "Failed to start re-sync."
+      resync_select_warning: "Select repositories to resync."
       connect: "Sign in with your Github account to start linking."
       login_button: "Sign in with Github"
       choose_org: "Select the organization that owns the repositories."
@@ -34,6 +39,10 @@ en:
     auth:
       login_first: "Please log in first to connect your GitHub account"
       connected: "GitHub account connected successfully"
+    markdown_sync:
+      step_description: "Enable Markdown Sync to import .md files as read-only creatives. Changes are auto-synced on push to the default branch."
+      not_enabled: "Markdown sync is not enabled for this repository."
+      resync_started: "Re-sync started. The tree will update shortly."
     errors:
       not_connected: "GitHub account not connected"
       forbidden: "You don't have permission to perform this action"

data/config/locales/ko.yml

@@ -16,6 +16,11 @@ ko:
       delete_error: "Github 연동 삭제에 실패했습니다."
       delete_button: "연동 삭제"
       delete_select_warning: "삭제할 Repository를 선택하세요."
+      resync_button: "전체 다시 싱크"
+      resync_confirm: "선택한 저장소의 마크다운 파일을 전체 다시 가져오시겠습니까?"
+      resync_success: "재동기화가 시작되었습니다. 잠시 후 트리가 업데이트됩니다."
+      resync_error: "재동기화를 시작하지 못했습니다."
+      resync_select_warning: "재동기화할 저장소를 선택하세요."
       connect: "Github 계정으로 로그인하여 연동을 시작하세요."
       login_button: "Github으로 로그인"
       choose_org: "저장소가 속한 조직을 선택하세요."
@@ -34,6 +39,10 @@ ko:
     auth:
       login_first: "GitHub 계정을 연결하려면 먼저 로그인하세요"
       connected: "GitHub 계정이 연결되었습니다"
+    markdown_sync:
+      step_description: "Markdown Sync를 활성화하면 .md 파일이 읽기전용 크리에이티브로 가져와집니다. 기본 브랜치에 push하면 자동으로 동기화됩니다."
+      not_enabled: "이 저장소에 Markdown Sync가 활성화되어 있지 않습니다."
+      resync_started: "재동기화가 시작되었습니다. 곧 트리가 업데이트됩니다."
     errors:
       not_connected: "GitHub 계정이 연결되지 않았습니다"
       forbidden: "이 작업을 수행할 권한이 없습니다"

data/config/routes.rb

@@ -16,6 +16,8 @@ CollavreGithub::Engine.routes.draw do
 
   # Creative integration endpoints
   resources :creatives, only: [] do
-    resource :integration, module: :creatives, only: [ :show, :update, :destroy ]
+    resource :integration, module: :creatives, only: [ :show, :update, :destroy ] do
+      post :resync, on: :member
+    end
   end
 end

data/db/migrate/20260412000000_add_markdown_sync_to_repository_links.rb

@@ -0,0 +1,10 @@
+class AddMarkdownSyncToRepositoryLinks < ActiveRecord::Migration[8.0]
+  def change
+    add_column :github_repository_links, :markdown_sync_enabled, :boolean, default: false, null: false
+    add_column :github_repository_links, :markdown_root_creative_id, :integer
+    add_column :github_repository_links, :last_synced_at, :datetime
+    add_column :github_repository_links, :sync_branch, :string
+
+    add_index :github_repository_links, :markdown_sync_enabled
+  end
+end

data/db/migrate/20260416000000_add_markdown_root_creative_index.rb

@@ -0,0 +1,5 @@
+class AddMarkdownRootCreativeIndex < ActiveRecord::Migration[8.0]
+  def change
+    add_index :github_repository_links, :markdown_root_creative_id, where: "markdown_root_creative_id IS NOT NULL", if_not_exists: true
+  end
+end

data/lib/collavre_github/version.rb

@@ -1,3 +1,3 @@
 module CollavreGithub
-  VERSION = "0.4.1"
+  VERSION = "0.5.1"
 end

data/lib/tasks/mock_import.rake

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+namespace :collavre_github do
+  desc "Import markdown files from mock GitHub server into a creative tree"
+  task mock_import: :environment do
+    puts "=== GitHub Markdown Mock Import ==="
+    puts ""
+
+    # 1. Find or create user
+    user = User.first
+    abort "No user found. Run db:seed first." unless user
+    puts "User: #{user.name} (#{user.email})"
+
+    # 2. Find or create GitHub account (mock)
+    account = CollavreGithub::Account.find_or_initialize_by(user: user)
+    if account.new_record?
+      account.assign_attributes(
+        github_uid: "mock-12345",
+        login: "dev-user",
+        name: "Dev User (Mock)",
+        token: "mock-token-#{SecureRandom.hex(10)}"
+      )
+      account.save!
+      puts "Created mock GitHub account: #{account.login}"
+    else
+      puts "Using existing GitHub account: #{account.login}"
+    end
+
+    # 3. Find or create a root creative for the import
+    repo_name = ENV.fetch("MOCK_REPO", "dev-user/my-app")
+    root = Collavre::Creative.find_by(description: "GitHub Docs")
+    unless root
+      parent = Collavre::Creative.roots.first
+      root = Collavre::Creative.create!(
+        description: "GitHub Docs",
+        parent: parent,
+        user: user
+      )
+      puts "Created root creative: #{root.id} — 'GitHub Docs'"
+    end
+
+    # 4. Clean up existing sync (if re-running)
+    existing_link = root.github_repository_links.find_by(
+      github_account: account,
+      repository_full_name: repo_name
+    )
+    if existing_link
+      puts "Cleaning up existing sync..."
+      # Archive old markdown tree
+      if existing_link.markdown_root_creative
+        existing_link.markdown_root_creative.descendants.each do |c|
+          c.destroy if c.data.is_a?(Hash) && c.data.dig("source", "type") == "github_markdown"
+        end
+        existing_link.markdown_root_creative.destroy
+      end
+      existing_link.update!(markdown_root_creative_id: nil, last_synced_at: nil)
+    end
+
+    # 5. Create or reuse RepositoryLink
+    link = root.github_repository_links.find_or_create_by!(
+      github_account: account,
+      repository_full_name: repo_name
+    )
+    link.update!(markdown_sync_enabled: true, sync_branch: "main")
+    puts "RepositoryLink: #{link.id} — #{repo_name} (markdown_sync: enabled)"
+
+    # 6. Run InitialImportService
+    puts ""
+    puts "Starting import from mock server..."
+    puts "(Make sure mock server is running: bin/rails collavre_github:mock_server)"
+    puts ""
+
+    begin
+      result = CollavreGithub::MarkdownSync::InitialImportService.new(
+        repository_link: link,
+        user: user
+      ).call
+
+      if result
+        puts ""
+        puts "✅ Import complete!"
+        puts "   Created #{result.size} creatives"
+        puts "   Root creative: #{link.reload.markdown_root_creative_id}"
+        puts "   Last synced: #{link.last_synced_at}"
+        puts ""
+        puts "   Open the app and navigate to the 'GitHub Docs' creative to see the tree."
+      else
+        puts "⚠️  No markdown files found in the repository."
+      end
+    rescue StandardError => e
+      puts "❌ Import failed: #{e.message}"
+      puts e.backtrace.first(5).join("\n")
+      puts ""
+      puts "Is the mock server running? Start it with:"
+      puts "  bin/rails collavre_github:mock_server"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_github
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Collavre
@@ -66,10 +66,16 @@ files:
 - app/controllers/collavre_github/auth_controller.rb
 - app/controllers/collavre_github/creatives/integrations_controller.rb
 - app/controllers/collavre_github/webhooks_controller.rb
+- app/javascript/collavre_github.js
+- app/jobs/collavre_github/initial_markdown_sync_job.rb
+- app/jobs/collavre_github/markdown_sync_job.rb
 - app/models/collavre_github/account.rb
 - app/models/collavre_github/application_record.rb
 - app/models/collavre_github/repository_link.rb
 - app/services/collavre_github/client.rb
+- app/services/collavre_github/markdown_sync/content_processor.rb
+- app/services/collavre_github/markdown_sync/incremental_sync_service.rb
+- app/services/collavre_github/markdown_sync/initial_import_service.rb
 - app/services/collavre_github/tools/concerns/github_client_finder.rb
 - app/services/collavre_github/tools/github_pr_commits_service.rb
 - app/services/collavre_github/tools/github_pr_details_service.rb
@@ -84,10 +90,13 @@ files:
 - db/migrate/20250927000000_add_webhook_secret_to_github_repository_links.rb
 - db/migrate/20250928105957_add_github_gemini_prompt_to_creatives.rb
 - db/migrate/20260219095224_remove_github_gemini_prompt_from_creatives.rb
+- db/migrate/20260412000000_add_markdown_sync_to_repository_links.rb
+- db/migrate/20260416000000_add_markdown_root_creative_index.rb
 - db/seeds.rb
 - lib/collavre_github.rb
 - lib/collavre_github/engine.rb
 - lib/collavre_github/version.rb
+- lib/tasks/mock_import.rake
 - lib/tasks/mock_server.rake
 homepage: https://collavre.com
 licenses: