@transitrix/diagrams 1.6.0 → 1.7.6

package/src/goals/__tests__/GoalTreeView.test.tsx

@@ -297,6 +297,54 @@ describe('GoalTreeView', () => {
     });
   });
 
+  it('fires onFactorClick with the clicked factor when a popover item is clicked', async () => {
+    const onFactorClick = vi.fn();
+    render(<GoalTreeView tree={makeTree()} onFactorClick={onFactorClick} />);
+    await waitFor(() => {
+      expect(screen.getByText('Cut churn')).toBeTruthy();
+    });
+
+    // Open the negative-factor panel on "Cut churn" (id=3, has risk factor "Support backlog")
+    const negativeBadge = screen.getByLabelText('1 negative factor');
+    negativeBadge.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+
+    // The popover item for the risk factor should now be in the DOM
+    const factorItem = await waitFor(() => screen.getByText('Support backlog'));
+    factorItem.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+
+    await waitFor(() => expect(onFactorClick).toHaveBeenCalledTimes(1));
+    expect(onFactorClick.mock.calls[0][0]).toMatchObject({ id: 10, name: 'Support backlog', impact_type: 'risk' });
+  });
+
+  it('backlog panel is collapsible — toggle hides and restores content', async () => {
+    const tree: GoalTree = {
+      goal_types: [
+        { name: 'Strategy', level: 0 },
+        { name: 'Business Goal', level: 1 },
+      ],
+      goals: [
+        { id: 1, name: 'Root goal', type: 'Strategy', level: 0, parent_id: 0 },
+        { id: 2, name: 'Orphaned goal', type: 'Business Goal', level: 1, parent_id: 999 },
+      ],
+    };
+    render(<GoalTreeView tree={tree} showBacklog />);
+    await waitFor(() => {
+      expect(screen.getByText('Backlog')).toBeTruthy();
+    });
+
+    // Collapse
+    screen.getByLabelText('Collapse backlog').dispatchEvent(new MouseEvent('click', { bubbles: true }));
+    await waitFor(() => {
+      expect(screen.queryByText('Backlog')).toBeNull();
+    });
+
+    // Expand again
+    screen.getByLabelText('Expand backlog').dispatchEvent(new MouseEvent('click', { bubbles: true }));
+    await waitFor(() => {
+      expect(screen.getByText('Backlog')).toBeTruthy();
+    });
+  });
+
   it('fires onEditRequest on double-click', async () => {
     const onEditRequest = vi.fn();
     render(<GoalTreeView tree={makeTree()} onEditRequest={onEditRequest} />);

package/src/goals/__tests__/mutations.test.ts

@@ -109,3 +109,45 @@ describe('restoreFromBacklog', () => {
     expect(r.result!.goals.find(g => g.id === 3)!.parent_id).toBe(1);
   });
 });
+
+describe('reparent — descendant type relabeling and level cap', () => {
+  const DEEP: GoalTree = {
+    goal_types: [
+      { name: 'Strategy', level: 0 },
+      { name: 'Business Goal', level: 1 },
+      { name: 'Project', level: 2 },
+      { name: 'Task', level: 3 },
+    ],
+    goals: [
+      { id: 1, name: 'Root', type: 'Strategy', level: 0, parent_id: 0 },
+      { id: 2, name: 'BG1', type: 'Business Goal', level: 1, parent_id: 1 },
+      { id: 3, name: 'Proj1', type: 'Project', level: 2, parent_id: 2 },
+      { id: 4, name: 'Task1', type: 'Task', level: 3, parent_id: 3 },
+    ],
+  };
+
+  it('relabels descendant types via getTypeForLevel when reparenting shifts levels', () => {
+    // Move Proj1 (id=3, level=2) directly under Root (id=1, level=0); delta = -1
+    // Task1 (child of Proj1, level=3): new level = 2, type should be 'Project'
+    const r = reparent(DEEP, 3, 1);
+    expect(r.ok).toBe(true);
+    const proj = r.result!.goals.find(g => g.id === 3)!;
+    const task = r.result!.goals.find(g => g.id === 4)!;
+    expect(proj.level).toBe(1);
+    expect(proj.type).toBe('Business Goal');
+    expect(task.level).toBe(2);
+    expect(task.type).toBe('Project');
+  });
+
+  it('caps descendant level at maxLevel and refuses when that violates GOALS-012', () => {
+    // Move Root (id=1, level=0) under Root2 (id=5, level=0); delta = +1
+    // BG1: 1→2, Proj1: 2→3 (maxLevel), Task1: 3→4, capped at 3
+    // Task1 (capped level=3) under Proj1 (level=3) violates GOALS-012 → refused
+    const tree: GoalTree = {
+      ...DEEP,
+      goals: [...DEEP.goals, { id: 5, name: 'Root2', type: 'Strategy', level: 0, parent_id: 0 }],
+    };
+    const r = reparent(tree, 1, 5);
+    expect(r.ok).toBe(false);
+  });
+});

