pmx-canvas 0.4.8 → 0.5.1

package/src/server/canvas-db.ts

@@ -65,7 +65,6 @@ const SCHEMA_SQL = `
     z_index INTEGER NOT NULL DEFAULT 0,
     collapsed INTEGER NOT NULL DEFAULT 0,
     pinned INTEGER NOT NULL DEFAULT 0,
-    dock_position TEXT,
     data TEXT NOT NULL
   );
 
@@ -119,7 +118,6 @@ const SCHEMA_SQL = `
     z_index INTEGER NOT NULL DEFAULT 0,
     collapsed INTEGER NOT NULL DEFAULT 0,
     pinned INTEGER NOT NULL DEFAULT 0,
-    dock_position TEXT,
     data TEXT NOT NULL,
     PRIMARY KEY (snapshot_id, id)
   );
@@ -209,6 +207,13 @@ const SCHEMA_SQL = `
   );
   CREATE INDEX IF NOT EXISTS idx_ax_steering_seq ON ax_steering (seq);
 
+  CREATE TABLE IF NOT EXISTS ax_steering_deliveries (
+    steering_id TEXT NOT NULL,
+    consumer TEXT NOT NULL,
+    at TEXT NOT NULL,
+    PRIMARY KEY (steering_id, consumer)
+  );
+
   CREATE TABLE IF NOT EXISTS ax_host_capabilities (
     host TEXT PRIMARY KEY,
     reported_at TEXT NOT NULL,
@@ -397,18 +402,17 @@ export function saveStateToDB(db: Database, state: PersistedCanvasState): void {
 
     // Save nodes
     const upsertNode = db.prepare(
-      `INSERT INTO nodes (id, type, pos_x, pos_y, width, height, z_index, collapsed, pinned, dock_position, data)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `INSERT INTO nodes (id, type, pos_x, pos_y, width, height, z_index, collapsed, pinned, data)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(id) DO UPDATE SET
          type = excluded.type, pos_x = excluded.pos_x, pos_y = excluded.pos_y,
          width = excluded.width, height = excluded.height, z_index = excluded.z_index,
-         collapsed = excluded.collapsed, pinned = excluded.pinned,
-         dock_position = excluded.dock_position, data = excluded.data
+         collapsed = excluded.collapsed, pinned = excluded.pinned, data = excluded.data
        WHERE type IS NOT excluded.type OR pos_x IS NOT excluded.pos_x
           OR pos_y IS NOT excluded.pos_y OR width IS NOT excluded.width
           OR height IS NOT excluded.height OR z_index IS NOT excluded.z_index
           OR collapsed IS NOT excluded.collapsed OR pinned IS NOT excluded.pinned
-          OR dock_position IS NOT excluded.dock_position OR data IS NOT excluded.data`,
+          OR data IS NOT excluded.data`,
     );
     for (const node of state.nodes) {
       upsertNode.run(
@@ -421,7 +425,6 @@ export function saveStateToDB(db: Database, state: PersistedCanvasState): void {
         node.zIndex,
         node.collapsed ? 1 : 0,
         node.pinned ? 1 : 0,
-        node.dockPosition,
         JSON.stringify(node.data),
       );
     }
@@ -535,7 +538,6 @@ export function loadStateFromDB(db: Database): PersistedCanvasState | null {
     z_index: number;
     collapsed: number;
     pinned: number;
-    dock_position: string | null;
     data: string;
   }
   const nodeRows = db.query<NodeRow, []>('SELECT * FROM nodes').all();
@@ -547,7 +549,6 @@ export function loadStateFromDB(db: Database): PersistedCanvasState | null {
     zIndex: row.z_index,
     collapsed: row.collapsed === 1,
     pinned: row.pinned === 1,
-    dockPosition: row.dock_position as CanvasNodeState['dockPosition'],
     data: JSON.parse(row.data) as Record<string, unknown>,
   }));
 
@@ -655,8 +656,8 @@ export function saveSnapshotToDB(db: Database, snapshot: CanvasSnapshot, state:
 
     // Insert snapshot nodes
     const insertNode = db.prepare(
-      `INSERT INTO snapshot_nodes (snapshot_id, id, type, pos_x, pos_y, width, height, z_index, collapsed, pinned, dock_position, data)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      `INSERT INTO snapshot_nodes (snapshot_id, id, type, pos_x, pos_y, width, height, z_index, collapsed, pinned, data)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
     );
     for (const node of state.nodes) {
       insertNode.run(
@@ -670,7 +671,6 @@ export function saveSnapshotToDB(db: Database, snapshot: CanvasSnapshot, state:
         node.zIndex,
         node.collapsed ? 1 : 0,
         node.pinned ? 1 : 0,
-        node.dockPosition,
         JSON.stringify(node.data),
       );
     }
@@ -780,7 +780,6 @@ export function loadSnapshotFromDB(
     z_index: number;
     collapsed: number;
     pinned: number;
-    dock_position: string | null;
     data: string;
   }
   const nodeRows = db
@@ -794,7 +793,6 @@ export function loadSnapshotFromDB(
     zIndex: row.z_index,
     collapsed: row.collapsed === 1,
     pinned: row.pinned === 1,
-    dockPosition: row.dock_position as CanvasNodeState['dockPosition'],
     data: JSON.parse(row.data) as Record<string, unknown>,
   }));
 
@@ -918,6 +916,10 @@ export function listSnapshotsFromDB(db: Database, options: CanvasSnapshotListOpt
   }));
 }
 
+export function renameSnapshotInDB(db: Database, id: string, name: string): boolean {
+  return db.run('UPDATE snapshots SET name = ? WHERE id = ?', [name, id]).changes > 0;
+}
+
 export function deleteSnapshotFromDB(db: Database, id: string): boolean {
   const transaction = db.transaction(() => {
     db.run('DELETE FROM snapshot_nodes WHERE snapshot_id = ?', [id]);
@@ -979,6 +981,9 @@ function trimAxTable(db: Database, table: 'ax_events' | 'ax_evidence' | 'ax_stee
   db.run(`DELETE FROM ${table} WHERE seq <= (SELECT seq FROM ${table} ORDER BY seq DESC LIMIT 1 OFFSET ?)`, [
     AX_TIMELINE_RETENTION,
   ]);
+  if (table === 'ax_steering') {
+    db.run('DELETE FROM ax_steering_deliveries WHERE steering_id NOT IN (SELECT id FROM ax_steering)');
+  }
 }
 
 function readLastSeq(db: Database, table: 'ax_events' | 'ax_evidence' | 'ax_steering'): number {
@@ -1036,10 +1041,28 @@ export function appendAxSteeringToDB(db: Database, s: Omit<PmxAxSteeringMessage,
   return { ...s, seq };
 }
 
-export function markAxSteeringDeliveredInDB(db: Database, id: string): boolean {
-  // Compare-and-set: true ONLY on the undelivered→delivered transition. Two
-  // adapters racing the same steer see exactly one true — the loser (and any
-  // re-mark) gets false and must not treat the message as its own delivery.
+export function markAxSteeringDeliveredInDB(db: Database, id: string, consumer?: string | null): boolean {
+  // ADDRESSED steer (target set): global compare-and-set as before — one
+  // legitimate recipient, true only on the undelivered→delivered transition.
+  // BROADCAST + consumer: per-consumer delivery ("all workers: stop" must
+  // reach every worker) — the mark records THIS consumer's pickup and the
+  // message stays pending for everyone else; true iff this consumer had not
+  // marked it before. BROADCAST without a consumer: the legacy anonymous ack
+  // (global CAS) that hides it from all consumers.
+  const row = db.query<{ target: string | null }, [string]>('SELECT target FROM ax_steering WHERE id = ?').get(id);
+  if (!row) return false;
+  // An addressed steer belongs to its target. A different named consumer marking
+  // it delivered would silently swallow the human's instruction (the target then
+  // never sees it). A consumer-less mark is still the single legitimate host ack.
+  if (row.target !== null && consumer && consumer !== row.target) return false;
+  if (row.target === null && consumer) {
+    const r = db.run('INSERT OR IGNORE INTO ax_steering_deliveries (steering_id, consumer, at) VALUES (?, ?, ?)', [
+      id,
+      consumer,
+      new Date().toISOString(),
+    ]);
+    return r.changes > 0;
+  }
   const r = db.run('UPDATE ax_steering SET delivered = 1 WHERE id = ? AND delivered = 0', [id]);
   return r.changes > 0;
 }
@@ -1112,6 +1135,18 @@ interface AxSteeringRow {
   target: string | null;
 }
 
+/**
+ * Broadcasts age out of PENDING (they stay on the timeline): per-consumer
+ * delivery otherwise means every broadcast greets every FUTURE consumer key
+ * forever — a brand-new pump inherited two-day-old "all workers" calls.
+ * Addressed steers never expire here; they wait for their named consumer.
+ */
+export const BROADCAST_PENDING_TTL_MS = 15 * 60_000;
+
+function broadcastCutoffIso(): string {
+  return new Date(Date.now() - BROADCAST_PENDING_TTL_MS).toISOString();
+}
+
 function mapAxSteeringRow(r: AxSteeringRow): PmxAxSteeringMessage | null {
   return normalizeAxSteeringMessage({
     ...r,
@@ -1129,7 +1164,27 @@ export function loadAxSteeringFromDB(
     ? 'SELECT * FROM ax_steering WHERE delivered = 0 ORDER BY seq DESC LIMIT ?'
     : 'SELECT * FROM ax_steering ORDER BY seq DESC LIMIT ?';
   const rows = db.query<AxSteeringRow, [number]>(sql).all(clampTimelineLimit(q.limit));
-  return rows.map(mapAxSteeringRow).filter((s): s is PmxAxSteeringMessage => s !== null);
+  const deliveredTo = new Map<string, string[]>();
+  for (const row of db
+    .query<{ steering_id: string; consumer: string }, []>('SELECT steering_id, consumer FROM ax_steering_deliveries')
+    .all()) {
+    if (!deliveredTo.has(row.steering_id)) deliveredTo.set(row.steering_id, []);
+    deliveredTo.get(row.steering_id)!.push(row.consumer);
+  }
+  return rows
+    .map((row) => {
+      const mapped = mapAxSteeringRow(row);
+      if (!mapped) return null;
+      const pickups = deliveredTo.get(mapped.id) ?? [];
+      // A broadcast reads as delivered once ANY consumer picked it up; the
+      // per-consumer list is exposed for fleet UIs ("picked up by 3").
+      return {
+        ...mapped,
+        delivered: mapped.delivered || pickups.length > 0,
+        ...(pickups.length > 0 ? { deliveredTo: pickups } : {}),
+      };
+    })
+    .filter((s): s is PmxAxSteeringMessage => s !== null);
 }
 
 export function loadPendingAxSteeringFromDB(
@@ -1142,13 +1197,20 @@ export function loadPendingAxSteeringFromDB(
   const limit = clampTimelineLimit(options.limit);
   const rows = options.consumer
     ? db
-        .query<AxSteeringRow, [string, string, string, number]>(
-          'SELECT * FROM ax_steering WHERE delivered = 0 AND (source IS NULL OR source != ?) AND (agent_id IS NULL OR agent_id != ?) AND (target IS NULL OR target = ?) ORDER BY seq ASC LIMIT ?',
+        .query<AxSteeringRow, [string, string, string, string, string, number]>(
+          // A broadcast stays pending PER CONSUMER: it leaves this consumer's
+          // queue only once THIS consumer marked it (or an anonymous global ack
+          // set delivered).
+          'SELECT * FROM ax_steering s WHERE s.delivered = 0 AND (s.source IS NULL OR s.source != ?) AND (s.agent_id IS NULL OR s.agent_id != ?) AND (s.target IS NULL OR s.target = ?) AND (s.target IS NOT NULL OR s.created_at > ?) AND NOT EXISTS (SELECT 1 FROM ax_steering_deliveries d WHERE d.steering_id = s.id AND d.consumer = ?) ORDER BY s.seq ASC LIMIT ?',
         )
-        .all(options.consumer, options.consumer, options.consumer, limit)
+        .all(options.consumer, options.consumer, options.consumer, broadcastCutoffIso(), options.consumer, limit)
     : db
-        .query<AxSteeringRow, [number]>('SELECT * FROM ax_steering WHERE delivered = 0 ORDER BY seq ASC LIMIT ?')
-        .all(limit);
+        .query<AxSteeringRow, [string, number]>(
+          // No consumer given: only broadcasts — addressed steering is claimable
+          // solely by the consumer it names.
+          'SELECT * FROM ax_steering WHERE delivered = 0 AND target IS NULL AND created_at > ? ORDER BY seq ASC LIMIT ?',
+        )
+        .all(broadcastCutoffIso(), limit);
   return rows.map(mapAxSteeringRow).filter((s): s is PmxAxSteeringMessage => s !== null);
 }
 
@@ -1167,25 +1229,33 @@ export function loadNewestPendingAxSteeringFromDB(
   const limit = clampTimelineLimit(options.limit);
   const rows = options.consumer
     ? db
-        .query<AxSteeringRow, [string, string, string, number]>(
-          'SELECT * FROM ax_steering WHERE delivered = 0 AND (source IS NULL OR source != ?) AND (agent_id IS NULL OR agent_id != ?) AND (target IS NULL OR target = ?) ORDER BY seq DESC LIMIT ?',
+        .query<AxSteeringRow, [string, string, string, string, string, number]>(
+          'SELECT * FROM ax_steering s WHERE s.delivered = 0 AND (s.source IS NULL OR s.source != ?) AND (s.agent_id IS NULL OR s.agent_id != ?) AND (s.target IS NULL OR s.target = ?) AND (s.target IS NOT NULL OR s.created_at > ?) AND NOT EXISTS (SELECT 1 FROM ax_steering_deliveries d WHERE d.steering_id = s.id AND d.consumer = ?) ORDER BY s.seq DESC LIMIT ?',
         )
-        .all(options.consumer, options.consumer, options.consumer, limit)
+        .all(options.consumer, options.consumer, options.consumer, broadcastCutoffIso(), options.consumer, limit)
     : db
-        .query<AxSteeringRow, [number]>('SELECT * FROM ax_steering WHERE delivered = 0 ORDER BY seq DESC LIMIT ?')
+        .query<AxSteeringRow, [number]>(
+          'SELECT * FROM ax_steering WHERE delivered = 0 AND target IS NULL ORDER BY seq DESC LIMIT ?',
+        )
         .all(limit);
   return rows.map(mapAxSteeringRow).filter((s): s is PmxAxSteeringMessage => s !== null);
 }
 
 /** Total undelivered steering for a consumer (loop-safe — excludes the consumer's own; target-scoped). */
 export function countPendingAxSteeringFromDB(db: Database, consumer?: string): number {
+  // Must mirror loadPendingAxSteeringFromDB exactly (per-consumer deliveries,
+  // broadcast TTL) — the roster shows this as "what would this consumer claim".
   const n = consumer
     ? db
-        .query<{ n: number }, [string, string, string]>(
-          'SELECT COUNT(*) AS n FROM ax_steering WHERE delivered = 0 AND (source IS NULL OR source != ?) AND (agent_id IS NULL OR agent_id != ?) AND (target IS NULL OR target = ?)',
+        .query<{ n: number }, [string, string, string, string, string]>(
+          'SELECT COUNT(*) AS n FROM ax_steering s WHERE s.delivered = 0 AND (s.source IS NULL OR s.source != ?) AND (s.agent_id IS NULL OR s.agent_id != ?) AND (s.target IS NULL OR s.target = ?) AND (s.target IS NOT NULL OR s.created_at > ?) AND NOT EXISTS (SELECT 1 FROM ax_steering_deliveries d WHERE d.steering_id = s.id AND d.consumer = ?)',
+        )
+        .get(consumer, consumer, consumer, broadcastCutoffIso(), consumer)?.n
+    : db
+        .query<{ n: number }, [string]>(
+          'SELECT COUNT(*) AS n FROM ax_steering WHERE delivered = 0 AND target IS NULL AND created_at > ?',
         )
-        .get(consumer, consumer, consumer)?.n
-    : db.query<{ n: number }, []>('SELECT COUNT(*) AS n FROM ax_steering WHERE delivered = 0').get()?.n;
+        .get(broadcastCutoffIso())?.n;
   return Number(n ?? 0);
 }
 

package/src/server/canvas-operations.ts

@@ -1,6 +1,8 @@
 import { existsSync, readFileSync, statSync } from 'node:fs';
 import { basename, resolve } from 'node:path';
+import { agentPresence } from './agent-presence.js';
 import { recomputeCodeGraph } from './code-graph.js';
+import { diffLayouts } from './mutation-history.js';
 import {
   canvasState,
   type CanvasEdge,
@@ -946,7 +948,6 @@ export function addCanvasNode(input: CanvasAddNodeInput): {
     zIndex: 1,
     collapsed: false,
     pinned: false,
-    dockPosition: null,
     data,
   };
 
@@ -1133,7 +1134,7 @@ export function removeCanvasNode(id: string): {
 }
 
 function isArrangeLocked(node: CanvasNodeState): boolean {
-  return node.pinned || node.dockPosition !== null || node.data.arrangeLocked === true;
+  return node.pinned || node.data.arrangeLocked === true;
 }
 
 function collectArrangeExcludedNodeIds(nodes: CanvasNodeState[]): Set<string> {
@@ -1219,7 +1220,7 @@ function rectsOverlap(a: ArrangeObstacleRect, b: ArrangeObstacleRect): boolean {
 
 function collectGridArrangeObstacles(nodes: CanvasNodeState[], excludedIds: Set<string>): ArrangeObstacleRect[] {
   return nodes
-    .filter((node) => excludedIds.has(node.id) && node.dockPosition === null)
+    .filter((node) => excludedIds.has(node.id))
     .map((node) => ({
       id: node.id,
       position: { ...node.position },
@@ -1247,7 +1248,7 @@ function shiftGridUpdatesBelowObstacles(
 ): CanvasNodeUpdate[] {
   if (updates.length === 0 || obstacles.length === 0) return updates;
 
-  // Grid arrange only sees movable nodes, so preserved locked/docked-group frames
+  // Grid arrange only sees movable nodes, so preserved locked-group frames
   // need a separate obstacle pass before applying the planned positions.
   const nodesById = new Map(nodes.map((node) => [node.id, node]));
   let shifted = updates;
@@ -1397,6 +1398,30 @@ export function listCanvasSnapshots(options?: Parameters<typeof canvasState.list
   return canvasState.listSnapshots(options);
 }
 
+/**
+ * Snapshot save with unchanged-board reuse — the ONE path every surface must
+ * take (op registry, SDK). The SDK once called saveCanvasSnapshot directly and
+ * stacked identical snapshots the HTTP/MCP path deduplicated (0.5.0 Codex
+ * finding V).
+ */
+export function saveCanvasSnapshotWithReuse(name: string): { snapshot: CanvasSnapshot | null; reused: boolean } {
+  const newest = canvasState.listSnapshots({ limit: 1 })[0];
+  if (newest) {
+    const newestData = canvasState.getSnapshotData(newest.id);
+    if (newestData) {
+      const diff = diffLayouts(newestData.name, newestData, canvasState.getLayout());
+      const identical =
+        diff.addedNodes.length === 0 &&
+        diff.removedNodes.length === 0 &&
+        diff.modifiedNodes.length === 0 &&
+        diff.addedEdges.length === 0 &&
+        diff.removedEdges.length === 0;
+      if (identical) return { snapshot: newest, reused: true };
+    }
+  }
+  return { snapshot: saveCanvasSnapshot(name), reused: false };
+}
+
 export function saveCanvasSnapshot(name: string): CanvasSnapshot | null {
   return canvasState.saveSnapshot(name);
 }
@@ -1465,6 +1490,20 @@ export function addCanvasEdge(input: {
   return edge;
 }
 
+export function updateCanvasEdge(
+  id: string,
+  patch: Partial<Pick<CanvasEdge, 'type' | 'label' | 'style' | 'animated'>>,
+): CanvasEdge {
+  if (!canvasState.getEdges().some((edge) => edge.id === id)) {
+    throw new Error(`Edge "${id}" not found.`);
+  }
+  const updated = canvasState.updateEdge(id, patch);
+  if (!updated) {
+    throw new Error('Retyping would duplicate an existing edge.');
+  }
+  return updated;
+}
+
 export function removeCanvasEdge(id: string): { removed: boolean } {
   return { removed: canvasState.removeEdge(id) };
 }
@@ -1512,7 +1551,6 @@ export function createCanvasGroup(input: CanvasCreateGroupInput): { id: string;
     zIndex: 0,
     collapsed: false,
     pinned: false,
-    dockPosition: null,
     data,
   });
 
@@ -1583,7 +1621,6 @@ export function createCanvasJsonRenderNode(input: JsonRenderNodeInput): {
     zIndex: 1,
     collapsed: false,
     pinned: false,
-    dockPosition: null,
     data: createJsonRenderNodeData(id, input.title?.trim() || inferJsonRenderNodeTitle(spec), spec, {
       viewerType: 'json-render',
       ...(input.strictSize ? { strictSize: true } : {}),
@@ -1627,7 +1664,6 @@ export function createCanvasStreamingJsonRenderNode(input: {
     zIndex: 1,
     collapsed: false,
     pinned: false,
-    dockPosition: null,
     data: createJsonRenderNodeData(id, input.title?.trim() || 'Streaming', spec, {
       viewerType: 'json-render',
       streamStatus: 'open',
@@ -1703,7 +1739,6 @@ export function createCanvasGraphNode(input: GraphNodeInput): {
     zIndex: 1,
     collapsed: false,
     pinned: false,
-    dockPosition: null,
     data: createJsonRenderNodeData(id, title, spec, {
       viewerType: 'graph',
       graphConfig: buildGraphConfig(input),
@@ -1739,7 +1774,7 @@ export function getClientViewportSize(): { width: number; height: number } | nul
 export function fitCanvasView(options: CanvasFitViewOptions = {}): CanvasFitViewResult {
   const width = positiveNumber(options.width, lastClientViewportSize?.width ?? 1440);
   const height = positiveNumber(options.height, lastClientViewportSize?.height ?? 900);
-  const padding = positiveNumber(options.padding, 60);
+  const padding = positiveNumber(options.padding, 24); // screen px now, not world units
   const maxScale = positiveNumber(options.maxScale, 1);
   const nodeIdFilter = options.nodeIds && options.nodeIds.length > 0 ? new Set(options.nodeIds) : null;
   const targetNodes = canvasState.getLayout().nodes.filter((node) => !nodeIdFilter || nodeIdFilter.has(node.id));
@@ -1761,14 +1796,23 @@ export function fitCanvasView(options: CanvasFitViewOptions = {}): CanvasFitView
   }
 
   const bounds = { x: minX, y: minY, width: maxX - minX, height: maxY - minY };
-  const worldWidth = Math.max(1, bounds.width + padding * 2);
-  const worldHeight = Math.max(1, bounds.height + padding * 2);
-  const scale = Math.min(maxScale, width / worldWidth, height / worldHeight);
+  // Screen-space fit (architecture rule 9): `padding` and the chrome reserve
+  // are SCREEN pixels — world-space padding shrank with the fit zoom and
+  // parked nodes under the command bar and minimap (0.5.0 Amp report,
+  // finding A). The server cannot measure the client's chrome, so it reserves
+  // nominal bottom space: the minimap is always there; the command bar only
+  // while a session is attached.
+  const bottomReserve = agentPresence.snapshot().sessionActive ? 128 : 96;
+  const usableWidth = Math.max(80, width - padding * 2);
+  const usableHeight = Math.max(80, height - padding - bottomReserve);
+  const worldWidth = Math.max(1, bounds.width);
+  const worldHeight = Math.max(1, bounds.height);
+  const scale = Math.min(maxScale, usableWidth / worldWidth, usableHeight / worldHeight);
   const centerX = minX + bounds.width / 2;
   const centerY = minY + bounds.height / 2;
   const viewport = {
-    x: width / 2 - centerX * scale,
-    y: height / 2 - centerY * scale,
+    x: padding + usableWidth / 2 - centerX * scale,
+    y: padding + usableHeight / 2 - centerY * scale,
     scale,
   };