collavre 0.3.2 → 0.5.0

data/config/locales/comments.ko.yml

@@ -23,7 +23,6 @@ ko:
       not_owner: 댓글 소유자만 수정할 수 있습니다.
       no_permission: 댓글을 추가할 권한이 없습니다.
       convert_not_allowed: 댓글 소유자 또는 크리에이티브 관리자만 이 메시지를 전환할 수 있습니다.
-      gemini: Gemini
       convert_button: 전환
       convert_to_creative: 하위 크리에이티브로 전환
       convert_confirm: 현재 크리에이티브 하위에 해당 댓글의 내용이 추가됩니다. 진행하시겠습니까?
@@ -44,6 +43,7 @@ ko:
       approve_invalid_attributes: 댓글 작업 속성은 객체 형식이어야 합니다.
       approve_no_attributes: 댓글 작업에는 최소 한 개의 허용 속성이 포함되어야 합니다.
       approve_invalid_creative: 댓글 작업이 잘못된 크리에이티브를 대상으로 하고 있습니다.
+      approve_no_write_permission: 이 크리에이티브에 대한 쓰기 권한이 없습니다.
       approve_invalid_progress: 댓글 작업 진행률은 숫자여야 합니다.
       approve_invalid_description: 댓글 작업 설명은 텍스트여야 합니다.
       approved_label: 승인됨
@@ -62,6 +62,8 @@ ko:
       voice_stop: 중지
       speech_unavailable: 이 브라우저는 음성 인식을 지원하지 않습니다.
       move_button: 이동
+      review_button: 리뷰
+      replace_button: 바꾸기
       move_no_selection: 이동할 메시지를 선택해주세요.
       move_error: 메시지를 이동할 수 없습니다.
       add_participant: 사용자 추가
@@ -84,6 +86,8 @@ ko:
         event_created: '이벤트가 생성되었습니다: [구글 캘린더 이벤트](%{url})'
         event_created_local: '이벤트가 생성되었습니다 (로컬 전용 - 구글 캘린더 연동 시 동기화됩니다)'
         event_created_sync_failed: '이벤트가 생성되었습니다 (구글 캘린더 동기화 실패 - 구글 계정을 다시 연동해주세요)'
+      mcp_command:
+        error_running: "/%{tool_name} 실행 오류: %{error}"
       topic_command:
         missing_name: '토픽 이름을 따옴표로 지정하세요: /topic "토픽 이름"'
         created: '토픽 "%{name}"이(가) 생성되었습니다.'

data/config/locales/orchestration.en.yml

@@ -1,4 +1,12 @@
 en:
+  collavre:
+    orchestration:
+      waiting_notice: "⏳ Waiting (%{reason})"
+      waiting_reasons:
+        topic_concurrency: "another task is running in this topic"
+        busy: "agent concurrency limit reached"
+        rate_limited: "rate limit reached"
+        unknown: "waiting for resources"
   admin:
     orchestration:
       title: "AI Agent Orchestration"

data/config/locales/orchestration.ko.yml

@@ -1,4 +1,12 @@
 ko:
+  collavre:
+    orchestration:
+      waiting_notice: "⏳ 대기중 (%{reason})"
+      waiting_reasons:
+        topic_concurrency: "이 토픽에서 다른 작업이 실행 중"
+        busy: "에이전트 동시 실행 한도 도달"
+        rate_limited: "요청 속도 제한 도달"
+        unknown: "리소스 대기 중"
   admin:
     orchestration:
       title: "AI 에이전트 오케스트레이션"

data/config/locales/users.en.yml

@@ -35,6 +35,8 @@ en:
         tools_note: You can check and test available tools after creating the agent.
       create_ai:
         success: AI User created successfully.
+      copy_ai:
+        link: Copy
       edit_ai:
         title: Edit AI Agent
         link: Edit
@@ -42,6 +44,8 @@ en:
         tools_title: Available Tools
         tools_description: These tools are available for the agent to use.
         no_tools_found: No tools found.
+        agent_conf_label: "Agent Configuration (YAML)"
+        agent_conf_help: "YAML configuration for agent behavior. chat_history: max previous messages (default 50), chat_history_size: max total characters (default 100000), context.creative_children_level: depth of children to include in creative context (default nil → follows user setting, 0=no children, 1=direct children, 2=grandchildren)."
         chat_title: Chat with Agent
         chat_placeholder: Type a message to test the agent...
       update_ai:
@@ -126,6 +130,14 @@ en:
         granted: System admin access granted.
         revoked: System admin access removed.
         failed: Could not update the user's system admin status.
