feat(ai-tools): omp shared + OpenCode/omp sessions, tokens, subagents; Grok hooks; resume by id

- omp-usage.js / opencode-usage.js: poll each CLI's own session store into
  sessions (tool omp/opencode), token_usage per model and subagent agents;
  transcript routes read them (omp journals, OpenCode's opencode.db).
- Grok runs the Claude hooks in ~/.claude/settings.json: its hooks are now
  recognised (hookEventName + workspaceRoot), tagged tool=grok, and their
  transcript_path dropped instead of being parsed as a Claude transcript.
- Catalog `resumeById`: omp/Grok/Cursor `--resume <id>`, OpenCode
  `--session <id>`; session ids may carry `_`. The client offers Resume for
  any tool that resumes by id.
- Kimi Code and GitHub Copilot leave the catalog (their session stores could
  not be verified).

server/__tests__/ai-tools-route.test.js

@@ -190,16 +190,16 @@ describe("install / update / icons", () => {
   it("starts an install job and reports it", async () => {
     jobs.__reset();
     assert.equal((await request("GET", "/api/ai-tools/job")).body, null);
-    const r = await request("POST", "/api/ai-tools/copilot/install");
+    const r = await request("POST", "/api/ai-tools/codex/install");
     assert.equal(r.status, 202);
-    assert.equal(r.body.job.tool, "copilot");
+    assert.equal(r.body.job.tool, "codex");
     const done = await settle();
     assert.equal(done.status, "ok");
     assert.deepEqual(spawned.at(-1), [
       path.join(BIN, "npm"),
       "install",
       "-g",
-      "@github/copilot@latest",
+      "@openai/codex@latest",
     ]);
   });
 
@@ -216,7 +216,7 @@ describe("install / update / icons", () => {
     const notNpm = await request("POST", "/api/ai-tools/opencode/update");
     assert.equal(notNpm.status, 409);
     assert.equal(notNpm.body.error.code, "ENOTNPM");
-    const cross = await request("POST", "/api/ai-tools/copilot/install", undefined, {
+    const cross = await request("POST", "/api/ai-tools/codex/install", undefined, {
       Origin: "https://evil.test",
     });
     assert.equal(cross.status, 403);
@@ -225,7 +225,7 @@ describe("install / update / icons", () => {
   it("answers EBUSY while a job runs", async () => {
     jobs.__reset({ timeoutMs: 50 });
     hang = true;
-    assert.equal((await request("POST", "/api/ai-tools/copilot/install")).status, 202);
+    assert.equal((await request("POST", "/api/ai-tools/codex/install")).status, 202);
     const busy = await request("POST", "/api/ai-tools/amp/install");
     assert.equal(busy.status, 409);
     assert.equal(busy.body.error.code, "EBUSY");

server/__tests__/ai-tools.test.js

@@ -194,6 +194,7 @@ describe("enable / default", () => {
       launcher: null,
       prompt: { mode: "flag" },
       resume: false,
+      resumeById: false,
       bypass: false,
       proxyCapable: false,
       modelFlag: false,

server/__tests__/grok-hook-route.test.js

@@ -0,0 +1,88 @@
+/**
+ * @file Tests POST /api/hooks/event for a hook Grok Build fired through the
+ * Claude hooks in `~/.claude/settings.json` (Grok's Claude compatibility): it
+ * arrives with no `tool`, is told apart by the camelCase keys only Grok sends
+ * (`hookEventName`, `workspaceRoot`), and lands as a `tool = 'grok'` session
+ * on the grok workspace — never the claude one sharing the directory — with
+ * its `transcript_path` dropped. A Claude hook is left Claude's. The DB lives
+ * in a temp dir.
+ * @author Nguyễn Ngọc Trí Vĩ <vinnt@smartgift.vn>
+ */
+
+const { describe, it, before, after } = require("node:test");
+const assert = require("node:assert/strict");
+const path = require("node:path");
+const os = require("node:os");
+const fs = require("node:fs");
+
+const ROOT = fs.mkdtempSync(path.join(os.tmpdir(), "agenthub-grok-hook-route-"));
+process.env.DASHBOARD_DB_PATH = path.join(ROOT, "dashboard.db");
+process.env.CLAUDE_HOME = path.join(ROOT, "claude");
+process.env.DASHBOARD_LIVENESS_PROBE = "0";
+
+const { createApp, startServer } = require("../index");
+const { db } = require("../db");
+const lanes = require("../lib/lanes");
+
+let server;
+let BASE;
+const CWD = path.join(fs.realpathSync(ROOT), "repo");
+fs.mkdirSync(CWD, { recursive: true });
+
+before(async () => {
+  server = await startServer(createApp(), 0);
+  BASE = `http://127.0.0.1:${server.address().port}`;
+});
+after(() => {
+  server.close();
+  fs.rmSync(ROOT, { recursive: true, force: true });
+});
+
+const post = (body) =>
+  fetch(`${BASE}/api/hooks/event`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+  }).then((r) => r.json());
+
+const grokData = (id, extra = {}) => ({
+  hookEventName: "session_start",
+  hook_event_name: "SessionStart",
+  sessionId: id,
+  session_id: id,
+  cwd: CWD,
+  workspaceRoot: CWD,
+  transcript_path: path.join(ROOT, "grok", "sessions", id, "chat_history.jsonl"),
+  permissionMode: "default",
+  ...extra,
+});
+
+describe("Grok hooks through the Claude settings", () => {
+  it("records a grok session, on the grok workspace, with no transcript path", async () => {
+    const claudeLane = lanes.createLane({ title: "c", cwd: CWD, tool: "claude" });
+    const grokLane = lanes.createLane({ title: "g", cwd: CWD, tool: "grok" });
+    const id = "0199f0aa-1111-7222-8333-444455556666";
+    await post({ hook_type: "SessionStart", data: grokData(id) });
+    await post({
+      hook_type: "UserPromptSubmit",
+      data: grokData(id, { hookEventName: "user_prompt_submit", prompt: "fix the bug" }),
+    });
+    const s = db.prepare("SELECT * FROM sessions WHERE id = ?").get(id);
+    assert.equal(s.tool, "grok");
+    assert.equal(s.transcript_path, null);
+    const events = db.prepare("SELECT data FROM events WHERE session_id = ?").all(id);
+    assert.ok(events.length >= 1);
+    for (const e of events) assert.equal(JSON.parse(e.data).transcript_path, undefined);
+    assert.equal(lanes.getLane(claudeLane.id).session_id, null);
+    assert.equal(lanes.getLane(grokLane.id).session_id, id);
+  });
+
+  it("leaves a Claude hook Claude's", async () => {
+    const id = "0199f0aa-1111-7222-8333-777788889999";
+    await post({
+      hook_type: "SessionStart",
+      data: { hook_event_name: "SessionStart", session_id: id, cwd: CWD },
+    });
+    assert.equal(db.prepare("SELECT tool FROM sessions WHERE id = ?").get(id).tool, "claude");
+  });
+});

server/__tests__/omp-usage.test.js

@@ -0,0 +1,233 @@
+/**
+ * @file Tests server/lib/omp-usage.js and the omp branch of the transcript
+ * routes — Oh My Pi sessions from omp's session journals: a session created
+ * as `tool = 'omp'` with its title, cwd, model and per-model tokens (its
+ * subagents' included), a subagent row per subagent journal, a journal read on
+ * from where it stopped, `session_exit` settling it to completed, a session
+ * the user deleted staying deleted, a non-omp row with the same id never
+ * touched, and the journal mapped to the Claude transcript shape. The omp dir
+ * and the DB are temp dirs; the journals are synthetic, in the shape omp
+ * 18.12 writes.
+ * @author Nguyễn Ngọc Trí Vĩ <vinnt@smartgift.vn>
+ */
+
+const os = require("node:os");
+const fs = require("node:fs");
+const path = require("node:path");
+
+const ROOT = fs.mkdtempSync(path.join(os.tmpdir(), "agenthub-omp-usage-"));
+process.env.DASHBOARD_DB_PATH = path.join(ROOT, "dashboard.db");
+process.env.CLAUDE_HOME = path.join(ROOT, "claude");
+process.env.AGENTHUB_OMP_DIR = path.join(ROOT, "omp");
+
+const { describe, it, before, after } = require("node:test");
+const assert = require("node:assert/strict");
+const { db } = require("../db");
+const omp = require("../lib/omp-usage");
+const { createApp, startServer } = require("../index");
+
+const ID = "01a15366-27e2-734a-9247-04d5c65c1636";
+const STAMP = "2026-10-19T09-02-46-242Z";
+const CWD = path.join(fs.realpathSync(ROOT), "work");
+fs.mkdirSync(CWD, { recursive: true });
+const DIR = path.join(process.env.AGENTHUB_OMP_DIR, "agent", "sessions", "-work");
+const MAIN = path.join(DIR, `${STAMP}_${ID}.jsonl`);
+const SUB = path.join(DIR, `${STAMP}_${ID}`, "Pinger.jsonl");
+
+let server;
+let BASE;
+after(() => {
+  server?.close();
+  fs.rmSync(ROOT, { recursive: true, force: true });
+});
+
+const line = (o) => JSON.stringify(o) + "\n";
+const title = (t) =>
+  line({ type: "title", v: 1, title: t, updatedAt: "2026-10-19T09:02:46.242Z", pad: " ".repeat(40) });
+const header = (id = ID) =>
+  line({ type: "session", version: 3, id, timestamp: "2026-10-19T09:02:46.242Z", cwd: CWD });
+const user = (text, attribution = "user") =>
+  line({
+    type: "message",
+    id: "u1",
+    timestamp: "2026-10-19T09:02:46.400Z",
+    message: { role: "user", content: [{ type: "text", text }], attribution },
+  });
+const assistant = (content, usage, model = "claude-sonnet-4-5") =>
+  line({
+    type: "message",
+    id: "a1",
+    timestamp: "2026-10-19T09:02:47.000Z",
+    message: { role: "assistant", content, provider: "anthropic", model, usage },
+  });
+const usage = (input, output, cacheRead = 0, cacheWrite = 0) => ({
+  input,
+  output,
+  cacheRead,
+  cacheWrite,
+  totalTokens: input + output + cacheRead + cacheWrite,
+});
+const exit = line({ type: "custom", customType: "session_exit", data: { reason: "dispose" } });
+
+const sessionRow = () => db.prepare("SELECT * FROM sessions WHERE id = ?").get(ID);
+const tokens = () =>
+  db
+    .prepare(
+      "SELECT model, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens FROM token_usage WHERE session_id = ? ORDER BY model"
+    )
+    .all(ID);
+
+before(async () => {
+  fs.mkdirSync(path.dirname(SUB), { recursive: true });
+  fs.writeFileSync(
+    MAIN,
+    title("") +
+      header() +
+      line({ type: "model_change", model: "anthropic/claude-sonnet-4-5" }) +
+      user("Fix the login bug\nin auth.ts") +
+      assistant(
+        [
+          { type: "thinking", thinking: "Look first" },
+          { type: "toolCall", id: "t1", name: "task", arguments: { tasks: [{ task: "ping" }] } },
+        ],
+        usage(100, 20, 1000, 50)
+      ) +
+      line({
+        type: "message",
+        timestamp: "2026-10-19T09:02:48.000Z",
+        message: {
+          role: "toolResult",
+          toolCallId: "t1",
+          toolName: "task",
+          content: [{ type: "text", text: "Spawned agent `Pinger`." }],
+        },
+      })
+  );
+  fs.writeFileSync(
+    SUB,
+    header("01a15366-0000-7000-8000-000000000001") +
+      user("Complete assignment: ping", "agent") +
+      assistant([{ type: "text", text: "pong" }], usage(10, 5), "claude-haiku-4-5")
+  );
+  server = await startServer(createApp(), 0);
+  BASE = `http://127.0.0.1:${server.address().port}`;
+});
+
+describe("omp usage ingest", () => {
+  it("creates the session with its prompt, cwd, model and every journal's tokens", async () => {
+    const r = await omp.ingestOmpUsage();
+    assert.equal(r.files, 2);
+    const s = sessionRow();
+    assert.equal(s.tool, "omp");
+    assert.equal(s.name, "Fix the login bug");
+    assert.equal(s.cwd, CWD);
+    assert.equal(s.model, "claude-sonnet-4-5");
+    assert.equal(s.status, "active"); // written just now, no session_exit
+    assert.deepEqual(tokens(), [
+      {
+        model: "claude-haiku-4-5",
+        input_tokens: 10,
+        output_tokens: 5,
+        cache_read_tokens: 0,
+        cache_write_tokens: 0,
+      },
+      {
+        model: "claude-sonnet-4-5",
+        input_tokens: 100,
+        output_tokens: 20,
+        cache_read_tokens: 1000,
+        cache_write_tokens: 50,
+      },
+    ]);
+    const agents = db.prepare("SELECT * FROM agents WHERE session_id = ?").all(ID);
+    assert.equal(agents.length, 1);
+    assert.equal(agents[0].id, `omp-${ID}-Pinger`);
+    assert.equal(agents[0].name, "Pinger");
+    assert.equal(agents[0].type, "subagent");
+    assert.equal(agents[0].task, "Complete assignment: ping");
+  });
+
+  it("leaves an unchanged journal unread", async () => {
+    const r = await omp.ingestOmpUsage();
+    assert.equal(r.files, 0);
+  });
+
+  it("reads only what was appended, takes the title, and settles on session_exit", async () => {
+    fs.appendFileSync(MAIN, assistant([{ type: "text", text: "Done" }], usage(5, 7)) + exit);
+    // The title slot is rewritten in place, same width.
+    const text = fs.readFileSync(MAIN, "utf8").split("\n");
+    const slot = { type: "title", v: 1, title: "Login fix", updatedAt: "x", pad: "" };
+    slot.pad = " ".repeat(Math.max(0, text[0].length - JSON.stringify(slot).length));
+    text[0] = JSON.stringify(slot);
+    fs.writeFileSync(MAIN, text.join("\n"));
+    const r = await omp.ingestOmpUsage();
+    assert.equal(r.files, 1);
+    const s = sessionRow();
+    assert.equal(s.name, "Login fix");
+    assert.equal(s.status, "completed");
+    assert.ok(s.ended_at);
+    const sonnet = tokens().find((t) => t.model === "claude-sonnet-4-5");
+    assert.equal(sonnet.input_tokens, 105);
+    assert.equal(sonnet.output_tokens, 27);
+    const agent = db.prepare("SELECT status FROM agents WHERE id = ?").get(`omp-${ID}-Pinger`);
+    assert.equal(agent.status, "completed");
+  });
+
+  it("maps the journal to the transcript shape, and lists the subagent's", async () => {
+    const list = await (await fetch(`${BASE}/api/sessions/${ID}/transcripts`)).json();
+    assert.deepEqual(
+      list.transcripts.map((t) => [t.id, t.type, t.db_agent_id]),
+      [
+        ["main", "main", null],
+        ["Pinger", "subagent", `omp-${ID}-Pinger`],
+      ]
+    );
+    const body = await (await fetch(`${BASE}/api/sessions/${ID}/transcript`)).json();
+    assert.deepEqual(
+      body.messages.map((m) => [m.type, m.sender, m.content.map((c) => c.type).join("+")]),
+      [
+        ["user", "user", "text"],
+        ["assistant", "assistant", "thinking+tool_use"],
+        ["user", "tool", "tool_result"],
+        ["assistant", "assistant", "text"],
+      ]
+    );
+    assert.deepEqual(body.messages[1].content[1], {
+      type: "tool_use",
+      name: "task",
+      id: "t1",
+      input: { tasks: [{ task: "ping" }] },
+    });
+    const sub = await (
+      await fetch(`${BASE}/api/sessions/${ID}/transcript?agent_id=Pinger`)
+    ).json();
+    assert.deepEqual(
+      sub.messages.map((m) => [m.sender, m.content[0].text]),
+      [
+        ["orchestrator", "Complete assignment: ping"],
+        ["assistant", "pong"],
+      ]
+    );
+  });
+
+  it("keeps a deleted session deleted until omp writes again", async () => {
+    db.prepare("DELETE FROM sessions WHERE id = ?").run(ID);
+    await omp.ingestOmpUsage();
+    assert.equal(sessionRow(), undefined);
+    fs.appendFileSync(MAIN, user("one more"));
+    await omp.ingestOmpUsage();
+    assert.equal(sessionRow()?.tool, "omp");
+  });
+
+  it("never touches another tool's session with the same id", async () => {
+    const other = "01a15366-27e2-734a-9247-04d5c65c9999";
+    db.prepare("INSERT INTO sessions (id, name, status, tool) VALUES (?, 'mine', 'completed', 'codex')").run(
+      other
+    );
+    fs.writeFileSync(path.join(DIR, `${STAMP}_${other}.jsonl`), title("") + header(other) + user("x"));
+    await omp.ingestOmpUsage();
+    const s = db.prepare("SELECT * FROM sessions WHERE id = ?").get(other);
+    assert.equal(s.tool, "codex");
+    assert.equal(s.name, "mine");
+  });
+});

server/__tests__/opencode-usage.test.js

@@ -0,0 +1,188 @@
+/**
+ * @file Tests server/lib/opencode-usage.js and the OpenCode branch of the
+ * transcript routes — OpenCode sessions from its SQLite store: a root session
+ * created as `tool = 'opencode'` with its title, cwd, model and per-model
+ * tokens (its subagent session's included, reasoning counted as output), a
+ * subagent row per child session, an unchanged store never re-read, a
+ * session the user deleted staying deleted until it is updated, and the
+ * conversation (text, reasoning, tool call + result) in the Claude
+ * transcript shape. The store is a temp file with the tables and columns
+ * opencode 1.19 writes.
+ * @author Nguyễn Ngọc Trí Vĩ <vinnt@smartgift.vn>
+ */
+
+const os = require("node:os");
+const fs = require("node:fs");
+const path = require("node:path");
+
+const ROOT = fs.mkdtempSync(path.join(os.tmpdir(), "agenthub-opencode-usage-"));
+process.env.DASHBOARD_DB_PATH = path.join(ROOT, "dashboard.db");
+process.env.CLAUDE_HOME = path.join(ROOT, "claude");
+process.env.AGENTHUB_OPENCODE_DIR = path.join(ROOT, "opencode");
+
+const { describe, it, before, after } = require("node:test");
+const assert = require("node:assert/strict");
+const { db, Database } = require("../db");
+const oc = require("../lib/opencode-usage");
+const { createApp, startServer } = require("../index");
+
+const ID = "ses_eac8393b4ffeEz26VGbeyq8sir";
+const CHILD = "ses_eac8393b4fffChildSession01";
+const CWD = path.join(fs.realpathSync(ROOT), "work");
+const STORE = path.join(process.env.AGENTHUB_OPENCODE_DIR, "opencode.db");
+const T0 = Date.parse("2026-10-19T09:27:05.000Z");
+
+let server;
+let BASE;
+after(() => {
+  server?.close();
+  fs.rmSync(ROOT, { recursive: true, force: true });
+});
+
+function withStore(fn) {
+  const conn = new Database(STORE);
+  try {
+    fn(conn);
+  } finally {
+    conn.close();
+  }
+}
+
+const assistant = (model, tokens) => JSON.stringify({ role: "assistant", modelID: model, tokens });
+const tokens = (input, output, reasoning = 0, read = 0, write = 0) => ({
+  input,
+  output,
+  reasoning,
+  cache: { read, write },
+});
+
+before(async () => {
+  fs.mkdirSync(path.dirname(STORE), { recursive: true });
+  withStore((c) => {
+    c.exec(`
+      CREATE TABLE session (id TEXT PRIMARY KEY, project_id TEXT NOT NULL, parent_id TEXT,
+        slug TEXT NOT NULL, directory TEXT NOT NULL, title TEXT NOT NULL, version TEXT NOT NULL,
+        model TEXT, time_created INTEGER NOT NULL, time_updated INTEGER NOT NULL, time_archived INTEGER);
+      CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT NOT NULL, time_created INTEGER NOT NULL,
+        time_updated INTEGER NOT NULL, data TEXT NOT NULL);
+      CREATE TABLE part (id TEXT PRIMARY KEY, message_id TEXT NOT NULL, session_id TEXT NOT NULL,
+        time_created INTEGER NOT NULL, time_updated INTEGER NOT NULL, data TEXT NOT NULL);
+    `);
+    const s = c.prepare(
+      "INSERT INTO session (id, project_id, parent_id, slug, directory, title, version, model, time_created, time_updated) VALUES (?, 'global', ?, 'x', ?, ?, '1.19.3', ?, ?, ?)"
+    );
+    s.run(ID, null, CWD, "Fix the login bug", '{"id":"claude-sonnet-4-5","providerID":"anthropic"}', T0, T0 + 5000);
+    s.run(CHILD, ID, CWD, "Explore auth (@explore subagent)", null, T0 + 1000, T0 + 3000);
+    const m = c.prepare("INSERT INTO message VALUES (?, ?, ?, ?, ?)");
+    m.run("msg_1", ID, T0 + 10, T0 + 10, JSON.stringify({ role: "user" }));
+    m.run("msg_2", ID, T0 + 20, T0 + 20, assistant("claude-sonnet-4-5", tokens(100, 20, 5, 1000, 50)));
+    m.run("msg_3", CHILD, T0 + 1100, T0 + 1100, JSON.stringify({ role: "user" }));
+    m.run("msg_4", CHILD, T0 + 1200, T0 + 1200, assistant("claude-haiku-4-5", tokens(10, 4)));
+    const p = c.prepare("INSERT INTO part VALUES (?, ?, ?, ?, ?, ?)");
+    p.run("prt_1", "msg_1", ID, T0 + 11, T0 + 11, JSON.stringify({ type: "text", text: "Fix the login bug" }));
+    p.run("prt_2", "msg_2", ID, T0 + 21, T0 + 21, JSON.stringify({ type: "reasoning", text: "Look first" }));
+    p.run(
+      "prt_3",
+      "msg_2",
+      ID,
+      T0 + 22,
+      T0 + 22,
+      JSON.stringify({
+        type: "tool",
+        tool: "read",
+        callID: "call_1",
+        state: { status: "completed", input: { filePath: "auth.ts" }, output: "export {}" },
+      })
+    );
+    p.run("prt_4", "msg_2", ID, T0 + 23, T0 + 23, JSON.stringify({ type: "step-start" }));
+    p.run("prt_5", "msg_3", CHILD, T0 + 1101, T0 + 1101, JSON.stringify({ type: "text", text: "Explore auth" }));
+    p.run("prt_6", "msg_4", CHILD, T0 + 1201, T0 + 1201, JSON.stringify({ type: "text", text: "Found it" }));
+  });
+  server = await startServer(createApp(), 0);
+  BASE = `http://127.0.0.1:${server.address().port}`;
+});
+
+const sessionRow = () => db.prepare("SELECT * FROM sessions WHERE id = ?").get(ID);
+
+describe("opencode usage ingest", () => {
+  it("creates the root session with its title, cwd, model and its tree's tokens", async () => {
+    const r = await oc.ingestOpencodeUsage({ now: T0 + 600_000 });
+    assert.equal(r.files, 1);
+    const s = sessionRow();
+    assert.equal(s.tool, "opencode");
+    assert.equal(s.name, "Fix the login bug");
+    assert.equal(s.cwd, CWD);
+    assert.equal(s.model, "claude-sonnet-4-5");
+    assert.equal(s.status, "completed");
+    assert.equal(db.prepare("SELECT 1 FROM sessions WHERE id = ?").get(CHILD), undefined);
+    const usage = db
+      .prepare(
+        "SELECT model, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens FROM token_usage WHERE session_id = ? ORDER BY model"
+      )
+      .all(ID);
+    assert.deepEqual(usage, [
+      { model: "claude-haiku-4-5", input_tokens: 10, output_tokens: 4, cache_read_tokens: 0, cache_write_tokens: 0 },
+      { model: "claude-sonnet-4-5", input_tokens: 100, output_tokens: 25, cache_read_tokens: 1000, cache_write_tokens: 50 },
+    ]);
+    const agent = db.prepare("SELECT * FROM agents WHERE id = ?").get(`opencode-${CHILD}`);
+    assert.equal(agent.session_id, ID);
+    assert.equal(agent.type, "subagent");
+    assert.equal(agent.name, "Explore auth (@explore subagent)");
+    assert.equal(agent.status, "completed");
+  });
+
+  it("leaves an unchanged store unread", async () => {
+    const r = await oc.ingestOpencodeUsage({ now: T0 + 600_000 });
+    assert.equal(r.files, 0);
+  });
+
+  it("maps the store to the transcript shape, and lists the subagent's", async () => {
+    const list = await (await fetch(`${BASE}/api/sessions/${ID}/transcripts`)).json();
+    assert.deepEqual(
+      list.transcripts.map((t) => [t.id, t.type, t.db_agent_id]),
+      [
+        ["main", "main", null],
+        [CHILD, "subagent", `opencode-${CHILD}`],
+      ]
+    );
+    const body = await (await fetch(`${BASE}/api/sessions/${ID}/transcript`)).json();
+    assert.deepEqual(
+      body.messages.map((m) => [m.type, m.sender, m.content.map((c) => c.type).join("+")]),
+      [
+        ["user", "user", "text"],
+        ["assistant", "assistant", "thinking+tool_use"],
+        ["user", "tool", "tool_result"],
+      ]
+    );
+    assert.equal(body.messages[2].content[0].output, "export {}");
+    assert.equal(body.last_line, 3);
+    const tail = await (await fetch(`${BASE}/api/sessions/${ID}/transcript?after=2`)).json();
+    assert.equal(tail.messages.length, 1);
+    const sub = await (
+      await fetch(`${BASE}/api/sessions/${ID}/transcript?agent_id=${CHILD}`)
+    ).json();
+    assert.deepEqual(
+      sub.messages.map((m) => [m.sender, m.content[0].text]),
+      [
+        ["orchestrator", "Explore auth"],
+        ["assistant", "Found it"],
+      ]
+    );
+  });
+
+  it("keeps a deleted session deleted until OpenCode updates it", async () => {
+    db.prepare("DELETE FROM sessions WHERE id = ?").run(ID);
+    const bump = (t) => {
+      withStore((c) => c.prepare("UPDATE session SET title = title WHERE id = ?").run(ID));
+      const at = new Date(t);
+      fs.utimesSync(STORE, at, at);
+    };
+    bump(Date.now() + 5000);
+    await oc.ingestOpencodeUsage({ now: T0 + 600_000 });
+    assert.equal(sessionRow(), undefined);
+    withStore((c) => c.prepare("UPDATE session SET time_updated = ? WHERE id = ?").run(T0 + 9000, ID));
+    fs.utimesSync(STORE, new Date(Date.now() + 10_000), new Date(Date.now() + 10_000));
+    await oc.ingestOpencodeUsage({ now: T0 + 600_000 });
+    assert.equal(sessionRow()?.tool, "opencode");
+  });
+});

server/__tests__/pty-run.test.js

@@ -733,7 +733,7 @@ describe("pty-run", () => {
     let savedPath;
     before(() => {
       fs.mkdirSync(BIN, { recursive: true });
-      for (const name of ["agy", "grok", "goose", "command-code"]) {
+      for (const name of ["agy", "grok", "goose", "command-code", "omp"]) {
         fs.writeFileSync(path.join(BIN, name), "#!/bin/sh\n");
         fs.chmodSync(path.join(BIN, name), 0o755);
       }
@@ -799,6 +799,35 @@ describe("pty-run", () => {
       );
     });
 
+    // omp declares `resumeById`: the id follows its flag as one argv element,
+    // in place of the resume-last args, and never one that reads as a flag.
+    it("resumes a named session for a catalog tool that declares resumeById", () => {
+      const call = captureNewSession(() =>
+        pty.spawnRun({
+          laneId: 17,
+          cwd: "/tmp/repo",
+          tool: "omp",
+          model: "opus",
+          resumeSessionId: "01a15366-27e2-734a-9247-04d5c65c1636",
+          resumeLast: true,
+          initialPrompt: "go on",
+        })
+      );
+      assert.deepEqual(paneArgv(call), [
+        at("omp"),
+        "--model",
+        "opus",
+        "--resume",
+        "01a15366-27e2-734a-9247-04d5c65c1636",
+        "go on",
+      ]);
+      assert.throws(
+        () =>
+          pty.spawnRun({ laneId: 18, cwd: "/tmp/repo", tool: "omp", resumeSessionId: "--abcdefgh" }),
+        { code: "EBADSESSION" }
+      );
+    });
+
     it("refuses a flag-shaped model id for any tool, before tmux is asked", () => {
       for (const tool of ["claude", "codex", "antigravity"]) {
         assert.throws(