okf 1.10.0 → 1.12.0

data/lib/okf/cli/command.rb

@@ -118,13 +118,15 @@ module OKF
       # reproduced on the CLI so an agent can read the same knowledge without one.
       # Each prints a scannable human view by default and machine JSON with --json;
       # all are advisory reads (exit 0). They share OKF::Bundle#catalog for their data,
-      # and (with `types`) narrow through the same --type/--area/--tag filters the
+      # and (with `types`) narrow through the same --type/--dir/--tag filters the
       # server UI offers, so browser and CLI can answer the same questions.
       #
-      # ── their shared --type/--area/--tag narrowing ──
+      # ── their shared --type/--dir/--tag narrowing ──
       # Each view takes the filters orthogonal to it (tags can't filter by tag).
-      # Matching is case-insensitive and exact; a concept at the bundle root lives in
-      # the "(root)" area, which --area also accepts as plain `root` (no shell quoting).
+      # Matching is case-insensitive; --type and --tag are exact, --dir is a prefix
+      # over the whole path (see #under_dir?). The bundle root is `.`, spellable
+      # `root` so no shell quoting is needed. --area is --dir's deprecated
+      # predecessor and keeps its old first-segment-only behavior.
 
       # The shared back half of `tags` and `types`: load, narrow, print.
       def print_inverted_index(dir, label, key, plural, options)
@@ -177,27 +179,187 @@ module OKF
 
       def filter_flags(parser, options, *keys)
         parser.on("--type TYPE", "only concepts of this type") { |v| options[:type] = v } if keys.include?(:type)
-        parser.on("--area AREA", "only concepts in this top-level area") { |v| options[:area] = v } if keys.include?(:area)
+        if keys.include?(:area)
+          parser.on("--dir PATH", "only concepts in this directory or below it",
+            "(`root` — or `.` — for the bundle root)") { |v| options[:dir] = v }
+          parser.on("--area AREA", "deprecated: use --dir (matches the first path segment only)") do |v|
+            options[:area] = v
+            deprecated("--area", "--dir")
+          end
+        end
         parser.on("--tag TAG", "only concepts carrying this tag") { |v| options[:tag] = v } if keys.include?(:tag)
       end
 
       def filter_entries(entries, options)
         entries.select do |entry|
           (options[:type].nil? || fold(entry[:type]) == fold(options[:type])) &&
-            (options[:area].nil? || fold(entry[:area]) == fold_area(options[:area])) &&
+            (options[:area].nil? || fold(entry[:top_dir]) == fold_area(options[:area])) &&
+            (options[:dir].nil? || under_dir?(entry[:dir], options[:dir])) &&
             (options[:tag].nil? || entry[:tags].any? { |tag| fold(tag) == fold(options[:tag]) })
         end
       end
 
+      # The one rule --dir is built on: a dir names itself and everything beneath
+      # it. `--dir foo` reaches foo/bar, `--dir foo/bar` narrows, and `--dir .`
+      # needs no special case at all — nothing starts with "./", so the root
+      # selects only what lives directly in it.
+      def under_dir?(entry_dir, wanted)
+        entry = fold(entry_dir)
+        path = fold_dir(wanted)
+        entry == path || entry.start_with?("#{path}/")
+      end
+
       def fold(value)
         value.to_s.downcase
       end
 
       def fold_area(value)
-        folded = fold(value)
+        folded = trim_slash(fold(value))
         folded == "root" ? "(root)" : folded
       end
 
