pinomad 0.11.0 → 0.12.0

package/dist/{chunk-67gq282t.js → chunk-ksfxqd8s.js}

@@ -5,7 +5,7 @@ import {
   openHostSettings,
   sameList,
   settingsDefaults
-} from "./chunk-44pnts98.js";
+} from "./chunk-nppgxh6c.js";
 import {
   DevicesDoc,
   RevocationsDoc,
@@ -16,19 +16,21 @@ import {
   pairingOffers
 } from "./chunk-t91zt5f0.js";
 import {
+  REMOVAL_NOTICE_FILE,
+  markRemoved,
   normalizeOrigin,
   readServerBinding,
   readServerConfig,
   resolveRelayOrigin
-} from "./chunk-etf7ef97.js";
+} from "./chunk-nq57fdnq.js";
 import {
   serveWebClient
-} from "./chunk-wb10efyq.js";
+} from "./chunk-445cevpm.js";
 import {
   relayHostId,
   relayWsBase,
   startRelayLink
-} from "./chunk-y127fe1a.js";
+} from "./chunk-g3ahp7b9.js";
 import {
   ATTACHMENT_TTL_MS,
   INVALID_FRAME_CLOSE_CODE,
@@ -54,7 +56,7 @@ import {
   rtcCandidateType,
   sdpCandidates,
   withRtcCandidates
-} from "./chunk-xqycs43g.js";
+} from "./chunk-47ff1d1t.js";
 import {
   ENDPOINT_SET_SCHEMA_VERSION,
   MAX_HOST_ENDPOINT_URL_LENGTH,
@@ -77,13 +79,13 @@ import {
 import {
   packagedVersion,
   webRoot
-} from "./chunk-sd5fkxjj.js";
+} from "./chunk-7wj0jh3t.js";
 import {
   __require
 } from "./chunk-df32avw6.js";
 
 // apps/host/src/main.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { mkdir as mkdir6, readFile as readFile7, writeFile as writeFile5 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
 import { join as join12, resolve as resolve7 } from "node:path";
@@ -712,11 +714,7 @@ async function checkoutInfo(harness, input, context) {
     }
   };
 }