+      unlock:
+        button: Unlock
+        success: "%{name} has been unlocked."
+      lock:
+        button: Lock
+        confirm: "Lock this user's account? They will not be able to log in."
+        success: "%{name} has been locked."
+        cannot_lock_self: "You cannot lock your own account."
       destroy:
         success: The user and all associated data have been deleted.
         failure: Could not delete the user.

data/config/locales/users.ko.yml

@@ -33,6 +33,8 @@ ko:
         tools_note: 에이전트 생성 후 사용 가능한 도구를 확인하고 테스트할 수 있습니다.
       create_ai:
         success: AI 에이전트가 생성되었습니다.
+      copy_ai:
+        link: 복사
       edit_ai:
         title: AI 에이전트 수정
         link: 수정
@@ -40,6 +42,8 @@ ko:
         tools_title: 사용 가능한 도구
         tools_description: 에이전트가 사용할 수 있는 도구 목록입니다.
         no_tools_found: 사용 가능한 도구가 없습니다.
+        agent_conf_label: "에이전트 설정 (YAML)"
+        agent_conf_help: "에이전트 동작을 위한 YAML 설정. chat_history: 최대 이전 메시지 수 (기본 50), chat_history_size: 최대 총 문자 수 (기본 100000), context.creative_children_level: 크리에이티브 컨텍스트에 포함할 자식 깊이 (기본 nil → 사용자 설정 따름, 0=자식 없음, 1=직접 자식, 2=손자까지)."
         chat_title: 에이전트와 대화하기
         chat_placeholder: 에이전트를 테스트하려면 메시지를 입력하세요...
       update_ai:
@@ -121,6 +125,14 @@ ko:
         granted: 시스템 관리자 권한이 부여되었습니다.
         revoked: 시스템 관리자 권한이 해제되었습니다.
         failed: 사용자의 시스템 관리자 상태를 변경하지 못했습니다.
+      unlock:
+        button: 잠금 해제
+        success: "%{name}의 잠금이 해제되었습니다."
+      lock:
+        button: 잠금
+        confirm: "이 사용자의 계정을 잠글까요? 로그인할 수 없게 됩니다."
+        success: "%{name}의 계정이 잠겼습니다."
+        cannot_lock_self: "자신의 계정은 잠글 수 없습니다."
       destroy:
         success: 사용자와 모든 관련 데이터가 삭제되었습니다.
         failure: 사용자를 삭제하지 못했습니다.

data/config/routes.rb

@@ -15,6 +15,8 @@ Collavre::Engine.routes.draw do
       patch :update_ai
       patch :grant_system_admin
       patch :revoke_system_admin
+      patch :unlock
+      patch :lock
       get :edit_password
       patch :update_password
       get :passkeys
@@ -94,8 +96,12 @@ Collavre::Engine.routes.draw do
   post "/creative_expanded_states/toggle", to: "creative_expanded_states#toggle"
   post "/comment_read_pointers/update", to: "comment_read_pointers#update"
 
-  # Admin orchestration
+  # Admin settings & orchestration
   scope "/admin", as: :admin do
+    get "/", to: "admin/settings#index", as: :settings
+    patch "/", to: "admin/settings#update"
+    get "/uiux", to: "admin/settings#uiux", as: :uiux
+    patch "/uiux", to: "admin/settings#update_uiux"
     resource :orchestration, only: [ :show, :update ], controller: "admin/orchestration"
   end
 end

data/db/migrate/20260212011655_add_quoted_comment_to_comments.rb

@@ -0,0 +1,7 @@
+class AddQuotedCommentToComments < ActiveRecord::Migration[8.0]
+  def change
+    add_column :comments, :quoted_comment_id, :integer
+    add_column :comments, :quoted_text, :text
+    add_index :comments, :quoted_comment_id
+  end
+end

data/db/migrate/20260213044247_add_agent_conf_to_users.rb

@@ -0,0 +1,5 @@
+class AddAgentConfToUsers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :users, :agent_conf, :text
+  end
+end

data/lib/collavre/engine.rb

@@ -68,6 +68,31 @@ module Collavre
       end
     end
 