package/src/goals/__tests__/parse-canonical.test.ts

@@ -122,8 +122,10 @@ describe('parseCanonicalGoals', () => {
   it('maps canonical IDs to internal numeric ids; parent_id is the parent\'s mapped id', () => {
     const r = parseCanonicalGoals(VALID);
     expect(r.parsed?.goals[0].id).toBe(1);
+    expect(r.parsed?.goals[0].canonical_id).toBe('GOAL-1');
     expect(r.parsed?.goals[0].parent_id).toBe(0);
     expect(r.parsed?.goals[1].id).toBe(2);
+    expect(r.parsed?.goals[1].canonical_id).toBe('GOAL-2');
     expect(r.parsed?.goals[1].parent_id).toBe(1);
   });
 });

package/src/goals/layout.ts

@@ -1,5 +1,6 @@
 import type { Goal, GoalTree, LayoutOptions, GoalTreeLayout, LaidOutNode, LaidOutEdge } from './types.js';
 import type { Scope } from '../scope.js';
+import { displayGoalId } from './parse-canonical.js';
 
 const DEFAULT_NODE_WIDTH = 250;
 const DEFAULT_NODE_HEIGHT = 80;
@@ -23,7 +24,7 @@ export function selectScopedGoals(goals: Goal[], scope: Scope): Goal[] {
     if (!children.has(g.parent_id)) children.set(g.parent_id, []);
     children.get(g.parent_id)!.push(g.id);
   }
-  const root = goals.find(g => String(g.id) === scope.rootGoalId);
+  const root = goals.find(g => displayGoalId(g) === scope.rootGoalId);
   if (!root) return [];
   const keep = new Set<number>();
   const stack = [root.id];

package/src/goals/mutations.ts

@@ -22,12 +22,12 @@ function getTypeForLevel(tree: GoalTree, level: number): string {
   return gt?.name ?? '';
 }
 
