openclacky 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 534d725368218baaf47a39be9b5ce86005b53ebec0f3a2c81d01d754232b56d6
-  data.tar.gz: 0d4cfa47f16a72ddc2cc35e4c7a714ef3bee1d961be5d135aa110804b692e9f1
+  metadata.gz: 473dceae1c35bc7eeb4095df2f35ea1403f6013168a3daf3318a709df4ce40ec
+  data.tar.gz: 9b7b97d917e13bf43ffff8fe50fda4f1eade74cd530e45959af46d9dbd313043
 SHA512:
-  metadata.gz: 2d4250858cbb68fd49f0e25cadde03352ffd40566f05957d7de23b386e0e4a13668e02ae00858a0039ce3346eeff69a6bf2cba40da9e8074f3f954c22cc564c8
-  data.tar.gz: 4a794d9b85a3a0a6f64e70e18e047aadc4d69b64780965f97a5c827403fff75536068937e7b7f824064f4bb0efbd6e793abcf4eb0975a1523d3e21fe27633624
+  metadata.gz: 6717eccea955e82d4dfa4381cb99707785d6ac36c3875ac622d51e854007d2997b16155af3e48d2b644aae3635d3989152a03e6f069bf525d8a8630049b6dfb0
+  data.tar.gz: 58cd3940c885363ae315e0430a318bb181713cdd0e5d1d4f7308343ce357f44075fd06cb8c4882f75824f857211c85c231b3d8b0cb2babe71ef6c76b5f21371c

data/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.3] - 2026-03-09
+
+### Added
+- **Slash command skill injection**: skill content is now injected as an assistant message for all `/skill-name` commands, giving the agent full context of the skill instructions at invocation time
+- **Collapsible `<think>` blocks** in web UI: model reasoning enclosed in `<think>…</think>` tags is rendered as a collapsible "Thinking…" section instead of raw text
+
+### Improved
+- **Web UI settings panel**: refined layout and styles for the settings modal
+- **Session state restored on page refresh**: "Thinking…" progress indicator and error messages are now restored from session status after a page reload instead of disappearing
+
+### Fixed
+- **AgentConfig shallow-copy bug**: switching models in Settings no longer pollutes existing sessions — `deep_copy` (JSON round-trip) is now used everywhere instead of `dup` to prevent shared `@models` hash mutation across sessions
+
 ## [0.8.2] - 2026-03-09
 
 ### Added

data/lib/clacky/agent/session_serializer.rb

@@ -52,6 +52,11 @@ module Clacky
             })
           end
         end
+
+        # Rebuild and refresh the system prompt so any newly installed skills
+        # (or other configuration changes since the session was saved) are
+        # reflected immediately — without requiring the user to create a new session.
+        refresh_system_prompt
       end
 
       # Generate session data for saving
@@ -174,6 +179,10 @@ module Clacky
           ui.show_user_message(display_text, created_at: msg[:created_at])
 
           round[:events].each do |ev|
+            # Skip system-injected messages (e.g. synthetic skill content, memory prompts)
+            # — they are internal scaffolding and must not be shown to the user.
+            next if ev[:system_injected]
+
             case ev[:role].to_s
             when "assistant"
               # Text content
@@ -210,6 +219,28 @@ module Clacky
 
       private
 
+      # Replace the system message in @messages with a freshly built system prompt.
+      # Called after restore_session so newly installed skills and any other
+      # configuration changes since the session was saved take effect immediately.
+      # If no system message exists yet (shouldn't happen in practice), a new one
+      # is prepended so the conversation stays well-formed.
+      def refresh_system_prompt
+        # Reload skills from disk to pick up anything installed since the session was saved
+        @skill_loader.load_all
+
+        fresh_prompt = build_system_prompt
+        system_index = @messages.index { |m| m[:role] == "system" }
+
+        if system_index
+          @messages[system_index] = { role: "system", content: fresh_prompt }
+        else
+          @messages.unshift({ role: "system", content: fresh_prompt })
+        end
+      rescue StandardError => e
+        # Log and continue — a stale system prompt is better than a broken restore
+        Clacky::Logger.warn("refresh_system_prompt failed during session restore: #{e.message}")
+      end
+
       # Extract text from message content (handles string and array formats)
       # @param content [String, Array, Object] Message content
       # @return [String] Extracted text

data/lib/clacky/agent/skill_manager.rb

@@ -128,6 +128,47 @@ module Clacky
         context
       end
 
