@ccmsg/protocol 1.17.0 → 1.19.0

package/package.json

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

package/src/control/dump.ts

@@ -24,7 +24,17 @@ import { Sid, Timestamp } from "../identifiers.ts";
  * Segments after the first carry the spelling of whatever named them, which is
  * why they are not held to snake_case: `tool:Bash` and `hook:PreToolUse` are
  * the harness's words, and rewriting them would leave the reader unable to
- * match what it sees against what it ran. */
+ * match what it sees against what it ran.
+ *
+ * Under `message`, the second segment is **a relation read from the subject**:
+ * `parent` is whoever started this agent, `sub` a throwaway agent it started,
+ * `team` a named counterpart that goes on standing, `session` another session
+ * over ccmsg. The one exception is `user` — a person is not a relation to
+ * anyone, but the user, standing alone. A harness's own name for a party is
+ * never a type: `message:main` would read as the main session's traffic being
+ * overheard wherever it happens, when what is meant is the party this subject
+ * answers to — which is what `parent` says. The literal names (`main`, a
+ * lead's, a teammate's) are kept in `harness_name` on the item. */
 export const TranscriptItemType = Type.String({
   pattern: "^[a-z]+(?::[A-Za-z0-9_.-]+)*$",
   $id: "TranscriptItemType",
@@ -69,6 +79,27 @@ export const TranscriptItemSelector = Type.String({
 });
 export type TranscriptItemSelector = Static<typeof TranscriptItemSelector>;
 
+/** Whose transcript an item was read from, said as a standing rather than a
+ * name: `main` is a session's own transcript, `sub` a throwaway agent's — one
+ * started to answer once — and `team` a teammate's, an agent that was named and
+ * goes on standing.
+ *
+ * It is what the relations are read from. `message:parent:in` under a `sub` is
+ * an errand's brief and under a `team` is what its lead wrote, and an item that
+ * does not say which of the two it stood in can only be placed by whoever
+ * remembers the request that fetched it. Carrying it on the item is what lets
+ * several transcripts be drawn as one, and what lets the table of relations be
+ * checked against items rather than against the request that asked for them.
+ *
+ * It is not `harness_name`: that is the other party's literal name, this is the
+ * subject's own standing, and a subject has one whether or not anything it
+ * talked to was named. */
+export const TranscriptSubject = Type.Union(
+  [Type.Literal("main"), Type.Literal("team"), Type.Literal("sub")],
+  { $id: "TranscriptSubject" },
+);
+export type TranscriptSubject = Static<typeof TranscriptSubject>;
+
 /** Where in the transcript the record an item was read from begins, and how far
  * it runs.
  *
@@ -105,10 +136,16 @@ export type TranscriptItemId = Static<typeof TranscriptItemId>;
  * `id` is what the links below point with — never a position in the array,
  * since a selection or a range decides which items exist in a given read — and
  * `uuid` stays beside it as the record the item came out of, which is what a
- * reader groups by when it wants the whole of one line. */
+ * reader groups by when it wants the whole of one line.
+ *
+ * `subject` is on every item because an item is read out of one transcript and
+ * ends up among items from others: a client draws a session beside the agents
+ * below it, and the standing it was read from is then the item's own to state
+ * and not something to be inferred from the call that fetched it. */
 const BASE_FIELDS = {
   id: TranscriptItemId,
   uuid: Type.String({ minLength: 1 }),
+  subject: TranscriptSubject,
   source: TranscriptItemSource,
   /** The item's own instant. A call and its result each keep their own. */
   at: Timestamp,
@@ -190,10 +227,10 @@ const MessageUserOut = item(Type.Literal("message:user:out"), { text: Text });
  * unnameable. */
 const MessageParentIn = item(Type.Literal("message:parent:in"), {
   text: Text,
-  /** The parent as the harness named it where this arrived — `main`, a lead's
-   * name, the agent above. Left out when the record says only that it came from
-   * above, which is the case for the brief an agent opens with. */
-  from: Type.Optional(Type.String()),
+  /** The harness's own name for the parent — `main`, a lead's name, the agent
+   * above. Left out when the record says only that it came from above, which is
+   * the case for the brief an agent opens with. */
+  harness_name: Type.Optional(Type.String()),
   msg_id: Type.Optional(Type.String()),
 });
 
@@ -202,8 +239,8 @@ const MessageParentIn = item(Type.Literal("message:parent:in"), {
 const MessageParentOutSent = item(Type.Literal("message:parent:out"), {
   ...USE_FIELDS,
   text: Text,
-  /** The parent as the subject addressed it, in the harness's spelling. */
-  to: Type.Optional(Type.String()),
+  /** The harness's own name for the parent, as the subject addressed it. */
+  harness_name: Type.Optional(Type.String()),
   summary: Type.Optional(Type.String()),
 });
 
@@ -223,7 +260,7 @@ const MessageTeamOut = item(Type.Literal("message:team:out"), {
   ...USE_FIELDS,
   text: Text,
   /** The teammate addressed, by the name it stands under. */
-  to: Type.Optional(Type.String()),
+  harness_name: Type.Optional(Type.String()),
   summary: Type.Optional(Type.String()),
   agent_id: Type.Optional(Type.String()),
   /** Present on the call that started the teammate, absent on the ones that
@@ -236,7 +273,8 @@ const MessageTeamOut = item(Type.Literal("message:team:out"), {
  * was written. */
 const MessageTeamInSaid = item(Type.Literal("message:team:in"), {
   text: Text,
-  from: Type.Optional(Type.String()),
+  /** The name the teammate stands under. */
+  harness_name: Type.Optional(Type.String()),
   msg_id: Type.Optional(Type.String()),
 });
 
@@ -244,6 +282,7 @@ const MessageTeamInSaid = item(Type.Literal("message:team:in"), {
 const MessageTeamInDone = item(Type.Literal("message:team:in"), {
   ...RESULT_FIELDS,
   text: Text,
+  harness_name: Type.Optional(Type.String()),
   agent_id: Type.Optional(Type.String()),
   status: Type.Optional(Type.String()),
   duration_ms: Type.Optional(Type.Integer({ minimum: 0 })),

package/src/fixtures/control.ts

@@ -230,6 +230,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "3f9a21c4:0",
     uuid: "3f9a21c4",
+    subject: "main",
     source: { offset: 180_000, bytes: 420 },
     type: "message:user:in",
     at: FIXTURE_NOW - 3_600_000,
@@ -239,6 +240,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "f10b6d43:0",
     uuid: "f10b6d43",
+    subject: "main",
     source: { offset: 180_420, bytes: 980 },
     type: "thinking",
     at: FIXTURE_NOW - 3_500_000,
@@ -247,6 +249,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "f10b6d43:1",
     uuid: "f10b6d43",
+    subject: "main",
     source: { offset: 180_420, bytes: 980 },
     type: "tool:Bash",
     at: FIXTURE_NOW - 3_400_000,
@@ -259,6 +262,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "18d6f2c9:0",
     uuid: "18d6f2c9",
+    subject: "main",
     source: { offset: 181_400, bytes: 260 },
     type: "tool:Bash",
     at: FIXTURE_NOW - 3_399_000,
@@ -271,6 +275,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "b7e41d09:0",
     uuid: "b7e41d09",
+    subject: "main",
     source: { offset: 181_660, bytes: 640 },
     type: "message:sub:out",
     at: FIXTURE_NOW - 3_300_000,
@@ -284,6 +289,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "92e6d4f5:0",
     uuid: "92e6d4f5",
+    subject: "main",
     source: { offset: 182_300, bytes: 310 },
     type: "hook:PreToolUse",
     at: FIXTURE_NOW - 3_200_000,
@@ -295,6 +301,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "81d5c3e4:0",
     uuid: "81d5c3e4",
+    subject: "main",
     source: { offset: 182_610, bytes: 190 },
     type: "system:attachment:queued_command",
     at: FIXTURE_NOW - 3_100_000,
@@ -303,6 +310,7 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   {
     id: "c8a2f371:0",
     uuid: "c8a2f371",
+    subject: "main",
     source: { offset: 182_800, bytes: 520 },
     type: "message:team:out",
     at: FIXTURE_NOW - 3_000_000,
@@ -310,22 +318,24 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
     result_item: "d4c1a0b2:0",
     tool_use_id: "toolu_01Tm5XYp",
     text: "契約に message:parent と message:team を足して",
-    to: "contract-dump-items",
+    harness_name: "contract-dump-items",
     agent_id: "b83e0f114",
     subagent_type: "opus5-worker-high",
   },
   {
     id: "e5b70c93:0",
     uuid: "e5b70c93",
+    subject: "main",
     source: { offset: 183_320, bytes: 300 },
     type: "message:team:in",
     at: FIXTURE_NOW - 2_900_000,
     text: "fixtures まで通ったので ci を回す",
-    from: "contract-dump-items",
+    harness_name: "contract-dump-items",
   },
   {
     id: "d4c1a0b2:0",
     uuid: "d4c1a0b2",
+    subject: "main",
     source: { offset: 183_620, bytes: 410 },
     type: "message:team:in",
     at: FIXTURE_NOW - 2_800_000,
@@ -339,15 +349,18 @@ export const TRANSCRIPT_ITEMS: Static<typeof TranscriptItem>[] = [
   },
 ];
 
-/** The same vocabulary read with an agent as the subject.
+/** The same vocabulary read with a throwaway agent as the subject.
  *
  * Nothing here is a new type: the brief an agent opens with and the answer it
  * closes with are what `message:parent` names from wherever it is read, and the
- * answer comes as prose with no call behind it. */
+ * answer comes as prose with no call behind it. What says these were read from
+ * an errand's transcript rather than a session's is `subject`, which every item
+ * carries. */
 export const TRANSCRIPT_ITEMS_AGENT_SUBJECT: Static<typeof TranscriptItem>[] = [
   {
     id: "a9f30d15:0",
     uuid: "a9f30d15",
+    subject: "sub",
     source: { offset: 0, bytes: 1_240 },
     type: "message:parent:in",
     at: FIXTURE_NOW - 3_290_000,
@@ -357,18 +370,20 @@ export const TRANSCRIPT_ITEMS_AGENT_SUBJECT: Static<typeof TranscriptItem>[] = [
   {
     id: "b0e41c26:0",
     uuid: "b0e41c26",
+    subject: "sub",
     source: { offset: 1_240, bytes: 380 },
     type: "message:parent:out",
     at: FIXTURE_NOW - 3_260_000,
     role: "use",
     tool_use_id: "toolu_01Qz8Vbn",
     text: "型一覧は 4 群に分けた。preset の例まで直してよいか",
-    to: "main",
+    harness_name: "main",
     summary: "型一覧の分け方を確認",
   },
   {
     id: "c1f52d37:0",
     uuid: "c1f52d37",
+    subject: "sub",
     source: { offset: 1_620, bytes: 690 },
     type: "message:parent:out",
     at: FIXTURE_NOW - 3_200_000,
@@ -376,6 +391,57 @@ export const TRANSCRIPT_ITEMS_AGENT_SUBJECT: Static<typeof TranscriptItem>[] = [
   },
 ];
 
+/** The same vocabulary again, read with a teammate as the subject.
+ *
+ * A teammate stands where neither of the other two does: it answers a lead, as
+ * an errand does, and a person can also type at it directly, as a session's own
+ * transcript has. The relations are the ones already spelled out — what tells
+ * these apart from the errand's above is `subject`, and it is what makes the
+ * three columns of the table checkable against items. */
+export const TRANSCRIPT_ITEMS_TEAM_SUBJECT: Static<typeof TranscriptItem>[] = [
+  {
+    id: "d2a63e48:0",
+    uuid: "d2a63e48",
+    subject: "team",
+    source: { offset: 0, bytes: 1_480 },
+    type: "message:parent:in",
+    at: FIXTURE_NOW - 3_000_000,
+    turn: 1,
+    text: "契約に message:parent と message:team を足して",
+    harness_name: "main",
+  },
+  {
+    id: "e3b74f59:0",
+    uuid: "e3b74f59",
+    subject: "team",
+    source: { offset: 1_480, bytes: 260 },
+    type: "message:user:in",
+    at: FIXTURE_NOW - 2_950_000,
+    text: "fixtures も忘れずに",
+  },
+  {
+    id: "f4c8506a:0",
+    uuid: "f4c8506a",
+    subject: "team",
+    source: { offset: 1_740, bytes: 340 },
+    type: "message:team:out",
+    at: FIXTURE_NOW - 2_920_000,
+    role: "use",
+    tool_use_id: "toolu_01Wc7Zdq",
+    text: "daemon 側の分類はどこまで進んでいる",
+    harness_name: "daemon-dump-items",
+  },
+  {
+    id: "a5d9617b:0",
+    uuid: "a5d9617b",
+    subject: "team",
+    source: { offset: 2_080, bytes: 410 },
+    type: "message:parent:out",
+    at: FIXTURE_NOW - 2_800_000,
+    text: "4 型を足して 1.17.0 を切った",
+  },
+];
+
 export const TRANSCRIPT_READ_REQUEST: Static<typeof TranscriptReadRequest> = {
   request_id,
   op: "transcript_read",