kward 0.69.0 → 0.69.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a84b87d1fd620a0008222c1f7cf6efd3fb7d019818e6674f75e3160ad738d2b3
-  data.tar.gz: 297fc5bd96d88356731b659cd6d43da8349e5711e50f1419a11afdab82192d57
+  metadata.gz: 4ac5f4222e4587d469ce5cb838e4fb0404309083a85a144378f16e75fdfa76ba
+  data.tar.gz: 325995cade98eb049a465bbfa9d12f2c7ffc9ed1fec0b14be889d2810741fe93
 SHA512:
-  metadata.gz: 1f7614a284acdd69deeeb8ae509ca42b093e7e9e55eac47d4c23d63d30ca0ccb4079c5fc21f747863097d1c938084627d6576b32b12cdecc7754c5cecff558db
-  data.tar.gz: ccc2a3e15276ef03d50b4d52ccdc1b1977c1555b3f367d152b8d889ee518d315645a910a6d1940a94e7fb5e378bf5a614bfe87189b8e723505e7eba3aaf13c0d
+  metadata.gz: 7fe3449248d4ae757422cd8e8113ad23b1bdb9dd6555015c64ea628911a8aa937a336b109945029b94f3f5e3fa4846b017af9455e839188ae3b2eb9ca1254cac
+  data.tar.gz: a92899f7e09d769220246923442450312b27852a801e64f273c3237594ab831b578ad72bde87f6fc6611c4b6fb5a02f4e6080bb7ecb2cd7cc3130e4804e76fc0

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to Kward will be documented in this file.
 
 ## [Unreleased]
 
+## [0.69.1] - 2026-06-18
+
+### Fixed
+
+- Fixed `/tree` session rendering to tolerate malformed cyclic tree records instead of overflowing the Ruby stack.
+
 ## [0.69.0] - 2026-06-17
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kward (0.69.0)
+    kward (0.69.1)
       base64
       nokogiri
       tiktoken_ruby
@@ -70,7 +70,7 @@ CHECKSUMS
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
   erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
-  kward (0.69.0)
+  kward (0.69.1)
   minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
   nokogiri (1.19.3-arm64-darwin) sha256=71b9bd424b1b7abc18b05052a1a3cfd3627abdca62be280854cc411791357e42
   nokogiri (1.19.3-x86_64-linux-gnu) sha256=2f5078620fe12e83669b5b17311b32532a8153d02eee7ad06948b926d6080976

data/lib/kward/rpc/session_tree_rows.rb

@@ -34,7 +34,12 @@ module Kward
         multiple_roots = visible_roots.length > 1
         result = []
 
-        walk = lambda do |node, indent, just_branched, show_connector, is_last, gutters, virtual_root_child|
+        stack = visible_roots.sort_by { |root| tree_contains_active_path?(root, active_path) ? 0 : 1 }.each_with_index.map do |root, index|
+          [root, multiple_roots ? 1 : 0, multiple_roots, multiple_roots, index == visible_roots.length - 1, [], multiple_roots]
+        end.reverse
+
+        until stack.empty?
+          node, indent, just_branched, show_connector, is_last, gutters, virtual_root_child = stack.pop
           entry = node[:source]["entry"] || {}
           entry_id = entry["id"].to_s
           formatted = tree_entry_display(entry, tool_calls_by_id)
@@ -66,14 +71,10 @@ module Kward
                          end
           connector_position = [display_indent - 1, 0].max
           child_gutters = show_connector && !virtual_root_child ? gutters + [{ position: connector_position, show: !is_last }] : gutters
-          children.each_with_index do |child, index|
-            walk.call(child, child_indent, multiple_children, multiple_children, index == children.length - 1, child_gutters, false)
+          children.each_with_index.reverse_each do |child, index|
+            stack << [child, child_indent, multiple_children, multiple_children, index == children.length - 1, child_gutters, false]
           end
         end
-
-        visible_roots.sort_by { |root| tree_contains_active_path?(root, active_path) ? 0 : 1 }.each_with_index do |root, index|
-          walk.call(root, multiple_roots ? 1 : 0, multiple_roots, multiple_roots, index == visible_roots.length - 1, [], multiple_roots)
-        end
         result
       end
 
@@ -83,7 +84,9 @@ module Kward
         by_id = tree_entries_by_id(roots)
         ids = []
         current = by_id[leaf_id.to_s]
