collavre 0.1.1 → 0.2.0

data/app/javascript/modules/creative_row_editor.js

@@ -3,6 +3,7 @@ import apiQueue from '../lib/api/queue_manager'
 import { $getCharacterOffsets, $getSelection, $isRangeSelection, $isTextNode, $isRootOrShadowRoot } from 'lexical'
 import { createInlineEditor } from './lexical_inline_editor'
 import { renderCreativeTree, dispatchCreativeTreeUpdated } from '../creatives/tree_renderer'
+import { isProgressComplete, progressBaselineValueFrom, progressValueChangedFrom } from './creative_progress'
 // Import Stimulus application from the global window (set by host app)
 const application = window.Stimulus
 
@@ -75,6 +76,9 @@ export function initializeCreativeRowEditor() {
     const editorContainer = template.querySelector('[data-lexical-editor-root]');
     const progressInput = document.getElementById('inline-creative-progress');
     const progressValue = document.getElementById('inline-progress-value');
+    const progressCompleteLabel = progressInput?.dataset.completeLabel || 'Complete';
+    const progressIncompleteLabel = progressInput?.dataset.incompleteLabel || 'Incomplete';
+    const progressHiddenInput = document.querySelector('input[type="hidden"][name="creative[progress]"]');
     const upBtn = document.getElementById('inline-move-up');
     const downBtn = document.getElementById('inline-move-down');
     const addBtn = document.getElementById('inline-add');
@@ -136,18 +140,53 @@ export function initializeCreativeRowEditor() {
     let originalProgress = 0;
     let originalOriginId = '';
     let isDirty = false;
+    let completionCascadePending = false;
 
     function formatProgressDisplay(value) {
-      const numeric = Number(value);
-      if (Number.isNaN(numeric)) return '0%';
-      const percentage = Math.round(numeric * 100);
-      return `${percentage}%`;
+      return isProgressComplete(value) ? progressCompleteLabel : progressIncompleteLabel;
+    }
+
+    function readProgressValue() {
+      if (!progressInput) return 0;
+      return progressInput.checked ? 1 : 0;
+    }
+
+    function progressValueChanged() {
+      if (!progressInput) return false;
+      return progressValueChangedFrom(originalProgress, progressInput.checked);
+    }
+
+    function setProgressState(value) {
+      if (!progressInput) return;
+      const complete = isProgressComplete(value);
+      progressInput.checked = complete;
+      if (progressValue) {
+        progressValue.textContent = formatProgressDisplay(value);
+      }
+    }
+
+    function updateProgressInputAvailability(value) {
+      if (!progressInput) return;
+      const hasChildren = currentRowHasChildren();
+      const complete = isProgressComplete(value);
+      const shouldDisable = hasChildren && complete;
+      progressInput.disabled = shouldDisable;
+      if (progressHiddenInput) {
+        progressHiddenInput.disabled = false;
+        progressHiddenInput.value = shouldDisable ? '1' : '0';
+      }
     }
 
     function treeRowElement(node) {
       return node && node.closest ? node.closest('creative-tree-row') : null;
     }
 
+    function currentRowHasChildren() {
+      const row = currentRowElement || (currentTree ? treeRowElement(currentTree) : null);
+      if (!row) return false;
+      return !!(row.hasChildren || row.getAttribute?.('has-children'));
+    }
+
     function hasDatasetValue(element, key) {
       if (!element || !element.dataset) return false;
       return Object.prototype.hasOwnProperty.call(element.dataset, key);
@@ -245,8 +284,9 @@ export function initializeCreativeRowEditor() {
       isDirty = false;
       const progressNumber = Number(data.progress ?? 0);
       const normalizedProgress = Number.isNaN(progressNumber) ? 0 : progressNumber;
-      progressInput.value = normalizedProgress;
-      progressValue.textContent = formatProgressDisplay(progressInput.value);
+      setProgressState(normalizedProgress);
+      updateProgressInputAvailability(normalizedProgress);
+      completionCascadePending = false;
       const fallbackParent = tree?.dataset?.parentId || '';
       parentInput.value = data.parent_id ?? fallbackParent ?? '';
       beforeInput.value = '';
@@ -892,8 +932,17 @@ export function initializeCreativeRowEditor() {
 
         // Capture values being saved to update dirty state on success
         const savedContent = descriptionInput.value;
-        const savedProgress = progressInput.value;
+        const shouldPersistProgress = progressValueChanged();
+        const savedProgress = shouldPersistProgress ? readProgressValue() : progressBaselineValueFrom(originalProgress);
         const savedOriginId = originIdInput ? originIdInput.value : '';
+        const cascadeProgressUpdate = completionCascadePending;
+        const progressInputsDisabled = progressInput?.disabled ?? false;
+        const hiddenProgressDisabled = progressHiddenInput?.disabled ?? false;
+
+        if (!shouldPersistProgress) {
+          if (progressInput) progressInput.disabled = true;
+          if (progressHiddenInput) progressHiddenInput.disabled = true;
+        }
 
         savePromise = creativesApi.save(form.action, method, form).then(function (r) {
           if (!r.ok) return r;
@@ -902,12 +951,14 @@ export function initializeCreativeRowEditor() {
           }).then(function (data) {
             // Update dirty state to reflect successful save
             originalContent = savedContent;
-            originalProgress = savedProgress;
+            if (shouldPersistProgress) {
+              originalProgress = savedProgress;
+            }
             originalOriginId = savedOriginId;
 
             // If current values match what was just saved, clear dirty flag
             if (descriptionInput.value === savedContent &&
-              progressInput.value === savedProgress &&
+              readProgressValue() === savedProgress &&
               originIdInput.value === savedOriginId) {
               isDirty = false;
             }
@@ -954,6 +1005,10 @@ export function initializeCreativeRowEditor() {
             } else if (method === 'PATCH') {
               if (tree) refreshRow(tree);
             }
+            if (cascadeProgressUpdate && tree) {
+              refreshChildren(tree);
+              completionCascadePending = false;
+            }
 
             // Delete removed attachments after successful save
             if (lexicalEditor && typeof lexicalEditor.getDeletedAttachments === 'function') {
@@ -966,6 +1021,10 @@ export function initializeCreativeRowEditor() {
           });
         }).finally(function () {
           saving = false;
+          if (!shouldPersistProgress) {
+            if (progressInput) progressInput.disabled = progressInputsDisabled;
+            if (progressHiddenInput) progressHiddenInput.disabled = hiddenProgressDisabled;
+          }
         });
         return savePromise;
       });
@@ -1071,7 +1130,8 @@ export function initializeCreativeRowEditor() {
       // CRITICAL: Capture ALL values BEFORE awaiting, because the editor may switch
       // to a different creative while we're waiting for uploads
       let currentContent = descriptionInput.value;
-      let currentProgress = progressInput.value;
+      let currentProgress = readProgressValue();
+      let shouldPersistProgress = progressValueChanged();
       const currentParentId = tree.dataset.parentId || '';
       const currentBeforeId = tree.previousElementSibling ? creativeIdFrom(tree.previousElementSibling) : '';
       const currentAfterId = tree.nextElementSibling ? creativeIdFrom(tree.nextElementSibling) : '';
@@ -1092,17 +1152,21 @@ export function initializeCreativeRowEditor() {
       // This ensures we capture the final HTML with signed IDs instead of blob URLs
       if (form.dataset.creativeId === startCreativeId) {
         currentContent = descriptionInput.value;
-        currentProgress = progressInput.value;
+        currentProgress = readProgressValue();
+        shouldPersistProgress = progressValueChanged();
       }
 
       // Build request body
       // Note: before_id and after_id must be top-level params, not nested under creative[]
       // because CreativesController reads params[:before_id] and params[:after_id] for positioning
       const body = {
-        'creative[description]': currentContent,
-        'creative[progress]': currentProgress
+        'creative[description]': currentContent
       };
 
+      if (shouldPersistProgress) {
+        body['creative[progress]'] = currentProgress;
+      }
+
       // Always include parent_id, even if empty (for moving to root)
       body['creative[parent_id]'] = currentParentId;
 
@@ -1122,7 +1186,9 @@ export function initializeCreativeRowEditor() {
           row.dataset.descriptionHtml = currentContent;
           row.descriptionHtml = currentContent;
           row.dataset.descriptionRawHtml = currentContent;
-          row.dataset.progressValue = String(currentProgress);
+          if (shouldPersistProgress) {
+            row.dataset.progressValue = String(currentProgress);
+          }
           if (currentParentId) {
             tree.dataset.parentId = currentParentId;
             row.parentId = currentParentId;
@@ -1156,6 +1222,9 @@ export function initializeCreativeRowEditor() {
 
       // Reset dirty state
       originalContent = currentContent;
+      if (shouldPersistProgress) {
+        originalProgress = currentProgress;
+      }
       isDirty = false;
       pendingSave = false;
       clearTimeout(saveTimer);
@@ -1540,8 +1609,8 @@ export function initializeCreativeRowEditor() {
           resetOriginTracking();
           descriptionInput.value = '';
           lexicalEditor.reset(`new-${Date.now()}`);
-          progressInput.value = 0;
-          progressValue.textContent = formatProgressDisplay(0);
+          setProgressState(0);
+          originalProgress = 0;
           if (unconvertBtn) unconvertBtn.style.display = 'none';
           pendingSave = false;
           lexicalEditor.focus();
@@ -1666,10 +1735,25 @@ export function initializeCreativeRowEditor() {
       return !!node && $isRootOrShadowRoot(node);
     }
 
-    progressInput.addEventListener('input', function () {
-      progressValue.textContent = formatProgressDisplay(progressInput.value);
-      scheduleSave();
-    });
+    if (progressInput) {
+      progressInput.addEventListener('change', function () {
+        if (progressValue) {
+          progressValue.textContent = formatProgressDisplay(readProgressValue());
+        }
+        completionCascadePending = false;
+        const hasChildren = currentRowHasChildren();
+        const shouldCascade = hasChildren && progressValueChanged();
+        if (shouldCascade) {
+          completionCascadePending = true;
+          const alertMessage = progressInput.dataset.childrenAlertMessage;
+          if (alertMessage) {
+            alert(alertMessage);
+          }
+        }
+        updateProgressInputAvailability(readProgressValue());
+        scheduleSave();
+      });
+    }
 
     if (parentSuggestBtn && parentSuggestions) {
       parentSuggestBtn.addEventListener('click', function () {

data/app/javascript/modules/plans_timeline.js

@@ -10,6 +10,9 @@ if (!plansTimelineScriptInitialized) {
     var plans = [];
     try { plans = JSON.parse(container.dataset.plans || '[]'); } catch (e) { }
     plans = plans.map(function (p) {
+      if (p.start_date) {
+        p.start_date = new Date(p.start_date);
+      }
       p.created_at = new Date(p.created_at);
       p.target_date = new Date(p.target_date);
       return p;
@@ -64,8 +67,9 @@ if (!plansTimelineScriptInitialized) {
       el.className = 'plan-bar';
       el.dataset.path = plan.path;
       el.dataset.id = plan.id;
-      var left = dayDiff(plan.created_at, startDate) * dayWidth;
-      var width = (dayDiff(plan.target_date, plan.created_at) + 1) * dayWidth;
+      var startDateValue = plan.start_date || plan.created_at;
+      var left = dayDiff(startDateValue, startDate) * dayWidth;
+      var width = (dayDiff(plan.target_date, startDateValue) + 1) * dayWidth;
       el.style.left = left + 'px';
       el.style.top = (idx * rowHeight + 40) + 'px';
       el.style.width = width + 'px';
@@ -146,8 +150,9 @@ if (!plansTimelineScriptInitialized) {
       var visibleWidth = dayDiff(endDate, startDate) * dayWidth;
       planEls.forEach(function (item, idx) {
         var plan = item.plan;
-        var left = dayDiff(plan.created_at, startDate) * dayWidth;
-        var width = (dayDiff(plan.target_date, plan.created_at) + 1) * dayWidth;
+        var startDateValue = plan.start_date || plan.created_at;
+        var left = dayDiff(startDateValue, startDate) * dayWidth;
+        var width = (dayDiff(plan.target_date, startDateValue) + 1) * dayWidth;
         var right = left + width;
 
         if (right < 0 || left > visibleWidth) {
@@ -193,6 +198,9 @@ if (!plansTimelineScriptInitialized) {
         .then(function (r) { return r.json(); })
         .then(function (newPlans) {
           plans = newPlans.map(function (p) {
+            if (p.start_date) {
+              p.start_date = new Date(p.start_date);
+            }
             p.created_at = new Date(p.created_at);
             p.target_date = new Date(p.target_date);
             return p;
@@ -362,6 +370,9 @@ if (!plansTimelineScriptInitialized) {
           return r.json().then(function (j) { throw j; });
         }).then(function (plan) {
           // Add to local plans if available via closure or re-fetch
+          if (plan.start_date) {
+            plan.start_date = new Date(plan.start_date);
+          }
           plan.created_at = new Date(plan.created_at);
           plan.target_date = new Date(plan.target_date);
 

data/app/javascript/modules/share_modal.js

@@ -69,5 +69,8 @@ document.addEventListener('turbo:load', function() {
         emailInput.dispatchEvent(new Event('blur'))
       }
     }
+    if (params.get('open_share') === 'true') {
+      shareBtn.click()
+    }
   }
 })

data/app/jobs/collavre/ai_agent_job.rb

@@ -1,27 +1,41 @@
 module Collavre
-class AiAgentJob < ApplicationJob
-  queue_as :default
+  class AiAgentJob < ApplicationJob
+    queue_as :default
 
-  def perform(agent_id, event_name, context)
-    agent = User.find(agent_id)
+    # Allow resuming a task that was pending approval
+    def perform(agent_id_or_task, event_name = nil, context = nil)
+      if agent_id_or_task.is_a?(Task)
+        # Resume existing task
+        task = agent_id_or_task
+        return if task.reload.status == "cancelled"
+        task.update!(status: "running")
+      else
+        # Create new task
+        agent = User.find(agent_id_or_task)
+        task = Task.create!(
+          name: "Response to #{event_name}",
+          status: "running",
+          trigger_event_name: event_name,
+          trigger_event_payload: context,
+          agent: agent
+        )
+      end
 
-    # Create Task
-    task = Task.create!(
-      name: "Response to #{event_name}",
-      status: "running",
-      trigger_event_name: event_name,
-      trigger_event_payload: context,
-      agent: agent
-    )
-
-    begin
-      AiAgentService.new(task).call
-      task.update!(status: "done")
-    rescue StandardError => e
-      task.update!(status: "failed")
-      Rails.logger.error("AiAgentJob failed for task #{task.id}: #{e.message}")
-      raise e
+      begin
+        AiAgentService.new(task).call
+        task.update!(status: "done")
+      rescue ApprovalPendingError
+        # Task status already set to pending_approval by AiAgentService
+        # Don't mark as failed, just let the job complete gracefully
+        Rails.logger.info("AiAgentJob paused for task #{task.id}: awaiting tool approval")
+      rescue CancelledError
+        # Task status already set to "cancelled" by Comment callback
+        Rails.logger.info("AiAgentJob cancelled for task #{task.id}: trigger message deleted")
+      rescue StandardError => e
+        task.update!(status: "failed")
+        Rails.logger.error("AiAgentJob failed for task #{task.id}: #{e.message}")
+        raise e
+      end
     end
   end
 end
-end

data/app/models/collavre/calendar_event.rb

@@ -5,13 +5,19 @@ module Collavre
     belongs_to :user, class_name: Collavre.configuration.user_class_name
     belongs_to :creative, class_name: "Collavre::Creative", optional: true
 
-    validates :google_event_id, :start_time, :end_time, presence: true
+    validates :start_time, :end_time, presence: true
 
     after_commit :delete_google_event, on: :destroy
 
+    def synced_to_google?
+      google_event_id.present?
+    end
+
     private
 
     def delete_google_event
+      return unless google_event_id.present?
+
       GoogleCalendarService.new(user: user).delete_event(google_event_id)
     rescue StandardError => e
       Rails.logger.error("Failed to delete Google event #{google_event_id}: #{e.message}")

data/app/models/collavre/comment.rb

@@ -2,6 +2,8 @@ module Collavre
   class Comment < ApplicationRecord
     self.table_name = "comments"
 
+    STREAMING_PLACEHOLDER_CONTENT = "..."
+
     # Use non-namespaced partial path for backward compatibility
     def to_partial_path
       "comments/comment"
@@ -26,9 +28,9 @@ module Collavre
     validate :creative_must_be_origin_creative
     validate :images_must_be_images
 
-    after_create_commit :broadcast_create, :notify_write_users, :notify_mentions, :broadcast_badges
+    after_create_commit :broadcast_create, :notify_write_users, :notify_mentions, :notify_approver, :broadcast_badges
     after_update_commit :broadcast_update
-    after_destroy_commit :broadcast_destroy, :broadcast_badges
+    after_destroy_commit :broadcast_destroy, :broadcast_badges, :cancel_pending_tasks
 
     # public for db migration
     def creative_snippet
@@ -75,6 +77,14 @@ module Collavre
 
     private
 
+    def cancel_pending_tasks
+      Task.where(status: %w[pending running]).each do |task|
+        if task.trigger_event_payload&.dig("comment", "id") == id
+          task.update!(status: "cancelled")
+        end
+      end
+    end
+
     def create_inbox_item(owner, key, params = {})
       origin = creative&.effective_origin
       metadata = params.to_h.stringify_keys
@@ -95,6 +105,11 @@ module Collavre
       )
     end
 
+    # AI agent streaming placeholder: skip inbox notifications for "..." content
+    def streaming_placeholder?
+      user&.ai_user? && content == STREAMING_PLACEHOLDER_CONTENT
+    end
+
     def mentioned_emails
       return [] unless content
       content.scan(/@([\w.\-+]+@[a-zA-Z0-9\-.]+\.[a-zA-Z]{2,})/)
@@ -147,6 +162,7 @@ module Collavre
 
     def notify_write_users
       return if private? || !user
+      return if streaming_placeholder?
       base_creative = creative.effective_origin
       present_ids = CommentPresenceStore.list(base_creative.id)
       recipients = base_creative.all_shared_users(:write).map(&:user)
@@ -167,6 +183,7 @@ module Collavre
 
     def notify_mentions
       return if private?
+      return if streaming_placeholder?
       mentioned_users.each do |mentioned|
         create_inbox_item(
           mentioned,
@@ -176,6 +193,22 @@ module Collavre
       end
     end
 
+    def notify_approver
+      return unless approver.present? && action.present?
+      return if approver == user
+
+      create_inbox_item(
+        approver,
+        "inbox.approval_requested",
+        { user: user&.display_name, tool_name: parsed_action_tool_name, creative: creative_snippet }
+      )
+    end
+
+    def parsed_action_tool_name
+      parsed = JSON.parse(action) rescue nil
+      parsed&.dig("tool_name") || "unknown"
+    end
+
     def assign_default_user
       self.user ||= Collavre.current_user
     end

data/app/models/collavre/creative.rb

@@ -51,7 +51,7 @@ module Collavre
     attr_accessor :filtered_progress
 
     belongs_to :origin, class_name: "Collavre::Creative", optional: true
-    has_many :linked_creatives, class_name: "Collavre::Creative", foreign_key: :origin_id, dependent: :delete_all
+    has_many :linked_creatives, class_name: "Collavre::Creative", foreign_key: :origin_id, dependent: :destroy
     belongs_to :user, class_name: Collavre.configuration.user_class_name, optional: true
 
     has_many :creative_shares, class_name: "Collavre::CreativeShare", dependent: :destroy
@@ -60,8 +60,6 @@ module Collavre
     has_many :creative_expanded_states, class_name: "Collavre::CreativeExpandedState", dependent: :delete_all
     has_many :invitations, class_name: "Collavre::Invitation", dependent: :delete_all
     has_many :github_repository_links, dependent: :destroy
-    has_many :notion_page_links, dependent: :destroy
-    has_many :notion_block_links, dependent: :destroy
     has_many :topics, class_name: "Collavre::Topic", dependent: :destroy
     has_many :mcp_tools, dependent: :destroy
     has_many :activity_logs, class_name: "Collavre::ActivityLog", dependent: :destroy

data/app/models/collavre/mcp_tool.rb

@@ -15,6 +15,10 @@ module Collavre
       approved_at.present?
     end
 
+    def requires_approval?
+      requires_approval == true
+    end
+
     def approve!
       # Register the tool immediately upon approval
       ::McpService.register_tool_from_source(source_code)

data/app/models/collavre/plan.rb

@@ -3,6 +3,7 @@ require "set"
 module Collavre
   class Plan < Label
     validates :target_date, presence: true
+    validate :start_date_not_after_target_date
 
     def progress(_user = nil)
       tagged_ids = Tag.where(label_id: id).pluck(:creative_id)
@@ -16,5 +17,27 @@ module Collavre
 
       values.sum.to_f / values.size
     end
+
+    # Delegate start_date to the associated creative's created_at
+    def start_date
+      creative&.created_at&.to_date
+    end
+
+    def start_date=(value)
+      return unless creative
+
+      date = value.is_a?(Date) ? value : Date.parse(value.to_s)
+      creative.update_column(:created_at, date.to_datetime)
+    end
+
+    private
+
+    def start_date_not_after_target_date
+      return if start_date.blank? || target_date.blank?
+
+      return unless start_date > target_date
+
+      errors.add(:start_date, "must be on or before target date")
+    end
   end
 end

data/app/models/collavre/topic.rb

@@ -8,5 +8,17 @@ module Collavre
     has_many :comments, class_name: "Collavre::Comment", dependent: :destroy
 
     validates :name, presence: true, uniqueness: { scope: :creative_id }
+
+    before_create :set_default_position
+
+    default_scope { order(:position) }
+
+    private
+
+    def set_default_position
+      return if position_changed? && position != 0
+
+      self.position = (Topic.unscoped.where(creative_id: creative_id).maximum(:position) || -1) + 1
+    end
   end
 end

data/app/models/collavre/user.rb

@@ -17,7 +17,6 @@ module Collavre
     has_many :contact_users, through: :contacts
     has_many :contact_memberships, class_name: "Collavre::Contact", foreign_key: :contact_user_id, dependent: :destroy, inverse_of: :contact_user
     has_one :github_account, class_name: "Collavre::GithubAccount", dependent: :destroy
-    has_one :notion_account, class_name: "Collavre::NotionAccount", dependent: :destroy
     has_many :tasks, class_name: "Collavre::Task", foreign_key: :agent_id, dependent: :destroy
 
     # Associations that reference creatives - must be destroyed BEFORE creatives
@@ -68,12 +67,27 @@ module Collavre
     attribute :llm_vendor, :string
     attribute :llm_model, :string
     attribute :llm_api_key, :string
+    attribute :gateway_url, :string
     attribute :tools, :json, default: -> { [] }
 
     encrypts :llm_api_key, deterministic: false
     encrypts :google_access_token, deterministic: false
     encrypts :google_refresh_token, deterministic: false
 
+    # Override encrypted attribute getters to handle decryption errors gracefully.
+    # This prevents the entire request from failing when a token can't be decrypted
+    # (e.g., if it was encrypted with a different key or is corrupted).
+    %i[google_access_token google_refresh_token llm_api_key].each do |attr|
+      define_method(attr) do
+        super()
+      rescue ActiveSupport::MessageEncryptor::InvalidMessage,
+             ActiveRecord::Encryption::Errors::Decryption,
+             OpenSSL::Cipher::CipherError => e
+        Rails.logger.error("Failed to decrypt #{attr} for user #{id}: #{e.class}")
+        nil
+      end
+    end
+
     SUPPORTED_LLM_MODELS = [
       "gemini-2.5-flash",
       "gemini-1.5-flash",