@nledford/omp-coord 0.2.2 → 0.2.3

package/.omp-plugin/marketplace.json

@@ -7,7 +7,7 @@
       "name": "omp-coord",
       "source": "./",
       "description": "Shared subagent caps, build and test queues, claims, pause, a decision log and messages across omp sessions working in one project on one machine.",
-      "version": "0.2.2",
+      "version": "0.2.3",
       "author": { "name": "Nathaniel Ledford" },
       "homepage": "https://github.com/nledford/omp-coord",
       "repository": "https://github.com/nledford/omp-coord",

package/CHANGELOG.md

@@ -6,6 +6,16 @@ Add each user-visible change under Unreleased as it lands, in one of: Added, Cha
 
 ## [Unreleased]
 
+## [0.2.3] - 2026-10-27
+
+### Added
+
+- `tagAgentCommands` (off by default): each queued job records the agent whose command queued it, and the queue lines in `/coord` and `omp-coord status` read `session A/WaveImport`; `status --json` has `agent` on each job and the `job_queued` event carries it. With it on, the extension starts every agent bash command with `export OMP_COORD_AGENT=<agent id>;`, which `omp-coord run` reads; leave it off if you use omp's `bash.patterns` rules or another extension that rewrites bash commands. A board made by an older omp-coord gains the new column when this version opens it; while any session of the scope still runs an older omp-coord, its saves drop the recorded agents (display only).
+
+### Changed
+
+- A queue line shows the job's key (for example `rebase-2204 ci`) instead of its command when the job has one; the command still shows when it doesn't, and `status --json` keeps both.
+
 ## [0.2.2] - 2026-10-27
 
 ### Added
@@ -53,7 +63,8 @@ Add each user-visible change under Unreleased as it lands, in one of: Added, Cha
 - An SQLite event log per scope, with retention.
 - Packaging as an omp plugin, with a marketplace catalog; queued commands run on omp's own Bun.
 
-[Unreleased]: https://github.com/nledford/omp-coord/compare/v0.2.2...HEAD
+[Unreleased]: https://github.com/nledford/omp-coord/compare/v0.2.3...HEAD
+[0.2.3]: https://github.com/nledford/omp-coord/compare/v0.2.2...v0.2.3
 [0.2.2]: https://github.com/nledford/omp-coord/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/nledford/omp-coord/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/nledford/omp-coord/compare/v0.1.0...v0.2.0

package/docs/commands.md

@@ -61,7 +61,7 @@ Every time is milliseconds since the epoch (`Date.now()`); a session is its lett
 | `line[]` | Sessions waiting for a slot: `pool`, `session`, `position` (from 1), `since`, `heldUntil` (`null` unless a freed slot is held for it). |
 | `agents[]` | One per agent holding a slot, by session letter then `since`: `id` (`null` for a spawn with no key and no first run yet), `type`, `parent` (`Main` or an agent id), `session`, `pool` (`null`: outside the caps), `state` (`starting` or `running`), `since`. |
 | `claims[]` | `kind` (`branch`, `worktree`, `pr`), `target`, `session`, `agent`, `note`, `since`. |
