openclacky 0.9.2 → 0.9.4

data/lib/clacky/web/settings.js

@@ -476,14 +476,16 @@ const Settings = (() => {
 
       const badge = document.getElementById("brand-status-badge");
       if (data.warning) {
-        badge.textContent  = "Warning";
-        badge.className    = "brand-status-value badge-expired";
+        // Distinguish between expired (red) and expiring-soon (yellow)
+        const isExpired = data.warning && data.warning.toLowerCase().includes("expired");
+        badge.textContent = isExpired ? I18n.t("settings.brand.badge.expired") : I18n.t("settings.brand.badge.warning");
+        badge.className   = "brand-status-value " + (isExpired ? "badge-expired" : "badge-expiring");
       } else {
-        badge.textContent  = "Active";
+        badge.textContent  = I18n.t("settings.brand.badge.active");
         badge.className    = "brand-status-value badge-active";
       }
 
-      // Fetch full brand info for expiry date
+      // Fetch full brand info for expiry date and support QR code
       fetch("/api/brand").then(r => r.json()).then(info => {
         const expiresEl = document.getElementById("brand-status-expires");
         if (info.license_expires_at) {
@@ -491,6 +493,17 @@ const Settings = (() => {
         } else {
           expiresEl.textContent = "—";
         }
+
+        // Show support QR code if available
+        const qrContainer = document.getElementById("brand-support-qr");
+        const qrImg       = document.getElementById("brand-support-qr-img");
+        if (info.support_qr_url && qrContainer && qrImg) {
+          qrImg.src                 = info.support_qr_url;
+          qrContainer.style.display = "";
+          _initQrLightbox(info.support_qr_url, info.support_qr_label || null);
+        } else if (qrContainer) {
+          qrContainer.style.display = "none";
+        }
       }).catch(() => {
         document.getElementById("brand-status-expires").textContent = "—";
       });
@@ -597,5 +610,45 @@ const Settings = (() => {
     _initLangBtns();
   }
 
+  // ── QR Code Lightbox ───────────────────────────────────────────────────
+  // Sets up click-to-enlarge behaviour for the support QR code.
+  // Safe to call multiple times — idempotent via a data attribute guard.
+  function _initQrLightbox(qrUrl, label) {
+    const btn      = document.getElementById("brand-support-qr-btn");
+    const lightbox = document.getElementById("qr-lightbox");
+    const backdrop = document.getElementById("qr-lightbox-backdrop");
+    const closeBtn = document.getElementById("qr-lightbox-close");
+    const lbImg    = document.getElementById("qr-lightbox-img");
+    const lbLabel  = document.getElementById("qr-lightbox-label");
+
+    if (!btn || !lightbox) return;
+    // Avoid double-binding
+    if (btn.dataset.lightboxBound) return;
+    btn.dataset.lightboxBound = "1";
+
+    function openLightbox() {
+      lbImg.src = qrUrl;
+      if (lbLabel && label) lbLabel.textContent = label;
+      lightbox.style.display = "";
+      document.body.style.overflow = "hidden";
+      closeBtn && closeBtn.focus();
+    }
+
+    function closeLightbox() {
+      lightbox.style.display = "none";
+      document.body.style.overflow = "";
+      btn.focus();
+    }
+
+    btn.addEventListener("click", openLightbox);
+    closeBtn  && closeBtn.addEventListener("click", closeLightbox);
+    backdrop  && backdrop.addEventListener("click", closeLightbox);
+
+    // Close on Escape key
+    document.addEventListener("keydown", e => {
+      if (e.key === "Escape" && lightbox.style.display !== "none") closeLightbox();
+    });
+  }
+
   return { open, init, loadBrand: _loadBrand };
 })();

data/lib/clacky.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "clacky/version"
+require_relative "clacky/message_format/anthropic"
+require_relative "clacky/message_format/open_ai"
 require_relative "clacky/client"
 require_relative "clacky/skill"
 require_relative "clacky/skill_loader"

data/scripts/install.sh

@@ -64,6 +64,40 @@ command_exists() {
     command -v "$1" >/dev/null 2>&1
 }
 
+# Detect current shell type based on $SHELL environment variable
+# Sets CURRENT_SHELL (e.g. "zsh", "bash", "fish") and SHELL_RC (rc file path)
+detect_shell() {
+    local shell_name
+    shell_name=$(basename "$SHELL")
+
+    case "$shell_name" in
+        zsh)
+            CURRENT_SHELL="zsh"
+            SHELL_RC="$HOME/.zshrc"
+            ;;
+        bash)
+            CURRENT_SHELL="bash"
+            # macOS uses ~/.bash_profile; Linux uses ~/.bashrc
+            if [ "$OS" = "macOS" ]; then
+                SHELL_RC="$HOME/.bash_profile"
+            else
+                SHELL_RC="$HOME/.bashrc"
+            fi
+            ;;
+        fish)
+            CURRENT_SHELL="fish"
+            SHELL_RC="$HOME/.config/fish/config.fish"
+            ;;
+        *)
+            # Fallback: treat as bash
+            CURRENT_SHELL="bash"
+            SHELL_RC="$HOME/.bashrc"
+            ;;
+    esac
+
+    print_info "Detected shell: $CURRENT_SHELL (rc file: $SHELL_RC)"
+}
+
 # ---------------------------------------------------------------------------
 # Network pre-flight check
 #