-        while current
+        seen = {}
+        while current && !seen[current["id"].to_s]
+          seen[current["id"].to_s] = true
           ids << current["id"].to_s
           current = by_id[current["parentId"].to_s]
         end
@@ -93,8 +96,12 @@ module Kward
       def tree_entries_by_id(roots)
         roots.each_with_object({}) do |root, map|
           stack = [root]
+          seen = {}
           until stack.empty?
             node = stack.pop
+            next if seen[node.object_id]
+
+            seen[node.object_id] = true
             entry = node["entry"] || {}
             map[entry["id"].to_s] = entry unless entry["id"].to_s.empty?
             stack.concat(Array(node["children"]))
@@ -103,10 +110,29 @@ module Kward
       end
 
       def visible_tree_nodes(node)
-        children = Array(node["children"]).flat_map { |child| visible_tree_nodes(child) }
-        return children if hidden_tree_entry?(node["entry"] || {})
+        results = {}
+        stack = [[node, false, {}]]
+
+        until stack.empty?
+          current, visited, seen = stack.pop
+          node_key = current.object_id
+          next if seen[node_key]
+
+          if visited
+            children = Array(current["children"]).flat_map { |child| results[child.object_id] || [] }
+            results[node_key] = if hidden_tree_entry?(current["entry"] || {})
+                                  children
+                                else
+                                  [{ source: current, children: children }]
+                                end
+          else
+            branch_seen = seen.merge(node_key => true)
+            stack << [current, true, seen]
+            Array(current["children"]).reverse_each { |child| stack << [child, false, branch_seen] unless branch_seen[child.object_id] }
+          end
+        end
 
-        [{ source: node, children: children }]
+        results[node.object_id] || []
       end
 
       def hidden_tree_entry?(entry)
@@ -126,15 +152,30 @@ module Kward
       end
 
       def tree_contains_active_path?(node, active_path)
-        entry_id = (node[:source]["entry"] || {})["id"].to_s
-        active_path.include?(entry_id) || node[:children].any? { |child| tree_contains_active_path?(child, active_path) }
+        stack = [node]
+        seen = {}
+        until stack.empty?
+          current = stack.pop
+          next if seen[current.object_id]
+
+          seen[current.object_id] = true
+          entry_id = (current[:source]["entry"] || {})["id"].to_s
+          return true if active_path.include?(entry_id)
+
+          stack.concat(current[:children])
+        end
+        false
       end
 
       def tree_tool_calls(roots)
         roots.each_with_object({}) do |root, tool_calls_by_id|
           stack = [root]
+          seen = {}
           until stack.empty?
             node = stack.pop
+            next if seen[node.object_id]
+
+            seen[node.object_id] = true
             entry = node["entry"] || {}
             message = entry["message"]
             if entry["type"] == "message" && message.is_a?(Hash) && MessageAccess.role(message) == "assistant"

data/lib/kward/session_store.rb

@@ -592,7 +592,11 @@ module Kward
         next unless node
 
         parent = nodes[entry["parentId"].to_s]
-        parent ? parent["children"] << node : roots << node
+        if parent && !parent.equal?(node)
+          parent["children"] << node unless parent["children"].include?(node)
+        else
+          roots << node unless roots.include?(node)
+        end
       end
       roots
     end

data/lib/kward/session_tree_renderer.rb

@@ -19,7 +19,12 @@ module Kward
       multiple_roots = visible_roots.length > 1
       result = []
 
-      walk = lambda do |node, indent, just_branched, show_connector, is_last, gutters, virtual_root_child|
+      stack = visible_roots.sort_by { |root| session_tree_contains_active_path?(root, active_path) ? 0 : 1 }.each_with_index.map do |root, index|
+        [root, multiple_roots ? 1 : 0, multiple_roots, multiple_roots, index == visible_roots.length - 1, [], multiple_roots]
+      end.reverse
+
+      until stack.empty?
+        node, indent, just_branched, show_connector, is_last, gutters, virtual_root_child = stack.pop
         entry = node[:source]["entry"] || {}
         display_indent = multiple_roots ? [indent - 1, 0].max : indent
         prefix = session_tree_visual_prefix(display_indent, gutters, show_connector && !virtual_root_child, is_last, !node[:children].empty?)
