feat(cell): binary→cell mapping via contributes.binaries (32→8 orphan)

Antigravity Agent · claude · Antigravity Agent · commit 8e38a72dda07 · 2026-03-17T06:39:36.000+07:00
- Added `contributes.binaries` field to 19 cell.tri files
- `tri cell map` now checks binaries field first, dir-name fallback
- `tri cell` status shows binary mapping stats
- 35/43 binaries mapped to cells, 8 remaining are benchmarks/examples/demos

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/src/agent_mu/cell.tri b/src/agent_mu/cell.tri
@@ -22,6 +22,7 @@ type = "agent"
 commands = ["learn", "recall", "forget"]
 tri_subcommands = ["mu status", "mu patterns"]
 events = ["on_pattern_learned", "on_experience_saved"]
+binaries = ["pas-demo"]
 
 [dependencies]
 trinity.tvc = "^1.0.0"
diff --git a/src/arena/cell.tri b/src/arena/cell.tri
@@ -22,6 +22,7 @@ type = "tool"
 commands = ["battle", "leaderboard", "judge"]
 tri_subcommands = ["arena battle", "arena leaderboard"]
 events = ["on_battle_complete", "on_elo_update"]
+binaries = ["arena"]
 
 [dependencies]
 trinity.hslm = "^1.0.0"
diff --git a/src/b2t/cell.tri b/src/b2t/cell.tri
@@ -22,6 +22,7 @@ type = "library"
 commands = ["convert", "batch"]
 tri_subcommands = []
 events = []
+binaries = ["b2t"]
 
 [dependencies]
 
diff --git a/src/beal/cell.tri b/src/beal/cell.tri
@@ -20,6 +20,7 @@ type = "backend"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["beal"]
 
 [dependencies]
 
diff --git a/src/cli/cell.tri b/src/cli/cell.tri
@@ -20,6 +20,7 @@ type = "library"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["hslm-entrypoint", "swe-entrypoint"]
 
 [dependencies]
 
diff --git a/src/firebird/cell.tri b/src/firebird/cell.tri
@@ -22,6 +22,7 @@ type = "agent"
 commands = ["browse", "navigate"]
 tri_subcommands = ["firebird browse"]
 events = ["on_page_loaded"]
+binaries = ["firebird"]
 
 [dependencies]
 trinity.vsa = "^1.0.0"
diff --git a/src/forge/cell.tri b/src/forge/cell.tri
@@ -20,6 +20,7 @@ type = "backend"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["forge"]
 
 [dependencies]
 
diff --git a/src/hslm/cell.tri b/src/hslm/cell.tri
@@ -22,6 +22,7 @@ type = "backend"
 commands = ["train", "eval", "export", "checkpoint"]
 tri_subcommands = ["farm train", "farm eval", "farm evolve"]
 events = ["on_step_complete", "on_epoch_end", "on_checkpoint"]
+binaries = ["hslm-train", "hslm-bench", "bpe-train"]
 
 [dependencies]
 trinity.sacred = "^1.0.0"
diff --git a/src/needle/cell.tri b/src/needle/cell.tri
@@ -22,6 +22,7 @@ type = "tool"
 commands = ["search", "index", "replace"]
 tri_subcommands = ["needle search", "needle replace"]
 events = []
+binaries = ["needle-mcp"]
 
 [dependencies]
 trinity.vsa = "^1.0.0"
diff --git a/src/phi_loop/cell.tri b/src/phi_loop/cell.tri
@@ -20,6 +20,7 @@ type = "library"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["phi-loop"]
 
 [dependencies]
 trinity.agent-mu = "^1.0.0"
diff --git a/src/quantum/cell.tri b/src/quantum/cell.tri
@@ -22,6 +22,7 @@ type = "library"
 commands = ["simulate", "measure"]
 tri_subcommands = []
 events = []
+binaries = ["quantum"]
 
 [dependencies]
 trinity.sacred = "^1.0.0"
diff --git a/src/registry/cell.tri b/src/registry/cell.tri
@@ -20,6 +20,7 @@ type = "library"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["export-registry"]
 
 [dependencies]
 
diff --git a/src/tri-api/cell.tri b/src/tri-api/cell.tri
@@ -20,6 +20,7 @@ type = "backend"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["tri-api"]
 
 [dependencies]
 
diff --git a/src/tri/cell.tri b/src/tri/cell.tri
@@ -20,6 +20,7 @@ type = "backend"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["tri"]
 
 [dependencies]
 trinity.math = "^1.0.0"