@@ -256,19 +290,23 @@ install_macos_dependencies() {
     fi
 
     # Install mise for Ruby version management
+    # Detect current shell before configuring mise
+    detect_shell
+
     print_info "Installing mise..."
     if ! command_exists mise; then
         if curl https://mise.run | sh; then
-            # Add mise to shell
-            if [ -f ~/.zshrc ]; then
-                echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.zshrc
-            fi
-            if [ -f ~/.bash_profile ]; then
-                echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.bash_profile
+            # Add mise activation to the current shell's rc file
+            local mise_init_line='eval "$(~/.local/bin/mise activate '"$CURRENT_SHELL"')"'
+            if [ -f "$SHELL_RC" ]; then
+                echo "$mise_init_line" >> "$SHELL_RC"
+            else
+                echo "$mise_init_line" > "$SHELL_RC"
             fi
+            print_info "Added mise activation to $SHELL_RC"
 
             export PATH="$HOME/.local/bin:$PATH"
-            eval "$(~/.local/bin/mise activate bash)"
+            eval "$(~/.local/bin/mise activate $CURRENT_SHELL)"
 
             print_success "mise installed successfully"
         else
@@ -282,8 +320,8 @@ install_macos_dependencies() {
     # Install Ruby 3 via mise
     print_info "Installing Ruby 3 via mise..."
     if ~/.local/bin/mise use -g ruby@3; then
-        # Reload mise
-        eval "$(~/.local/bin/mise activate bash)"
+        # Reload mise using the current shell
+        eval "$(~/.local/bin/mise activate $CURRENT_SHELL)"
         print_success "Ruby 3 installed successfully"
     else
         print_error "Failed to install Ruby 3"
@@ -322,17 +360,24 @@ install_ubuntu_dependencies() {
         return 1
     fi
 
+    # Detect current shell before configuring mise
+    detect_shell
+
     # Install mise for Ruby version management
     print_info "Installing mise..."
     if ! command_exists mise; then
         if curl https://mise.run | sh; then
-            # Add mise to shell
-            if [ -f ~/.bashrc ]; then
-                echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.bashrc
+            # Add mise activation to the current shell's rc file
+            local mise_init_line='eval "$(~/.local/bin/mise activate '"$CURRENT_SHELL"')"'
+            if [ -f "$SHELL_RC" ]; then
+                echo "$mise_init_line" >> "$SHELL_RC"
+            else
+                echo "$mise_init_line" > "$SHELL_RC"
             fi
+            print_info "Added mise activation to $SHELL_RC"
 
             export PATH="$HOME/.local/bin:$PATH"
-            eval "$(~/.local/bin/mise activate bash)"
+            eval "$(~/.local/bin/mise activate $CURRENT_SHELL)"
 
             print_success "mise installed successfully"
         else
@@ -346,8 +391,8 @@ install_ubuntu_dependencies() {
     # Install Ruby 3 via mise
     print_info "Installing Ruby 3 via mise..."
     if ~/.local/bin/mise use -g ruby@3; then
-        # Reload mise
-        eval "$(~/.local/bin/mise activate bash)"
+        # Reload mise using the current shell
+        eval "$(~/.local/bin/mise activate $CURRENT_SHELL)"
         print_success "Ruby 3 installed successfully"
     else
         print_error "Failed to install Ruby 3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - windy
@@ -226,6 +226,7 @@ files:
 - docs/deploy_subagent_design.md
 - docs/memory-architecture.md
 - docs/openclacky_cloud_api_reference.md
+- docs/security-design.md
 - docs/session-skill-invocation.md
 - docs/time_machine_design.md
 - docs/ui2-architecture.md
@@ -249,6 +250,8 @@ files:
 - lib/clacky/agent/tool_registry.rb
 - lib/clacky/agent_config.rb
 - lib/clacky/agent_profile.rb
+- lib/clacky/banner.rb
+- lib/clacky/block_font.rb
 - lib/clacky/brand_config.rb
 - lib/clacky/cli.rb
 - lib/clacky/client.rb
@@ -259,6 +262,7 @@ files:
 - lib/clacky/default_agents/coding/system_prompt.md
 - lib/clacky/default_agents/general/profile.yml
 - lib/clacky/default_agents/general/system_prompt.md
+- lib/clacky/default_skills/activate-license/SKILL.md
 - lib/clacky/default_skills/channel-setup/SKILL.md
 - lib/clacky/default_skills/code-explorer/SKILL.md
 - lib/clacky/default_skills/cron-task-creator/SKILL.md
@@ -300,6 +304,8 @@ files:
 - lib/clacky/default_skills/skill-creator/scripts/utils.py
 - lib/clacky/idle_compression_timer.rb
 - lib/clacky/json_ui_controller.rb
+- lib/clacky/message_format/anthropic.rb
+- lib/clacky/message_format/open_ai.rb
 - lib/clacky/plain_ui_controller.rb
 - lib/clacky/providers.rb
 - lib/clacky/server/channel.rb
@@ -343,6 +349,7 @@ files:
 - lib/clacky/tools/write.rb
 - lib/clacky/ui2.rb
 - lib/clacky/ui2/README.md
+- lib/clacky/ui2/block_font.rb
 - lib/clacky/ui2/components/base_component.rb
 - lib/clacky/ui2/components/command_suggestions.rb
 - lib/clacky/ui2/components/common_component.rb