pmx-canvas 0.4.3 → 0.4.5

package/src/client/theme/global.css

@@ -446,6 +446,61 @@
   --c-annotation: #EDF5EF;
 }
 
+:root[data-theme="volt"] {
+  /* ── Core palette (volt · green-tinted charcoal + coral) ── */
+  --c-bg: #0B0D0B;
+  --c-panel: #171A17;
+  --c-panel-soft: #111311;
+  --c-line: #272A27;
+  --c-text: #F6FFF5;
+  --c-text-soft: #CBD3CA;
+  --c-muted: #9CA49C;
+  --c-dim: #626962;
+  --c-accent: #DFDFC1;
+  --c-ok: #52C880;
+  --c-warn: #E4C465;
+  --c-warn-alt: #FFB300;
+  --c-danger: #D67670;
+  --c-purple: #BC8FB4;
+  --c-thinking: #BC8FB4;
+  --c-subagent: #6CA0E0;
+  --c-input-bg: #111311;
+  --c-dot-grid: rgba(223, 223, 193, 0.08);
+  --c-panel-overlay: rgba(11, 13, 11, 0.6);
+  --c-panel-glass: rgba(23, 26, 23, 0.92);
+  --c-shadow: rgba(0, 0, 0, 0.3);
+  --c-shadow-heavy: rgba(0, 0, 0, 0.5);
+  --c-glow-accent: rgba(223, 223, 193, 0.15);
+  --c-surface-hover: rgba(255, 255, 255, 0.06);
+  --c-surface-subtle: rgba(255, 255, 255, 0.03);
+  --c-surface-th: rgba(255, 255, 255, 0.04);
+  --c-accent-8: rgba(223, 223, 193, 0.08);
+  --c-accent-10: rgba(223, 223, 193, 0.1);
+  --c-accent-12: rgba(223, 223, 193, 0.12);
+  --c-accent-15: rgba(223, 223, 193, 0.15);
+  --c-accent-25: rgba(223, 223, 193, 0.25);
+  --c-accent-30: rgba(223, 223, 193, 0.3);
+  --c-accent-40: rgba(223, 223, 193, 0.4);
+  --c-ok-10: rgba(82, 200, 128, 0.1);
+  --c-ok-12: rgba(82, 200, 128, 0.12);
+  --c-ok-20: rgba(82, 200, 128, 0.2);
+  --c-ok-25: rgba(82, 200, 128, 0.25);
+  --c-warn-10: rgba(228, 196, 101, 0.1);
+  --c-warn-12: rgba(228, 196, 101, 0.12);
+  --c-warn-15: rgba(228, 196, 101, 0.15);
+  --c-warn-20: rgba(228, 196, 101, 0.2);
+  --c-warn-22: rgba(228, 196, 101, 0.22);
+  --c-warn-30: rgba(228, 196, 101, 0.3);
+  --c-warn-60: rgba(228, 196, 101, 0.6);
+  --c-danger-12: rgba(214, 118, 112, 0.12);
+  --c-line-30: rgba(39, 42, 39, 0.3);
+  --c-contrast-fg: #0B0D0B;
+  --c-accent-hover: #EDEDDB;
+  --c-warn-hover: #EBD087;
+  --c-canvas-wash: linear-gradient(180deg, rgba(255, 255, 255, 0.02), rgba(0, 0, 0, 0));
+  --c-annotation: #F1F7F0;
+}
+
 * {
   box-sizing: border-box;
   margin: 0;
@@ -614,6 +669,29 @@ body,
   flex-shrink: 0;
 }
 