-| `queues[]` | `name`, `order`, `slots` (now), `configuredSlots`, `running[]` and `waiting[]` (in the order they will start), each job: `id`, `session`, `owner` (the owning session's id, or `null` outside omp), `lane`, `priority`, `key` (or `null`), `command`, `state`, `queuedAt`, `startedAt` (`null` while waiting), `position` (from 1 while waiting, `null` while running). |
+| `queues[]` | `name`, `order`, `slots` (now), `configuredSlots`, `running[]` and `waiting[]` (in the order they will start), each job: `id`, `session`, `owner` (the owning session's id, or `null` outside omp), `lane`, `priority`, `key` (or `null`), `command`, `agent` (omp's id of the agent whose command queued it, `"Main"` for the main agent; `null` when `tagAgentCommands` is off, for a job started outside an agent's bash call, and while any session of the scope runs an omp-coord older than 0.2.3, whose saves drop it), `state`, `queuedAt`, `startedAt` (`null` while waiting), `position` (from 1 while waiting, `null` while running). |
 | `notes[]` | The latest three decisions, oldest first: `id`, `at`, `session` (the letter when it was written, kept after that session ends; `null` outside omp), `author`, `text`. |
 
 ```json
@@ -102,4 +102,5 @@ Exit codes: `0` success, the command's own for `run`, `75` a job not run, `124`
 | `OMP_COORD_SESSION` | the extension | The session that owns jobs started from its agents' commands. |
 | `OMP_COORD_PORTS` | the extension | The session's port block, e.g. `18700-18799`, when `resources.ports` is set. |
 | `OMP_COORD_SCRATCH` | the extension | The session's scratch folder, when `resources.scratch` is set. |
+| `OMP_COORD_AGENT` | the extension, with `tagAgentCommands` | The agent whose command this is (`Main` for the main agent); `omp-coord run` records it on the job. |
 | `OMP_COORD_JOB`, `OMP_COORD_QUEUE` | `omp-coord run` | The running job's id and queue, for nested runs. |

package/docs/configuration.md

@@ -21,6 +21,7 @@
 | `queues.<name>.onDuplicate` | `"refuse"` | `"refuse"` or `"supersede"` a waiting job with the same key. |
 | `queues.<name>.timeoutMinutes` | none | Stop a job's command after this long: SIGTERM to its process group, then SIGKILL to whatever of it is left 10 s later; it exits 124. `--timeout` overrides it per job. |
 | `queues.<name>.loadSlots` | `[]` | `[{ "above": 150, "slots": 1 }]`: fewer slots under load; `0` holds the queue. |
+| `tagAgentCommands` | `false` | Start each agent bash command with `export OMP_COORD_AGENT=<agent id>;`, so each queued job records the agent that queued it (queue lines read `session A/<agent>`). Leave it off when you use omp's `bash.patterns` allow or deny rules (a rewritten command no longer matches them) or another extension that rewrites bash commands (the last rewrite wins). |
 | `resources.ports` | none | `{ "from", "to", "perSession", "perAgent" (10) }`: each session gets a block of `perSession` ports, each agent a block of `perAgent` from its session's. |
 | `resources.scratch` | none | Root of the scratch folders: `<scratch>/<letter>` per session, `<scratch>/<letter>/<agent id>` per agent. Relative to the config file. |
 | `history.retentionDays` | `30` | Events and decision-log notes older than this are deleted. |

package/docs/event-log.md

@@ -14,7 +14,7 @@ These tables are rebuilt as sessions come and go; their layout is not part of th
 | `slots` | Agent slots held: `session_id`, `agent_id`, `parent_id`, `agent_type`, `pool` (null outside the caps), `state` (`starting` or `running`), `since`. |
 | `tickets` | The line: `session_id`, `pool`, `since`, `hold_until` (set while a slot is held for it), `notified`. |
 | `messages` | Messages not yet delivered. |
-| `jobs` | Queued and running build/test jobs: `id`, `queue`, `owner` (session id, or null outside omp), `lane`, `priority`, `key`, `command`, `pid`, `state` (`waiting`, `running`, `superseded`), `since`, `started_at`. |
+| `jobs` | Queued and running build/test jobs: `id`, `queue`, `owner` (session id, or null outside omp), `lane`, `priority`, `key`, `command`, `agent` (null when not recorded), `pid`, `state` (`waiting`, `running`, `superseded`), `since`, `started_at`. |
 | `claims` | `kind` (`branch`, `worktree`, `pr`), `target`, `session_id`, `agent_id`, `note`, `since`. |
 | `pause` | One row while the scope is paused: `by_session` (null from a terminal), `reason`, `since`. |
 | `agent_ports` | Port blocks agents took: `session_id`, `agent_id`, `from_port`, `to_port`. |
@@ -25,7 +25,7 @@ These tables are rebuilt as sessions come and go; their layout is not part of th
 `events` is an append-only log: `at` (ms since epoch), `type`, `session_id` (null for jobs from outside omp), `label`, and `data` (JSON). Types:
 
 - Sessions and agents: `session_joined`, `session_left`, `spawn_approved`, `spawn_refused` (with `position`, `used`, `cap`, or `nested` and `reason`), `run_started` (with `revived`), `run_ended` (with `ranMs`), `start_expired`, `hold_granted`, `hold_used` and `hold_expired` (with `waitedMs` since the first refusal), `message_sent` (recipients and length, never the text).
-- Jobs: `job_queued` (with `queue`, `lane`, `priority`, `key`), `job_refused` (with `reason`), `job_started` (with `waitedMs`), `job_ended` (with `exitCode`, `ranMs`, and `timedOut` when the time limit stopped it), `job_withdrawn` (left the line before starting), `job_superseded`, `job_lost` (its runner died), `job_reprioritized`.
+- Jobs: `job_queued` (with `queue`, `lane`, `priority`, `key`, and `agent` when recorded), `job_refused` (with `reason`), `job_started` (with `waitedMs`), `job_ended` (with `exitCode`, `ranMs`, and `timedOut` when the time limit stopped it), `job_withdrawn` (left the line before starting), `job_superseded`, `job_lost` (its runner died), `job_reprioritized`.
 - Control: `paused` (with `reason`), `resumed` (with `pausedMs`), `claimed`, `released`, `claim_refused` (with `holder`), `note_added` (note number and length).
 
 `notes` is the decision log: `id`, `at`, `label`, `author`, `text`.

package/docs/queues.md

@@ -49,4 +49,6 @@ A command that puts its work in the background (`cargo test &`) holds the slot o
 
 When an agent's bash command matches a `queue` rule under `commands`, the extension rewrites it to run `omp-coord run <queue> --owner <session> -- sh -c '<command>'` with omp's own binary as Bun (`BUN_BE_BUN=1`), so it needs no separate Bun install. The waiting happens inside the bash call, which counts against the bash tool's timeout: agents should run long jobs as background (`async`) bash calls. The rewritten command runs in `sh`, so shell variables the agent set earlier without exporting them are not visible to it.
 
+With `tagAgentCommands` on, the extension also starts every agent bash command with `export OMP_COORD_AGENT=<agent id>;`, and `omp-coord run` records that agent on the job: queue lines read `session A/WaveImport` instead of only `session A`. It is off by default because the rewritten command no longer matches omp's `bash.patterns` rules (they must match the whole command) and replaces any other extension's rewrite of the same call.
+
 A command matching a `refuse` rule is refused with the rule's reason.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nledford/omp-coord",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "files": [
     "src",
     "docs",

package/src/adapters/cli/cli.ts

@@ -249,6 +249,8 @@ async function run(args: string[]): Promise<number> {
         id,
         queue,
         owner: values.owner || process.env.OMP_COORD_SESSION || null,
+        // set per command by the extension's bash hook
+        ...(process.env.OMP_COORD_AGENT ? { agent: process.env.OMP_COORD_AGENT } : {}),
         ...(values.lane === undefined ? {} : { lane: values.lane }),
         priority,
         ...(values.key === undefined ? {} : { key: values.key }),

package/src/adapters/omp/extension.ts

@@ -16,7 +16,7 @@ import { join, resolve } from "node:path";
 import { Coordinator } from "../../app/coordinator.ts";
 import type { Listener } from "../../app/ports.ts";
 import { type Config, ConfigError, findConfigFile, loadConfig } from "../../config.ts";
-import { decideCommand } from "../../domain/commands.ts";
+import { decideCommand, withAgent } from "../../domain/commands.ts";
 import type { Claim } from "../../domain/model.ts";
 import { osLoad } from "../os/load.ts";
 import { BoardStore, stateDir } from "../sqlite/store.ts";
@@ -190,7 +190,12 @@ export default function ompCoord(pi: ExtensionAPI): void {
       config: rt.config.source,
     });
     if (decision.kind === "refuse") return { block: true, reason: `omp-coord: ${decision.reason}` };
-    if (decision.kind === "queue") return { input: { ...event.input, command: decision.command } };
+    const run = decision.kind === "queue" ? decision.command : command;
+    // Every agent of a session shares the omp process's environment, so the agent's id can reach `omp-coord run` (and
+    // the queue lines) only through the command itself; opt-in (`tagAgentCommands`), since the rewrite defeats omp's
+    // bash.patterns rules and other extensions' rewrites. Off, the hook changes only queued commands, as before.
+    if (rt.config.tagAgentCommands) return { input: { ...event.input, command: withAgent(ctx.agent.id, run) } };
+    if (decision.kind === "queue") return { input: { ...event.input, command: run } };
     return undefined;
   });
 

package/src/adapters/sqlite/store.ts

@@ -77,6 +77,7 @@ CREATE TABLE jobs (
   priority   INTEGER NOT NULL,
   key        TEXT,
   command    TEXT NOT NULL,
+  agent      TEXT,
   socket     TEXT NOT NULL,
   pid        INTEGER NOT NULL,
   state      TEXT NOT NULL CHECK (state IN ('waiting', 'running', 'superseded')),
@@ -229,7 +230,10 @@ export class BoardStore implements BoardRepository {
 
   #migrate(): void {
     const version = this.#db.query<{ user_version: number }, []>("PRAGMA user_version").get()?.user_version ?? 0;
-    if (version === SCHEMA_VERSION) return;
+    if (version === SCHEMA_VERSION) {
+      this.#addColumns();
+      return;
+    }
     if (version !== 0) {
       throw new Error(
         `the board database has schema ${version}, but this omp-coord reads schema ${SCHEMA_VERSION}; update omp-coord`,
@@ -239,6 +243,20 @@ export class BoardStore implements BoardRepository {
     this.#db.exec(`PRAGMA user_version = ${SCHEMA_VERSION}`);
   }
 
+  /**
+   * Nullable columns added after schema 1 was released, without a version bump: a board made by an older omp-coord
+   * gets them here, and an older omp-coord still running (an omp session not yet restarted) keeps reading and
+   * writing the board, ignoring them (its saves write null there, which readers show as unknown).
+   */
+  #addColumns(): void {
+    const has = (table: string, column: string) =>
+      this.#db
+        .query<{ name: string }, []>(`PRAGMA table_info(${table})`)
+        .all()
+        .some(c => c.name === column);
+    if (!has("jobs", "agent")) this.#db.exec("ALTER TABLE jobs ADD COLUMN agent TEXT");
+  }
+
   #maybePruneEvents(now: number): void {
     const last = Number(
       this.#db.query<{ value: string }, []>("SELECT value FROM meta WHERE key = 'events_pruned_at'").get()?.value ?? 0,
@@ -337,6 +355,7 @@ export class BoardStore implements BoardRepository {
             priority: number;
             key: string | null;
             command: string;
+            agent: string | null;
             socket: string;
             pid: number;
             state: "waiting" | "running" | "superseded";
@@ -354,6 +373,7 @@ export class BoardStore implements BoardRepository {
           priority: r.priority,
           key: r.key ?? undefined,
           command: r.command,
+          agent: r.agent ?? undefined,
           socket: r.socket,
           pid: r.pid,
           state: r.state,
@@ -455,7 +475,7 @@ export class BoardStore implements BoardRepository {
     const sent = db.query("INSERT INTO sent (session_id, at) VALUES (?, ?)");
     for (const x of board.sent) sent.run(x.sessionId, x.at);
     const job = db.query(
-      "INSERT INTO jobs (id, queue, owner, lane, priority, key, command, socket, pid, state, since, started_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+      "INSERT INTO jobs (id, queue, owner, lane, priority, key, command, agent, socket, pid, state, since, started_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
     );
     for (const j of board.jobs) {
       job.run(
@@ -466,6 +486,7 @@ export class BoardStore implements BoardRepository {
         j.priority,
         j.key ?? null,
         j.command,
+        j.agent ?? null,
         j.socket,
         j.pid,
         j.state,

package/src/adapters/text/report.ts

@@ -5,7 +5,7 @@ import { capOf, used } from "../../domain/agents.ts";
 import { pauseReason } from "../../domain/control.ts";
 import type { DayStats, InterruptedSession } from "../../domain/history.ts";
 import { currentLoad } from "../../domain/limits.ts";
-import { type AgentPolicy, type Board, labelOf, type Note } from "../../domain/model.ts";
+import { type AgentPolicy, type Board, type Job, labelOf, type Note } from "../../domain/model.ts";
 import { agentList, LATEST_NOTES } from "../../domain/overview.ts";
 import { orderWaiting, type Queues, slotsOf } from "../../domain/queues.ts";
 
@@ -126,8 +126,13 @@ export function formatStatus(board: Board, config: Config, me: string, now: numb
 /** One block per queue: running jobs, then waiting jobs in the order they will start. */
 export function formatQueues(board: Board, queues: Queues, now: number): string[] {
   const lines: string[] = [];
-  const who = (owner: string | null) =>
-    owner === null ? "outside omp" : `session ${labelOf(board, owner) ?? "(ended)"}`;
+  // whose job: the session, and the agent when recorded ("session A/WaveImport")
+  const who = (j: Job) =>
+    (j.owner === null ? "outside omp" : `session ${labelOf(board, j.owner) ?? "(ended)"}`) +
+    (j.agent ? `/${j.agent}` : "");
+  // what it is: the job's key ("<checkout> <recipe> <args>") reads better than the command's full path; the command
+  // when there is no key
+  const what = (j: Job) => j.key || j.command;
   for (const [name, q] of Object.entries(queues)) {
     const running = board.jobs.filter(j => j.queue === name && j.state === "running");
     const waiting = orderWaiting(q, name, board, now);
@@ -135,14 +140,14 @@ export function formatQueues(board: Board, queues: Queues, now: number): string[
     const lowered = slots < q.slots && !board.pause ? ` (lowered from ${q.slots} under load)` : "";
     lines.push(`  ${name} (${q.order}): ${running.length}/${slots} running${lowered}, ${waiting.length} waiting`);
     for (const j of running)
-      lines.push(`    running  ${j.id}  ${who(j.owner)}  ${minutes(now - (j.startedAt ?? now))}  ${j.command}`);
+      lines.push(`    running  ${j.id}  ${who(j)}  ${minutes(now - (j.startedAt ?? now))}  ${what(j)}`);
     for (const [i, j] of waiting.entries()) {
       const extras = [
         j.lane === q.lanes.at(-1) ? "" : `lane ${j.lane}`,
         j.priority ? `priority ${j.priority}` : "",
       ].filter(Boolean);
       lines.push(
-        `    #${i + 1}       ${j.id}  ${who(j.owner)}  waited ${minutes(now - j.since)}${extras.length ? ` (${extras.join(", ")})` : ""}  ${j.command}`,
+        `    #${i + 1}       ${j.id}  ${who(j)}  waited ${minutes(now - j.since)}${extras.length ? ` (${extras.join(", ")})` : ""}  ${what(j)}`,
       );
     }
   }