+      # `.` is the stored spelling of the root everywhere; `root` is the one a
+      # shell needs no quoting for, and the only reason the two exist.
+      def fold_dir(value)
+        folded = trim_slash(fold(value))
+        folded.empty? || folded == "root" ? "." : folded
+      end
+
+      # The human views print a directory with the slash that says it is one —
+      # `tables/`, `docs/api/` — so the flag has to accept the label the CLI
+      # itself just printed. Without this, pasting a row back into --dir matched
+      # nothing and exited 0: an empty answer that reads like a real one.
+      def trim_slash(value)
+        value.sub(%r{/+\z}, "")
+      end
+
+      # The inverse of fold_dir: `.` is the stored spelling of the root and
+      # "(root)" the human one, and every grouped view keeps that split so a
+      # table and its --json never disagree about which spelling is the data.
+      # `slash:` adds the trailing slash the listing views use to say "directory"
+      # — the same one fold_dir now accepts back.
+      def dir_label(dir, slash: false)
+        return "(root)" if [ ".", "(root)" ].include?(dir)
+
+        slash ? "#{dir}/" : dir
+      end
+
+      # How many path segments deep a directory sits. The root is 0.
+      def dir_depth(dir)
+        dir == "." ? 0 : dir.count("/") + 1
+      end
+
+      # --depth N: how many directory levels below the *starting point* to keep,
+      # where the starting point is each --dir when one is given and the bundle
+      # root otherwise. Relative rather than absolute on purpose: `--dir a/b
+      # --depth 1` reads "a/b and one level under it" without the caller first
+      # working out how deep a/b already is — and the two flags then compose the
+      # way a reader descending a tree actually moves.
+      def depth_flag(parser, options)
+        parser.on("--depth N", "keep only this many directory levels below the",
+          "starting point (--dir when given, else the bundle root)") { |v| options[:depth] = v }
+      end
+
+      # Checked here rather than with OptionParser's Integer coercion, which
+      # accepts "-1" and "0x2" and reports in its own words. Returns the exit
+      # status to hand back, or nil when the value is fine.
+      def depth_error(options)
+        raw = options[:depth]
+        return nil if raw.nil? || raw.to_s =~ /\A\d+\z/
+
+        usage_error("--depth takes a whole number of levels (got #{raw.inspect})")
+      end
+
+      # The chain from the bundle root down to each --dir, so a branch is never
+      # shown adrift. On by default in the *directory* views (`index`, `dirs`):
+      # the map's job there is orientation, and a subtree printed with nothing
+      # above it has dropped the authored context that says what it is — the root
+      # index.md's prose first among it. Off with --no-ancestors, which restores
+      # the subtree alone.
+      #
+      # Deliberately not offered on the concept filters (search/catalog/files/…):
+      # there --dir narrows *concepts*, and a concept in `a/` is simply not in
+      # `a/b`. Same flag, one meaning, because it is asked about two different
+      # kinds of row.
+      def ancestors_flag(parser, options)
+        parser.on("--[no-]ancestors", "with --dir, also show the chain up to the root",
+          "so the branch is placed (default: yes)") { |v| options[:ancestors] = v }
+      end
+
+      # Every proper ancestor of each --dir, root included. Empty unless --dir
+      # named something below the root: with no --dir the whole bundle is already
+      # the starting point, and `--dir .` has nothing above it.
+      #
+      # `known` is the map's own directory list, and a base outside it contributes
+      # no chain. Without that check `--dir typo` came back with the root — a
+      # chain to a place that does not exist, which reads as a partial answer to
+      # a query that in fact matched nothing.
+      #
+      # The deprecated --area gains no chain either: it is exact, and a deprecated
+      # flag that quietly answers with more than it used to is worse than one that
+      # is merely old.
+      # Matching folds case, but a row is found by its *stored* spelling, so the
+      # chain is walked folded and handed back in the map's own words. Returning
+      # the folded string instead dropped every ancestor a bundle spelled with a
+      # capital — the rows are selected with `include?`, which does not fold.
+      def ancestor_dirs(options, known)
+        return [] unless options[:ancestors]
+
+        stored = known.each_with_object({}) { |dir, out| out[fold(dir)] = dir }
+        Array(options[:dirs]).each_with_object([]) do |path, out|
+          base = fold_dir(path)
+          next unless stored.key?(base)
+
+          current = dir_parent(base)
+          while current
+            out << stored.fetch(current, current)
+            current = dir_parent(current)
+          end
+        end.uniq
+      end
+
+      # nil above the root, so the walk above terminates on it rather than on ".".
+      def dir_parent(dir)
+        return nil if dir == "."
+
+        slash = dir.rindex("/")
+        slash ? dir[0, slash] : "."
+      end
+
+      # The directories a --dir/--depth pair selects, out of the map's own
+      # ordered list. Neither flag given keeps everything — these narrow a view,
+      # they do not define one. The ancestor chain is unioned on top by the
+      # caller, which is also what tells a row apart from context.
+      def select_dirs(dirs, options)
+        bases = Array(options[:dirs]).map { |path| fold_dir(path) }
+        depth = options[:depth]&.to_i
+        return dirs if bases.empty? && depth.nil?
+        # No --dir means the whole bundle is the starting point, which is *not*
+        # `--dir .`: that one selects the root alone, by the same prefix rule
+        # everything else here uses.
+        return dirs.select { |dir| dir_depth(dir) <= depth } if bases.empty?
+
+        dirs.select do |dir|
+          bases.any? do |base|
+            # --depth bounds the *descent*; the chain above is the ascent, and the
+            # two are separate axes. That is what keeps `--depth 0` meaning "the
+            # named directory alone" even while its chain is printed with it.
+            under_dir?(dir, base) && (depth.nil? || dir_depth(dir) - dir_depth(base) <= depth)
+          end
+        end
+      end
+
+      # A deprecated spelling still does what it always did — never silently
+      # something else — and says so once per run, on stderr so a --json
+      # consumer's stdout stays a clean machine substrate.
+      def deprecated(what, instead)
+        @deprecated ||= {}
+        return if @deprecated[what]
+
+        @deprecated[what] = true
+        @err.puts "warning: #{what} is deprecated, use #{instead}"
+      end
+
       # Turn an inverted index ({ value => [id, …] }) into display rows ordered by
       # count, narrowed to the concepts the active filters select; rows the narrowing
       # empties drop. With no filters the index passes through whole.
