@caddis/cli 0.4.47 → 0.4.48

package/bundles/antigravity-plugin/plugin.json

@@ -1,5 +1,5 @@
 {
   "name": "caddis",
-  "version": "1.3.133",
+  "version": "1.3.134",
   "description": "caddis — agent-agnostic dev harness as an Antigravity (agy) plugin: TDD skills + commands, single-sourced with the Claude Code plugin."
 }

package/bundles/antigravity-plugin/skills/flow-studio/SKILL.md

@@ -76,7 +76,7 @@ In either route, derive node and link IDs from immutable business keys. Preserve
 
 ```
 version 1, meta {title, help, asOf, source, labels?}, layout "columns-lanes" | "free" | "auto"
-columns [{id, title, short?, width, phase?}]              stages, left to right
+columns [{id, title, short?, width, phase?, continues?}]              stages, left to right
 lanes   [{id, title, badge?, badgeTone?, note?, gap?}]    rows; gap true = dashed amber lane
 states  {id: {word, tone, border, edge, motion, bucket}}  tone: ok|warn|crit|info|muted|accent; bucket: good|neutral|gap
 nodes   [{id, kind, lane?, col?, colSpan?, row?, x?, y?, w?, h?, state, title, subtitle?, members?, weight?,

package/bundles/antigravity-plugin/skills/flow-studio/model.schema.json

@@ -26,7 +26,7 @@
         "type": "object", "required": ["id", "title", "width"], "additionalProperties": false,
         "properties": {
           "id": { "type": "string" }, "title": { "type": "string" }, "short": { "type": "string" },
-          "width": { "type": "number", "minimum": 60 }, "phase": { "type": "string" }
+          "width": { "type": "number", "minimum": 60 }, "phase": { "type": "string" }, "continues": { "type": "boolean" }
         }
       }
     },

package/bundles/antigravity-plugin/skills/flow-studio/references/model-schema.md

@@ -48,6 +48,7 @@ Columns provide vertical partitioning for time, stages, or architecture tiers.
 | `short` | `string` | Optional | - | Compact abbreviated title for tight viewports. |
 | `width` | `number` | Required | - | Column width in pixels (minimum 60). |
 | `phase` | `string` | Optional | - | Super-category phase grouping shown in top banner. |
+| `continues` | `boolean` | Optional | `false` | This column is a wrapped continuation of the column before it (for example one long list laid out in three side-by-side columns). It shows no header label and no strip cell of its own: its nodes count into the cell of the column it continues. Not allowed on the first column. |
 
 ---
 

package/bundles/antigravity-plugin/skills/flow-studio/src/chrome.ts

@@ -4,7 +4,7 @@
 import { el, on, type Ctx } from "./ctx.ts";
 import { esc } from "./model.ts";
 import { DASH, toneVar, cssId } from "./stateCss.ts";
-import { bucketOf, columnTitle, effectiveLinks, nodeStateId, nodeVisible } from "./rules.ts";
+import { bucketOf, columnTitle, effectiveLinks, nodeStateId, nodeVisible, stripHeads } from "./rules.ts";
 import { matches } from "./interact.ts";
 
 const DEFAULT_LABELS: Record<string, string> = {
@@ -34,16 +34,19 @@ export function install(ctx: Ctx): void {
 
   function buildStrip(): void {
     const box = els.strip;
+    // One cell per head column: a column that `continues` another counts into the cell before it.
+    const heads = stripHeads(model), cells = model.columns.map((c, i) => ({ c, i })).filter(({ i }) => heads[i] === i);
     box.style.display = model.columns.length ? "" : "none";
-    box.style.gridTemplateColumns = `repeat(${Math.max(1, model.columns.length)}, minmax(0, 1fr))`;
+    box.style.gridTemplateColumns = `repeat(${Math.max(1, cells.length)}, minmax(0, 1fr))`;
     if (!box.firstChild) {
-      box.innerHTML = model.columns.map(c => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
+      box.innerHTML = cells.map(({ c }) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
     }
-    box.querySelectorAll<HTMLElement>(".lcell").forEach((cell, i) => {
-      cell.style.setProperty("--i", String(i));
+    box.querySelectorAll<HTMLElement>(".lcell").forEach((cell, cellIndex) => {
+      const i = cells[cellIndex]?.i ?? cellIndex;
+      cell.style.setProperty("--i", String(cellIndex));
       let tot = 0, good = 0, neutral = 0, gap = 0;
       for (const n of model.nodes) {
-        if (n.col !== i || n.kind === "chip") continue;
+        if (heads[n.col ?? -1] !== i || n.kind === "chip") continue;
         if (!visible(n.id)) continue;
         const w = Math.max(1, n.weight ?? 1);
         tot += w;

package/bundles/antigravity-plugin/skills/flow-studio/src/controls.ts

@@ -71,7 +71,7 @@ export function install(ctx: Ctx): void {
     const cols = els.cols;
     cols.style.display = model.columns.length ? "" : "none";
     if (!cols.firstChild) {
-      model.columns.forEach((c, i) => { const h = el("div", "hd"); h.textContent = (c.short ?? c.title).toUpperCase(); h.title = c.title; h.dataset.i = String(i); cols.appendChild(h); });
+      model.columns.forEach((c, i) => { const h = el("div", "hd"); h.textContent = c.continues ? "" : (c.short ?? c.title).toUpperCase(); h.title = c.title; h.dataset.i = String(i); cols.appendChild(h); });
       let i = 0;
       while (i < model.columns.length) {
         const name = model.columns[i]?.phase;

package/bundles/antigravity-plugin/skills/flow-studio/src/model.test.ts

@@ -165,3 +165,11 @@ test("group containment validates ids, ownership, self-reference, and skips grou
   assert.ok(found.includes("contains-undefined"));
   assert.ok(found.includes("contains-duplicate"));
 });
+test("a column may continue the one before it", () => {
+  const m = base(); m.columns.push({ id: "c2", title: "B", width: 150, continues: true });
+  assert.deepEqual(codes(m), []);
+});
+test("the first column cannot continue a column that does not exist", () => {
+  const m = base(); m.columns[0]!.continues = true;
+  assert.ok(codes(m).includes("column-continues-first"));
+});

package/bundles/antigravity-plugin/skills/flow-studio/src/model.ts

@@ -16,7 +16,7 @@ export interface StateDef {
   motion: Motion;
   bucket: Bucket;
 }
-export interface ColumnDef { id: string; title: string; short?: string; width: number; phase?: string }
+export interface ColumnDef { id: string; title: string; short?: string; width: number; phase?: string; continues?: boolean }
 export interface LaneDef { id: string; title: string; badge?: string; badgeTone?: "ok" | "warn" | "muted"; note?: string; gap?: boolean }
 export interface NodeDef {
   id: string;
@@ -111,6 +111,7 @@ export function validateModel(input: unknown): Issue[] {
   if (!Array.isArray(m.lanes) || (m.layout !== "auto" && m.lanes.length === 0)) add("error", "lanes-missing", "lanes", "At least one lane is required.");
   if (!m.states || typeof m.states !== "object" || Object.keys(m.states).length === 0) add("error", "states-missing", "states", "At least one state is required.");
   const columns = Array.isArray(m.columns) ? m.columns : [];
+  if (columns[0]?.continues) add("error", "column-continues-first", "columns[0]", "The first column cannot continue a column before it.");
   const lanes = Array.isArray(m.lanes) ? m.lanes : [];
   const states = m.states && typeof m.states === "object" ? m.states : {};
   if (!m.meta || typeof m.meta !== "object" || typeof m.meta.title !== "string") add("error", "meta-missing", "meta", "meta with a title is required.");

package/bundles/antigravity-plugin/skills/flow-studio/src/notes.ts

@@ -70,7 +70,7 @@ export function install(ctx: Ctx): void {
   const markdown = (): string => {
     const out = [`# ${model.meta.title}`, "", model.meta.help, "", `As of ${model.meta.asOf}. Source: ${model.meta.source}`, "", "## States"];
     for (const [id, s] of Object.entries(model.states)) out.push(`- **${s.word}** (${id}): tone ${s.tone}, border ${s.border}, link ${s.edge}, motion ${s.motion}, bucket ${s.bucket}`);