diff --git a/src/tri/tri_cell.zig b/src/tri/tri_cell.zig
@@ -49,6 +49,7 @@ const CellInfo = struct {
     contributes_commands: []const u8,
     contributes_tri_subcommands: []const u8,
     contributes_events: []const u8,
+    contributes_binaries: []const u8,
     dependencies_raw: []const u8, // raw [dependencies] section text (TOML lines: key = "value")
     // Security permissions
     perm_level: []const u8, // L0 (read-only), L1 (local r/w), L2 (network+external)
@@ -2372,14 +2373,41 @@ fn runStatus(allocator: Allocator) !void {
     // Count binaries and mapped ones
     var bin_total: usize = 0;
     var bin_mapped: usize = 0;
+    // Build binary→cell map from contributes.binaries
+    var status_bin_map = std.StringHashMap(void).init(allocator);
+    defer status_bin_map.deinit();
+    for (discovered) |path| {
+        const stbp = std.fmt.allocPrint(allocator, "{s}/cell.tri", .{path}) catch continue;
+        defer allocator.free(stbp);
+        const stbc = std.fs.cwd().readFileAlloc(allocator, stbp, 65536) catch continue;
+        defer allocator.free(stbc);
+        const stcell = parseCellTri(stbc);
+        if (stcell.contributes_binaries.len > 2) {
+            const stripped = std.mem.trim(u8, stcell.contributes_binaries, "[]");
+            var sbit = std.mem.splitScalar(u8, stripped, ',');
+            while (sbit.next()) |elem| {
+                const tb = std.mem.trim(u8, elem, " \t\"'");
+                if (tb.len > 0) {
+                    const kb = allocator.dupe(u8, tb) catch continue;
+                    status_bin_map.put(kb, {}) catch allocator.free(kb);
+                }
+            }
+        }
+    }
+
     if (std.fs.cwd().openDir("zig-out/bin", .{ .iterate = true })) |bd_val| {
         var bd = bd_val;
         defer bd.close();
         var bi = bd.iterate();
         while (bi.next() catch null) |entry| {
             if (entry.kind != .file or entry.name[0] == '.') continue;
             bin_total += 1;
-            // Quick match: check if any cell dir name matches binary
+            // Check contributes.binaries first
+            if (status_bin_map.contains(entry.name)) {
+                bin_mapped += 1;
+                continue;
+            }
+            // Fallback: dir-name matching
             for (discovered) |path| {
                 const dir_name = if (std.mem.lastIndexOf(u8, path, "/")) |s| path[s + 1 ..] else path;
                 var norm_bin: [64]u8 = undefined;
@@ -2488,19 +2516,41 @@ fn runMap(allocator: Allocator) !void {
         allocator.free(discovered);
     }
 
-    // Build path → cell id map
+    // Build binary_name → cell_id map from contributes.binaries
+    var bin_to_cell = std.StringHashMap([]const u8).init(allocator);
+    defer bin_to_cell.deinit();
+    // Also keep path→id for dir-name fallback
     var cell_paths = std.StringHashMap([]const u8).init(allocator);
     defer cell_paths.deinit();
+
     for (discovered) |path| {
         const cell_tri_path = std.fmt.allocPrint(allocator, "{s}/cell.tri", .{path}) catch continue;
         defer allocator.free(cell_tri_path);
         const content = std.fs.cwd().readFileAlloc(allocator, cell_tri_path, 65536) catch continue;
         defer allocator.free(content);
         const cell = parseCellTri(content);
         if (cell.id.len == 0) continue;
-        // Dupe since content is freed
         const id_copy = allocator.dupe(u8, cell.id) catch continue;
-        cell_paths.put(path, id_copy) catch allocator.free(id_copy);
+        cell_paths.put(path, id_copy) catch {
+            allocator.free(id_copy);
+            continue;
+        };
+
+        // Parse contributes.binaries = ["bin1", "bin2"]
+        if (cell.contributes_binaries.len > 2) {
+            const stripped = std.mem.trim(u8, cell.contributes_binaries, "[]");
+            var bit = std.mem.splitScalar(u8, stripped, ',');
+            while (bit.next()) |elem| {
+                const trimmed_bin = std.mem.trim(u8, elem, " \t\"'");
+                if (trimmed_bin.len > 0) {
+                    // Dupe key since it points into content which will be freed
+                    const key_copy = allocator.dupe(u8, trimmed_bin) catch continue;
+                    bin_to_cell.put(key_copy, id_copy) catch {
+                        allocator.free(key_copy);
+                    };
+                }
+            }
+        }
     }
     defer {
         var vit = cell_paths.valueIterator();
@@ -2514,30 +2564,32 @@ fn runMap(allocator: Allocator) !void {
     std.debug.print("  {s}─────────────────────── ──────────────────────── ──────{s}\n", .{ GRAY, RESET });
 
     for (binaries.items) |bin_name| {
-        // Try to find matching cell by directory name matching binary name
-        var found_cell: ?[]const u8 = null;
-        for (discovered) |path| {
-            const dir_name = if (std.mem.lastIndexOf(u8, path, "/")) |slash| path[slash + 1 ..] else path;
-            // Match: binary name contains cell dir name, or cell dir contains binary name
-            // Normalize: binary "trinity-mcp" → "trinity_mcp"
-            var norm_bin: [64]u8 = undefined;
-            const norm_len = @min(bin_name.len, 63);
-            @memcpy(norm_bin[0..norm_len], bin_name[0..norm_len]);
-            for (norm_bin[0..norm_len]) |*c| {
-                if (c.* == '-') c.* = '_';
-            }
-            var norm_dir: [64]u8 = undefined;
-            const dir_len = @min(dir_name.len, 63);
-            @memcpy(norm_dir[0..dir_len], dir_name[0..dir_len]);
-            for (norm_dir[0..dir_len]) |*c| {
-                if (c.* == '-') c.* = '_';
-            }
+        // First: check contributes.binaries mapping
+        var found_cell: ?[]const u8 = bin_to_cell.get(bin_name);
 
-            if (std.mem.eql(u8, norm_bin[0..norm_len], norm_dir[0..dir_len]) or
-                std.mem.eql(u8, bin_name, dir_name))
-            {
-                found_cell = cell_paths.get(path);
-                break;
+        // Fallback: dir-name matching
+        if (found_cell == null) {
+            for (discovered) |path| {
+                const dir_name = if (std.mem.lastIndexOf(u8, path, "/")) |slash| path[slash + 1 ..] else path;
+                var norm_bin: [64]u8 = undefined;
+                const norm_len = @min(bin_name.len, 63);
+                @memcpy(norm_bin[0..norm_len], bin_name[0..norm_len]);
+                for (norm_bin[0..norm_len]) |*c| {
+                    if (c.* == '-') c.* = '_';
+                }
+                var norm_dir: [64]u8 = undefined;
+                const dir_len = @min(dir_name.len, 63);
+                @memcpy(norm_dir[0..dir_len], dir_name[0..dir_len]);
+                for (norm_dir[0..dir_len]) |*c| {
+                    if (c.* == '-') c.* = '_';
+                }
+
+                if (std.mem.eql(u8, norm_bin[0..norm_len], norm_dir[0..dir_len]) or
+                    std.mem.eql(u8, bin_name, dir_name))
+                {
+                    found_cell = cell_paths.get(path);
+                    break;
+                }
             }
         }
 
@@ -3925,6 +3977,7 @@ fn parseCellTri(content: []const u8) CellInfo {
         .contributes_commands = "",
         .contributes_tri_subcommands = "",
         .contributes_events = "",
+        .contributes_binaries = "",
         .dependencies_raw = "",
         .perm_level = "",
         .perm_filesystem = "",
@@ -4001,7 +4054,8 @@ fn parseCellTri(content: []const u8) CellInfo {
             .contributes => {
                 if (std.mem.eql(u8, key, "commands")) info.contributes_commands = value
                 else if (std.mem.eql(u8, key, "tri_subcommands")) info.contributes_tri_subcommands = value
-                else if (std.mem.eql(u8, key, "events")) info.contributes_events = value;
+                else if (std.mem.eql(u8, key, "events")) info.contributes_events = value
+                else if (std.mem.eql(u8, key, "binaries")) info.contributes_binaries = value;
             },
             .dependencies => {
                 // Track end of dependencies section
diff --git a/src/trinity_node/cell.tri b/src/trinity_node/cell.tri
@@ -22,6 +22,7 @@ type = "agent"
 commands = ["start", "status", "connect"]
 tri_subcommands = ["node start", "node status"]
 events = ["on_node_connected", "on_node_disconnected"]
+binaries = ["trinity-node", "trinity-node-gui"]
 
 [dependencies]
 trinity.vibeec = "^1.0.0"
diff --git a/src/vibeec/cell.tri b/src/vibeec/cell.tri
@@ -22,6 +22,7 @@ type = "tool"
 commands = ["gen", "parse", "validate"]
 tri_subcommands = ["vibee gen", "vibee parse"]
 events = ["on_codegen_complete"]
+binaries = ["vibee", "vibee-self-improve", "claude-ui", "fluent", "trinity-hybrid", "trinity-cli"]
 
 [dependencies]
 trinity.vsa = "^1.0.0"
diff --git a/src/vsa/cell.tri b/src/vsa/cell.tri
@@ -20,6 +20,7 @@ type = "library"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["photon-demo", "photon-immersive", "photon-terminal", "trinity-canvas"]
 
 [dependencies]
 trinity.models = "^1.0.0"
diff --git a/tools/hooks/cell.tri b/tools/hooks/cell.tri
@@ -20,6 +20,7 @@ type = "library"
 commands = []
 tri_subcommands = []
 events = []
+binaries = ["pipeline-guard"]
 
 [dependencies]
 
diff --git a/tools/mcp/trinity_mcp/cell.tri b/tools/mcp/trinity_mcp/cell.tri
@@ -22,6 +22,7 @@ type = "tool"
 commands = ["serve", "list-tools"]
 tri_subcommands = ["mcp start", "mcp tools"]
 events = ["on_tool_invoked"]
+binaries = ["trinity-mcp", "ralph-agent", "ralph-hook", "scholar-agent", "mu-agent", "tri-bot", "agent-entrypoint"]
 
 [dependencies]
 trinity.needle = "^1.0.0"