@@ -212,7 +374,7 @@ module OKF
       # The ids the filters select, resolved through the catalog metadata — or nil
       # when no filter is active, meaning keep everything.
       def filter_ids(folder, options)
-        return nil if options[:type].nil? && options[:area].nil? && options[:tag].nil?
+        return nil if options[:type].nil? && options[:area].nil? && options[:dir].nil? && options[:tag].nil?
 
         filter_entries(folder.catalog, options).map { |entry| entry[:id] }
       end
@@ -259,15 +421,58 @@ module OKF
       # Parse options, then take zero or more bundle positionals (the multi-bundle
       # server) — directories or @refs. Returns the resolved array (possibly
       # empty), or nil (after reporting) so the caller returns 2.
-      def positional_dirs(parser, argv)
+      def positional_dirs(parser, argv, expand_groups: false)
         parser.parse!(argv)
-        dirs = argv.map { |dir| resolve_ref(dir) }
+        dirs = if expand_groups
+                 argv.flat_map { |arg| resolve_ref_expanding(arg) }
+               else
+                 argv.map { |dir| resolve_ref(dir) }
+               end
         dirs.include?(nil) ? nil : dirs
       rescue OptionParser::ParseError => e
         @err.puts e.message
         nil
       end
 
+      # Like #resolve_ref, but a group @ref fans out to its member directories —
+      # the multi-bundle expansion only `server` wants (single-bundle verbs reject
+      # a group in #resolve_registered). Always returns an array of dirs so the
+      # caller can flat_map, or nil (reported) to fail the run.
+      def resolve_ref_expanding(arg)
+        return [ resolve_ref(arg) ] unless arg.start_with?("@")
+
+        registry = load_registry
+        return [ nil ] unless registry
+
+        slug = OKF::Registry.normalize(arg[1..-1])
+        return [ resolve_ref(arg) ] if slug.empty? || registry.group?(slug).nil?
+
+        group_member_dirs(registry, slug)
+      end
+
+      # A group's member directories, in order, skipping ones whose directory has
+      # vanished with the same note `@all` gives — and populating +ref_slugs+ so the
+      # hub mounts each under its registered slug. nil (reported) when nothing
+      # readable is left, or on a hand-edited cycle.
+      def group_member_dirs(registry, slug)
+        dirs = []
+        registry.expand(slug).each do |entry|
+          if File.directory?(entry.path)
+            ref_slugs[entry.path] = entry.slug
+            dirs << entry.path
+          else
+            skip_registered(entry)
+          end
+        end
+        return dirs unless dirs.empty?
+
+        @err.puts "error: @#{slug} resolves to no readable bundle (okf registry list)"
+        nil
+      rescue OKF::Error => e
+        @err.puts "error: #{e.message}"
+        nil
+      end
+
       # "@slug" — or bare "@", the registry's default — names a registered bundle
       # wherever a <dir> goes; anything else must be a directory on disk. A
       # leading @ always means the registry (a directory literally named that way
@@ -290,15 +495,24 @@ module OKF
       # only `server` and the `registry` verbs rescue one. Returns nil after
       # reporting, so every caller returns 2.
       def load_registry