-function updateDescendantLevels(goals: Goal[], id: number, levelDelta: number): void {
-  for (const g of goals) {
+function updateDescendantLevels(clone: GoalTree, id: number, levelDelta: number, maxLevel: number): void {
+  for (const g of clone.goals) {
     if (g.parent_id === id) {
-      g.level += levelDelta;
-      g.type = '';
-      updateDescendantLevels(goals, g.id, levelDelta);
+      g.level = Math.min(g.level + levelDelta, maxLevel);
+      g.type = getTypeForLevel(clone, g.level);
+      updateDescendantLevels(clone, g.id, levelDelta, maxLevel);
     }
   }
 }
@@ -70,7 +70,7 @@ export function reparent(tree: GoalTree, sourceId: number, targetId: number): Mu
   source.parent_id = targetId;
   source.level = newLevel;
   source.type = getTypeForLevel(clone, newLevel);
-  if (levelDelta !== 0) updateDescendantLevels(clone.goals, sourceId, levelDelta);
+  if (levelDelta !== 0) updateDescendantLevels(clone, sourceId, levelDelta, maxLevel);
 
   const v = validateGoalTree(clone);
   if (!v.valid) return refusalError(v.errors[0]?.message ?? 'Validation failed after reparent');

package/src/goals/parse-canonical.ts

@@ -36,6 +36,11 @@ export interface CanonicalGoalsResult extends ValidationResult {
 const GOAL_ID_RE = /^GOAL(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
 const GOALS_DOC_ID_RE = /^GOALS(-[A-Z0-9][A-Z0-9_]*)*-\d+$/;
 
+/** Display id for previews — canonical `GOAL-…` when present, else internal numeric id. */
+export function displayGoalId(goal: { id: number; canonical_id?: string }): string {
+  return goal.canonical_id ?? String(goal.id);
+}
+
 function isNonEmptyString(v: unknown): v is string {
   return typeof v === 'string' && v.trim().length > 0;
 }
@@ -267,6 +272,7 @@ export function parseCanonicalGoals(input: unknown): CanonicalGoalsResult {
       isNonEmptyString(parent) && idToInternal.has(parent) ? idToInternal.get(parent)! : 0;
     return {
       id: idToInternal.get(o['id'] as string)!,
+      canonical_id: o['id'] as string,
       name: o['name'] as string,
       type: o['type'] as string,
       level: o['level'] as number,

package/src/goals/types.ts

@@ -10,6 +10,8 @@ export interface Factor {
 
 export interface Goal {
   id: number;
+  /** Canonical typed id from the YAML (`GOAL-…`) when parsed from canonical form. */
+  canonical_id?: string;
   name: string;
   type: string;
   level: number;

package/src/repo-validate/types.ts

@@ -4,9 +4,8 @@
 // referential integrity, atomicity, ID uniqueness, policy — the checks that the
 // methodology's Python `.validators/lint.py` owns today. This converges those
 // checks onto the shared TypeScript model so there is a single validation
-// runtime (methodology ADR
-// `2026-06-11-validation-two-axis-model.md`; Studio referencing ADR
-// `docs/decisions/2026-06-11-validation-runtime-convergence.md`).
+// runtime (methodology ADR "Validation Two-Axis Model"; Studio decision
+// "Validation Runtime Convergence").
 //
 // The finding shape is deliberately minimal — `{ scope, id, message }`. The
 // richer `target` / `category` reporting taxonomy is explicitly DEFERRED per the

package/src/webview/__tests__/render-goals.test.ts

@@ -65,8 +65,22 @@ describe('renderGoalsSvg', () => {
     expect(svg).toContain('height="0"');
   });
 
-  it('omits the title block when treeName is missing', () => {
-    const svg = renderGoalsSvg(SIMPLE_TREE);
-    expect(svg).not.toContain('Goal tree —');
+  it('shows canonical goal ids in node labels when present', () => {
+    const tree: GoalTree = {
+      goal_types: [{ name: 'Strategy', level: 0 }],
+      goals: [
+        {
+          id: 1,
+          canonical_id: 'GOAL-REVENUE-1',
+          name: 'Triple revenue',
+          type: 'Strategy',
+          level: 0,
+          parent_id: 0,
+        },
+      ],
+    };
+    const svg = renderGoalsSvg(tree);
+    expect(svg).toContain('GOAL-REVENUE-1');
+    expect(svg).not.toMatch(/>\s*1\s*</);
   });
 });

package/src/webview/render-goals.ts

@@ -12,6 +12,7 @@
  */
 import { layoutGoalTree } from '../goals/layout.js';
 import type { GoalTree, GoalTreeLayout, LaidOutEdge } from '../goals/types.js';
+import { displayGoalId } from '../goals/parse-canonical.js';
 import { horizontalCubicEdgePath, DEFAULT_EDGE_CURVATURE } from '../edge-path.js';
 import { generateSvgEmbedCss, type ThemeId } from '../theme/index.js';
 import { escXml } from './render-util.js';
@@ -129,7 +130,7 @@ export function renderGoalsLayoutSvg(layout: GoalTreeLayout, options: RenderGoal
       const typeY = twoLines ? y + 43 : y + 35;
       const idY = twoLines ? y + 59 : y + 55;
       const typeLabel = n.data.type ?? '';
-      const idText = String(n.data.id);
+      const idText = displayGoalId(n.data);
       return `<g>
   <rect class="diagram-node level-${level}" x="${x}" y="${y}" width="${n.width}" height="${n.height}" rx="${ENTITY_NODE_RX}"/>
   <text class="text-primary" x="${x + n.width / 2}" y="${nameY1}" text-anchor="middle" dominant-baseline="central">${escXml(line1)}</text>${twoLines ? `