-async function cleanupArchivedWorktrees(harness, rootId, context) {
-  const index = await harness.snapshot(IndexDoc, context);
-  const checkouts = index?.checkouts ?? [];
-  if (checkouts.length === 0)
-    return [];
+async function conversationSubtree(harness, rootId, context) {
   const all = [];
   let cursor;
   do {
@@ -743,6 +741,27 @@ async function cleanupArchivedWorktrees(harness, rootId, context) {
       }
     }
   }
+  return subtree;
+}
+async function familyRoot(harness, id, context) {
+  let current = id;
+  const seen = new Set;
+  while (!seen.has(current)) {
+    seen.add(current);
+    const record = await harness.commit((tx) => tx.conversation(current), context);
+    const parent = record?.parent?.conversationId ?? record?.owner?.conversationId;
+    if (parent === undefined)
+      return current;
+    current = parent;
+  }
+  return current;
+}
+async function cleanupArchivedWorktrees(harness, rootId, context) {
+  const index = await harness.snapshot(IndexDoc, context);
+  const checkouts = index?.checkouts ?? [];
+  if (checkouts.length === 0)
+    return [];
+  const subtree = await conversationSubtree(harness, rootId, context);
   const kept = [];
   for (const record of checkouts.filter((checkout) => subtree.has(checkout.conversationId))) {
     const reason = await removeWorktree(record);
@@ -1451,6 +1470,7 @@ var todo = {
 };
 
 // apps/host/src/gateway.ts
+import { stat as stat6 } from "node:fs/promises";
 import { createServer } from "node:http";
 import { homedir, networkInterfaces } from "node:os";
 import { join as join7, sep as sep5 } from "node:path";
@@ -2056,6 +2076,329 @@ function dataChannelCarrier(channel, timers, log, onClosed) {
   };
 }
 
+// apps/host/src/terminals.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { userInfo } from "node:os";
+var TERMINAL_LIMIT = 8;
+var BUFFER_SIZE = 512 * 1024;
+var FLUSH_MS = 8;
+var MAX_CHUNK = 16 * 1024;
+var MAX_TITLE = 1024;
+var TITLE = /\x1b\][02];([^\x07\x1b]*)(?:\x07|\x1b\\)/g;
+
+class Terminals {
+  #options;
+  #limit;
+  #terminals = new Map;
+  #numbers = new Map;
+  #watchers = new Map;
+  constructor(options) {
+    this.#options = options;
+    this.#limit = options.limit ?? TERMINAL_LIMIT;
+  }
+  get limit() {
+    return this.#limit;
+  }
+  list(owner) {
+    const terminals = [...this.#terminals.values()].filter((terminal) => terminal.owner === owner).map(info);
+    return { owner, limit: this.#limit, terminals };
+  }
+  watch(owner, listener) {
+    let set = this.#watchers.get(owner);
+    if (set === undefined)
+      this.#watchers.set(owner, set = new Set);
+    set.add(listener);
+    listener(this.list(owner));
+    return () => {
+      set.delete(listener);
+      if (set.size === 0)
+        this.#watchers.delete(owner);
+    };
+  }
+  open(owner, cwd, size) {
+    const count = [...this.#terminals.values()].filter((terminal2) => terminal2.owner === owner).length;
+    if (count >= this.#limit)
+      throw new Error(`Terminal limit reached (${this.#limit})`);
+    const number = (this.#numbers.get(owner) ?? 0) + 1;
+    this.#numbers.set(owner, number);
+    const terminal = {
+      id: randomUUID2(),
+      owner,
+      cwd,
+      number,
+      pty: undefined,
+      generation: 0,
+      cols: size.cols,
+      rows: size.rows,
+      title: undefined,
+      rename: undefined,
+      exit: undefined,
+      buffer: "",
+      start: 0,
+      pending: "",
+      flushTimer: undefined,
+      titleCarry: "",
+      viewers: new Set
+    };
+    this.#terminals.set(terminal.id, terminal);
+    try {
+      this.#start(terminal);
+    } catch (error) {
+      this.#terminals.delete(terminal.id);
+      throw error;
+    }
+    this.#changed(owner);
+    return terminal.id;
+  }
+  input(id, data, size) {
+    const terminal = this.#get(id);
+    if (size !== undefined)
+      this.#resize(terminal, size);
+    terminal.pty?.write(data);
+  }
+  resize(id, size) {
+    this.#resize(this.#get(id), size);
+  }
+  rename(id, name) {
+    const terminal = this.#get(id);
+    const trimmed = name?.trim();
+    terminal.rename = trimmed === undefined || trimmed === "" ? undefined : trimmed;
+    this.#changed(terminal.owner);
+  }
+  restart(id, size) {
+    const terminal = this.#get(id);
+    this.#stop(terminal);
+    terminal.start += terminal.buffer.length + terminal.pending.length + 1;
+    terminal.buffer = "";
+    terminal.pending = "";
+    terminal.titleCarry = "";
+    terminal.title = undefined;
+    terminal.exit = undefined;
+    terminal.cols = size.cols;
+    terminal.rows = size.rows;
+    for (const viewer of terminal.viewers)
+      viewer.position = undefined;
+    try {
+      this.#start(terminal);
+    } catch (error) {
+      terminal.exit = { code: null };
+      this.#changed(terminal.owner);
+      throw error;
+    }
+    this.#changed(terminal.owner);
+  }
+  close(id) {
+    const terminal = this.#get(id);
+    this.#remove(terminal);
+    this.#changed(terminal.owner);
+  }
+  closeOwners(owners) {
+    for (const owner of new Set(owners)) {
+      const owned = [...this.#terminals.values()].filter((terminal) => terminal.owner === owner);
+      if (owned.length === 0)
+        continue;
+      for (const terminal of owned)
+        this.#remove(terminal);
+      this.#changed(owner);
+    }
+  }
+  closeAll() {
+    this.closeOwners([...this.#terminals.values()].map((terminal) => terminal.owner));
+  }
+  attach(id, since, sink) {
+    const terminal = this.#get(id);
+    const end = terminal.start + terminal.buffer.length;
+    const position = since !== undefined && since >= terminal.start && since <= end ? since : undefined;
+    const viewer = { sink, position, sending: false };
+    terminal.viewers.add(viewer);
+    this.#pump(terminal, viewer);
+    return () => {
+      terminal.viewers.delete(viewer);
+    };
+  }
+  #get(id) {
+    const terminal = this.#terminals.get(id);
+    if (terminal === undefined)
+      throw new Error("Unknown terminal");
+    return terminal;
+  }
+  #start(terminal) {
+    const generation = ++terminal.generation;
+    const { shell, env } = this.#options;
+    const pty = this.#options.spawn(shell.file, [...shell.args], {
+      name: "xterm-256color",
+      cols: terminal.cols,
+      rows: terminal.rows,
+      cwd: terminal.cwd,
+      env: { ...env, TERM: "xterm-256color", COLORTERM: "truecolor" }
+    });
+    terminal.pty = pty;
+    pty.onData((data) => {
+      if (terminal.generation !== generation)
+        return;
+      terminal.pending += data;
+      if (terminal.pending.length >= (this.#options.maxChunk ?? MAX_CHUNK))
+        this.#flush(terminal);
+      else
+        terminal.flushTimer ??= setTimeout(() => this.#flush(terminal), this.#options.flushMs ?? FLUSH_MS);
+    });
+    pty.onExit(({ exitCode, signal }) => {
+      if (terminal.generation !== generation || !this.#terminals.has(terminal.id))
+        return;
+      this.#flush(terminal);
+      terminal.pty = undefined;
+      terminal.exit = signal === undefined || signal === 0 ? { code: exitCode } : { code: exitCode, signal };
+      this.#changed(terminal.owner);
+    });
+  }
+  #stop(terminal) {
+    if (terminal.flushTimer !== undefined)
+      clearTimeout(terminal.flushTimer);
+    terminal.flushTimer = undefined;
+    terminal.generation++;
+    const pty = terminal.pty;
+    terminal.pty = undefined;
+    try {
+      pty?.kill();
+    } catch {}
+  }
+  #remove(terminal) {
+    this.#stop(terminal);
+    this.#terminals.delete(terminal.id);
+    for (const viewer of terminal.viewers)
+      viewer.sink.ended("Terminal closed");
+    terminal.viewers.clear();
+  }
+  #resize(terminal, size) {
+    if (terminal.cols === size.cols && terminal.rows === size.rows)
+      return;
+    terminal.cols = size.cols;
+    terminal.rows = size.rows;
+    try {
+      terminal.pty?.resize(size.cols, size.rows);
+    } catch {}
+    this.#changed(terminal.owner);
+  }
+  #flush(terminal) {
+    if (terminal.flushTimer !== undefined)
+      clearTimeout(terminal.flushTimer);
+    terminal.flushTimer = undefined;
+    const data = terminal.pending;
+    if (data === "")
+      return;
+    terminal.pending = "";
+    terminal.buffer += data;
+    const bufferSize = this.#options.bufferSize ?? BUFFER_SIZE;
+    if (terminal.buffer.length > bufferSize) {
+      let cut = terminal.buffer.length - bufferSize;
+      const line = terminal.buffer.indexOf(`
+`, cut);
+      if (line !== -1 && line - cut < 1024)
+        cut = line + 1;
+      terminal.buffer = terminal.buffer.slice(cut);
+      terminal.start += cut;
+    }
+    if (this.#readTitle(terminal, data))
+      this.#changed(terminal.owner);
+    for (const viewer of terminal.viewers)
+      this.#pump(terminal, viewer);
+  }
+  #readTitle(terminal, data) {
+    const text = terminal.titleCarry + data;
+    let title;
+    let consumed = 0;
+    for (const match of text.matchAll(TITLE)) {
+      title = match[1];
+      consumed = match.index + match[0].length;
+    }
+    const open = text.lastIndexOf("\x1B]");
+    terminal.titleCarry = open >= consumed && text.length - open <= MAX_TITLE ? text.slice(open) : "";
+    if (title === undefined || title === terminal.title)
+      return false;
+    terminal.title = title;
+    return terminal.rename === undefined;
+  }
+  async#pump(terminal, viewer) {
+    if (viewer.sending)
+      return;
+    viewer.sending = true;
+    try {
+      const maxChunk = this.#options.maxChunk ?? MAX_CHUNK;
+      while (terminal.viewers.has(viewer)) {
+        const end = terminal.start + terminal.buffer.length;
+        const reset = viewer.position === undefined || viewer.position < terminal.start;
+        const from = reset ? terminal.start : viewer.position;
+        if (!reset && from >= end)
+          return;
+        let to = reset ? end : Math.min(end, from + maxChunk);
+        if (to < end && isHighSurrogate(terminal.buffer.charCodeAt(to - terminal.start - 1)))
+          to--;
+        const data = terminal.buffer.slice(from - terminal.start, to - terminal.start);
+        viewer.position = to;
+        await viewer.sink.output(reset ? { seq: to, data, reset: true } : { seq: to, data });
+      }
+    } finally {
+      viewer.sending = false;
+    }
+  }
+  #changed(owner) {
+    const watchers = this.#watchers.get(owner);
+    if (watchers === undefined)
+      return;
+    const list = this.list(owner);
+    for (const watcher of watchers)
+      watcher(list);
+  }
+}
+async function startTerminals(options = {}) {
+  let spawn3 = options.spawn;
+  if (spawn3 === undefined) {
+    try {
+      const loaded = options.load === undefined ? await import("@lydell/node-pty") : await options.load();
+      if (typeof loaded.spawn !== "function")
+        throw new Error("the module has no spawn()");
+      spawn3 = loaded.spawn;
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      (options.diagnostic ?? console.error)(`Terminals unavailable: cannot load @lydell/node-pty on ${process.platform} (${process.arch}); missing @lydell/node-pty-${process.platform}-${process.arch}. Install without --omit=optional; the host continues without hello.terminals. (${detail})`);
+      return;
+    }
+  }
+  return new Terminals({ ...options, spawn: spawn3, shell: options.shell ?? loginShell(), env: options.env ?? shellEnv(process.env) });
+}
+function loginShell() {
+  let file = process.env.SHELL;
+  if (file === undefined || file === "") {
+    try {
+      file = userInfo().shell ?? undefined;
+    } catch {
+      file = undefined;
+    }
+  }
+  return { file: file === undefined || file === "" ? "/bin/sh" : file, args: ["-l"] };
+}
+function shellEnv(env) {
+  const result2 = {};
+  for (const [key, value] of Object.entries(env)) {
+    if (value !== undefined && !key.startsWith("PINOMAD_"))
+      result2[key] = value;
+  }
+  return result2;
+}
+function info(terminal) {
+  return {
+    id: terminal.id,
+    name: terminal.rename ?? terminal.title ?? `Terminal ${terminal.number}`,
+    renamed: terminal.rename !== undefined,
+    cols: terminal.cols,
+    rows: terminal.rows,
+    ...terminal.exit === undefined ? {} : { exit: terminal.exit }
+  };
+}
+function isHighSurrogate(code) {
+  return code >= 55296 && code <= 56319;
+}
+
 // apps/host/src/folders.ts
 import { readdir, realpath as realpath5, stat as stat5 } from "node:fs/promises";
 import { isAbsolute, join as join6 } from "node:path";
@@ -3351,6 +3694,7 @@ async function startGateway(options) {
   const clients = new Set;
   let rtc;
   const rtcHello = () => rtc?.hello();
+  const terminals = await startTerminals(options.terminals);
   const broadcast = (level, message) => {
     for (const client of clients)
       client.send({ type: "notice", level, message });
@@ -3365,10 +3709,12 @@ async function startGateway(options) {
     }
     rtc?.closeDevice(publicKey);
   };
+  const reachableRelay = () => relay?.state().status === "removed" ? undefined : relay;
   const currentAdvertisement = () => {
     const advertiseUrl = remote?.advertiseUrl;
+    const relay2 = reachableRelay();
     const endpoints = remoteEndpointCandidates({
-      ...relay === undefined ? {} : { relay: { origin: relay.origin, hostId: relay.hostId } },
+      ...relay2 === undefined ? {} : { relay: { origin: relay2.origin, hostId: relay2.hostId } },
       ...advertiseUrl === undefined ? {} : { direct: { advertiseUrl } }
     });
     return { endpoints, ...advertiseUrl === undefined ? {} : { advertiseUrl } };
@@ -3385,6 +3731,7 @@ async function startGateway(options) {
     const client = new GatewayClient(connection, options, conversations, fileLister, skillLister, imageVariants, {
       devicePublicKey,
       rtcHello,
+      terminals,
       closed: (self) => {
         clients.delete(self);
         connections.delete(self);
@@ -3405,11 +3752,12 @@ async function startGateway(options) {
         const fragment = (secret2, target2, endpointSet2) => `${pair(secret2)}&url=${encodeURIComponent(target2)}${endpointSet2 === undefined ? "" : `&endpointSet=${encodeEndpointSetParam(endpointSet2)}`}`;
         const advertisement = currentAdvertisement();
         const endpointSet = checkedEndpointSet(advertisement.endpoints);
+        const relay2 = reachableRelay();
         const relayReachable = endpointSet.endpoints.some((endpoint) => endpoint.role === "relay");
-        if (relayReachable && relay !== undefined) {
+        if (relayReachable && relay2 !== undefined) {
           const { secret: secret2, expiresAt: expiresAt2 } = spec.offers.create("qr");
           return {
-            url: `${relay.origin}/#${fragment(secret2, relaySocketTarget(relay.origin, relay.hostId), endpointSet)}`,
+            url: `${relay2.origin}/#${fragment(secret2, relaySocketTarget(relay2.origin, relay2.hostId), endpointSet)}`,
             expiresAt: expiresAt2
           };
         }
@@ -3422,10 +3770,10 @@ async function startGateway(options) {
           const { secret: secret2, expiresAt: expiresAt2 } = spec.offers.create("qr");
           return { url: `${advertise}/#${fragment(secret2, direct.url, endpointSet)}`, expiresAt: expiresAt2 };
         }
-        if (relay !== undefined) {
+        if (relay2 !== undefined) {
           const { secret: secret2, expiresAt: expiresAt2 } = spec.offers.create("qr");
           return {
-            url: `${relay.origin}/#${fragment(secret2, relaySocketTarget(relay.origin, relay.hostId))}`,
+            url: `${relay2.origin}/#${fragment(secret2, relaySocketTarget(relay2.origin, relay2.hostId))}`,
             expiresAt: expiresAt2
           };
         }
@@ -3519,6 +3867,10 @@ async function startGateway(options) {
   });
   if (secure?.relay !== undefined) {
     const relayOrigin = secure.relay.origin;
+    const startConfig = await readServerConfig(options.dataDir).catch(() => {
+      return;
+    });
+    const linkJoin = startConfig !== undefined && normalizeOrigin(startConfig.origin) === normalizeOrigin(relayOrigin) ? startConfig : undefined;
     const currentBinding = async () => {
       const config = await readServerConfig(options.dataDir).catch(() => {
         return;
@@ -3572,6 +3924,16 @@ async function startGateway(options) {
           console.log(JSON.stringify({ event: "relay", status: "registered", origin: link.origin, hostId: link.hostId, push }));
         } else if (state.status === "connecting") {
           console.log(JSON.stringify({ event: "relay", status: "connecting", origin: link.origin }));
+        } else if (state.status === "removed") {
+          broadcast("warning", state.reason);
+          console.error(state.reason);
+          markRemoved(options.dataDir, {
+            origin: relayOrigin,
+            ...linkJoin?.binding === undefined ? {} : { binding: linkJoin.binding },
+            ...linkJoin?.username === undefined ? {} : { username: linkJoin.username }
+          }).catch((error) => {
+            console.error(`could not write ${REMOVAL_NOTICE_FILE}: ${error instanceof Error ? error.message : String(error)}`);
+          });
         } else {
           broadcast("warning", state.reason);
           console.error(state.reason);
@@ -3606,6 +3968,7 @@ async function startGateway(options) {
       detachSettingsWatch();
       await detachPush?.close();
       conversations.dispose();
+      terminals?.closeAll();
       await rtc?.close();
       await Promise.all([...connections].map((connection) => connection.dispose()));
       for (const socket of server.clients)
@@ -3956,6 +4319,7 @@ class ConversationList {
         facts.label = subagent.label;
       if (typeof subagent?.role === "string" && subagent.role !== "")
         facts.role = subagent.role;
+      facts.model = modelRefOf(subagent?.model);
     }
     facts.agent = roleNameOf(await harness.snapshot(RoleDoc, record.id, context3));
     const named = (await harness.snapshot(TitleDoc, record.id, context3))?.title;
@@ -4021,6 +4385,7 @@ class ConversationList {
           const value = change.value;
           facts.label = typeof value?.label === "string" && value.label !== "" ? value.label : undefined;
           facts.role = typeof value?.role === "string" && value.role !== "" ? value.role : undefined;
+          facts.model = modelRefOf(value?.model);
           touched.add(id);
         } else if (change.record.kind === TitleDoc.definition.kind) {
           const named = change.value?.title;
@@ -4108,6 +4473,14 @@ function roleNameOf(value) {
     return;
   return typeof value.name === "string" ? value.name : value.name === null ? null : undefined;
 }
+function modelRefOf(value) {
+  if (typeof value !== "string")
+    return;
+  const slash = value.indexOf("/");
+  if (slash <= 0 || slash === value.length - 1)
+    return;
+  return { provider: value.slice(0, slash), modelId: value.slice(slash + 1) };
+}
 function rolesOf(index) {
   const roles = new Map;
   for (const entry of index?.conversations ?? []) {
@@ -4138,6 +4511,8 @@ function summaryOf(record, facts, role, currentAgent) {
   return {
     id: record.id,
     kind: record.owner !== undefined ? "subagent" : record.parent !== undefined ? "fork" : "conversation",
+    ...record.owner === undefined ? {} : { lifecycle: "foreground" },
+    ...facts.model === undefined ? {} : { model: facts.model },
     ...parent === undefined ? {} : { parent },
     ...record.parent === undefined ? {} : { forkedAt: String(record.parent.at) },
     ...(facts.named ?? facts.title) === undefined ? {} : { title: facts.named ?? facts.title },
@@ -4150,7 +4525,7 @@ function summaryOf(record, facts, role, currentAgent) {
   };
 }
 function sameSummary(a, b) {
-  return a.id === b.id && a.kind === b.kind && a.parent === b.parent && a.forkedAt === b.forkedAt && a.title === b.title && a.status === b.status && a.updatedAt === b.updatedAt && a.label === b.label && a.role === b.role && a.currentAgent === b.currentAgent && a.activity?.tool === b.activity?.tool && a.activity?.target === b.activity?.target;
+  return a.id === b.id && a.kind === b.kind && a.lifecycle === b.lifecycle && a.model?.provider === b.model?.provider && a.model?.modelId === b.model?.modelId && a.parent === b.parent && a.forkedAt === b.forkedAt && a.title === b.title && a.status === b.status && a.updatedAt === b.updatedAt && a.label === b.label && a.role === b.role && a.currentAgent === b.currentAgent && a.activity?.tool === b.activity?.tool && a.activity?.target === b.activity?.target;
 }
 function titleOf(entry) {
   const message = entry?.model?.[0];
@@ -4293,6 +4668,7 @@ class GatewayClient {
   }
   #hostValues;
   #subscriptions = new Map;
+  #terminalSizes = new Map;
   #disposed = false;
   constructor(connection, options, conversations, files, skills, imageVariants, hooks) {
     this.#connection = connection;
@@ -4355,7 +4731,8 @@ class GatewayClient {
       })),
       toolPresentations: options.toolPresentations ?? {},
       endpointSet: this.#hooks.endpointSet(),
-      ...rtc === undefined ? {} : { rtc }
+      ...rtc === undefined ? {} : { rtc },
+      ...this.#hooks.terminals === undefined ? {} : { terminals: { limit: this.#hooks.terminals.limit } }
     });
   }
   send(frame) {
@@ -4368,15 +4745,15 @@ class GatewayClient {
   }
   async#receive(frame) {
     if (frame.type === "subscribe")
-      await this.#subscribe(frame.stream, frame.images === "ref");
+      await this.#subscribe(frame.stream, frame.images === "ref", frame.since);
     else if (frame.type === "unsubscribe")
       await this.#unsubscribe(frame.stream);
     else
       await this.#answer(frame.id, frame.method, frame.args);
   }
-  async#subscribe(stream, imageRefs) {
+  async#subscribe(stream, imageRefs, since) {
     const previous = this.#subscriptions.get(stream);
-    const state = imageRefs && stream.startsWith("conversation:") ? { images: new ImageRefs } : {};
+    const state = imageRefs && stream.startsWith("conversation:") ? { images: new ImageRefs } : since === undefined ? {} : { since };
     this.#subscriptions.set(stream, state);
     const current = () => !this.#disposed && this.#subscriptions.get(stream) === state;
     const send = (frame) => current() ? this.send(frame) : Promise.resolve();
@@ -4420,6 +4797,24 @@ class GatewayClient {
     }
     if (stream === "tasks")
       return this.#forward(stream, await this.#options.harness.watchTaskGraph(context3), send);
+    if (stream.startsWith("terminals:")) {
+      const terminals = this.#terminals();
+      const conversation2 = await this.#conversation(Number(stream.slice("terminals:".length)));
+      const { owner } = await this.#terminalOwner(conversation2);
+      return { stop: terminals.watch(owner, (value) => void send({ type: "snapshot", stream, value })) };
+    }
+    if (stream.startsWith("terminal:")) {
+      const terminalStream = stream;
+      const detach = this.#terminals().attach(terminalStream.slice("terminal:".length), state?.since, {
+        output: (frame) => send({ type: "output", stream: terminalStream, ...frame }),
+        ended: (reason) => {
+          send({ type: "ended", stream, reason });
+          if (this.#subscriptions.get(stream) === state)
+            this.#subscriptions.delete(stream);
+        }
+      });
+      return { stop: detach };
+    }
     if (stream.startsWith("doc:")) {
       const at = stream.lastIndexOf(":");
       return this.#openDoc(stream, stream.slice("doc:".length, at), Number(stream.slice(at + 1)), send);
@@ -4569,10 +4964,43 @@ class GatewayClient {
       await this.send({ type: "result", id, ok: true, value: value ?? null });
     } catch (error) {
       await this.send({ type: "result", id, ok: false, error: error instanceof Error ? error.message : String(error) });
+      return;
+    }
+    const device = this.devicePublicKey;
+    if (method === "revokeDevice" && device !== undefined && args.publicKey === device) {
+      this.#hooks.closeDevice(device);
     }
   }
   async#call(method, args) {
     switch (method) {
+      case "terminalInput": {
+        const input = args;
+        this.#terminals().input(input.terminalId, input.data, this.#terminalSizes.get(input.terminalId));
+        return null;
+      }
+      case "resizeTerminal": {
+        const input = args;
+        const size = { cols: input.cols, rows: input.rows };
+        this.#terminals().resize(input.terminalId, size);
+        this.#terminalSizes.set(input.terminalId, size);
+        return null;
+      }
+      case "renameTerminal": {
+        const input = args;
+        this.#terminals().rename(input.terminalId, input.name);
+        return null;
+      }
+      case "restartTerminal": {
+        const input = args;
+        const size = { cols: input.cols, rows: input.rows };
+        this.#terminals().restart(input.terminalId, size);
+        this.#terminalSizes.set(input.terminalId, size);
+        return null;
+      }
+      case "closeTerminal":
+        this.#terminals().close(args.terminalId);
+        this.#terminalSizes.delete(args.terminalId);
+        return null;
       case "addProject":
         return addProject(this.#options.harness, args.path, context3);
       case "removeProject":
@@ -4636,6 +5064,7 @@ class GatewayClient {
         const input = args;
         await archive(this.#options.harness, input.conversationId, input.archived, context3);
         if (input.archived) {
+          this.#hooks.terminals?.closeOwners(await conversationSubtree(this.#options.harness, input.conversationId, context3));
           const kept = await cleanupArchivedWorktrees(this.#options.harness, input.conversationId, context3);
           for (const { record, reason } of kept) {
             await this.send({ type: "notice", level: "warning", message: `Kept worktree ${record.path} (branch ${record.branch}): ${reason}` });
@@ -4652,7 +5081,8 @@ class GatewayClient {
       case "revokeDevice": {
         const { publicKey } = args;
         await revokeDevice(this.#options.harness, publicKey, context3);
-        this.#hooks.closeDevice(publicKey);
+        if (publicKey !== this.devicePublicKey)
+          this.#hooks.closeDevice(publicKey);
         return null;
       }
       case "rtcOffer": {
@@ -4935,8 +5365,34 @@ class GatewayClient {
       case "changes": {
         return await this.#changes(conversation, context3);
       }
+      case "openTerminal": {
+        const input = args;
+        const terminals = this.#terminals();
+        const { owner, cwd, record } = await this.#terminalOwner(conversation);
+        const ready = record === undefined || await worktreeSettled(record);
+        if (!ready || !await stat6(cwd).then((info2) => info2.isDirectory(), () => false)) {
+          throw new Error(`The checkout is unavailable: ${cwd}`);
+        }
+        const size = { cols: input.cols, rows: input.rows };
+        const terminalId = terminals.open(owner, cwd, size);
+        this.#terminalSizes.set(terminalId, size);
+        return { terminalId };
+      }
     }
   }
+  #terminals() {
+    if (this.#hooks.terminals === undefined)
+      throw new Error("Terminals are unavailable on this host");
+    return this.#hooks.terminals;
+  }
+  async#terminalOwner(conversation) {
+    const cwd = (await conversation.agent(context3)).cwd;
+    if (cwd === undefined)
+      throw new Error("No working directory");
+    const record = checkoutAt((await this.#options.harness.snapshot(IndexDoc, context3))?.checkouts, cwd);
+    const owner = record?.conversationId ?? await familyRoot(this.#options.harness, conversation.id, context3);
+    return { owner, cwd, record };
+  }
   async#expandSkills(text, scope, bound) {
     if (bound === undefined ? !text.includes("$") : bound.length === 0)
       return text;
@@ -5524,7 +5980,7 @@ import {
   readdir as readdir3,
   rename as rename2,
   rm as rm3,
-  stat as stat6,
+  stat as stat7,
   writeFile as writeFile2
 } from "node:fs/promises";
 import { basename as basename2, join as join9, resolve as resolve6 } from "node:path";
@@ -5713,7 +6169,7 @@ class AttachmentStore {
         throw new Error(problem);
       const decoded = base64DecodedLength(data);
       const path = this.#dataPath(meta);
-      const received = (await stat6(path)).size;
+      const received = (await stat7(path)).size;
       if (received === meta.size) {
         await chmod(path, 292);
         await this.#writeMeta({ ...meta, state: "complete" });
@@ -5756,13 +6212,13 @@ class AttachmentStore {
         if (meta.state === "uploading")
           throw new Error(`Attachment ${index + 1} is still uploading`);
         const path = this.#dataPath(meta);
-        let info;
+        let info2;
         try {
-          info = await lstat(path);
+          info2 = await lstat(path);
         } catch {
           throw new Error(`Attachment ${index + 1} is unavailable; attach it again`);
         }
-        if (!info.isFile() || info.size !== meta.size) {
+        if (!info2.isFile() || info2.size !== meta.size) {
           throw new Error(`Attachment ${index + 1} is unavailable; attach it again`);
         }
         checked.push({ meta, path });
@@ -5805,7 +6261,7 @@ class AttachmentStore {
         } else {
           this.#pending.delete(entry.name);
           try {
-            if (now - (await stat6(directory)).mtimeMs <= this.#ttlMs)
+            if (now - (await stat7(directory)).mtimeMs <= this.#ttlMs)
               continue;
           } catch {
             continue;
@@ -6004,6 +6460,7 @@ async function openHost(options) {
         }
       },
       ...options.rtc === undefined ? {} : { rtc: options.rtc },
+      ...options.terminals === undefined ? {} : { terminals: options.terminals },
       secure: {
         hostKey,
         offers,
@@ -6085,7 +6542,7 @@ async function openHost(options) {
 }
 
 // apps/host/src/service/log-rotation.ts
-import { copyFile, rename as rename3, rm as rm4, stat as stat7, truncate } from "node:fs/promises";
+import { copyFile, rename as rename3, rm as rm4, stat as stat8, truncate } from "node:fs/promises";
 import { join as join11 } from "node:path";
 var HOST_LOG_MAX_BYTES = 10 * 1024 * 1024;
 var HOST_LOG_HISTORY = 3;
@@ -6099,7 +6556,7 @@ async function rotateHostLog(dataDir, copy = copyFile) {
   await rm4(temp, { force: true });
   let size;
   try {
-    size = (await stat7(log)).size;
+    size = (await stat8(log)).size;
   } catch (error) {
     if (isMissing(error))
       return false;
@@ -6147,7 +6604,7 @@ function startHostLogRotation(dataDir) {
 }
 
 // apps/host/src/model-auth.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 import { mkdir as mkdir5, readFile as readFile6, rename as rename4, writeFile as writeFile4 } from "node:fs/promises";
 import { dirname as dirname3 } from "node:path";
 import { getBuiltinProviders } from "@earendil-works/pi-ai/providers/all";
@@ -6451,7 +6908,7 @@ async function openModelAuth(runtime, options) {
       if ([...logins.values()].some((login2) => login2.flow.providerId === providerId && login2.flow.state === "running")) {
         throw new Error(`A login for ${provider.name} is already in progress`);
       }
-      const id = randomUUID2();
+      const id = randomUUID3();
       const login = {
         flow: { id, providerId, method, events: [], state: "running" },
         controller: new AbortController,
@@ -6826,7 +7283,7 @@ async function installId(dataDir) {
   const path = join12(dataDir, "install-id");
   let id = (await readFile7(path, "utf8").catch(() => "")).trim();
   if (id === "") {
-    id = randomUUID3();
+    id = randomUUID4();
     await mkdir6(dataDir, { recursive: true });
     await writeFile5(path, `${id}
 `, { mode: 384 });