-        require "okf/registry"
-        OKF::Registry.load
+        open_registry
       rescue OKF::Error => e
         @err.puts "error: #{e.message}"
         nil
       end
 
-      # Resolve one @ref through the registry under $OKF_HOME (default ~/.okf).
-      # The slug part is normalized
+      # The registry a verb resolves against — the single seam that opts the CLI
+      # into discovery. `cwd: Dir.pwd` is what makes OKF::Registry.load walk up for
+      # a project-local .okf-registry.json; a library caller passing no cwd stays
+      # global-only. The registry subcommands and `server` open through here too,
+      # so a bare `okf server` inside a repo serves that repo's bundles.
+      def open_registry
+        require "okf/registry"
+        OKF::Registry.load(cwd: Dir.pwd)
+      end
+
+      # Resolve one @ref through the active registry — a discovered project-local
+      # one, else the global $OKF_HOME (default ~/.okf). The slug part is normalized
       # exactly as registration normalized it, so @One finds the bundle
       # registered from dir One — but never through #slugify's mint-a-name
       # placeholder, so "@***" is a bad ref rather than whatever is slugged
@@ -324,6 +538,19 @@ module OKF
 
         asked = ref[1..-1]
         slug = OKF::Registry.normalize(asked)
+
+        # A group is a set, and this verb takes one bundle. Reading its first member
+        # would answer confidently about a bundle the user never singled out — the
+        # silent-wrong-answer shape the second-bundle rule already forbids — so it is
+        # exit 2, with the two verbs that *can* take a group named.
+        group = slug.empty? ? nil : registry.group?(slug)
+        if group
+          count = group.members.size
+          @err.puts "error: @#{slug} names a group of #{count} #{count == 1 ? "member" : "members"}; " \
+                    "only `okf search` and `okf server` take a group"
+          return nil
+        end
+
         entry = if asked.empty?
                   registry.default # bare "@"
                 elsif slug.empty?