+.canvas-node .node-ax-status {
+  font-size: calc(9px * var(--node-chrome-scale, 1));
+  padding: calc(1px * var(--node-chrome-scale, 1)) calc(6px * var(--node-chrome-scale, 1));
+  border-radius: calc(4px * var(--node-chrome-scale, 1));
+  background: var(--c-panel-overlay);
+  color: var(--c-muted);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  flex-shrink: 0;
+}
+
+.canvas-node .node-ax-status-in-progress {
+  color: var(--c-accent);
+}
+
+.canvas-node .node-ax-status-done {
+  color: var(--c-ok);
+}
+
+.canvas-node .node-ax-status-blocked {
+  color: var(--c-warn);
+}
+
 .canvas-node .node-controls {
   display: flex;
   align-items: center;
@@ -3900,6 +3978,19 @@ button.welcome-hint:hover {
   display: contents;
 }
 
+/* Auto-ghosts (server-synthesized for unlinked agent mutations) read lighter
+   than a deliberate canvas_intent signal: desaturated, dotted, no veto —
+   the opacity drop lives in ghostOpacity() (inline style). */
+.intent-ghost.is-auto {
+  filter: saturate(0.7);
+  border-style: dotted;
+}
+
+.intent-ghost.is-auto .intent-ghost-titlebar,
+.intent-ghost.is-auto .intent-chip {
+  border-style: dotted;
+}
+
 .intent-ghost {
   position: absolute;
   pointer-events: none;

package/src/client/theme/surface-theme.css

@@ -281,6 +281,38 @@
   --color-danger: #E57373;
 }
 
+:root[data-theme="volt"] {
+  /* ── Core palette (volt · green-tinted charcoal + coral) ── */
+  --c-bg: #0B0D0B;
+  --c-panel: #171A17;
+  --c-panel-soft: #111311;
+  --c-line: #272A27;
+  --c-text: #F6FFF5;
+  --c-text-soft: #CBD3CA;
+  --c-muted: #9CA49C;
+  --c-dim: #626962;
+  --c-accent: #DFDFC1;
+  --c-ok: #52C880;
+  --c-warn: #E4C465;
+  --c-warn-alt: #FFB300;
+  --c-danger: #D67670;
+  --c-purple: #BC8FB4;
+
+  --color-bg: #0B0D0B;
+  --color-panel: #171A17;
+  --color-surface: #111311;
+  --color-border: #272A27;
+  --color-text: #F6FFF5;
+  --color-text-primary: #F6FFF5;
+  --color-text-secondary: #CBD3CA;
+  --color-text-muted: #9CA49C;
+  --color-text-dim: #626962;
+  --color-accent: #DFDFC1;
+  --color-success: #52C880;
+  --color-warning: #E4C465;
+  --color-danger: #D67670;
+}
+
 html,
 body {
   margin: 0;

package/src/mcp/server.ts

@@ -26,6 +26,7 @@ import { fileURLToPath } from 'node:url';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
+import { AX_SOURCES } from '../server/operations/ops/ax-shared.js';
 import { canvasState, describeCanvasSchema } from '../server/index.js';
 import { AX_INTERACTION_TYPES } from '../server/ax-interaction.js';
 import { buildPendingAxActivity } from '../server/ax-state.js';
@@ -253,10 +254,7 @@ export async function startMcpServer(): Promise<void> {
         .describe('Type-specific payload, e.g. {"title":"..."} for ax.work.create.'),
       sourceSurface: z.enum(['native-node', 'json-render', 'html-node', 'mcp-app', 'adapter']).optional(),
       correlationId: z.string().optional(),
-      source: z
-        .enum(['agent', 'api', 'browser', 'cli', 'codex', 'copilot', 'mcp', 'sdk', 'system'])
-        .optional()
-        .describe('Optional host/source label. Defaults to mcp.'),
+      source: z.enum(AX_SOURCES).optional().describe('Optional host/source label. Defaults to mcp.'),
     },
     async ({ type, sourceNodeId, payload, sourceSurface, correlationId, source }) => {
       try {
@@ -345,7 +343,7 @@ export async function startMcpServer(): Promise<void> {
         })
         .optional()
         .describe('Override or suppress the kind-driven default reactions.'),
-      source: z.enum(['agent', 'api', 'browser', 'cli', 'codex', 'copilot', 'mcp', 'sdk', 'system']).optional(),
+      source: z.enum(AX_SOURCES).optional(),
     },
     async ({ kind, title, summary, outcome, ref, nodeIds, data, reactions, source }) => {
       try {

package/src/server/ax-state-manager.ts

@@ -239,7 +239,13 @@ export class AxStateManager {
   }
 
   addWorkItem(
-    input: { title: string; status?: PmxAxWorkItemStatus; detail?: string | null; nodeIds?: string[] },
+    input: {
+      title: string;
+      status?: PmxAxWorkItemStatus;
+      detail?: string | null;
+      nodeIds?: string[];
+      agentId?: string | null;
+    },
     options: { source?: PmxAxSource } = {},
   ): PmxAxWorkItem {
     const oldAxState = this.getAxState();
@@ -267,7 +273,13 @@ export class AxStateManager {
 
   updateWorkItem(
     id: string,
-    patch: { title?: string; status?: PmxAxWorkItemStatus; detail?: string | null; nodeIds?: string[] },
+    patch: {
+      title?: string;
+      status?: PmxAxWorkItemStatus;
+      detail?: string | null;
+      nodeIds?: string[];
+      agentId?: string | null;
+    },
     options: { source?: PmxAxSource } = {},
   ): PmxAxWorkItem | null {
     const oldAxState = this.getAxState();
@@ -280,6 +292,7 @@ export class AxStateManager {
       ...(patch.status !== undefined ? { status: patch.status } : {}),
       ...(patch.detail !== undefined ? { detail: patch.detail } : {}),
       ...(patch.nodeIds !== undefined ? { nodeIds: patch.nodeIds.filter((n) => validNodeIds.has(n)) } : {}),
+      ...(patch.agentId !== undefined ? { agentId: patch.agentId } : {}),
       updatedAt: new Date().toISOString(),
       source: options.source ?? existing.source,
     };
@@ -703,9 +716,9 @@ export class AxStateManager {
       nodeIds?: string[];
       data?: Record<string, unknown> | null;
     },
-    options: { source?: PmxAxSource } = {},
+    options: { source?: PmxAxSource; agentId?: string | null } = {},
   ): PmxAxEvent {
-    const draft = createAxEvent(input, options.source ?? 'api');
+    const draft = createAxEvent(input, options.source ?? 'api', options.agentId ?? null);
     const db = this.deps.getDb();
     if (db) {
       try {
@@ -746,8 +759,16 @@ export class AxStateManager {
     return { ...draft, seq: 0 };
   }
 
-  recordSteeringMessage(message: string, options: { source?: PmxAxSource } = {}): PmxAxSteeringMessage {
-    const draft = createAxSteeringMessage(message, options.source ?? 'api');
+  recordSteeringMessage(
+    message: string,
+    options: { source?: PmxAxSource; agentId?: string | null; target?: string | null } = {},
+  ): PmxAxSteeringMessage {
+    const draft = createAxSteeringMessage(
+      message,
+      options.source ?? 'api',
+      options.agentId ?? null,
+      options.target ?? null,
+    );
     const db = this.deps.getDb();
     if (db) {
       try {

package/src/server/ax-state.ts

@@ -1,7 +1,7 @@
 import type { CanvasLayout, CanvasNodeState } from './canvas-state.js';
 import type { AgentContextNode } from './agent-context.js';
 
-export type PmxAxSource = 'agent' | 'api' | 'browser' | 'cli' | 'codex' | 'copilot' | 'mcp' | 'sdk' | 'system';
+export type PmxAxSource = 'agent' | 'amp' | 'api' | 'browser' | 'cli' | 'codex' | 'copilot' | 'mcp' | 'sdk' | 'system';
 
 export interface PmxAxFocusState {
   nodeIds: string[];
@@ -39,6 +39,7 @@ export interface PmxAxWorkItem {
   createdAt: string;
   updatedAt: string;
   source: PmxAxSource | null;
+  agentId: string | null;
 }
 
 export interface PmxAxApprovalGate {
@@ -87,6 +88,7 @@ export interface PmxAxEvent {
   data: Record<string, unknown> | null;
   createdAt: string;
   source: PmxAxSource | null;
+  agentId: string | null;
 }
 
 export interface PmxAxEvidence {
@@ -109,6 +111,9 @@ export interface PmxAxSteeringMessage {
   delivered: boolean;
   createdAt: string;
   source: PmxAxSource | null;
+  agentId: string | null;
+  /** The agentId/consumer this steer is addressed to; null = broadcast to all consumers. */
+  target: string | null;
 }
 
 // ── Host/session capability (own table; reported by adapters) ──────
@@ -269,7 +274,18 @@ export function buildPendingAxActivity(state: PmxAxState, consumer?: string): Pe
   return out;
 }
 
-const AX_SOURCES = new Set<PmxAxSource>(['agent', 'api', 'browser', 'cli', 'codex', 'copilot', 'mcp', 'sdk', 'system']);
+const AX_SOURCES = new Set<PmxAxSource>([
+  'agent',
+  'amp',
+  'api',
+  'browser',
+  'cli',
+  'codex',
+  'copilot',
+  'mcp',
+  'sdk',
+  'system',
+]);
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return value !== null && typeof value === 'object' && !Array.isArray(value);
@@ -622,6 +638,7 @@ export function normalizeAxWorkItem(input: unknown, validNodeIds?: Set<string>):
     createdAt,
     updatedAt: normalizeTimestamp(input.updatedAt) ?? createdAt,
     source: normalizeSource(input.source),
+    agentId: optionalString(input.agentId),
   };
 }
 
@@ -715,6 +732,7 @@ export function normalizeAxEvent(input: unknown): PmxAxEvent | null {
     data: boundedRecord(input.data),
     createdAt: normalizeTimestamp(input.createdAt) ?? nowIso(),
     source: normalizeSource(input.source),
+    agentId: optionalString(input.agentId),
   };
 }
 
@@ -745,12 +763,20 @@ export function normalizeAxSteeringMessage(input: unknown): PmxAxSteeringMessage
     delivered: input.delivered === true,
     createdAt: normalizeTimestamp(input.createdAt) ?? nowIso(),
     source: normalizeSource(input.source),
+    agentId: optionalString(input.agentId),
+    target: optionalString(input.target),
   };
 }
 
 // ── Factories ──────────────────────────────────────────────────────
 export function createAxWorkItem(
-  input: { title: string; status?: PmxAxWorkItemStatus; detail?: string | null; nodeIds?: string[] },
+  input: {
+    title: string;
+    status?: PmxAxWorkItemStatus;
+    detail?: string | null;
+    nodeIds?: string[];
+    agentId?: string | null;
+  },
   source: PmxAxSource | null,
   validNodeIds?: Set<string>,
 ): PmxAxWorkItem {
@@ -764,6 +790,7 @@ export function createAxWorkItem(
     createdAt: now,
     updatedAt: now,
     source,
+    agentId: input.agentId ?? null,
   };
 }
 
@@ -829,6 +856,7 @@ export function createAxEvent(
     data?: Record<string, unknown> | null;
   },
   source: PmxAxSource | null,
+  agentId: string | null = null,
 ): Omit<PmxAxEvent, 'seq'> {
   return {
     id: axId('evt'),
@@ -839,6 +867,7 @@ export function createAxEvent(
     data: input.data ?? null,
     createdAt: nowIso(),
     source,
+    agentId,
   };
 }
 
@@ -869,6 +898,8 @@ export function createAxEvidence(
 export function createAxSteeringMessage(
   message: string,
   source: PmxAxSource | null,
+  agentId: string | null = null,
+  target: string | null = null,
 ): Omit<PmxAxSteeringMessage, 'seq'> {
   return {
     id: axId('steer'),
@@ -876,6 +907,8 @@ export function createAxSteeringMessage(
     delivered: false,
     createdAt: nowIso(),
     source,
+    agentId,
+    target,
   };
 }
 

package/src/server/canvas-db.ts

@@ -178,7 +178,8 @@ const SCHEMA_SQL = `
     node_ids TEXT NOT NULL DEFAULT '[]',
     data TEXT,
     created_at TEXT NOT NULL,
-    source TEXT
+    source TEXT,
+    agent_id TEXT
   );
   CREATE INDEX IF NOT EXISTS idx_ax_events_seq ON ax_events (seq);
 
@@ -202,7 +203,9 @@ const SCHEMA_SQL = `
     message TEXT NOT NULL,
     delivered INTEGER NOT NULL DEFAULT 0,
     created_at TEXT NOT NULL,
-    source TEXT
+    source TEXT,
+    agent_id TEXT,
+    target TEXT
   );
   CREATE INDEX IF NOT EXISTS idx_ax_steering_seq ON ax_steering (seq);
 
@@ -213,6 +216,22 @@ const SCHEMA_SQL = `
   );
 `;
 
+/** Idempotently add a column to an existing table (no prior-migrations system in this repo). */
+function ensureColumn(db: Database, table: string, column: string, ddl: string): void {
+  interface ColumnInfoRow {
+    name: string;
+  }
+  const columns = db.query<ColumnInfoRow, []>(`PRAGMA table_info(${table})`).all();
+  if (columns.some((c) => c.name === column)) return;
+  try {
+    db.exec(`ALTER TABLE ${table} ADD COLUMN ${ddl}`);
+  } catch (error) {
+    // Two processes can race the check-then-ALTER on the first post-upgrade
+    // open; the loser's duplicate-column error means the column exists — done.
+    if (!/duplicate column/i.test(error instanceof Error ? error.message : String(error))) throw error;
+  }
+}
+
 function normalizePositiveInteger(value: number | undefined): number | undefined {
   if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) return undefined;
   return Math.floor(value);
@@ -258,6 +277,11 @@ export function openCanvasDb(dbPath: string): Database {
   db.exec('PRAGMA busy_timeout=5000');
   db.exec(SCHEMA_SQL);
 
+  // Additive columns for pre-existing DBs (fresh installs already get them via SCHEMA_SQL above).
+  ensureColumn(db, 'ax_events', 'agent_id', 'agent_id TEXT');
+  ensureColumn(db, 'ax_steering', 'agent_id', 'agent_id TEXT');
+  ensureColumn(db, 'ax_steering', 'target', 'target TEXT');
+
   // Set schema version if not present
   const row = db.query<{ value: string }, [string]>('SELECT value FROM meta WHERE key = ?').get('schema_version');
   if (!row) {
@@ -858,7 +882,7 @@ function readLastSeq(db: Database, table: 'ax_events' | 'ax_evidence' | 'ax_stee
 
 export function appendAxEventToDB(db: Database, ev: Omit<PmxAxEvent, 'seq'>): PmxAxEvent {
   db.run(
-    'INSERT INTO ax_events (id, kind, summary, detail, node_ids, data, created_at, source) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+    'INSERT INTO ax_events (id, kind, summary, detail, node_ids, data, created_at, source, agent_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
     [
       ev.id,
       ev.kind,
@@ -868,6 +892,7 @@ export function appendAxEventToDB(db: Database, ev: Omit<PmxAxEvent, 'seq'>): Pm
       ev.data ? JSON.stringify(ev.data) : null,
       ev.createdAt,
       ev.source,
+      ev.agentId,
     ],
   );
   const seq = readLastSeq(db, 'ax_events');
@@ -896,20 +921,20 @@ export function appendAxEvidenceToDB(db: Database, ev: Omit<PmxAxEvidence, 'seq'
 }
 
 export function appendAxSteeringToDB(db: Database, s: Omit<PmxAxSteeringMessage, 'seq'>): PmxAxSteeringMessage {
-  db.run('INSERT INTO ax_steering (id, message, delivered, created_at, source) VALUES (?, ?, ?, ?, ?)', [
-    s.id,
-    s.message,
-    s.delivered ? 1 : 0,
-    s.createdAt,
-    s.source,
-  ]);
+  db.run(
+    'INSERT INTO ax_steering (id, message, delivered, created_at, source, agent_id, target) VALUES (?, ?, ?, ?, ?, ?, ?)',
+    [s.id, s.message, s.delivered ? 1 : 0, s.createdAt, s.source, s.agentId, s.target],
+  );
   const seq = readLastSeq(db, 'ax_steering');
   trimAxTable(db, 'ax_steering');
   return { ...s, seq };
 }
 
 export function markAxSteeringDeliveredInDB(db: Database, id: string): boolean {
-  const r = db.run('UPDATE ax_steering SET delivered = 1 WHERE id = ?', [id]);
+  // 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.
+  const r = db.run('UPDATE ax_steering SET delivered = 1 WHERE id = ? AND delivered = 0', [id]);
   return r.changes > 0;
 }
 
@@ -924,6 +949,7 @@ export function loadAxEventsFromDB(db: Database, q: AxTimelineQuery = {}): PmxAx
     data: string | null;
     created_at: string;
     source: string | null;
+    agent_id: string | null;
   }
   const rows = db
     .query<Row, [number]>('SELECT * FROM ax_events ORDER BY seq DESC LIMIT ?')
@@ -935,6 +961,7 @@ export function loadAxEventsFromDB(db: Database, q: AxTimelineQuery = {}): PmxAx
         createdAt: r.created_at,
         nodeIds: safeParseJson(r.node_ids),
         data: safeParseJson(r.data),
+        agentId: r.agent_id,
       }),
     )
     .filter((e): e is PmxAxEvent => e !== null);
@@ -968,58 +995,62 @@ export function loadAxEvidenceFromDB(db: Database, q: AxTimelineQuery = {}): Pmx
     .filter((e): e is PmxAxEvidence => e !== null);
 }
 
+interface AxSteeringRow {
+  seq: number;
+  id: string;
+  message: string;
+  delivered: number;
+  created_at: string;
+  source: string | null;
+  agent_id: string | null;
+  target: string | null;
+}
+
+function mapAxSteeringRow(r: AxSteeringRow): PmxAxSteeringMessage | null {
+  return normalizeAxSteeringMessage({
+    ...r,
+    createdAt: r.created_at,
+    delivered: r.delivered === 1,
+    agentId: r.agent_id,
+  });
+}
+
 export function loadAxSteeringFromDB(
   db: Database,
   q: AxTimelineQuery & { onlyPending?: boolean } = {},
 ): PmxAxSteeringMessage[] {
-  interface Row {
-    seq: number;
-    id: string;
-    message: string;
-    delivered: number;
-    created_at: string;
-    source: string | null;
-  }
   const sql = q.onlyPending
     ? '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<Row, [number]>(sql).all(clampTimelineLimit(q.limit));
-  return rows
-    .map((r) => normalizeAxSteeringMessage({ ...r, createdAt: r.created_at, delivered: r.delivered === 1 }))
-    .filter((s): s is PmxAxSteeringMessage => s !== null);
+  const rows = db.query<AxSteeringRow, [number]>(sql).all(clampTimelineLimit(q.limit));
+  return rows.map(mapAxSteeringRow).filter((s): s is PmxAxSteeringMessage => s !== null);
 }
 
 export function loadPendingAxSteeringFromDB(
   db: Database,
   options: { consumer?: string; limit?: number } = {},
 ): PmxAxSteeringMessage[] {
-  interface Row {
-    seq: number;
-    id: string;
-    message: string;
-    delivered: number;
-    created_at: string;
-    source: string | null;
-  }
-  // FIFO (oldest undelivered first); exclude the consumer's own steering in SQL
-  // so the LIMIT is applied AFTER loop-prevention, not before.
+  // FIFO (oldest undelivered first); exclude the consumer's own steering (loop
+  // prevention) and any steering addressed to a DIFFERENT consumer (target scoping)
+  // in SQL so the LIMIT is applied AFTER both filters, not before.
   const limit = clampTimelineLimit(options.limit);
   const rows = options.consumer
     ? db
-        .query<Row, [string, number]>(
-          'SELECT * FROM ax_steering WHERE delivered = 0 AND (source IS NULL OR source != ?) ORDER BY seq ASC LIMIT ?',
+        .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 ?',
         )
-        .all(options.consumer, limit)
-    : db.query<Row, [number]>('SELECT * FROM ax_steering WHERE delivered = 0 ORDER BY seq ASC LIMIT ?').all(limit);
-  return rows
-    .map((r) => normalizeAxSteeringMessage({ ...r, createdAt: r.created_at, delivered: r.delivered === 1 }))
-    .filter((s): s is PmxAxSteeringMessage => s !== null);
+        .all(options.consumer, options.consumer, options.consumer, limit)
+    : db
+        .query<AxSteeringRow, [number]>('SELECT * FROM ax_steering WHERE delivered = 0 ORDER BY seq ASC LIMIT ?')
+        .all(limit);
+  return rows.map(mapAxSteeringRow).filter((s): s is PmxAxSteeringMessage => s !== null);
 }
 
 /**
  * NEWEST undelivered steering first (report #57) for the compact AX context lead
  * block — so a fresh steer is visible even behind a long backlog. Loop-safe: excludes
- * the consumer's own steering in SQL so the LIMIT applies after loop-prevention.
+ * the consumer's own steering and steering targeted at a different consumer in SQL
+ * so the LIMIT applies after both filters.
  * Distinct from loadPendingAxSteeringFromDB (FIFO oldest-first) which the claim/ack
  * delivery queue uses for ordered processing.
  */
@@ -1027,35 +1058,27 @@ export function loadNewestPendingAxSteeringFromDB(
   db: Database,
   options: { consumer?: string; limit?: number } = {},
 ): PmxAxSteeringMessage[] {
-  interface Row {
-    seq: number;
-    id: string;
-    message: string;
-    delivered: number;
-    created_at: string;
-    source: string | null;
-  }
   const limit = clampTimelineLimit(options.limit);
   const rows = options.consumer
     ? db
-        .query<Row, [string, number]>(
-          'SELECT * FROM ax_steering WHERE delivered = 0 AND (source IS NULL OR source != ?) ORDER BY seq DESC LIMIT ?',
+        .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 ?',
         )
-        .all(options.consumer, limit)
-    : db.query<Row, [number]>('SELECT * FROM ax_steering WHERE delivered = 0 ORDER BY seq DESC LIMIT ?').all(limit);
-  return rows
-    .map((r) => normalizeAxSteeringMessage({ ...r, createdAt: r.created_at, delivered: r.delivered === 1 }))
-    .filter((s): s is PmxAxSteeringMessage => s !== null);
+        .all(options.consumer, options.consumer, options.consumer, limit)
+    : db
+        .query<AxSteeringRow, [number]>('SELECT * FROM ax_steering WHERE delivered = 0 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). */
+/** Total undelivered steering for a consumer (loop-safe — excludes the consumer's own; target-scoped). */
 export function countPendingAxSteeringFromDB(db: Database, consumer?: string): number {
   const n = consumer
     ? db
-        .query<{ n: number }, [string]>(
-          'SELECT COUNT(*) AS n FROM ax_steering WHERE delivered = 0 AND (source IS NULL OR source != ?)',
+        .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 = ?)',
         )
-        .get(consumer)?.n
+        .get(consumer, consumer, consumer)?.n
     : db.query<{ n: number }, []>('SELECT COUNT(*) AS n FROM ax_steering WHERE delivered = 0').get()?.n;
   return Number(n ?? 0);
 }