+      # Inject a synthetic assistant message containing the skill content for slash
+      # commands (e.g. /pptx, /onboard).
+      #
+      # When a user types "/skill-name [arguments]", we immediately expand the skill
+      # content and inject it as an assistant message so the LLM receives the full
+      # instructions and acts on them — no waiting for the LLM to discover and call
+      # invoke_skill on its own.
+      #
+      # Message structure after injection:
+      #   user:      "/pptx write a deck about X"
+      #   assistant: "[full skill content]"   <- injected here
+      #   (LLM continues from here)
+      #
+      # Fires when:
+      #   1. Input starts with "/"
+      #   2. The named skill exists and is user-invocable
+      #
+      # @param user_input [String] Raw user input
+      # @param task_id [Integer] Current task ID (for message tagging)
+      # @return [void]
+      def inject_skill_command_as_assistant_message(user_input, task_id)
+        parsed = parse_skill_command(user_input)
+        return unless parsed
+
+        skill = parsed[:skill]
+        arguments = parsed[:arguments]
+
+        # Expand skill content (substitutes $ARGUMENTS if present)
+        expanded_content = skill.process_content(arguments, template_context: build_template_context)
+
+        # Inject as a synthetic assistant message so the LLM treats it as already read
+        @messages << {
+          role: "assistant",
+          content: expanded_content,
+          task_id: task_id,
+          system_injected: true
+        }
+
+        @ui&.log("Injected skill content for /#{skill.identifier}", level: :info)
+      end
+
       private
 
       # Filter skills by the agent profile name using the skill's own `agent:` field.

data/lib/clacky/agent.rb

@@ -177,6 +177,11 @@ module Clacky
       @messages << { role: "user", content: user_content, task_id: task_id, created_at: Time.now.to_f }
       @total_tasks += 1
 
+      # If the user typed a slash command targeting a skill with disable-model-invocation: true,
+      # inject the skill content as a synthetic assistant message so the LLM can act on it.
+      # Skills already in the system prompt (model_invocation_allowed?) are skipped.
+      inject_skill_command_as_assistant_message(user_input, task_id)
+
       @hooks.trigger(:on_start, user_input)
 
       begin
@@ -671,7 +676,7 @@ module Clacky
     # @return [Agent] New subagent instance
     def fork_subagent(model: nil, forbidden_tools: [], system_prompt_suffix: nil)
       # Clone config to avoid affecting parent
-      subagent_config = @config.dup
+      subagent_config = @config.deep_copy
 
       # Switch to specified model if provided
       if model

data/lib/clacky/agent_config.rb

@@ -226,6 +226,16 @@ module Clacky
     end
 
     # Save configuration to file
+    # Deep copy — models array contains mutable Hashes, so a shallow dup would
+    # let the copy share the same Hash objects with the original, causing
+    # Settings changes to silently mutate already-running session configs.
+    # JSON round-trip is the cleanest approach since @models is pure JSON-able data.
+    def deep_copy
+      copy = dup
+      copy.instance_variable_set(:@models, JSON.parse(JSON.generate(@models)))
+      copy
+    end
+
     def save(config_file = CONFIG_FILE)
       config_dir = File.dirname(config_file)
       FileUtils.mkdir_p(config_dir)

data/lib/clacky/server/http_server.rb

@@ -1115,7 +1115,7 @@ module Clacky
         session_id = @registry.create(name: name, working_dir: working_dir)
 
         client = @client_factory.call
-        config = @agent_config.dup
+        config = @agent_config.deep_copy
         config.permission_mode = permission_mode
         broadcaster = method(:broadcast)
         ui = WebUIController.new(session_id, broadcaster)
@@ -1142,7 +1142,7 @@ module Clacky
                                       session_id: original_id)
 
         client = @client_factory.call
-        config = @agent_config.dup
+        config = @agent_config.deep_copy
         broadcaster = method(:broadcast)
         ui = WebUIController.new(session_id, broadcaster)
         agent  = Clacky::Agent.from_session(client, config, session_data, ui: ui, profile: "general")

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/lib/clacky/web/app.css