data/lib/okf/cli/dirs.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module OKF
+  class CLI
+    # The bundle's directories — its clusters — and how many concepts live
+    # directly in each. The shape view: `index` reads a directory's contents,
+    # `dirs` reads the layout they hang off, which is the question `--dir` is
+    # answered against.
+    #
+    # `count` is *direct*, never cumulative: a dir's number is what lives in it,
+    # so the column sums to the bundle's concept count and an empty intermediate
+    # dir reads as the zero it is. `subtree` is the other half of that honesty —
+    # what `--dir <that row>` would return — because a direct count alone cannot
+    # say where the mass is once `--depth` truncates the listing: on a deep
+    # bundle the top-level rows are then all zeroes.
+    #
+    # Presentation only — every number comes off Bundle#directory_index, the same
+    # source `okf index` and the server's Index panel read. Advisory: exit 0.
+    class Dirs < Command
+      def self.id
+        :dirs
+      end
+
+      def self.group
+        :read
+      end
+
+      def self.help_rows
+        [
+          [ "dirs      <dir|@slug> [--json] [--dir D] [--depth N]", "list the bundle's dirs (clusters) and their concept counts" ]
+        ]
+      end
+
+      def call(argv)
+        options = { json: false, dirs: nil, depth: nil, ancestors: true }
+        parser = OptionParser.new do |o|
+          o.banner = "Usage: okf dirs <dir|@slug> [--dir PATH] [--depth N] [--json]"
+          json_flags(o, options, "emit the dirs as JSON")
+          projection_flags(o, options)
+          o.on("--dir PATH", "only this directory and the ones below it",
+            "(repeatable; `root` for the bundle root)") { |v| (options[:dirs] ||= []) << v }
+          depth_flag(o, options)
+          ancestors_flag(o, options)
+          help_flag(o)
+        end
+        dir = positional_dir(parser, argv) or return 2
+        bad_depth = depth_error(options)
+        return bad_depth if bad_depth
+
+        folder = OKF::Bundle::Folder.load(dir)
+        report_skipped(folder)
+        rows = select_rows(folder.directory_index, options)
+        return emit_list_json(dir, "dirs", rows, options, "total" => total(rows)) if options[:json]
+
+        print_dirs(dir, rows)
+        0
+      end
+
+      private
+
+      # The subtree counts come off the *whole* map, before any narrowing — a
+      # truncated view still has to report the real weight hanging below a row,
+      # which is the only reason the column exists.
+      def select_rows(entries, options)
+        subtree = subtree_counts(entries)
+        all_dirs = entries.map { |entry| entry[:dir] }
+        wanted = select_dirs(all_dirs, options)
+        chain = ancestor_dirs(options, all_dirs) - wanted
+        entries.select { |entry| wanted.include?(entry[:dir]) || chain.include?(entry[:dir]) }.map do |entry|
+          { "dir" => entry[:dir], "ancestor" => chain.include?(entry[:dir]), "count" => entry[:count],
+            "subtree" => subtree[entry[:dir]], "subdirs" => entry[:subdirs] }
+        end
+      end
+
+      # Per dir, the concepts at or below it — defined as exactly what `--dir` on
+      # that row selects, so the number on the row and the flag can never
+      # disagree. Which is also why the root's subtree is its own direct count:
+      # `.` is a prefix of nothing, the same rule `--dir .` is built on.
+      def subtree_counts(entries)
+        entries.each_with_object({}) do |entry, out|
+          out[entry[:dir]] = entries.reduce(0) do |sum, other|
+            under_dir?(other[:dir], entry[:dir]) ? sum + other[:count] : sum
+          end
+        end
+      end
+
+      # The chain is context, not the answer, so it stays out of the total —
+      # which is what keeps a row's `subtree` equal to the total `--dir` on that
+      # row returns. `count` in the envelope is rows printed, chain included,
+      # because that is what it has always meant: how many rows came back.
+      def total(rows)
+        rows.reject { |row| row["ancestor"] }.map { |row| row["count"] }.reduce(0, :+)
+      end
+
+      def print_dirs(dir, rows)
+        @out.puts "Dirs — #{bundle_label(dir)}"
+        @out.puts
+        labels = rows.map { |row| "#{"↑ " if row["ancestor"]}#{dir_label(row["dir"])}" }
+        # The second column earns its place only where a dir actually nests. On a
+        # flat bundle it would repeat the first one down the page.
+        nested = rows.any? { |row| row["subtree"] != row["count"] }
+        unless rows.empty?
+          width = [ 3, *labels.map(&:length) ].max
+          @out.puts "  #{"Dir".ljust(width)}  Concepts#{"   Subtree" if nested}"
+          rows.each_with_index do |row, i|
+            line = "  #{labels[i].ljust(width)}  #{row["count"].to_s.rjust(8)}"
+            line += "   #{row["subtree"].to_s.rjust(7)}" if nested
+            @out.puts line
+          end
+          @out.puts
+        end
+        @out.puts "  #{rows.size} #{pluralize(rows.size, "dir")} · #{total(rows)} #{pluralize(total(rows), "concept")}"
+      end
+    end
+
+    register(Dirs)
+  end
+end

data/lib/okf/cli/files.rb

@@ -22,7 +22,7 @@ module OKF
       def call(argv)
         options = { json: false }
         parser = OptionParser.new do |o|
-          o.banner = "Usage: okf files <dir|@slug> [--type T] [--area A] [--tag T] [--json]"
+          o.banner = "Usage: okf files <dir|@slug> [--type T] [--dir D] [--tag T] [--json]"
           json_flags(o, options, "emit the file tree as JSON")
           projection_flags(o, options)
           filter_flags(o, options, :type, :area, :tag)
@@ -47,7 +47,7 @@ module OKF
         entries.group_by { |entry| entry[:dir] }.sort_by(&:first).each do |folder, group|
           width = group.map { |entry| File.basename("#{entry[:id]}.md").length }.max
           @out.puts
-          @out.puts "  #{folder == "." ? "(root)" : "#{folder}/"}"
+          @out.puts "  #{dir_label(folder, slash: true)}"
           group.each do |entry|
             @out.puts "    #{File.basename("#{entry[:id]}.md").ljust(width)}  #{entry[:title]}"
           end

data/lib/okf/cli/graph.rb

@@ -15,22 +15,26 @@ module OKF
 
       def self.help_rows
         [
-          [ "graph     <dir|@slug> [--json] [--minimal] [--hubs]", "print the knowledge graph" ]
+          [ "graph     <dir|@slug> [--json] [--minimal] [--hubs]", "print the knowledge graph" ],
+          [ "graph     <dir|@slug> --traffic [--cut N]", "directories and the link traffic between them" ]
         ]
       end
 
       def call(argv)