@@ -40,25 +45,40 @@ module Kward
         connector_position = [display_indent - 1, 0].max
         child_gutters = show_connector && !virtual_root_child ? gutters + [{ position: connector_position, show: !is_last }] : gutters
 
-        children.each_with_index do |child, index|
-          walk.call(child, child_indent, multiple_children, multiple_children, index == children.length - 1, child_gutters, false)
+        children.each_with_index.reverse_each do |child, index|
+          stack << [child, child_indent, multiple_children, multiple_children, index == children.length - 1, child_gutters, false]
         end
       end
 
-      visible_roots.sort_by { |root| session_tree_contains_active_path?(root, active_path) ? 0 : 1 }.each_with_index do |root, index|
-        walk.call(root, multiple_roots ? 1 : 0, multiple_roots, multiple_roots, index == visible_roots.length - 1, [], multiple_roots)
-      end
-
       result
     end
 
     private
 
     def visible_session_tree_nodes(node)
-      children = Array(node["children"]).flat_map { |child| visible_session_tree_nodes(child) }
-      return children if hidden_session_tree_entry?(node["entry"] || {})
+      results = {}
+      stack = [[node, false, {}]]
+
+      until stack.empty?
+        current, visited, seen = stack.pop
+        node_key = current.object_id
+        next if seen[node_key]
+
+        if visited
+          children = Array(current["children"]).flat_map { |child| results[child.object_id] || [] }
+          results[node_key] = if hidden_session_tree_entry?(current["entry"] || {})
+                                children
+                              else
+                                [{ source: current, children: children }]
+                              end
+        else
+          branch_seen = seen.merge(node_key => true)
+          stack << [current, true, seen]
+          Array(current["children"]).reverse_each { |child| stack << [child, false, branch_seen] unless branch_seen[child.object_id] }
+        end
+      end
 
-      [{ source: node, children: children }]
+      results[node.object_id] || []
     end
 
     def hidden_session_tree_entry?(entry)
@@ -132,15 +152,28 @@ module Kward
     end
 
     def session_tree_contains_active_path?(node, active_path)
-      entry_id = (node[:source]["entry"] || {})["id"].to_s
-      active_path.include?(entry_id) || node[:children].any? { |child| session_tree_contains_active_path?(child, active_path) }
+      stack = [node]
+      seen = {}
+      until stack.empty?
+        current = stack.pop
+        next if seen[current.object_id]
+
+        seen[current.object_id] = true
+        entry_id = (current[:source]["entry"] || {})["id"].to_s
+        return true if active_path.include?(entry_id)
+
+        stack.concat(current[:children])
+      end
+      false
     end
 
     def session_tree_active_path(roots, leaf_id)
       by_id = session_tree_entries_by_id(roots)
       ids = []
       entry = by_id[leaf_id.to_s]
-      while entry
+      seen = {}
+      while entry && !seen[entry["id"].to_s]
+        seen[entry["id"].to_s] = true
         ids << entry["id"].to_s
         entry = by_id[entry["parentId"].to_s]
       end
@@ -150,8 +183,12 @@ module Kward
     def session_tree_entries_by_id(roots)
       roots.each_with_object({}) do |root, map|
         stack = [root]
+        seen = {}
         until stack.empty?
           node = stack.pop
+          next if seen[node.object_id]
+
+          seen[node.object_id] = true
           entry = node["entry"] || {}
           map[entry["id"].to_s] = entry unless entry["id"].to_s.empty?
           stack.concat(Array(node["children"]))
@@ -162,8 +199,12 @@ module Kward
     def session_tree_tool_calls(roots)
       roots.each_with_object({}) do |root, tool_calls|
         stack = [root]
+        seen = {}
         until stack.empty?
           node = stack.pop
+          next if seen[node.object_id]
+
+          seen[node.object_id] = true
           entry = node["entry"] || {}
           message = entry["message"]
           if entry["type"] == "message" && message.is_a?(Hash) && message_role(message) == "assistant"

data/lib/kward/version.rb

@@ -1,5 +1,5 @@
 # Namespace for the Kward CLI agent runtime.
 module Kward
   # Current gem version.
-  VERSION = "0.69.0"
+  VERSION = "0.69.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kward
 version: !ruby/object:Gem::Version
-  version: 0.69.0
+  version: 0.69.1
 platform: ruby
 authors:
 - Kai Wood