openclacky 1.5.6 → 1.5.7

data/lib/clacky/web/ws-dispatcher.js

@@ -58,32 +58,29 @@
   // The DOM id "messages" is never swapped: external code, CSS, devtools and
   // closures all see a stable identity.
   const RenderTarget = (() => {
-    const stack = [];
+    let pinned = null;
     return {
-      push(el) { stack.push(el); },
-      pop()    { return stack.pop(); },
-      current(){ return stack[stack.length - 1] || document.getElementById("messages"); },
+      // Concurrent phases make "innermost open phase" meaningless, so events
+      // are routed by their own phase_id (pin) and anything untagged goes to
+      // the outer stream rather than whichever phase happens to be open.
+      pin(el)  { pinned = el; },
+      unpin()  { pinned = null; },
+      current(){ return pinned || document.getElementById("messages"); },
       outer()  { return document.getElementById("messages"); },
-      depth()  { return stack.length; },
     };
   })();
   window.RenderTarget = RenderTarget;
 
-  const _phaseStack = []; // [{ id, kind, card, body, summary }]
+  const _phases = new Map(); // phase_id -> { id, kind, card, body, summary, order }
+  let _phaseSeq = 0;
 
-  function _activePhase() {
-    return _phaseStack[_phaseStack.length - 1] || null;
-  }
-
-  function _phaseLabel(kind) {
-    const map = {
-      skill_evolution: I18n.t ? (I18n.t("phase.skill_evolution") || "Skill evolution") : "Skill evolution",
-    };
-    return map[kind] || kind;
+  function _phaseIcon(kind) {
+    const map = { subagent: "🤖", fanout_subagent: "🤖", memory_update: "🧠" };
+    return map[kind] || "🧬";
   }
 
   function _beginPhase(ev) {
-    if (_phaseStack.length > 0) return; // single-level for now
+    if (_phases.has(ev.phase_id)) return;
 
     const outer = RenderTarget.outer();
     if (!outer) return;
@@ -92,11 +89,13 @@
     card.className = "msg-phase";
     card.dataset.phaseId = ev.phase_id;
     card.dataset.phaseKind = ev.kind || "phase";
+    card.open = true;
 
     const summary = document.createElement("summary");
     summary.className = "msg-phase-summary";
-    const labelText = ev.label || _phaseLabel(ev.kind);
-    summary.innerHTML = `<span class="msg-phase-icon">🧬</span><span class="msg-phase-label">${escapeHtml(labelText)}</span><span class="msg-phase-status">…</span>`;
+    const labelText = ev.label || ev.kind;
+    const icon = _phaseIcon(ev.kind);
+    summary.innerHTML = `<span class="msg-phase-icon">${icon}</span><span class="msg-phase-label">${escapeHtml(labelText)}</span><span class="msg-phase-status">…</span>`;
     card.appendChild(summary);
 
     const body = document.createElement("div");
@@ -104,33 +103,42 @@
     card.appendChild(body);
 
     outer.appendChild(card);
-    RenderTarget.push(body);
 
-    _phaseStack.push({
+    _phases.set(ev.phase_id, {
       id: ev.phase_id,
       kind: ev.kind,
       card,
       body,
       summary,
+      order: _phaseSeq++,
+    });
+
+    const phase = _phases.get(ev.phase_id);
+    card.addEventListener("toggle", () => {
+      if (!phase.programmaticToggle) phase.userToggled = true;
     });
 
     outer.scrollTop = outer.scrollHeight;
   }
 
   function _endPhase(phaseId, summary) {
-    const idx = _phaseStack.findIndex(p => p.id === phaseId);
-    if (idx === -1) return;
-    while (_phaseStack.length > idx) {
-      const phase = _phaseStack.pop();
-      RenderTarget.pop();
-      _finalizePhase(phase, { summary: phase.id === phaseId ? summary : null });
-    }
+    const phase = _phases.get(phaseId);
+    if (!phase) return;
+    _phases.delete(phaseId);
+    _finalizePhase(phase, { summary });
+  }
+
+  function _setPhaseOpen(phase, open) {
+    phase.programmaticToggle = true;
+    phase.card.open = open;
+    phase.programmaticToggle = false;
   }
 
   function _finalizePhase(phase, { summary, incomplete } = {}) {
     const body = phase.body;
     const isEmpty = !incomplete && body && body.children.length === 0;
     if (isEmpty) phase.card.classList.add("msg-phase-empty");
+    if (!phase.userToggled) _setPhaseOpen(phase, false);
 
     const statusEl = phase.summary && phase.summary.querySelector(".msg-phase-status");
     if (statusEl) {
@@ -138,7 +146,7 @@
         statusEl.textContent = " (interrupted)";
         statusEl.classList.add("msg-phase-status-incomplete");
       } else if (isEmpty) {
-        const noChange = I18n.t ? (I18n.t("phase.no_changes") || "no changes needed") : "no changes needed";
+        const noChange = I18n.t("phase.no_changes");
         statusEl.textContent = ` ✓ ${noChange}`;
       } else if (summary) {
         statusEl.textContent = ` ✓ ${summary}`;
@@ -149,11 +157,11 @@
   }
 
   function _closeAllPhases(reason) {
-    while (_phaseStack.length > 0) {
-      const phase = _phaseStack.pop();
-      RenderTarget.pop();
+    const phases = [..._phases.values()].sort((a, b) => b.order - a.order);
+    _phases.clear();
+    phases.forEach(phase => {
       _finalizePhase(phase, { incomplete: reason === "incomplete" });
-    }
+    });
   }
 
   window._closeAllPhases = _closeAllPhases;
@@ -167,6 +175,20 @@ WS.onEvent(ev => {
     _closeAllPhases("incomplete");
   }
 
+  // Concurrent phases interleave, so stack order says nothing about where an
+  // event belongs — route by the phase_id the backend stamped on it.
+  const _taggedPhase = ev.phase_id && ev.type !== "phase_start" && ev.type !== "phase_end"
+    ? _phases.get(ev.phase_id)
+    : null;
+  if (_taggedPhase) RenderTarget.pin(_taggedPhase.body);
+  try {
+    _dispatchEvent(ev);
+  } finally {
+    if (_taggedPhase) RenderTarget.unpin();
+  }
+});
+
+function _dispatchEvent(ev) {
   // Bridge before the switch: per-case active-session guards must not block
   // the extension bus. All received events mirror onto Clacky.ext here.
   if (window.Clacky && Clacky.ext) {
@@ -185,6 +207,11 @@ WS.onEvent(ev => {
       }
       const sid = payload.session_id || (ev.session && ev.session.id);
       Clacky.ext.emit(extName, { sessionId: sid, ...payload, session_id: sid });
+    } else if (typeof ev.type === "string" && ev.type.startsWith("ext.")) {
+      // Custom events from UIInterface#emit. The host has no rendering for
+      // these; they exist purely so an extension can observe its own backend.
+      const sid = ev.session_id;
+      Clacky.ext.emit(ev.type, { sessionId: sid, ...ev });
     }
   }
 
@@ -237,7 +264,7 @@ WS.onEvent(ev => {
 
     // ── Session list ───────────────────────────────────────────────────
     case "session_list": {
-      Sessions.setAll(ev.sessions || [], !!ev.has_more, ev.cron_count || 0, ev.latest_cron_updated_at || null);
+      Sessions.setAll(ev.sessions || [], !!ev.has_more, ev.groups || {});
       Projects.setAll(ev.projects || []);
       Sessions.renderList();
       Projects.renderSection();
@@ -519,7 +546,7 @@ WS.onEvent(ev => {
       break;
 
   }
-});
+}
 
 // ── Ext-developer refresh hint ─────────────────────────────────────────────
 // Appended after a completed ext-developer session so the user can reload

data/lib/clacky.rb

@@ -86,6 +86,7 @@ require_relative "clacky/agent/message_compressor"
 require_relative "clacky/agent/hook_manager"
 require_relative "clacky/shell_hook_loader"
 require_relative "clacky/agent/tool_registry"
+require_relative "clacky/fanout"
 
 # UI modules
 require_relative "clacky/ui2/thinking_verbs"
@@ -201,6 +202,7 @@ module Clacky
   class UpstreamTruncatedError < RetryableError; end
   class ToolCallError < AgentError; end  # Raised when tool call fails due to invalid parameters
   class BrowserNotReachableError < AgentError; end  # Chrome/Edge not running or remote debugging disabled
+  class FanoutTimeoutError < AgentError; end  # A fan-out job exceeded the batch wall-clock budget
   # BrowserManager singleton: Clacky::BrowserManager.instance
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - windy
@@ -324,12 +324,16 @@ files:
 - docs/agent-first-ui-design.md
 - docs/billing-system.md
 - docs/channel-architecture.md
+- docs/design-emit-and-background-skills.md
 - docs/engineering-article.md
 - docs/mcp-architecture.md
 - docs/mcp.example.json
 - docs/rich_ui_guide.md
 - docs/rich_ui_refactor_plan.md
 - docs/session-skill-invocation.md
+- docs/superpowers/plans/2026-08-09-chatcut-extension-bridge.md
+- docs/superpowers/plans/2026-08-09-native-mcp-oauth.md
+- docs/superpowers/specs/2026-08-09-mcp-oauth-extension-fallback-design.md
 - docs/time_machine_design.md
 - docs/ui2-architecture.md
 - homebrew/README.md
@@ -463,14 +467,21 @@ files:
 - lib/clacky/extension/scaffold/templates/hello/ext.yml.erb
 - lib/clacky/extension/scaffold/templates/hello/panels/hello/view.js.erb
 - lib/clacky/extension/verifier.rb
+- lib/clacky/fanout.rb
 - lib/clacky/identity.rb
 - lib/clacky/idle_compression_timer.rb
 - lib/clacky/json_ui_controller.rb
 - lib/clacky/locales/en.rb
 - lib/clacky/locales/i18n.rb
 - lib/clacky/locales/zh.rb
+- lib/clacky/mcp/cli_commands.rb
 - lib/clacky/mcp/client.rb
+- lib/clacky/mcp/connection_manager.rb
 - lib/clacky/mcp/http_transport.rb
+- lib/clacky/mcp/oauth/authorization_manager.rb
+- lib/clacky/mcp/oauth/config.rb
+- lib/clacky/mcp/oauth/credential_store.rb
+- lib/clacky/mcp/oauth/session.rb
 - lib/clacky/mcp/registry.rb
 - lib/clacky/mcp/skill_provider.rb
 - lib/clacky/mcp/stdio_transport.rb