-        options = { json: false, minimal: false, body: true, hubs: false }
+        options = { json: false, minimal: false, body: true, hubs: false, traffic: false, cut: nil }
         parser = OptionParser.new do |o|
-          o.banner = "Usage: okf graph <dir|@slug> [--json] [--minimal] [--no-body] [--hubs]"
+          o.banner = "Usage: okf graph <dir|@slug> [--json] [--minimal] [--no-body] [--hubs] [--traffic]"
           json_flags(o, options, "emit nodes and edges as JSON")
           o.on("--minimal", "leanest nodes (id + title); adds type/tag indexes") { options[:minimal] = true }
           o.on("--[no-]body", "include each concept's body (default: yes)") { |v| options[:body] = v }
-          o.on("--hubs", "rank concepts by inbound links, with the source areas") { options[:hubs] = true }
+          o.on("--hubs", "rank concepts by inbound links, with the source top-level dirs") { options[:hubs] = true }
+          o.on("--traffic", "collapse concepts into their dirs; count the links between them") { options[:traffic] = true }
+          o.on("--cut N", Integer, "least arc weight to draw (default: fitted to the bundle)") { |v| options[:cut] = v }
           help_flag(o)
         end
         dir = positional_dir(parser, argv) or return 2
 
+        return print_traffic(dir, options) if options[:traffic]
         return print_hubs(dir, options) if options[:hubs]
 
         folder = OKF::Bundle::Folder.load(dir)
@@ -52,16 +56,118 @@ module OKF
 
       private
 
+      # `graph --traffic`: concepts collapse into the directory they live in, and
+      # the links between two directories collapse into one weighted arc. It is
+      # the reduction that pays, and the measurement says why: on a typical
+      # bundle three quarters of all links cross a directory boundary, and those
+      # aggregate roughly ten-to-one — 227 links became 14 arcs on the bundle
+      # this was built for.
+      #
+      # The other half of the view is the cohesion column, which is the reason
+      # `refine` wants this. `--hubs` measures concepts; refine's step-3
+      # judgements ("does this directory prune?", "concern or container?") are
+      # about *directories*, and nothing measured those. Cohesion is a
+      # directory's internal traffic over its total, so it reads directly:
+      # near-zero with heavy inbound is a shared primitive, heavy outbound with
+      # nothing coming back is an index behaving like a container, and high is a
+      # directory that genuinely holds together.
+      def print_traffic(dir, options)
+        folder = OKF::Bundle::Folder.load(dir)
+        skeleton = folder.skeleton
+        cut = options[:cut] || skeleton.suggested_cut
+        return usage_error("--cut must be 1 or more, got #{cut}") if cut < 1
+
+        report_skipped(folder)
+        arcs = OKF::Bundle::Skeleton.arcs_above(skeleton.arcs, cut)
+        rows = dir_traffic(skeleton)
+        if options[:json]
+          emit_json(bundle_head(dir).merge(
+            "cut" => cut, "fitted" => options[:cut].nil?, "dirs" => stringify_rows(rows),
+            "arcs" => stringify_rows(arcs), "total_arcs" => skeleton.arcs.size
+          ))
+        else
+          @out.puts "Traffic — #{bundle_label(dir)} (#{skeleton.dirs.size} #{pluralize(skeleton.dirs.size, "dir")}, " \
+                    "#{counted(arcs.size, skeleton.arcs.size, "arc")} at weight #{cut} or more)"
+          print_dir_rows(rows)
+          print_arc_rows(arcs)
+        end
+        0
+      end
+
+      # Each directory's link traffic, split three ways. Counted over *every*
+      # arc, never the cut ones: the cut decides what is drawn, and a measurement
+      # that moved when the picture was tidied would be worthless as evidence.
+      def dir_traffic(skeleton)
+        out = Hash.new(0)
+        into = Hash.new(0)
+        skeleton.arcs.each do |arc|
+          out[arc[:source]] += arc[:weight]
+          into[arc[:target]] += arc[:weight]
+        end
+
+        skeleton.dirs.map do |row|
+          total = row[:internal] + out[row[:dir]] + into[row[:dir]]
+          row.merge(out: out[row[:dir]], in: into[row[:dir]],
+            cohesion: total.zero? ? nil : (100.0 * row[:internal] / total).round)
+        end
+      end
+
+      # An empty bundle gets no table at all — a column header over nothing is a
+      # heading that promises rows. The arc list is the opposite case and prints
+      # regardless (see print_arc_rows); the difference is that an empty arc list
+      # is a fact about the *cut*, and an empty dir table is a fact about the
+      # bundle the count line has already stated.
+      #
+      # Sorted by cohesion ascending, so the directories with a case to answer
+      # come first — a table that leads with the healthy ones buries its finding
+      # under the rows nobody needed to read. A directory with no traffic at all
+      # has no ratio to report and prints `—` rather than a 0% it did not earn.
+      def print_dir_rows(rows)
+        return if rows.empty?
+
+        ordered = rows.sort_by { |row| [ row[:cohesion] || 999, row[:dir] ] }
+        @out.puts
+        labels = ordered.map { |row| dir_label(row[:dir]) }
+        width = [ 3, *labels.map(&:length) ].max
+        @out.puts "  #{"Dir".ljust(width)}  Concepts  Internal   Out    In  Cohesion"
+        ordered.each_with_index do |row, i|
+          @out.puts "  #{labels[i].ljust(width)}  #{row[:count].to_s.rjust(8)}  #{row[:internal].to_s.rjust(8)}  " \
+                    "#{row[:out].to_s.rjust(4)}  #{row[:in].to_s.rjust(4)}  #{(row[:cohesion] ? "#{row[:cohesion]}%" : "—").rjust(8)}"
+        end
+      end
+
+      # The arc list is the answer this mode exists for, so it prints even when
+      # the cut emptied it — a heading over nothing says "the cut was too tight",
+      # where silence reads as "the bundle has no cross-links".
+      def print_arc_rows(arcs)
+        @out.puts
+        @out.puts "  Arcs"
+        return @out.puts "    (none at this cut)" if arcs.empty?
+
+        width = arcs.map { |arc| dir_label(arc[:source]).length }.max
+        twidth = arcs.map { |arc| dir_label(arc[:target]).length }.max
+        arcs.each do |arc|
+          @out.puts "    #{dir_label(arc[:source]).ljust(width)} → #{dir_label(arc[:target]).ljust(twidth)}  ×#{arc[:weight]}"
+        end
+      end
+
+      # The skeleton is symbol-keyed (it is a pure model, not a payload), and every
+      # other --json view in this CLI answers in strings. Converted at the edge, so
+      # the model stays the model.
+      def stringify_rows(rows)
+        rows.map { |row| stringify(row) }
+      end
+
       # `graph --hubs`: the inbound ranking with each hub's links grouped by