package/src/app/job-runner.ts

@@ -17,6 +17,8 @@ export interface JobSpec {
   id: string;
   queue: string;
   owner: string | null;
+  /** omp's id of the agent whose command this is, for display. */
+  agent?: string;
   lane?: string;
   priority: number;
   key?: string;

package/src/config.ts

@@ -26,6 +26,12 @@ export interface Config {
   commands: CommandRule[];
   /** Build and test queues, machine-wide within the scope. */
   queues: Queues;
+  /**
+   * Start each agent bash command with `export OMP_COORD_AGENT=<agent id>;` so queued jobs record whose they are.
+   * Off by default: the rewritten command no longer matches omp's `bash.patterns` rules and replaces other
+   * extensions' rewrites of the same call.
+   */
+  tagAgentCommands: boolean;
   /** Port ranges and scratch folders handed to sessions and their agents. */
   resources: { ports: PortPolicy | undefined; scratch: string | undefined };
   /** Retention of the event log and the decision log. */
@@ -185,6 +191,7 @@ export function parseConfig(raw: unknown, source: string, hash = "none"): Config
     },
     commands,
     queues,
+    tagAgentCommands: flag(root.tagAgentCommands ?? false, "tagAgentCommands", fail),
     resources: { ports, scratch },
     history: {
       maxAgeMs: count(history.retentionDays ?? 30, "history.retentionDays", fail) * 24 * 3_600_000,
@@ -205,6 +212,11 @@ function list(v: unknown, field: string, fail: Fail): unknown[] {
   return v;
 }
 
+function flag(v: unknown, field: string, fail: Fail): boolean {
+  if (typeof v !== "boolean") fail(field, "must be true or false");
+  return v as boolean;
+}
+
 function str(v: unknown, field: string, fail: Fail): string {
   if (typeof v !== "string" || v.trim() === "") return fail(field, "must be a non-empty string");
   return v;

package/src/domain/commands.ts

@@ -54,3 +54,12 @@ export function decideCommand(rules: CommandRule[], command: string, runner: Run
 function quote(word: string): string {
   return `'${word.replaceAll("'", `'\\''`)}'`;
 }
+
+/**
+ * The command with the id of the agent running it exported first, so a queued job records whose it is
+ * (`omp-coord run` reads `OMP_COORD_AGENT`). An export, not a `VAR=… cmd` prefix, so it reaches every command of a
+ * compound line; each agent's next command sets it again.
+ */
+export function withAgent(agentId: string, command: string): string {
+  return `export OMP_COORD_AGENT=${quote(agentId)}; ${command}`;
+}

package/src/domain/model.ts

@@ -158,6 +158,9 @@ export interface Job {
   queue: string;
   /** The omp session whose agent started it, or null (a terminal, a script). Fair share is per owner. */
   owner: string | null;
+  /** omp's id of the agent whose command queued it ("Main" for the main agent), or undefined (outside omp, or an
+   * older omp-coord that did not record it). For display only. */
+  agent: string | undefined;
   lane: string;
   priority: number;
   /** Jobs with the same key are duplicates (e.g. "<checkout> ci"). */

package/src/domain/overview.ts

@@ -51,6 +51,8 @@ export interface JobView {
   priority: number;
   key: string | null;
   command: string;
+  /** omp's id of the agent whose command queued it ("Main" for the main agent); null outside omp or when not recorded. */
+  agent: string | null;
   state: "running" | "waiting";
   /** When it joined the line (a superseding job keeps the place of the one it replaced). */
   queuedAt: number;
@@ -136,6 +138,7 @@ export function statusView(board: Board, config: ScopeConfig, now: number): Stat
     priority: j.priority,
     key: j.key ?? null,
     command: j.command,
+    agent: j.agent ?? null,
     state: position === null ? "running" : "waiting",
     queuedAt: j.since,
     startedAt: j.startedAt ?? null,

package/src/domain/queues.ts

@@ -43,6 +43,7 @@ export interface JobRequest {
   id: string;
   queue: string;
   owner: string | null;
+  agent?: string;
   lane?: string;
   priority: number;
   key?: string;
@@ -81,6 +82,7 @@ export function enqueueJob(board: Board, queues: Queues, req: JobRequest): Enque
     id: req.id,
     queue: req.queue,
     owner: req.owner,
+    agent: req.agent,
     lane,
     priority: req.priority,
     key: req.key,
@@ -97,6 +99,7 @@ export function enqueueJob(board: Board, queues: Queues, req: JobRequest): Enque
     lane,
     priority: req.priority,
     ...(req.key === undefined ? {} : { key: req.key }),
+    ...(req.agent === undefined ? {} : { agent: req.agent }),
   });
   schedule(board, queues, req.now);
   return { ok: true };