@hraness/dawg 0.2.0 → 0.3.0

package/tui/activity.ts

@@ -45,7 +45,9 @@ export type AgentActivityEvent =
   | { type: "start"; prompt?: string | undefined; model?: string | undefined }
   | { type: "step"; step: number }
   | { type: "text-delta"; delta?: string; text?: string }
+  | { type: "activity"; message: string }
   | { type: "tool-start"; name: string; callId?: string; step?: number }
+  | { type: "tool-progress"; line: string; name?: string; callId?: string }
   | {
       type: "tool-applied";
       summary: string;
@@ -238,6 +240,9 @@ export class ActivityFeed {
           event.step <= 1 ? "thinking" : `thinking · step ${event.step}`,
         );
         return;
+      case "activity":
+        this.setSpinner(event.message);
+        return;
       case "text-delta": {
         const chunk = event.delta ?? event.text ?? "";
         const joined = `${this.streamText}${chunk}`.replace(/\s+/g, " ");
@@ -249,15 +254,27 @@ export class ActivityFeed {
       case "tool-start":
         this.setSpinner(`${event.name.replace(/_/g, " ")}…`);
         return;
-      case "tool-applied":
+      case "tool-progress":
+        this.setSpinner(
+          event.name
+            ? `${event.name.replace(/_/g, " ")} · ${event.line}`
+            : event.line,
+        );
+        return;
+      case "tool-applied": {
+        // A media or explain result leaves the revision alone: nothing to undo.
+        const unchanged =
+          event.baseRevision !== undefined &&
+          event.baseRevision === event.resultRevision;
         this.pushCard(event.summary, {
           tone: "success",
           baseRevision: event.baseRevision,
           resultRevision: event.resultRevision,
           trackId: event.trackId,
-          hint: "^z undo",
+          hint: unchanged ? undefined : "^z undo",
         });
         return;
+      }
       case "tool-rejected": {
         const what = event.summary ?? event.name?.replace(/_/g, " ");
         const why = event.reason ?? event.diagnostic;
@@ -309,9 +326,31 @@ export class ActivityFeed {
   }
 }
 
+/**
+ * A command receipt with its outcome carried structurally: `ok: true` is a
+ * success, `false` a failure, `"warn"` a no-op or conflict. Handlers return
+ * these so the strip never infers failure from prose.
+ */
+export type Receipt = Readonly<{ ok: boolean | "warn"; text: string }>;
+
+export const ok = (text: string): Receipt => ({ ok: true, text });
+export const fail = (text: string): Receipt => ({ ok: false, text });
+export const warn = (text: string): Receipt => ({ ok: "warn", text });
+
+/** Tone of a structured receipt; strings fall back to `receiptTone`. */
+export function toneOf(receipt: string | Receipt): CardTone {
+  if (typeof receipt === "string") return receiptTone(receipt);
+  return receipt.ok === true
+    ? "success"
+    : receipt.ok === "warn"
+      ? "warning"
+      : "error";
+}
+
 /**
  * Classify a legacy command receipt string (e.g. "undid · rev 41",
- * "tempo error · …") into a card tone so existing handlers need no rewrite.
+ * "tempo error · …") into a card tone. Fallback for handlers that still
+ * return plain strings; new handlers return a `Receipt`.
  */
 export function receiptTone(message: string): CardTone {
   const lower = message.toLowerCase();

package/tui/app.ts

@@ -26,6 +26,11 @@ import {
 } from "./highway.ts";
 import { classifyKey, overlayKey, type UiCommand } from "./keys.ts";
 import { PromptModel, type PromptAction, type PromptMode } from "./prompt.ts";
+import {
+  paintPlayHeader,
+  paintPlayStrip,
+  type PlayHeaderView,
+} from "./play-strip.ts";
 import { CellBuffer, ScreenWriter, type CursorPosition } from "./screen.ts";
 import { displayWidth, truncate } from "./text.ts";
 import {
@@ -54,18 +59,43 @@ export interface AppView {
   sessionName?: string | undefined;
   /** Live windows on this session (presence); shown when more than one. */
   windows?: number | undefined;
+  /** Project typecheck result; `types ✓` or `types ✗ N` beside sync. */
+  types?: TypesIndicator | undefined;
+  /**
+   * The line under the prompt: `$0.12 session · $0.48 today · opus-5.5 ·
+   * gateway`, or `no model · dawg login`. The caller sizes it to the width.
+   */
+  spend?: string | undefined;
+  /** No agent provider: the placeholder teaches commands, no STEER pill. */
+  agentOffline?: boolean | undefined;
+  /** Play mode: replaces the header and adds the keyboard strip row. */
+  play?: PlayHeaderView | undefined;
 }
 
+export type TypesIndicator = Readonly<{ ok: boolean; errors: number }>;
+
 export interface UiState {
   prompt: PromptModel;
   activity: ActivityFeed;
   theme: Theme;
   capabilities: TerminalCapabilities;
   reducedMotion: boolean;
-  overlay: "log" | "picker" | undefined;
+  overlay: Overlay;
   /** Transcript scroll (entries up from the newest) and filter. */
   log?: LogView | undefined;
   picker?: PickerState | undefined;
+  text?: TextView | undefined;
+}
+
+/** `log` is the transcript, `picker` an arrow-key list, `text` static lines. */
+export type Overlay = "log" | "picker" | "text" | undefined;
+
+/** A scrollable read-only panel (`/help`, `/sessions`, `/tracks`). */
+export interface TextView {
+  title: string;
+  lines: readonly string[];
+  /** Rows scrolled down from the top. */
+  scroll: number;
 }
 
 export type LogFilter = "all" | "requests" | "ops" | "errors";
@@ -88,6 +118,13 @@ export interface PickerState {
   title: string;
   items: readonly PickerItem[];
   index: number;
+  /** Type-to-filter on label and detail (`/model`). */
+  filterable?: boolean | undefined;
+  /** Current filter text; `items` is then the matching subset of `all`. */
+  query?: string | undefined;
+  all?: readonly PickerItem[] | undefined;
+  /** Footer keys, replacing the default move/choose/cancel hint. */
+  hint?: string | undefined;
 }
 
 export interface PickerItem {
@@ -95,6 +132,8 @@ export interface PickerItem {
   /** Opaque value returned on Enter. */
   value: string;
   detail?: string | undefined;
+  /** Marked with ● (the current model). */
+  current?: boolean | undefined;
 }
 
 /** Most picker rows kept; longer lists are truncated by the caller's order. */
@@ -350,6 +389,14 @@ function paintHeader(
       style: roles.text,
       priority: 1,
     });
+  if (view.types)
+    right.push({
+      text: view.types.ok
+        ? `types ${unicode ? "✓" : "ok"}`
+        : `types ${unicode ? "✗" : "x"} ${view.types.errors}`,
+      style: view.types.ok ? roles.success : roles.error,
+      priority: 4,
+    });
   const sync = syncSegment(view.sync, theme, unicode);
   if (sync) right.push(sync);
   paintSegments(buffer, 0, left, width, " · ", roles.faint, roles.panel, right);
@@ -500,9 +547,14 @@ function paintPrompt(
   const mode = prompt.snapshot.mode;
   const pillStyle = mode === "queue" ? roles.pillQueue : roles.pillSteer;
   let x = 2;
-  x += buffer.text(x, top, pill(mode), pillStyle);
+  if (!view.agentOffline) x += buffer.text(x, top, pill(mode), pillStyle);
   const status: string[] = [];
-  if (view.model) status.push(view.model);
+  // The model shows once, in the header; the spend line carries it here.
+  // Views without a spend line (embedders such as the site demo) keep the
+  // model label.
+  if (view.spend) {
+    if (!layout.footer) status.push(view.spend);
+  } else if (view.model) status.push(view.model);
   if (activity.queueDepth > 0) status.push(`queue ${activity.queueDepth}`);
   const layoutInfo = prompt.layout(rows);
   if (layoutInfo.total > rows)
@@ -541,8 +593,9 @@ function paintPrompt(
       buffer.text(width - 3, y, capabilities.unicode ? "↓" : "v", faint);
   }
   if (prompt.value.length === 0) {
-    const placeholder =
-      mode === "queue"
+    const placeholder = view.agentOffline
+      ? "try: tempo 96 · add C4 at 0 · /help  (dawg login enables the agent)"
+      : mode === "queue"
         ? "queue a request for after the current one…"
         : "describe a change — “add a walking bass in A minor”";
     buffer.text(5, top + 1, truncate(placeholder, editorWidth - 1), faint);
@@ -563,8 +616,19 @@ function paintPrompt(
           : width >= 44
             ? " enter · ^q queue · ^z undo · ^o log "
             : "";
-    const shown = hints;
+    const spend = view.spend ? ` ${view.spend} ` : "";
+    const spendWidth = displayWidth(spend);
+    // Spend wins over hints when both do not fit.
+    const shown =
+      hints && displayWidth(hints) + spendWidth + 6 <= width ? hints : "";
     if (shown) buffer.text(2, y, shown, onBackground(roles.muted, panel));
+    if (spend && spendWidth + 4 <= width)
+      buffer.text(
+        width - 2 - spendWidth,
+        y,
+        spend,
+        onBackground(roles.muted, panel),
+      );
   }
 
   // Cursor: shown as a reverse cell and as the real terminal cursor.
@@ -678,6 +742,67 @@ function paintOverlay(
   });
 }
 
+/** Static lines in a bordered panel; the title sits on the top border. */
+function paintText(
+  buffer: CellBuffer,
+  ui: UiState,
+  region: { y: number; height: number },
+  width: number,
+): void {
+  const text = ui.text;
+  if (!text) return;
+  const roles = ui.theme.roles;
+  const left = width >= 60 ? 2 : 0;
+  const boxWidth = width - left * 2;
+  const height = region.height;
+  if (height < 3 || boxWidth < 10) return;
+  const panel = paintBox(buffer, ui, {
+    left,
+    top: region.y,
+    width: boxWidth,
+    height,
+  });
+  const inner = height - 2;
+  const maxScroll = Math.max(0, text.lines.length - inner);
+  const scroll = Math.max(0, Math.min(maxScroll, text.scroll));
+  const position =
+    maxScroll > 0
+      ? ` · ${scroll + 1}-${scroll + inner}/${text.lines.length}`
+      : "";
+  buffer.text(
+    left + 2,
+    region.y,
+    ` ${text.title}${position} `,
+    onBackground({ ...roles.text, bold: true }, panel),
+    boxWidth - 4,
+  );
+  const hint = ui.capabilities.unicode
+    ? " ↑↓ pgup pgdn scroll · esc close "
+    : " up dn pgup pgdn scroll · esc close ";
+  if (boxWidth > hint.length + 4)
+    buffer.text(
+      left + boxWidth - 2 - hint.length,
+      region.y + height - 1,
+      hint,
+      onBackground(roles.muted, panel),
+    );
+  text.lines.slice(scroll, scroll + inner).forEach((line, index) => {
+    const heading = line.startsWith("── ");
+    buffer.text(
+      left + 2,
+      region.y + 1 + index,
+      truncate(
+        heading && !ui.capabilities.unicode ? line.replace("── ", "-- ") : line,
+        boxWidth - 4,
+      ),
+      onBackground(
+        heading ? { ...roles.borderFocus, bold: true } : roles.text,
+        panel,
+      ),
+    );
+  });
+}
+
 function paintBox(
   buffer: CellBuffer,
   ui: UiState,
@@ -715,7 +840,7 @@ function paintPicker(
   const roles = ui.theme.roles;
   const left = width >= 60 ? 2 : 0;
   const boxWidth = width - left * 2;
-  const height = Math.min(region.height, picker.items.length + 2);
+  const height = Math.min(region.height, Math.max(1, picker.items.length) + 2);
   if (height < 3 || boxWidth < 10) return;
   const panel = paintBox(buffer, ui, {
     left,
@@ -726,13 +851,15 @@ function paintPicker(
   buffer.text(
     left + 2,
     region.y,
-    ` ${picker.title} `,
+    ` ${picker.title}${picker.query ? ` · ${picker.query}` : picker.filterable ? " · type to filter" : ""} `,
     onBackground({ ...roles.text, bold: true }, panel),
     boxWidth - 4,
   );
-  const hint = ui.capabilities.unicode
-    ? " ↑↓ move · enter choose · esc cancel "
-    : " up/dn move · enter choose · esc cancel ";
+  const hint =
+    picker.hint ??
+    (ui.capabilities.unicode
+      ? " ↑↓ move · enter choose · esc cancel "
+      : " up/dn move · enter choose · esc cancel ");
   if (boxWidth > hint.length + 4)
     buffer.text(
       left + boxWidth - 2 - hint.length,
@@ -745,6 +872,16 @@ function paintPicker(
     0,
     Math.min(picker.items.length - inner, picker.index - inner + 1),
   );
+  const marks = (picker.all ?? picker.items).some(
+    (item) => item.current !== undefined,
+  );
+  if (picker.items.length === 0)
+    buffer.text(
+      left + 4,
+      region.y + 1,
+      "no matches",
+      onBackground(roles.muted, panel),
+    );
   picker.items.slice(first, first + inner).forEach((item, offset) => {
     const index = first + offset;
     const y = region.y + 1 + offset;
@@ -754,11 +891,25 @@ function paintPicker(
       ? onBackground({ ...roles.borderFocus, bold: true }, panel)
       : onBackground(roles.text, panel);
     buffer.text(left + 2, y, marker, style);
-    const room = boxWidth - 6;
-    const used = buffer.text(left + 4, y, truncate(item.label, room), style);
+    // A column for the current-item mark only when the picker uses one.
+    const pad = marks ? 2 : 0;
+    if (item.current)
+      buffer.text(
+        left + 4,
+        y,
+        ui.capabilities.unicode ? "●" : "*",
+        onBackground(roles.success, panel),
+      );
+    const room = boxWidth - 6 - pad;
+    const used = buffer.text(
+      left + 4 + pad,
+      y,
+      truncate(item.label, room),
+      style,
+    );
     if (item.detail && used + 3 < room)
       buffer.text(
-        left + 4 + used + 2,
+        left + 4 + pad + used + 2,
         y,
         truncate(item.detail, room - used - 2),
         onBackground(roles.muted, panel),
@@ -802,12 +953,30 @@ export function composeFrame(
     paintTooSmall(buffer, ui, { width, height });
     return { buffer, cursor: undefined, promptRows: 0, layout };
   }
-  paintHeader(buffer, view, ui, width);
+  if (view.play) {
+    paintPlayHeader(
+      buffer,
+      layout.header,
+      width,
+      view.play,
+      ui.theme,
+      ui.capabilities.unicode,
+    );
+    if (layout.highway.height > 1) {
+      paintPlayStrip(buffer, layout.highway.y, width, view.play.keys, ui.theme);
+      layout.highway = {
+        y: layout.highway.y + 1,
+        height: layout.highway.height - 1,
+      };
+    }
+  } else paintHeader(buffer, view, ui, width);
   const beat = view.beat ?? resolveBeat(view.score, nowMs);
   if (layout.highway.height > 0) {
     if (ui.overlay === "log") paintOverlay(buffer, ui, layout.highway, width);
     else if (ui.overlay === "picker" && ui.picker)
       paintPicker(buffer, ui, layout.highway, width);
+    else if (ui.overlay === "text" && ui.text)
+      paintText(buffer, ui, layout.highway, width);
     else
       paintHighway(
         buffer,
@@ -864,9 +1033,10 @@ export class TuiApp {
   capabilities: TerminalCapabilities;
   themeName: ThemeName;
   reducedMotion: boolean;
-  overlay: "log" | "picker" | undefined;
+  overlay: Overlay;
   log: LogView = { scroll: 0, filter: "all" };
   picker: PickerState | undefined;
+  text: TextView | undefined;
   /** `/view all` overlays every unmuted track; `/view focus` shows one. */
   highwayView: "all" | "focus" = "all";
   private writer: ScreenWriter;
@@ -902,6 +1072,7 @@ export class TuiApp {
       overlay: this.overlay,
       log: this.log,
       picker: this.picker,
+      text: this.text,
     };
   }
 
@@ -971,6 +1142,18 @@ export class TuiApp {
         this.closePicker();
         return { type: "pick-cancel", picker: picker.id };
       }
+      if (picker.filterable && (value === "\u007f" || value === "\b")) {
+        this.filterPicker((picker.query ?? "").slice(0, -1));
+        return { type: "overlay" };
+      }
+      if (
+        picker.filterable &&
+        key.type === "text" &&
+        (picker.query || !/^[1-9]$/.test(key.text))
+      ) {
+        this.filterPicker(((picker.query ?? "") + key.text).slice(0, 40));
+        return { type: "overlay" };
+      }
       if (key.type === "text" && /^[1-9]$/.test(key.text)) {
         const index = Number(key.text) - 1;
         if (index < picker.items.length) {
@@ -990,6 +1173,30 @@ export class TuiApp {
       }
       return { type: "overlay" };
     }
+    if (this.overlay === "text" && this.text) {
+      const nav = overlayKey(value);
+      const page = Math.max(1, this.io.rows() - 10);
+      if (nav && nav !== "enter") {
+        const step =
+          nav === "down"
+            ? 1
+            : nav === "up"
+              ? -1
+              : nav === "pgdn"
+                ? page
+                : nav === "pgup"
+                  ? -page
+                  : 0;
+        const total = this.text.lines.length;
+        this.text.scroll =
+          nav === "home"
+            ? 0
+            : nav === "end"
+              ? total
+              : Math.max(0, Math.min(total, this.text.scroll + step));
+        return { type: "overlay" };
+      }
+    }
     if (this.overlay === "log") {
       const nav = overlayKey(value);
       const page = Math.max(1, this.io.rows() - 10);
@@ -1041,8 +1248,13 @@ export class TuiApp {
         }
         if (key.command === "redraw") this.invalidate();
         return { type: "ui", command: key.command };
-      case "prompt":
-        return { type: "action", action: this.prompt.handle(key.key) };
+      case "prompt": {
+        const action = this.prompt.handle(key.key);
+        // Submitting from under a text panel closes it so the receipt shows.
+        if (action.kind === "submit" && this.overlay === "text")
+          this.closeText();
+        return { type: "action", action };
+      }
       case "text": {
         let action: PromptAction = {
           kind: "noop",
@@ -1069,11 +1281,42 @@ export class TuiApp {
     this.overlay = "picker";
   }
 
+  /** Narrow a filterable picker to rows matching `query`. */
+  private filterPicker(query: string): void {
+    const picker = this.picker;
+    if (!picker) return;
+    const all = picker.all ?? picker.items;
+    const needle = query.toLowerCase();
+    const items = all.filter(
+      (item) =>
+        !needle ||
+        item.label.toLowerCase().includes(needle) ||
+        (item.detail ?? "").toLowerCase().includes(needle),
+    );
+    const keep = picker.items[picker.index]?.value;
+    const index = Math.max(
+      0,
+      items.findIndex((item) => item.value === keep),
+    );
+    this.picker = { ...picker, all, query, items, index };
+  }
+
   closePicker(): void {
     this.picker = undefined;
     if (this.overlay === "picker") this.overlay = undefined;
   }
 
+  /** Show static lines over the highway (`/help`, lists); replaces any overlay. */
+  openText(title: string, lines: readonly string[]): void {
+    this.text = { title, lines: lines.slice(0, 512), scroll: 0 };
+    this.overlay = "text";
+  }
+
+  closeText(): void {
+    this.text = undefined;
+    if (this.overlay === "text") this.overlay = undefined;
+  }
+
   /**
    * Handle TUI-local slash commands (`/log`, `/theme`, `/motion`).
    * Returns a receipt, or undefined when the command is not a UI command.

package/tui/drums.ts

@@ -3,6 +3,11 @@
  * (kick, snare, clap, rim, tom, hat, open hat) instead of by pitch.
  */
 import { DRUM_VOICES, drumLane, isDrumInstrument } from "../core/drums.ts";
+import {
+  isSamplerInstrument,
+  samplerVoiceSlots,
+  type Track,
+} from "../core/score.ts";
 import type { NoteSnapshot, TrackScoreSnapshot } from "./render.ts";
 
 export function drumSnapshotFields(
@@ -19,3 +24,42 @@ export function drumSnapshotFields(
     })),
   };
 }
+
+/**
+ * Sampler adapter: oneshot samplers stream one lane per voice (named, in
+ * pitch-slot order from 36); keyed samplers keep the pitch axis, labelled by
+ * note name like any melodic track.
+ */
+export function samplerSnapshotFields(
+  track: Pick<Track, "instrument" | "sampler"> | undefined,
+  notes: readonly NoteSnapshot[],
+): Partial<TrackScoreSnapshot> {
+  const lanes = samplerLanes(track);
+  if (!lanes) return {};
+  return {
+    laneCount: lanes.labels.length,
+    laneLabels: lanes.labels,
+    notes: notes.flatMap((note) => {
+      const lane = lanes.laneOf(note.pitch ?? -1);
+      return lane === undefined ? [] : [{ ...note, lane }];
+    }),
+  };
+}
+
+/** Oneshot sampler lanes, or undefined for keyed/non-sampler tracks. */
+export function samplerLanes(
+  track: Pick<Track, "instrument" | "sampler"> | undefined,
+):
+  | { labels: string[]; laneOf: (pitch: number) => number | undefined }
+  | undefined {
+  if (!track || !isSamplerInstrument(track.instrument) || !track.sampler)
+    return undefined;
+  if (track.sampler.mode !== "oneshot") return undefined;
+  const slots = [...samplerVoiceSlots(track.sampler)];
+  if (slots.length === 0) return undefined;
+  const byPitch = new Map(slots.map(([, slot], index) => [slot, index]));
+  return {
+    labels: slots.map(([voice]) => voice),
+    laneOf: (pitch) => byPitch.get(pitch),
+  };
+}

package/tui/highway.ts

@@ -11,6 +11,7 @@
  */
 
 import { CellBuffer } from "./screen.ts";
+import { truncate } from "./text.ts";
 import {
   accentStyle,
   onBackground,
@@ -472,6 +473,11 @@ export function paintHighway(
   const rowBeat = (row: number): number => beat + (hitRow - row) / rowsPerBeat;
   const legendRow = layout.legendRow;
   const lastNoteRow = (legendRow ?? region.height) - 1;
+  // Nothing to label yet: bar numbers and the lane legend stay off and a
+  // centred hint says how to start. The hit line and grid still draw.
+  const empty =
+    score.notes.length === 0 &&
+    !(score.layers ?? []).some((layer) => layer.notes.length > 0);
 
   // Beat, bar, and loop rules of increasing strength.
   for (let row = 0; row <= lastNoteRow; row += 1) {
@@ -497,7 +503,7 @@ export function paintHighway(
       if (!isBar && !isLoop && (column - gutter) % 2 === 1) continue;
       painter.put(column, row, glyph, style);
     }
-    if (gutter > 0 && (isBar || isLoop)) {
+    if (gutter > 0 && (isBar || isLoop) && !empty) {
       const label = isLoop
         ? glyphs.loop
         : String(Math.floor(inLoop / beatsPerBar) + 1);
@@ -553,8 +559,18 @@ export function paintHighway(
     }
   }
 
+  if (empty) {
+    const name = score.trackName ?? score.trackId ?? "track";
+    const start = projection.kind === "pitch" ? "add C4 at 0" : "hit kick at 0";
+    const text = truncate(`${name} · empty · ${start} to start`, areaWidth);
+    const x = gutter + Math.max(0, Math.floor((areaWidth - text.length) / 2));
+    const y = Math.max(0, Math.floor(hitRow / 2));
+    for (let index = 0; index < text.length; index += 1)
+      painter.put(x + index, y, text[index]!, roles.muted);
+  }
+
   // Legend for drum voices (or C-octave markers for pitch lanes).
-  if (legendRow !== undefined && projection.label) {
+  if (legendRow !== undefined && projection.label && !empty) {
     let nextFree = 0;
     for (let lane = 0; lane < layout.laneCount; lane += 1) {
       const label = projection.label(lane);

package/tui/layers.ts

@@ -9,6 +9,8 @@ import {
   MAX_LAYER_NOTES,
   type HighwayLayer,
 } from "./highway.ts";
+import { samplerLanes } from "./drums.ts";
+import type { Sampler } from "../core/score.ts";
 
 export interface LayerTrack {
   id: string;
@@ -16,6 +18,7 @@ export interface LayerTrack {
   instrument: string;
   muted: boolean;
   solo?: boolean | undefined;
+  sampler?: Sampler | undefined;
 }
 
 export interface LayerNote {
@@ -43,17 +46,24 @@ export function highwayLayers(
   let budget = MAX_LAYER_NOTES;
   return audible.map((track) => {
     const drum = isDrumInstrument(track.instrument);
+    const sampled = drum ? undefined : samplerLanes(track);
     const own = [];
     for (const note of notes) {
       if (note.trackId !== track.id) continue;
       if (budget <= 0) break;
+      const lane = drum
+        ? drumLane(note.pitch)
+        : sampled
+          ? sampled.laneOf(note.pitch)
+          : undefined;
+      if (sampled && lane === undefined) continue;
       budget -= 1;
       own.push({
         startBeat: note.startTick / tpb,
         durationBeats: note.durationTicks / tpb,
         pitch: note.pitch,
         velocity: note.velocity,
-        ...(drum ? { lane: drumLane(note.pitch) } : {}),
+        ...(lane !== undefined ? { lane } : {}),
       });
     }
     return {
@@ -62,7 +72,9 @@ export function highwayLayers(
       notes: own,
       projection: drum
         ? drumLaneProjection(DRUM_VOICES.map((info) => info.label))
-        : undefined,
+        : sampled
+          ? drumLaneProjection(sampled.labels)
+          : undefined,
     };
   });
 }