-      # source area — the "is this hub well-homed?" evidence. A hub whose
-      # inbound majority comes from outside its own area is a move candidate;
-      # --minimal/--no-body shape node payloads and change nothing here.
+      # source top-level dir — the "is this hub well-homed?" evidence. A hub whose
+      # inbound majority comes from outside its own top-level dir is a move
+      # candidate; --minimal/--no-body shape node payloads and change nothing here.
       def print_hubs(dir, options)
         folder = OKF::Bundle::Folder.load(dir)
         hubs = folder.hubs
         report_skipped(folder)
         if options[:json]
-          rows = hubs.map { |row| { "id" => row[:id], "area" => row[:area], "inbound" => row[:inbound], "by_area" => row[:by_area] } }
+          rows = hubs.map { |row| { "id" => row[:id], "top_dir" => row[:top_dir], "inbound" => row[:inbound], "by_top_dir" => row[:by_top_dir] } }
           emit_json(bundle_head(dir).merge("count" => hubs.size, "hubs" => rows))
         else
           @out.puts "Hubs — #{bundle_label(dir)} (#{counted(hubs.size, folder.concepts.size, "concept")} with inbound links)"
@@ -69,7 +175,7 @@ module OKF
           width = hubs.map { |row| row[:id].length }.max || 0
           dwidth = hubs.map { |row| row[:inbound].to_s.length }.max || 0
           hubs.each do |row|
-            sources = row[:by_area].map { |area, count| "#{area} #{count}" }.join(", ")
+            sources = row[:by_top_dir].map { |top_dir, count| "#{top_dir} #{count}" }.join(", ")
             @out.puts "  #{row[:id].ljust(width)}  ×#{row[:inbound].to_s.rjust(dwidth)}   #{sources}"
           end
         end