@@ -401,6 +401,7 @@ body {
 #chat-title { font-weight: 600; font-size: 15px; }
 .status-idle    { font-size: 11px; color: #8b949e; }
 .status-running { font-size: 11px; color: #3fb950; }
+.status-error   { font-size: 11px; color: #f85149; }
 
 /* Delete session button in chat header */
 .btn-delete-session {
@@ -500,6 +501,52 @@ body {
 .tool-item-status.err    { color: #f85149; }
 .tool-item-status.running { color: #58a6ff; animation: pulse 1.2s infinite; }
 
+/* ── Thinking block (collapsible <think>...</think> sections) ─────────────── */
+.thinking-block {
+  margin: 0 0 6px 0;
+  background: transparent;
+  overflow: hidden;
+}
+
+.thinking-summary {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  padding: 0;
+  cursor: pointer;
+  user-select: none;
+  list-style: none;
+  color: #6e7681;
+  font-size: 12px;
+  font-style: italic;
+  transition: color 0.15s;
+}
+.thinking-summary::-webkit-details-marker { display: none; }
+.thinking-summary:hover { color: #8b949e; }
+
+.thinking-icon  { display: none; }
+.thinking-label { font-weight: 400; }
+.thinking-chevron {
+  font-size: 12px;
+  color: inherit;
+  transition: transform 0.2s;
+  line-height: 1;
+  display: inline-block;
+}
+.thinking-block[open] .thinking-chevron { transform: rotate(90deg); }
+
+.thinking-body {
+  margin-top: 2px;
+  margin-bottom: 10px;
+  padding-left: 14px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #6e7681;
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-style: italic;
+}
+
 /* Inline image thumbnails inside user message bubbles */
 .msg-image-thumb {
   display: block;
@@ -828,6 +875,7 @@ body {
   display: flex;
   flex-direction: column;
   gap: 14px;
+  margin-bottom: 16px;
 }
 .model-card-header {
   display: flex;
@@ -958,6 +1006,27 @@ body {
   font-size: 13px;
   padding: 6px 18px;
 }
+.btn-set-default {
+  font-size: 13px;
+  padding: 6px 14px;
+  background: #238636;
+  color: #fff;
+  border: none;
+  border-radius: 6px;
+  cursor: pointer;
+}
+.btn-set-default:hover {
+  background: #2ea043;
+}
+.btn-set-default:disabled {
+  background: #484f58;
+  cursor: not-allowed;
+}
+.model-card-actions-row {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
 
 /* ── Modals ──────────────────────────────────────────────────────────────── */
 .modal-overlay {

data/lib/clacky/web/sessions.js

@@ -23,6 +23,59 @@ const Sessions = (() => {
   let   _pendingRunTaskId  = null;  // session_id waiting to send "run_task" after subscribe
   let   _pendingMessage    = null;  // { session_id, content } — slash command to send after subscribe
 
+  // ── Thinking block parser ──────────────────────────────────────────────
+  //
+  // Converts <think>...</think> blocks in assistant messages into collapsible
+  // "Thinking" sections. The block is collapsed by default and can be
+  // expanded by clicking the header.
+
+  function _parseThinkingBlocks(rawHtml) {
+    // rawHtml is already HTML-escaped text (via escapeHtml). We need to detect
+    // the escaped versions of <think> and </think>.
+    const OPEN  = "&lt;think&gt;";
+    const CLOSE = "&lt;/think&gt;";
+
+    // Fast path: no thinking block present
+    if (!rawHtml.includes(OPEN)) return rawHtml;
+
+    let result = "";
+    let rest   = rawHtml;
+
+    while (rest.includes(OPEN)) {
+      const openIdx  = rest.indexOf(OPEN);
+      const closeIdx = rest.indexOf(CLOSE, openIdx + OPEN.length);
+
+      // Prepend any text before the <think> block
+      result += rest.slice(0, openIdx);
+
+      if (closeIdx === -1) {
+        // Unclosed <think> — treat remainder as plain text
+        result += rest.slice(openIdx);
+        rest = "";
+        break;
+      }
+
+      const thinkContent = rest.slice(openIdx + OPEN.length, closeIdx);
+      result += _buildThinkingBlock(thinkContent);
+      // Strip leading newlines after </think> to avoid blank space from pre-wrap
+      rest = rest.slice(closeIdx + CLOSE.length).replace(/^\n+/, "");
+    }
+
+    result += rest;
+    return result;
+  }
+
+  // Build the collapsible thinking block HTML for a given (already-escaped) content string.
+  function _buildThinkingBlock(escapedContent) {
+    return `<details class="thinking-block">` +
+      `<summary class="thinking-summary">` +
+        `<span class="thinking-chevron">›</span>` +
+        `<span class="thinking-label">Thought for a moment</span>` +
+      `</summary>` +
+      `<div class="thinking-body">${escapedContent}</div>` +
+    `</details>`;
+  }
+
   // ── Private helpers ────────────────────────────────────────────────────
 
   function _cacheActiveMessages() {
@@ -151,7 +204,7 @@ const Sessions = (() => {
         if (historyCtx.group) { _collapseToolGroup(historyCtx.group); historyCtx.group = null; }
         const el = document.createElement("div");
         el.className = "msg msg-assistant";
-        el.innerHTML = escapeHtml(ev.content || "");
+        el.innerHTML = _parseThinkingBlocks(escapeHtml(ev.content || ""));
         container.appendChild(el);
         break;
       }
@@ -241,6 +294,21 @@ const Sessions = (() => {
           messages.appendChild(frag);
           messages.scrollTop = messages.scrollHeight;
         }
+
+        // Restore transient UI state based on session status after initial load
+        // (not prepend, which is scroll-up pagination — no need to re-restore then)
+        if (!prepend) {
+          const session = _sessions.find(s => s.id === id);
+          if (session) {
+            if (session.status === "running") {
+              // Agent is still running (e.g. page was refreshed mid-task)
+              Sessions.showProgress("Thinking…");
+            } else if (session.status === "error" && session.error) {
+              // Show the stored error message at the end of history
+              Sessions.appendMsg("error", session.error);
+            }
+          }
+        }
       }
     } finally {
       state.loading = false;
@@ -401,7 +469,13 @@ const Sessions = (() => {
 
     updateStatusBar(status) {
       $("chat-status").textContent = status || "idle";
-      $("chat-status").className   = status === "running" ? "status-running" : "status-idle";
+      if (status === "running") {
+        $("chat-status").className = "status-running";
+      } else if (status === "error") {
+        $("chat-status").className = "status-error";
+      } else {
+        $("chat-status").className = "status-idle";
+      }
       $("btn-interrupt").style.display = status === "running" ? "" : "none";
     },
 
@@ -447,7 +521,8 @@ const Sessions = (() => {
       const messages = $("messages");
       const el = document.createElement("div");
       el.className = `msg msg-${type}`;
-      el.innerHTML = html;
+      // Parse thinking blocks out of assistant messages
+      el.innerHTML = type === "assistant" ? _parseThinkingBlocks(html) : html;
       messages.appendChild(el);
       messages.scrollTop = messages.scrollHeight;
     },

data/lib/clacky/web/settings.js

@@ -107,7 +107,10 @@ const Settings = (() => {
 
       <div class="model-card-footer">
         <span class="model-test-result" data-index="${index}"></span>
-        <button class="btn-save-model btn-primary" data-index="${index}">Save</button>
+        <div class="model-card-actions-row">
+          ${!isDefault ? `<button class="btn-set-default" data-index="${index}" title="Set as default model">Set as Default</button>` : ""}
+          <button class="btn-save-model btn-primary" data-index="${index}">Save</button>
+        </div>
       </div>
     `;
 
@@ -143,6 +146,12 @@ const Settings = (() => {
     if (removeBtn) {
       removeBtn.addEventListener("click", () => _removeModel(index));
     }
+
+    // Set as default model
+    const setDefaultBtn = card.querySelector(".btn-set-default");
+    if (setDefaultBtn) {
+      setDefaultBtn.addEventListener("click", () => _setAsDefault(index));
+    }
   }
 
   // ── Read form values from a card ────────────────────────────────────────────
@@ -233,16 +242,69 @@ const Settings = (() => {
     el.className   = `model-test-result ${ok ? "result-ok" : "result-fail"}`;
   }
 
+  // ── Set as Default Model ───────────────────────────────────────────────────
+
+  async function _setAsDefault(index) {
+    const btn = document.querySelector(`.btn-set-default[data-index="${index}"]`);
+    if (!btn) return;
+
+    btn.disabled    = true;
+    btn.textContent = "Setting…";
+
+    // Set the selected one as "default", others as null (not just delete)
+    // Using null ensures the server explicitly updates/removes the type field
+    const updatedModels = _models.map((m, i) => {
+      const model = { ...m };
+      if (i === index) {
+        model.type = "default";
+      } else {
+        model.type = null;
+      }
+      return model;
+    });
+
+    try {
+      const res = await fetch("/api/config", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ models: updatedModels })
+      });
+      const data = await res.json();
+
+      if (data.ok) {
+        btn.textContent = "Done ✓";
+        // Reload to refresh the UI
+        setTimeout(_load, 800);
+      } else {
+        btn.textContent = "Set as Default";
+        btn.disabled    = false;
+        alert(data.error || "Failed to set default model");
+      }
+    } catch (e) {
+      btn.textContent = "Set as Default";
+      btn.disabled    = false;
+      alert("Error: " + e.message);
+    }
+  }
+
   // ── Add / Remove model ───────────────────────────────────────────────────────
 
   function _addModel() {
+    // When adding a new model, automatically set it as default.
+    // Set all existing models' type to null (not just delete) so server updates them.
+    _models = _models.map(m => {
+      const model = { ...m };
+      model.type = null;
+      return model;
+    });
+
     _models.push({
       index:            _models.length,
       model:            "",
       base_url:         "",
       api_key_masked:   "",
       anthropic_format: false,
-      type:             null
+      type:             "default"  // New model automatically becomes default
     });
     _renderCards();
     // Scroll to the new card

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - windy