+    # Boot the self-scheduling CronSchedulerJob for dynamic recurring tasks.
+    # Uses DB-based guard (SolidQueue::Job table) to prevent duplicate chains.
+    # Boot the self-scheduling CronSchedulerJob for dynamic recurring tasks.
+    # Uses DB-based guard (SolidQueue::Job table) to prevent duplicate chains.
+    # Runs in any non-test process that has DB access — the DB guard ensures
+    # only one scheduler chain is active regardless of how many processes boot.
+    initializer "collavre.cron_scheduler" do
+      config.after_initialize do
+        next if Rails.env.test?
+
+        # DB-based check: skip if a CronSchedulerJob is already pending
+        pending = SolidQueue::Job.where(class_name: "Collavre::CronSchedulerJob", finished_at: nil)
+        failed_ids = SolidQueue::FailedExecution.pluck(:job_id)
+        pending = pending.where.not(id: failed_ids) if failed_ids.any?
+        unless pending.exists?
+          Rails.logger.info("[CronScheduler] Booting self-scheduling cron scheduler")
+          Collavre::CronSchedulerJob.perform_later
+        else
+          Rails.logger.info("[CronScheduler] Already running, skipping boot")
+        end
+      rescue StandardError => e
+        Rails.logger.error("[CronScheduler] Failed to boot: #{e.message}")
+      end
+    end
+
     # Reset navigation registry before any registrations (runs first)
     initializer "collavre.navigation_reset" do
       ActiveSupport::Reloader.to_prepare(prepend: true) do

data/lib/collavre/version.rb

@@ -1,3 +1,3 @@
 module Collavre
-  VERSION = "0.3.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Collavre
@@ -164,6 +164,7 @@ files:
 - app/assets/stylesheets/collavre/comments_popup.css
 - app/assets/stylesheets/collavre/creatives.css
 - app/assets/stylesheets/collavre/dark_mode.css
+- app/assets/stylesheets/collavre/design_tokens.css
 - app/assets/stylesheets/collavre/mention_menu.css
 - app/assets/stylesheets/collavre/popup.css
 - app/assets/stylesheets/collavre/print.css
@@ -187,6 +188,7 @@ files:
 - app/components/collavre/progress_filter_component.rb
 - app/components/collavre/user_mention_menu_component.rb
 - app/controllers/collavre/admin/orchestration_controller.rb
+- app/controllers/collavre/admin/settings_controller.rb
 - app/controllers/collavre/application_controller.rb
 - app/controllers/collavre/attachments_controller.rb
 - app/controllers/collavre/calendar_events_controller.rb
@@ -256,6 +258,7 @@ files:
 - app/javascript/creatives/drag_drop/operations.js
 - app/javascript/creatives/drag_drop/state.js
 - app/javascript/creatives/tree_renderer.js
+- app/javascript/lib/__tests__/html_code_block_wrapper.test.js
 - app/javascript/lib/api/__tests__/queue_manager.test.js
 - app/javascript/lib/api/creatives.js
 - app/javascript/lib/api/csrf_fetch.js
@@ -263,6 +266,7 @@ files:
 - app/javascript/lib/api/queue_manager.js
 - app/javascript/lib/apply_lexical_styles.js
 - app/javascript/lib/common_popup.js
+- app/javascript/lib/html_code_block_wrapper.js
 - app/javascript/lib/lexical/__tests__/action_text_attachment_node.test.jsx
 - app/javascript/lib/lexical/__tests__/attachment_payload.test.js
 - app/javascript/lib/lexical/action_text_attachment_node.js
@@ -294,8 +298,10 @@ files:
 - app/javascript/slide_view.js
 - app/javascript/utils/caret_position.js
 - app/javascript/utils/clipboard.js
+- app/javascript/utils/emoji_parser.js
 - app/jobs/collavre/ai_agent_job.rb
 - app/jobs/collavre/cron_action_job.rb
+- app/jobs/collavre/cron_scheduler_job.rb
 - app/jobs/collavre/inbox_summary_job.rb
 - app/jobs/collavre/permission_cache_cleanup_job.rb
 - app/jobs/collavre/permission_cache_job.rb
@@ -311,11 +317,17 @@ files:
 - app/models/collavre/application_record.rb
 - app/models/collavre/calendar_event.rb
 - app/models/collavre/comment.rb
+- app/models/collavre/comment/approvable.rb
+- app/models/collavre/comment/broadcastable.rb
+- app/models/collavre/comment/notifiable.rb
 - app/models/collavre/comment_presence_store.rb
 - app/models/collavre/comment_reaction.rb
 - app/models/collavre/comment_read_pointer.rb
 - app/models/collavre/contact.rb
 - app/models/collavre/creative.rb
+- app/models/collavre/creative/describable.rb
+- app/models/collavre/creative/linkable.rb
+- app/models/collavre/creative/permissible.rb
 - app/models/collavre/creative_expanded_state.rb
 - app/models/collavre/creative_share.rb
 - app/models/collavre/creative_shares_cache.rb
