@ccmsg/protocol 2.0.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccmsg/protocol",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "Wire contract (schema + types + op attribute table) shared by the ccmsg daemon and web UI",
   "license": "MIT",
   "author": "kawaz",

package/src/common/topics.ts

@@ -9,6 +9,7 @@ export const PLAIN_TOPICS = [
   "peers",
   "instances",
   "agents",
+  "terminals",
   "session.errors",
   "llm.requests",
   "llm.status",
@@ -109,6 +110,9 @@ export const TOPIC_ATTRIBUTES = {
   // is apart from the rows of `peers`.
   instances: { roles: ["session", "user"], granularity: "per_instance_whole" },
   agents: { roles: ["user"], granularity: "element" },
+  // The host's terminals, which exist whether a session is in them or not, so
+  // they are a list of their own rather than a field of a session's row.
+  terminals: { roles: ["user"], granularity: "element" },
   // A set the instance derives whole, by folding one error pattern over its
   // sessions: it learns which sessions are stopped, not that one of them
   // changed, so each frame is that reading entire.

package/src/control/agents.ts

@@ -45,7 +45,11 @@ export const AgentInfo = Type.Object(
     /** The terminal the session runs in, which is the handle a rename types
      * into. Absent when the process does not name one or its environment could
      * not be read. Read from the running process rather than remembered from
-     * when it started, since resuming a session gives it a new process. */
+     * when it started, since resuming a session gives it a new process.
+     *
+     * Where the instance states `terminals` as well, the match of the pids
+     * there is what says which terminal this run is in; this field is what an
+     * instance with no terminal manager has to go on. */
     terminal_id: Type.Optional(TerminalId),
     /** Which namespace that terminal lives in. Absent means the process set
      * none, which the multiplexer treats as its default — not the instance's

package/src/control/peers.ts

@@ -40,8 +40,9 @@ export type SessionRun = Static<typeof SessionRun>;
  * whether anything it says can still be trusted. */
 export const SessionStatusStanding = Type.Union(
   [
-    /** No transcript, so there is nothing to fold. A session that has just
-     * started stands here until the harness writes its first record. */
+    /** Nothing is folded: there is no transcript yet (a session that has just
+     * started stands here until the harness writes its first record), or this
+     * instance holds no fold of it because nothing has asked for one. */
     Type.Literal("absent"),
     /** The transcript is being read from the top; what the fold says so far is
      * incomplete. */
@@ -236,10 +237,16 @@ export function liveness(
   now: number,
 ): Liveness {
   if (row.runs.length >= 2) return "duplicated";
-  const running =
-    (row.runs.length > 0 && row.stopped_at === undefined) ||
-    (row.gateway_active_at !== undefined && now - row.gateway_active_at <= GATEWAY_LIVE_WINDOW_MS);
-  if (running) return "alive";
+  if (row.runs.length === 1) return "alive";
+  // No run is seen, so the declaration and the gateway are all there is to go
+  // on: inference still running for it is a session that is alive somewhere
+  // this instance cannot see the process of.
+  if (
+    row.gateway_active_at !== undefined &&
+    now - row.gateway_active_at <= GATEWAY_LIVE_WINDOW_MS
+  ) {
+    return "alive";
+  }
   return row.stopped_at === undefined ? "disappeared" : "paused";
 }
 

package/src/control/terminals.ts

@@ -0,0 +1,166 @@
+import { type Static, Type } from "@sinclair/typebox";
+import { topicFrame } from "../envelope.ts";
+import { InstanceId, TerminalId, Timestamp } from "../identifiers.ts";
+
+/** One terminal on a host, as the terminal manager reports it.
+ *
+ * A terminal is not an attribute of a session: a person opens one with nothing
+ * running in it, and the terminal outlives the session that was running there.
+ * So it is a row of its own, matched by `instance` and `id`, and which session
+ * is in it is read off the pids rather than stated here.
+ *
+ * The words are a terminal's own — `id`, `state`, `pid` — rather than any one
+ * manager's, so another manager's terminals are rows of the same list. Which
+ * manager a row came from is the scheme of its `id`. */
+export const TerminalInfo = Type.Object(
+  {
+    /** The instance that polled it, and whose host the pid belongs to. */
+    instance: InstanceId,
+    /** `<scheme>:<id>`, the scheme naming which terminal manager observed it. */
+    id: TerminalId,
+    /** What the terminal manager says the terminal is doing. An open set. */
+    state: Type.String(),
+    /** What is running in the terminal, as argv. */
+    command: Type.Array(Type.String()),
+    cwd: Type.Optional(Type.String()),
+    /** The main process inside the terminal. Absent where the manager reports
+     * none, which is also what leaves such a row out of every derivation
+     * below: nothing can be matched against a pid that is not there. */
+    pid: Type.Optional(Type.Integer({ minimum: 1 })),
+    started_at: Type.Optional(Timestamp),
+  },
+  { $id: "TerminalInfo" },
+);
+export type TerminalInfo = Static<typeof TerminalInfo>;
+
+/** A row that is gone: the terminal was closed, or the instance that polled it
+ * stopped. Marked rather than absent, since a frame carries only what changed. */
+export const TerminalRemoved = Type.Object(
+  {
+    instance: InstanceId,
+    id: TerminalId,
+    removed: Type.Literal(true),
+  },
+  { $id: "TerminalRemoved" },
+);
+export type TerminalRemoved = Static<typeof TerminalRemoved>;
+
+export const TerminalElement = Type.Union([TerminalInfo, TerminalRemoved], {
+  $id: "TerminalElement",
+});
+export type TerminalElement = Static<typeof TerminalElement>;
+
+/** The commands a harness is started as, by the name its binary is installed
+ * under. What `starting` below reads a terminal's `command` against, so that a
+ * shell a person opened is not read as a session on its way up.
+ *
+ * Names rather than paths: the same harness is installed under a dozen
+ * prefixes and run through as many wrappers, and none of that changes what it
+ * is. A harness outside this list is one nothing here claims to recognise — its
+ * terminal is unattached until the harness reports the run itself. */
+export const HARNESS_COMMANDS = ["claude", "codex"] as const;
+
+/** What a derivation below reads off a terminal: where it is and what is
+ * running in it. */
+interface TerminalRow {
+  readonly instance: string;
+  readonly pid?: number;
+  readonly command?: readonly string[];
+}
+
+/** What it reads off an `agents` row: where the process is, and whose session
+ * it runs. */
+interface AgentRow {
+  readonly instance: string;
+  readonly pid: number;
+  readonly sid?: string;
+}
+
+const held = (agents: readonly AgentRow[]): Set<string> =>
+  new Set(agents.map((agent) => `${agent.instance}/${agent.pid}`));
+
+/** Whether a terminal is running a harness, read off the name its command was
+ * invoked under. */
+const isHarness = (command: readonly string[] | undefined): boolean => {
+  const argv0 = command?.[0];
+  if (argv0 === undefined) return false;
+  const name = argv0.slice(argv0.lastIndexOf("/") + 1);
+  return (HARNESS_COMMANDS as readonly string[]).includes(name);
+};
+
+const key = (terminal: TerminalRow): string | undefined =>
+  terminal.pid === undefined ? undefined : `${terminal.instance}/${terminal.pid}`;
+
+/** The terminals a session is running in: those whose process is a run of that
+ * session.
+ *
+ * The pid is what says so, not `agents.terminal_id`: the terminal list is the
+ * one that knows which terminals exist, and a run reaches it as the process
+ * inside one. Both lists are the `user` role's, and both are keyed by the host
+ * the pid belongs to, which is why a row is matched by `instance` and `pid`
+ * together.
+ *
+ * Derived here rather than by each side, for the reason `liveness` is: an
+ * instance and a client that each wrote this would show one host two ways. */
+export function terminalsOf<T extends TerminalRow>(
+  sid: string,
+  agents: readonly AgentRow[],
+  terminals: readonly T[],
+): T[] {
+  const pids = held(agents.filter((agent) => agent.sid === sid));
+  return terminals.filter((terminal) => {
+    const at = key(terminal);
+    return at !== undefined && pids.has(at);
+  });
+}
+
+/** The terminals no run is in: the ones a person opened for themselves, and the
+ * ones a harness has just started in and not yet been seen as a run of.
+ *
+ * A terminal whose manager reports no pid is here too — nothing can be matched
+ * against it, so nothing can claim it. */
+export function unattachedTerminals<T extends TerminalRow>(
+  agents: readonly AgentRow[],
+  terminals: readonly T[],
+): T[] {
+  const pids = held(agents);
+  return terminals.filter((terminal) => {
+    const at = key(terminal);
+    return at === undefined || !pids.has(at);
+  });
+}
+
+/** The terminals a harness is running in that the harness has not reported: one
+ * that has started and has neither written a state file nor greeted yet. This
+ * is where a run before its state file is said, rather than as an `agents` row
+ * without a `sid`.
+ *
+ * Narrower than `unattachedTerminals` in both ways it can be: a terminal with
+ * no process is one nothing can be starting in, and a terminal running
+ * something that is not a harness is a person's own and is not on its way to
+ * becoming a session. The `command` is what says which — a pid alone cannot
+ * tell a shell from a harness — so a row that states none is not here. */
+export function starting<T extends TerminalRow>(
+  terminals: readonly T[],
+  agents: readonly AgentRow[],
+): T[] {
+  const pids = held(agents);
+  return terminals.filter((terminal) => {
+    const at = key(terminal);
+    return at !== undefined && !pids.has(at) && isHarness(terminal.command);
+  });
+}
+
+/** The `terminals` topic. Elements, like `agents`: the rows that changed since
+ * the last frame, matched by their `instance` and `id`.
+ *
+ * The `user` role's alone. A terminal is the host's, and a session has no
+ * reason to be told which terminals another session is being typed into. */
+export const TerminalsFrame = topicFrame(
+  "terminals",
+  Type.Object({
+    terminals: Type.Array(TerminalElement),
+    /** When the poll behind these rows ran. Absent before the first one. */
+    polled_at: Type.Optional(Timestamp),
+  }),
+);

package/src/fixtures/index.ts

@@ -179,6 +179,7 @@ export const TOPIC_FIXTURES = {
   peers: topics.PEERS_FRAME,
   instances: topics.INSTANCES_FRAME,
   agents: topics.AGENTS_FRAME,
+  terminals: topics.TERMINALS_FRAME,
   "session.status": topics.SESSION_STATUS_FRAME,
   transcript: topics.TRANSCRIPT_FRAME,
   "transcript.items": topics.TRANSCRIPT_ITEMS_FRAME,

package/src/fixtures/topics.ts

@@ -7,6 +7,7 @@ import type { LlmRequestsFrame, LlmStatusFrame } from "../control/llm.ts";
 import type { PeersFrame } from "../control/peers.ts";
 import type { SessionErrorsFrame } from "../control/session-errors.ts";
 import type { SessionStatusFrame } from "../control/session-status.ts";
+import type { TerminalsFrame } from "../control/terminals.ts";
 import type { TranscriptFrame, TranscriptItemsFrame } from "../control/transcript.ts";
 import { TRANSCRIPT_ITEMS } from "./control.ts";
 import type { InboxFrame } from "../messaging/message.ts";
@@ -223,6 +224,47 @@ export const AGENTS_CHANGE_FRAME: Static<typeof AgentsFrame> = {
   data: { agents: [{ instance, pid: 7314, removed: true }], polled_at: FIXTURE_NOW + 5_000 },
 };
 
+export const TERMINALS_FRAME: Static<typeof TerminalsFrame> = {
+  ev: "topic",
+  topic: "terminals",
+  snapshot: true,
+  instance,
+  data: {
+    terminals: [
+      {
+        instance,
+        id: "hyoui:%17",
+        state: "running",
+        command: ["claude", "--continue"],
+        cwd: WORKSPACE,
+        pid: 4821,
+        started_at: FIXTURE_NOW - 600_000,
+      },
+      {
+        instance,
+        id: "hyoui:%31",
+        state: "running",
+        command: ["zsh", "-i"],
+        cwd: WORKSPACE,
+        pid: 5177,
+        started_at: FIXTURE_NOW - 120_000,
+      },
+    ],
+    polled_at: FIXTURE_NOW,
+  },
+};
+
+/** A later frame: one terminal was closed. */
+export const TERMINALS_CHANGE_FRAME: Static<typeof TerminalsFrame> = {
+  ev: "topic",
+  topic: "terminals",
+  instance,
+  data: {
+    terminals: [{ instance, id: "hyoui:%31", removed: true }],
+    polled_at: FIXTURE_NOW + 5_000,
+  },
+};
+
 export const SESSION_STATUS_FRAME: Static<typeof SessionStatusFrame> = {
   ev: "topic",
   topic: `session.status:${sid}`,

package/src/index.ts

@@ -16,6 +16,7 @@ export * from "./control/sandbox.ts";
 export * from "./control/session-errors.ts";
 export * from "./control/session-status.ts";
 export * from "./control/session.ts";
+export * from "./control/terminals.ts";
 export * from "./control/transcript.ts";
 export * from "./control/translate.ts";
 export * from "./envelope.ts";

package/src/schemas.ts

@@ -94,6 +94,7 @@ import {
 } from "./control/sandbox.ts";
 import { SessionErrorsFrame } from "./control/session-errors.ts";
 import { SessionStatusFrame } from "./control/session-status.ts";
+import { TerminalsFrame } from "./control/terminals.ts";
 import {
   SessionDumpWriteRequest,
   SessionDumpWriteResponse,
@@ -216,6 +217,7 @@ export const TOPIC_SCHEMAS = {
   peers: PeersFrame,
   instances: InstancesFrame,
   agents: AgentsFrame,
+  terminals: TerminalsFrame,
   "session.status": SessionStatusFrame,
   transcript: TranscriptFrame,
   "transcript.items": TranscriptItemsFrame,