-    out.push("", "## Columns", ...model.columns.map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
+    out.push("", "## Columns", ...model.columns.filter(c => !c.continues).map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
     out.push("", "## Lanes", ...model.lanes.map(l => `- ${l.title}${l.badge ? ` [${l.badge}]` : ""}${l.note ? `: ${l.note}` : ""}`));
     out.push("", `## Size`, `${model.nodes.length} nodes, ${model.links.length} links.`);
     if (notes.length) out.push("", "## Notes", ...notes.map(n => `${n.id}. **${n.title}**: ${n.text}`));

package/bundles/antigravity-plugin/skills/flow-studio/src/rules.test.ts

@@ -1,7 +1,7 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import type { Model } from "./model.ts";
-import { baselineView, defaultView, nodeVisible, nodeStateId, linkVisible, linkStateId, isNew, isImproved, bucketOf, canonOf, effectiveLinks, initialCollapsed, columnTitle, toggleGroupState } from "./rules.ts";
+import { baselineView, defaultView, nodeVisible, nodeStateId, linkVisible, linkStateId, isNew, isImproved, bucketOf, canonOf, effectiveLinks, initialCollapsed, columnTitle, toggleGroupState, stripHeads } from "./rules.ts";
 
 const m = (): Model => ({
   version: 1,
@@ -133,3 +133,12 @@ test("toggleGroup selects a visible child on expansion and its group on collapse
   assert.equal(folded.collapsed.has("group"), true);
   assert.equal(toggleGroupState(mm, "full", starting, "missing"), null);
 });
+
+test("stripHeads: a continuing column joins the one before it", () => {
+  const mm = m();
+  mm.columns = [{ id: "a", title: "A", width: 100 }, { id: "p", title: "P", width: 100 }, { id: "p2", title: "P", width: 100, continues: true }, { id: "p3", title: "P", width: 100, continues: true }, { id: "z", title: "Z", width: 100 }];
+  assert.deepEqual(stripHeads(mm), [0, 1, 1, 1, 4]);
+});
+test("stripHeads: with no continuing column every column is its own head", () => {
+  assert.deepEqual(stripHeads(m()), [0, 1]);
+});

package/bundles/antigravity-plugin/skills/flow-studio/src/rules.ts

@@ -10,6 +10,12 @@ export const defaultView = (m: Model): string => (m.views?.find(v => v.default)
 /** A group that contains nodes starts folded unless it explicitly opts out. */
 export const initialCollapsed = (m: Model): Set<string> => new Set(m.nodes
   .filter(n => n.kind === "group" && n.contains && n.collapsed !== false).map(n => n.id));
+/** For each column, the index of the column whose header and strip cell it shares: itself, or (when it
+ *  `continues` another) the nearest earlier column that does not. */
+export const stripHeads = (m: Model): number[] => {
+  let head = 0;
+  return m.columns.map((c, i) => { if (!c.continues || i === 0) head = i; return head; });
+};
 export const columnTitle = (m: Model, n: NodeDef): string => n.col === undefined ? "" : m.columns[n.col]?.title ?? "";
 
 export function groupFor(m: Model, nodeId: string): NodeDef | undefined {

package/bundles/antigravity-plugin/skills/flow-studio/templates/engine.html

@@ -286,6 +286,7 @@
     if (!Array.isArray(m.lanes) || m.layout !== "auto" && m.lanes.length === 0) add("error", "lanes-missing", "lanes", "At least one lane is required.");
     if (!m.states || typeof m.states !== "object" || Object.keys(m.states).length === 0) add("error", "states-missing", "states", "At least one state is required.");
     const columns = Array.isArray(m.columns) ? m.columns : [];
+    if (columns[0]?.continues) add("error", "column-continues-first", "columns[0]", "The first column cannot continue a column before it.");
     const lanes = Array.isArray(m.lanes) ? m.lanes : [];
     const states = m.states && typeof m.states === "object" ? m.states : {};
     if (!m.meta || typeof m.meta !== "object" || typeof m.meta.title !== "string") add("error", "meta-missing", "meta", "meta with a title is required.");
@@ -591,6 +592,13 @@
   var baselineView = (m) => m.views?.[0]?.id ?? "all";
   var defaultView = (m) => (m.views?.find((v) => v.default) ?? m.views?.[0])?.id ?? "all";
   var initialCollapsed = (m) => new Set(m.nodes.filter((n) => n.kind === "group" && n.contains && n.collapsed !== false).map((n) => n.id));
+  var stripHeads = (m) => {
+    let head = 0;
+    return m.columns.map((c, i) => {
+      if (!c.continues || i === 0) head = i;
+      return head;
+    });
+  };
   var columnTitle = (m, n) => n.col === void 0 ? "" : m.columns[n.col]?.title ?? "";
   function groupFor(m, nodeId) {
     return m.nodes.find((n) => n.kind === "group" && n.contains?.includes(nodeId));
@@ -1415,7 +1423,7 @@
       if (!cols.firstChild) {
         model.columns.forEach((c, i2) => {
           const h = el("div", "hd");
-          h.textContent = (c.short ?? c.title).toUpperCase();
+          h.textContent = c.continues ? "" : (c.short ?? c.title).toUpperCase();
           h.title = c.title;
           h.dataset.i = String(i2);
           cols.appendChild(h);
@@ -1801,16 +1809,18 @@
     }
     function buildStrip() {
       const box = els.strip;
+      const heads = stripHeads(model), cells = model.columns.map((c, i) => ({ c, i })).filter(({ i }) => heads[i] === i);
       box.style.display = model.columns.length ? "" : "none";
-      box.style.gridTemplateColumns = `repeat(${Math.max(1, model.columns.length)}, minmax(0, 1fr))`;
+      box.style.gridTemplateColumns = `repeat(${Math.max(1, cells.length)}, minmax(0, 1fr))`;
       if (!box.firstChild) {
-        box.innerHTML = model.columns.map((c) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
+        box.innerHTML = cells.map(({ c }) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
       }
-      box.querySelectorAll(".lcell").forEach((cell, i) => {
-        cell.style.setProperty("--i", String(i));
+      box.querySelectorAll(".lcell").forEach((cell, cellIndex) => {
+        const i = cells[cellIndex]?.i ?? cellIndex;
+        cell.style.setProperty("--i", String(cellIndex));
         let tot = 0, good = 0, neutral = 0, gap = 0;
         for (const n of model.nodes) {
-          if (n.col !== i || n.kind === "chip") continue;
+          if (heads[n.col ?? -1] !== i || n.kind === "chip") continue;
           if (!visible(n.id)) continue;
           const w = Math.max(1, n.weight ?? 1);
           tot += w;
@@ -2029,7 +2039,7 @@
     const markdown = () => {
       const out = [`# ${model.meta.title}`, "", model.meta.help, "", `As of ${model.meta.asOf}. Source: ${model.meta.source}`, "", "## States"];
       for (const [id, s] of Object.entries(model.states)) out.push(`- **${s.word}** (${id}): tone ${s.tone}, border ${s.border}, link ${s.edge}, motion ${s.motion}, bucket ${s.bucket}`);
-      out.push("", "## Columns", ...model.columns.map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
+      out.push("", "## Columns", ...model.columns.filter((c) => !c.continues).map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
       out.push("", "## Lanes", ...model.lanes.map((l) => `- ${l.title}${l.badge ? ` [${l.badge}]` : ""}${l.note ? `: ${l.note}` : ""}`));
       out.push("", `## Size`, `${model.nodes.length} nodes, ${model.links.length} links.`);
       if (notes.length) out.push("", "## Notes", ...notes.map((n) => `${n.id}. **${n.title}**: ${n.text}`));

package/bundles/antigravity-plugin/skills/flow-studio/templates/flow-studio.lib.mjs

@@ -29,6 +29,7 @@ function validateModel(input) {
   if (!Array.isArray(m.lanes) || m.layout !== "auto" && m.lanes.length === 0) add("error", "lanes-missing", "lanes", "At least one lane is required.");
   if (!m.states || typeof m.states !== "object" || Object.keys(m.states).length === 0) add("error", "states-missing", "states", "At least one state is required.");
   const columns = Array.isArray(m.columns) ? m.columns : [];
+  if (columns[0]?.continues) add("error", "column-continues-first", "columns[0]", "The first column cannot continue a column before it.");
   const lanes = Array.isArray(m.lanes) ? m.lanes : [];
   const states = m.states && typeof m.states === "object" ? m.states : {};
   if (!m.meta || typeof m.meta !== "object" || typeof m.meta.title !== "string") add("error", "meta-missing", "meta", "meta with a title is required.");
@@ -347,11 +348,19 @@ __export(rules_exports, {
   linkVisible: () => linkVisible,
   nodeStateId: () => nodeStateId,
   nodeVisible: () => nodeVisible,
+  stripHeads: () => stripHeads,
   toggleGroupState: () => toggleGroupState
 });
 var baselineView = (m) => m.views?.[0]?.id ?? "all";
 var defaultView = (m) => (m.views?.find((v) => v.default) ?? m.views?.[0])?.id ?? "all";
 var initialCollapsed = (m) => new Set(m.nodes.filter((n) => n.kind === "group" && n.contains && n.collapsed !== false).map((n) => n.id));
+var stripHeads = (m) => {
+  let head = 0;
+  return m.columns.map((c, i) => {
+    if (!c.continues || i === 0) head = i;
+    return head;
+  });
+};
 var columnTitle = (m, n) => n.col === void 0 ? "" : m.columns[n.col]?.title ?? "";
 function groupFor(m, nodeId) {
   return m.nodes.find((n) => n.kind === "group" && n.contains?.includes(nodeId));
@@ -1203,7 +1212,7 @@ function install3(ctx) {
     if (!cols.firstChild) {
       model.columns.forEach((c, i2) => {
         const h = el("div", "hd");
-        h.textContent = (c.short ?? c.title).toUpperCase();
+        h.textContent = c.continues ? "" : (c.short ?? c.title).toUpperCase();
         h.title = c.title;
         h.dataset.i = String(i2);
         cols.appendChild(h);
@@ -1589,16 +1598,18 @@ function install5(ctx) {
   }
   function buildStrip() {
     const box = els.strip;
+    const heads = stripHeads(model), cells = model.columns.map((c, i) => ({ c, i })).filter(({ i }) => heads[i] === i);
     box.style.display = model.columns.length ? "" : "none";
-    box.style.gridTemplateColumns = `repeat(${Math.max(1, model.columns.length)}, minmax(0, 1fr))`;
+    box.style.gridTemplateColumns = `repeat(${Math.max(1, cells.length)}, minmax(0, 1fr))`;
     if (!box.firstChild) {
-      box.innerHTML = model.columns.map((c) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
+      box.innerHTML = cells.map(({ c }) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
     }
-    box.querySelectorAll(".lcell").forEach((cell, i) => {
-      cell.style.setProperty("--i", String(i));
+    box.querySelectorAll(".lcell").forEach((cell, cellIndex) => {
+      const i = cells[cellIndex]?.i ?? cellIndex;
+      cell.style.setProperty("--i", String(cellIndex));
       let tot = 0, good = 0, neutral = 0, gap = 0;
       for (const n of model.nodes) {
-        if (n.col !== i || n.kind === "chip") continue;
+        if (heads[n.col ?? -1] !== i || n.kind === "chip") continue;
         if (!visible(n.id)) continue;
         const w = Math.max(1, n.weight ?? 1);
         tot += w;
@@ -1817,7 +1828,7 @@ function install6(ctx) {
   const markdown = () => {
     const out = [`# ${model.meta.title}`, "", model.meta.help, "", `As of ${model.meta.asOf}. Source: ${model.meta.source}`, "", "## States"];
     for (const [id, s] of Object.entries(model.states)) out.push(`- **${s.word}** (${id}): tone ${s.tone}, border ${s.border}, link ${s.edge}, motion ${s.motion}, bucket ${s.bucket}`);
-    out.push("", "## Columns", ...model.columns.map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
+    out.push("", "## Columns", ...model.columns.filter((c) => !c.continues).map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
     out.push("", "## Lanes", ...model.lanes.map((l) => `- ${l.title}${l.badge ? ` [${l.badge}]` : ""}${l.note ? `: ${l.note}` : ""}`));
     out.push("", `## Size`, `${model.nodes.length} nodes, ${model.links.length} links.`);
     if (notes.length) out.push("", "## Notes", ...notes.map((n) => `${n.id}. **${n.title}**: ${n.text}`));
@@ -2482,6 +2493,7 @@ export {
   rules_exports as rules,
   slaState,
   stateCss,
+  stripHeads,
   suggestedExit,
   toggleGroupState,
   trace_exports as trace,

package/bundles/codex/.codex/skills/frontend/flow-studio/SKILL.md

@@ -76,7 +76,7 @@ In either route, derive node and link IDs from immutable business keys. Preserve
 
 ```
 version 1, meta {title, help, asOf, source, labels?}, layout "columns-lanes" | "free" | "auto"
-columns [{id, title, short?, width, phase?}]              stages, left to right
+columns [{id, title, short?, width, phase?, continues?}]              stages, left to right
 lanes   [{id, title, badge?, badgeTone?, note?, gap?}]    rows; gap true = dashed amber lane
 states  {id: {word, tone, border, edge, motion, bucket}}  tone: ok|warn|crit|info|muted|accent; bucket: good|neutral|gap
 nodes   [{id, kind, lane?, col?, colSpan?, row?, x?, y?, w?, h?, state, title, subtitle?, members?, weight?,

package/bundles/codex/.codex/skills/frontend/flow-studio/model.schema.json

@@ -26,7 +26,7 @@
         "type": "object", "required": ["id", "title", "width"], "additionalProperties": false,
         "properties": {
           "id": { "type": "string" }, "title": { "type": "string" }, "short": { "type": "string" },
-          "width": { "type": "number", "minimum": 60 }, "phase": { "type": "string" }
+          "width": { "type": "number", "minimum": 60 }, "phase": { "type": "string" }, "continues": { "type": "boolean" }
         }
       }
     },

package/bundles/codex/.codex/skills/frontend/flow-studio/references/model-schema.md

@@ -48,6 +48,7 @@ Columns provide vertical partitioning for time, stages, or architecture tiers.
 | `short` | `string` | Optional | - | Compact abbreviated title for tight viewports. |
 | `width` | `number` | Required | - | Column width in pixels (minimum 60). |
 | `phase` | `string` | Optional | - | Super-category phase grouping shown in top banner. |
+| `continues` | `boolean` | Optional | `false` | This column is a wrapped continuation of the column before it (for example one long list laid out in three side-by-side columns). It shows no header label and no strip cell of its own: its nodes count into the cell of the column it continues. Not allowed on the first column. |
 
 ---
 

package/bundles/codex/.codex/skills/frontend/flow-studio/src/chrome.ts

@@ -4,7 +4,7 @@
 import { el, on, type Ctx } from "./ctx.ts";
 import { esc } from "./model.ts";
 import { DASH, toneVar, cssId } from "./stateCss.ts";
-import { bucketOf, columnTitle, effectiveLinks, nodeStateId, nodeVisible } from "./rules.ts";
+import { bucketOf, columnTitle, effectiveLinks, nodeStateId, nodeVisible, stripHeads } from "./rules.ts";
 import { matches } from "./interact.ts";
 
 const DEFAULT_LABELS: Record<string, string> = {
@@ -34,16 +34,19 @@ export function install(ctx: Ctx): void {
 
   function buildStrip(): void {
     const box = els.strip;
+    // One cell per head column: a column that `continues` another counts into the cell before it.
+    const heads = stripHeads(model), cells = model.columns.map((c, i) => ({ c, i })).filter(({ i }) => heads[i] === i);
     box.style.display = model.columns.length ? "" : "none";
-    box.style.gridTemplateColumns = `repeat(${Math.max(1, model.columns.length)}, minmax(0, 1fr))`;
+    box.style.gridTemplateColumns = `repeat(${Math.max(1, cells.length)}, minmax(0, 1fr))`;
     if (!box.firstChild) {
-      box.innerHTML = model.columns.map(c => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
+      box.innerHTML = cells.map(({ c }) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
     }
-    box.querySelectorAll<HTMLElement>(".lcell").forEach((cell, i) => {
-      cell.style.setProperty("--i", String(i));
+    box.querySelectorAll<HTMLElement>(".lcell").forEach((cell, cellIndex) => {
+      const i = cells[cellIndex]?.i ?? cellIndex;
+      cell.style.setProperty("--i", String(cellIndex));
       let tot = 0, good = 0, neutral = 0, gap = 0;
       for (const n of model.nodes) {
-        if (n.col !== i || n.kind === "chip") continue;
+        if (heads[n.col ?? -1] !== i || n.kind === "chip") continue;
         if (!visible(n.id)) continue;
         const w = Math.max(1, n.weight ?? 1);
         tot += w;

package/bundles/codex/.codex/skills/frontend/flow-studio/src/controls.ts

@@ -71,7 +71,7 @@ export function install(ctx: Ctx): void {
     const cols = els.cols;
     cols.style.display = model.columns.length ? "" : "none";
     if (!cols.firstChild) {
-      model.columns.forEach((c, i) => { const h = el("div", "hd"); h.textContent = (c.short ?? c.title).toUpperCase(); h.title = c.title; h.dataset.i = String(i); cols.appendChild(h); });
+      model.columns.forEach((c, i) => { const h = el("div", "hd"); h.textContent = c.continues ? "" : (c.short ?? c.title).toUpperCase(); h.title = c.title; h.dataset.i = String(i); cols.appendChild(h); });
       let i = 0;
       while (i < model.columns.length) {
         const name = model.columns[i]?.phase;

package/bundles/codex/.codex/skills/frontend/flow-studio/src/model.test.ts

@@ -165,3 +165,11 @@ test("group containment validates ids, ownership, self-reference, and skips grou
   assert.ok(found.includes("contains-undefined"));
   assert.ok(found.includes("contains-duplicate"));
 });
+test("a column may continue the one before it", () => {
+  const m = base(); m.columns.push({ id: "c2", title: "B", width: 150, continues: true });
+  assert.deepEqual(codes(m), []);
+});
+test("the first column cannot continue a column that does not exist", () => {
+  const m = base(); m.columns[0]!.continues = true;
+  assert.ok(codes(m).includes("column-continues-first"));
+});

package/bundles/codex/.codex/skills/frontend/flow-studio/src/model.ts

@@ -16,7 +16,7 @@ export interface StateDef {
   motion: Motion;
   bucket: Bucket;
 }
-export interface ColumnDef { id: string; title: string; short?: string; width: number; phase?: string }
+export interface ColumnDef { id: string; title: string; short?: string; width: number; phase?: string; continues?: boolean }
 export interface LaneDef { id: string; title: string; badge?: string; badgeTone?: "ok" | "warn" | "muted"; note?: string; gap?: boolean }
 export interface NodeDef {
   id: string;
@@ -111,6 +111,7 @@ export function validateModel(input: unknown): Issue[] {
   if (!Array.isArray(m.lanes) || (m.layout !== "auto" && m.lanes.length === 0)) add("error", "lanes-missing", "lanes", "At least one lane is required.");
   if (!m.states || typeof m.states !== "object" || Object.keys(m.states).length === 0) add("error", "states-missing", "states", "At least one state is required.");
   const columns = Array.isArray(m.columns) ? m.columns : [];
+  if (columns[0]?.continues) add("error", "column-continues-first", "columns[0]", "The first column cannot continue a column before it.");
   const lanes = Array.isArray(m.lanes) ? m.lanes : [];
   const states = m.states && typeof m.states === "object" ? m.states : {};
   if (!m.meta || typeof m.meta !== "object" || typeof m.meta.title !== "string") add("error", "meta-missing", "meta", "meta with a title is required.");

package/bundles/codex/.codex/skills/frontend/flow-studio/src/notes.ts

@@ -70,7 +70,7 @@ export function install(ctx: Ctx): void {
   const markdown = (): string => {
     const out = [`# ${model.meta.title}`, "", model.meta.help, "", `As of ${model.meta.asOf}. Source: ${model.meta.source}`, "", "## States"];
     for (const [id, s] of Object.entries(model.states)) out.push(`- **${s.word}** (${id}): tone ${s.tone}, border ${s.border}, link ${s.edge}, motion ${s.motion}, bucket ${s.bucket}`);
-    out.push("", "## Columns", ...model.columns.map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
+    out.push("", "## Columns", ...model.columns.filter(c => !c.continues).map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
     out.push("", "## Lanes", ...model.lanes.map(l => `- ${l.title}${l.badge ? ` [${l.badge}]` : ""}${l.note ? `: ${l.note}` : ""}`));
     out.push("", `## Size`, `${model.nodes.length} nodes, ${model.links.length} links.`);
     if (notes.length) out.push("", "## Notes", ...notes.map(n => `${n.id}. **${n.title}**: ${n.text}`));

package/bundles/codex/.codex/skills/frontend/flow-studio/src/rules.test.ts

@@ -1,7 +1,7 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import type { Model } from "./model.ts";
-import { baselineView, defaultView, nodeVisible, nodeStateId, linkVisible, linkStateId, isNew, isImproved, bucketOf, canonOf, effectiveLinks, initialCollapsed, columnTitle, toggleGroupState } from "./rules.ts";
+import { baselineView, defaultView, nodeVisible, nodeStateId, linkVisible, linkStateId, isNew, isImproved, bucketOf, canonOf, effectiveLinks, initialCollapsed, columnTitle, toggleGroupState, stripHeads } from "./rules.ts";
 
 const m = (): Model => ({
   version: 1,
@@ -133,3 +133,12 @@ test("toggleGroup selects a visible child on expansion and its group on collapse
   assert.equal(folded.collapsed.has("group"), true);
   assert.equal(toggleGroupState(mm, "full", starting, "missing"), null);
 });
+
+test("stripHeads: a continuing column joins the one before it", () => {
+  const mm = m();
+  mm.columns = [{ id: "a", title: "A", width: 100 }, { id: "p", title: "P", width: 100 }, { id: "p2", title: "P", width: 100, continues: true }, { id: "p3", title: "P", width: 100, continues: true }, { id: "z", title: "Z", width: 100 }];
+  assert.deepEqual(stripHeads(mm), [0, 1, 1, 1, 4]);
+});
+test("stripHeads: with no continuing column every column is its own head", () => {
+  assert.deepEqual(stripHeads(m()), [0, 1]);
+});

package/bundles/codex/.codex/skills/frontend/flow-studio/src/rules.ts

@@ -10,6 +10,12 @@ export const defaultView = (m: Model): string => (m.views?.find(v => v.default)
 /** A group that contains nodes starts folded unless it explicitly opts out. */
 export const initialCollapsed = (m: Model): Set<string> => new Set(m.nodes
   .filter(n => n.kind === "group" && n.contains && n.collapsed !== false).map(n => n.id));
+/** For each column, the index of the column whose header and strip cell it shares: itself, or (when it
+ *  `continues` another) the nearest earlier column that does not. */
+export const stripHeads = (m: Model): number[] => {
+  let head = 0;
+  return m.columns.map((c, i) => { if (!c.continues || i === 0) head = i; return head; });
+};
 export const columnTitle = (m: Model, n: NodeDef): string => n.col === undefined ? "" : m.columns[n.col]?.title ?? "";
 
 export function groupFor(m: Model, nodeId: string): NodeDef | undefined {

package/bundles/codex/.codex/skills/frontend/flow-studio/templates/engine.html

@@ -286,6 +286,7 @@
     if (!Array.isArray(m.lanes) || m.layout !== "auto" && m.lanes.length === 0) add("error", "lanes-missing", "lanes", "At least one lane is required.");
     if (!m.states || typeof m.states !== "object" || Object.keys(m.states).length === 0) add("error", "states-missing", "states", "At least one state is required.");
     const columns = Array.isArray(m.columns) ? m.columns : [];
+    if (columns[0]?.continues) add("error", "column-continues-first", "columns[0]", "The first column cannot continue a column before it.");
     const lanes = Array.isArray(m.lanes) ? m.lanes : [];
     const states = m.states && typeof m.states === "object" ? m.states : {};
     if (!m.meta || typeof m.meta !== "object" || typeof m.meta.title !== "string") add("error", "meta-missing", "meta", "meta with a title is required.");
@@ -591,6 +592,13 @@
   var baselineView = (m) => m.views?.[0]?.id ?? "all";
   var defaultView = (m) => (m.views?.find((v) => v.default) ?? m.views?.[0])?.id ?? "all";
   var initialCollapsed = (m) => new Set(m.nodes.filter((n) => n.kind === "group" && n.contains && n.collapsed !== false).map((n) => n.id));
+  var stripHeads = (m) => {
+    let head = 0;
+    return m.columns.map((c, i) => {
+      if (!c.continues || i === 0) head = i;
+      return head;
+    });
+  };
   var columnTitle = (m, n) => n.col === void 0 ? "" : m.columns[n.col]?.title ?? "";
   function groupFor(m, nodeId) {
     return m.nodes.find((n) => n.kind === "group" && n.contains?.includes(nodeId));
@@ -1415,7 +1423,7 @@
       if (!cols.firstChild) {
         model.columns.forEach((c, i2) => {
           const h = el("div", "hd");
-          h.textContent = (c.short ?? c.title).toUpperCase();
+          h.textContent = c.continues ? "" : (c.short ?? c.title).toUpperCase();
           h.title = c.title;
           h.dataset.i = String(i2);
           cols.appendChild(h);
@@ -1801,16 +1809,18 @@
     }
     function buildStrip() {
       const box = els.strip;
+      const heads = stripHeads(model), cells = model.columns.map((c, i) => ({ c, i })).filter(({ i }) => heads[i] === i);
       box.style.display = model.columns.length ? "" : "none";
-      box.style.gridTemplateColumns = `repeat(${Math.max(1, model.columns.length)}, minmax(0, 1fr))`;
+      box.style.gridTemplateColumns = `repeat(${Math.max(1, cells.length)}, minmax(0, 1fr))`;
       if (!box.firstChild) {
-        box.innerHTML = model.columns.map((c) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
+        box.innerHTML = cells.map(({ c }) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
       }
-      box.querySelectorAll(".lcell").forEach((cell, i) => {
-        cell.style.setProperty("--i", String(i));
+      box.querySelectorAll(".lcell").forEach((cell, cellIndex) => {
+        const i = cells[cellIndex]?.i ?? cellIndex;
+        cell.style.setProperty("--i", String(cellIndex));
         let tot = 0, good = 0, neutral = 0, gap = 0;
         for (const n of model.nodes) {
-          if (n.col !== i || n.kind === "chip") continue;
+          if (heads[n.col ?? -1] !== i || n.kind === "chip") continue;
           if (!visible(n.id)) continue;
           const w = Math.max(1, n.weight ?? 1);
           tot += w;
@@ -2029,7 +2039,7 @@
     const markdown = () => {
       const out = [`# ${model.meta.title}`, "", model.meta.help, "", `As of ${model.meta.asOf}. Source: ${model.meta.source}`, "", "## States"];
       for (const [id, s] of Object.entries(model.states)) out.push(`- **${s.word}** (${id}): tone ${s.tone}, border ${s.border}, link ${s.edge}, motion ${s.motion}, bucket ${s.bucket}`);
-      out.push("", "## Columns", ...model.columns.map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
+      out.push("", "## Columns", ...model.columns.filter((c) => !c.continues).map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
       out.push("", "## Lanes", ...model.lanes.map((l) => `- ${l.title}${l.badge ? ` [${l.badge}]` : ""}${l.note ? `: ${l.note}` : ""}`));
       out.push("", `## Size`, `${model.nodes.length} nodes, ${model.links.length} links.`);
       if (notes.length) out.push("", "## Notes", ...notes.map((n) => `${n.id}. **${n.title}**: ${n.text}`));

package/bundles/codex/.codex/skills/frontend/flow-studio/templates/flow-studio.lib.mjs

@@ -29,6 +29,7 @@ function validateModel(input) {
   if (!Array.isArray(m.lanes) || m.layout !== "auto" && m.lanes.length === 0) add("error", "lanes-missing", "lanes", "At least one lane is required.");
   if (!m.states || typeof m.states !== "object" || Object.keys(m.states).length === 0) add("error", "states-missing", "states", "At least one state is required.");
   const columns = Array.isArray(m.columns) ? m.columns : [];
+  if (columns[0]?.continues) add("error", "column-continues-first", "columns[0]", "The first column cannot continue a column before it.");
   const lanes = Array.isArray(m.lanes) ? m.lanes : [];
   const states = m.states && typeof m.states === "object" ? m.states : {};
   if (!m.meta || typeof m.meta !== "object" || typeof m.meta.title !== "string") add("error", "meta-missing", "meta", "meta with a title is required.");
@@ -347,11 +348,19 @@ __export(rules_exports, {
   linkVisible: () => linkVisible,
   nodeStateId: () => nodeStateId,
   nodeVisible: () => nodeVisible,
+  stripHeads: () => stripHeads,
   toggleGroupState: () => toggleGroupState
 });
 var baselineView = (m) => m.views?.[0]?.id ?? "all";
 var defaultView = (m) => (m.views?.find((v) => v.default) ?? m.views?.[0])?.id ?? "all";
 var initialCollapsed = (m) => new Set(m.nodes.filter((n) => n.kind === "group" && n.contains && n.collapsed !== false).map((n) => n.id));
+var stripHeads = (m) => {
+  let head = 0;
+  return m.columns.map((c, i) => {
+    if (!c.continues || i === 0) head = i;
+    return head;
+  });
+};
 var columnTitle = (m, n) => n.col === void 0 ? "" : m.columns[n.col]?.title ?? "";
 function groupFor(m, nodeId) {
   return m.nodes.find((n) => n.kind === "group" && n.contains?.includes(nodeId));
@@ -1203,7 +1212,7 @@ function install3(ctx) {
     if (!cols.firstChild) {
       model.columns.forEach((c, i2) => {
         const h = el("div", "hd");
-        h.textContent = (c.short ?? c.title).toUpperCase();
+        h.textContent = c.continues ? "" : (c.short ?? c.title).toUpperCase();
         h.title = c.title;
         h.dataset.i = String(i2);
         cols.appendChild(h);
@@ -1589,16 +1598,18 @@ function install5(ctx) {
   }
   function buildStrip() {
     const box = els.strip;
+    const heads = stripHeads(model), cells = model.columns.map((c, i) => ({ c, i })).filter(({ i }) => heads[i] === i);
     box.style.display = model.columns.length ? "" : "none";
-    box.style.gridTemplateColumns = `repeat(${Math.max(1, model.columns.length)}, minmax(0, 1fr))`;
+    box.style.gridTemplateColumns = `repeat(${Math.max(1, cells.length)}, minmax(0, 1fr))`;
     if (!box.firstChild) {
-      box.innerHTML = model.columns.map((c) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
+      box.innerHTML = cells.map(({ c }) => `<div class="lcell"><div class="ln">${esc(c.title)}</div><div class="lb"><i class="good"></i><i class="neutral"></i><i class="gap"></i></div><div class="lv"></div></div>`).join("");
     }
-    box.querySelectorAll(".lcell").forEach((cell, i) => {
-      cell.style.setProperty("--i", String(i));
+    box.querySelectorAll(".lcell").forEach((cell, cellIndex) => {
+      const i = cells[cellIndex]?.i ?? cellIndex;
+      cell.style.setProperty("--i", String(cellIndex));
       let tot = 0, good = 0, neutral = 0, gap = 0;
       for (const n of model.nodes) {
-        if (n.col !== i || n.kind === "chip") continue;
+        if (heads[n.col ?? -1] !== i || n.kind === "chip") continue;
         if (!visible(n.id)) continue;
         const w = Math.max(1, n.weight ?? 1);
         tot += w;
@@ -1817,7 +1828,7 @@ function install6(ctx) {
   const markdown = () => {
     const out = [`# ${model.meta.title}`, "", model.meta.help, "", `As of ${model.meta.asOf}. Source: ${model.meta.source}`, "", "## States"];
     for (const [id, s] of Object.entries(model.states)) out.push(`- **${s.word}** (${id}): tone ${s.tone}, border ${s.border}, link ${s.edge}, motion ${s.motion}, bucket ${s.bucket}`);
-    out.push("", "## Columns", ...model.columns.map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
+    out.push("", "## Columns", ...model.columns.filter((c) => !c.continues).map((c, i) => `${i + 1}. ${c.title}${c.phase ? ` (${c.phase})` : ""}`));
     out.push("", "## Lanes", ...model.lanes.map((l) => `- ${l.title}${l.badge ? ` [${l.badge}]` : ""}${l.note ? `: ${l.note}` : ""}`));
     out.push("", `## Size`, `${model.nodes.length} nodes, ${model.links.length} links.`);
     if (notes.length) out.push("", "## Notes", ...notes.map((n) => `${n.id}. **${n.title}**: ${n.text}`));
@@ -2482,6 +2493,7 @@ export {
   rules_exports as rules,
   slaState,
   stateCss,
+  stripHeads,
   suggestedExit,
   toggleGroupState,
   trace_exports as trace,

package/bundles/manifest.json

@@ -1,7 +1,7 @@
 {
-  "poolVersion": "1.3.133",
+  "poolVersion": "1.3.134",
   "bundles": {
-    "antigravity-plugin": "1.3.133",
+    "antigravity-plugin": "1.3.134",
     "antigravity-plugin-extras": "1.3.41",
     "codex": "unknown"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caddis/cli",
-  "version": "0.4.47",
+  "version": "0.4.48",
   "description": "Install, update and diagnose the caddis dev harness across every coding agent you use (Claude Code, agy/Antigravity, and more).",
   "keywords": [
     "caddis",