@@ -338,11 +350,16 @@ files:
 - app/models/collavre/user_theme.rb
 - app/models/collavre/variation.rb
 - app/models/collavre/webauthn_credential.rb
+- app/services/collavre/ai_agent/approval_handler.rb
+- app/services/collavre/ai_agent/message_builder.rb
+- app/services/collavre/ai_agent/review_handler.rb
 - app/services/collavre/ai_agent_service.rb
 - app/services/collavre/ai_client.rb
 - app/services/collavre/ai_system_prompt_renderer.rb
 - app/services/collavre/auto_theme_generator.rb
+- app/services/collavre/command_menu_service.rb
 - app/services/collavre/comment_link_formatter.rb
+- app/services/collavre/comment_move_service.rb
 - app/services/collavre/comments/action_executor.rb
 - app/services/collavre/comments/action_validator.rb
 - app/services/collavre/comments/calendar_command.rb
@@ -350,6 +367,8 @@ files:
 - app/services/collavre/comments/mcp_command.rb
 - app/services/collavre/comments/mcp_command_builder.rb
 - app/services/collavre/comments/topic_command.rb
+- app/services/collavre/creatives/create_service.rb
+- app/services/collavre/creatives/destroy_service.rb
 - app/services/collavre/creatives/filter_pipeline.rb
 - app/services/collavre/creatives/filters/assignee_filter.rb
 - app/services/collavre/creatives/filters/base_filter.rb
@@ -371,8 +390,10 @@ files:
 - app/services/collavre/gemini_parent_recommender.rb
 - app/services/collavre/google_calendar_service.rb
 - app/services/collavre/link_preview_fetcher.rb
+- app/services/collavre/markdown_converter.rb
 - app/services/collavre/markdown_importer.rb
 - app/services/collavre/mcp_service.rb
+- app/services/collavre/mention_parser.rb
 - app/services/collavre/orchestration/agent_context_builder.rb
 - app/services/collavre/orchestration/agent_orchestrator.rb
 - app/services/collavre/orchestration/arbiter.rb
@@ -387,6 +408,7 @@ files:
 - app/services/collavre/ruby_llm_interaction_logger.rb
 - app/services/collavre/system_events/context_builder.rb
 - app/services/collavre/system_events/dispatcher.rb
+- app/services/collavre/tools/creative_batch_service.rb
 - app/services/collavre/tools/creative_create_service.rb
 - app/services/collavre/tools/creative_retrieval_service.rb
 - app/services/collavre/tools/creative_update_service.rb
@@ -396,6 +418,10 @@ files:
 - app/services/collavre/tools/cron_update_service.rb
 - app/views/admin/shared/_tabs.html.erb
 - app/views/collavre/admin/orchestration/show.html.erb
+- app/views/collavre/admin/settings/_system_tab.html.erb
+- app/views/collavre/admin/settings/_uiux_tab.html.erb
+- app/views/collavre/admin/settings/index.html.erb
+- app/views/collavre/admin/settings/uiux.html.erb
 - app/views/collavre/comments/_activity_log_details.html.erb
 - app/views/collavre/comments/_comment.html.erb
 - app/views/collavre/comments/_comments_popup.html.erb
@@ -413,6 +439,7 @@ files:
 - app/views/collavre/creatives/_mobile_actions_menu.html.erb
 - app/views/collavre/creatives/_set_plan_modal.html.erb
 - app/views/collavre/creatives/_share_button.html.erb
+- app/views/collavre/creatives/_share_modal.html.erb
 - app/views/collavre/creatives/edit.html.erb
 - app/views/collavre/creatives/index.html.erb
 - app/views/collavre/creatives/new.html.erb
@@ -460,6 +487,8 @@ files:
 - app/views/collavre/users/show.html.erb
 - app/views/inbox/badge_component/_count.html.erb
 - app/views/layouts/collavre/slide.html.erb
+- config/locales/admin.en.yml
+- config/locales/admin.ko.yml
 - config/locales/ai_agent.en.yml
 - config/locales/ai_agent.ko.yml
 - config/locales/comments.en.yml
@@ -577,6 +606,8 @@ files:
 - db/migrate/20260206005035_create_orchestrator_policies.rb
 - db/migrate/20260206094509_add_retry_count_to_tasks.rb
 - db/migrate/20260206100000_add_topic_id_to_tasks.rb
+- db/migrate/20260212011655_add_quoted_comment_to_comments.rb
+- db/migrate/20260213044247_add_agent_conf_to_users.rb
 - lib/collavre.rb
 - lib/collavre/configuration.rb
 - lib/collavre/engine.rb