@cueloop/daemon 0.1.0-alpha.102 → 0.1.0-alpha.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cueloop/daemon",
-  "version": "0.1.0-alpha.102",
+  "version": "0.1.0-alpha.104",
   "description": "The cueloop session daemon and its client: socket protocol, atomic store, resumable waits",
   "homepage": "https://github.com/mmurakaru/cueloop#readme",
   "bugs": {
@@ -44,8 +44,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@cueloop/extension-api": "0.1.0-alpha.102",
-    "@cueloop/schema": "0.1.0-alpha.102",
+    "@cueloop/extension-api": "0.1.0-alpha.104",
+    "@cueloop/schema": "0.1.0-alpha.104",
     "@pierre/diffs": "^1.5.1",
     "effect": "^4.0.0",
     "smol-toml": "^1.9.0",

package/src/agent-tools.ts

@@ -19,6 +19,7 @@ export function parseAgentToolInput(name: string, serialized: string) {
 
     return { kind: "reply" as const, ...args };
   }
+
   if (name === "send_message") {
     const args = v.parse(
       v.object({
@@ -31,7 +32,9 @@ export function parseAgentToolInput(name: string, serialized: string) {
 
     return { kind: "api" as const, method: "session.sendMessage", params: args };
   }
+
   if (name !== "cueloop_api") throw new Error("Thread agent tool name is unavailable");
+
   const args = v.parse(v.object({ method: v.string(), params: v.unknown() }), input);
 
   return { kind: "api" as const, ...args };
@@ -77,7 +80,9 @@ export function assertAgentToolScope(
 
     return;
   }
+
   if (input.method === "session.list") return;
+
   const params = v.parse(v.record(v.string(), v.unknown()), input.params);
 
   if (THREAD_AGENT_SESSION_METHODS.has(input.method)) {
@@ -85,6 +90,7 @@ export function assertAgentToolScope(
 
     return;
   }
+
   if (THREAD_AGENT_REPO_METHODS.has(input.method)) {
     const { cwd } = v.parse(v.object({ cwd: v.string() }), params);
 

package/src/api.ts

@@ -32,7 +32,6 @@ import {
   isBlockCut,
   restoreBlock,
   switchBranch,
-  messageAllows,
   type Annotation,
   type DiffFileStatus,
   type DiffFileContents,
@@ -74,6 +73,8 @@ import { resolveWorkspace } from "./thread-review";
 import { VcsSourceManager } from "./vcs-source";
 import { DaemonError } from "./errors";
 
+export { messageResponse } from "./thread-review";
+
 /** Reviewer-controlled fields that make an annotation new or edited for delivery. */
 function annotationDeliveryFingerprint(annotation: Annotation | undefined): string {
   if (!annotation) return "";
@@ -238,6 +239,7 @@ export class DaemonCore {
     const binding = this.harnessState.binding(bindingId);
 
     if (!binding) throw new DaemonError("not_found", `no harness binding ${bindingId}`);
+
     const session = this.sessionGet(binding.threadId);
 
     if (
@@ -259,6 +261,7 @@ export class DaemonCore {
     const binding = this.harnessState.binding(bindingId);
 
     if (!binding) throw new DaemonError("not_found", `no harness binding ${bindingId}`);
+
     const session = this.sessionGet(binding.threadId);
 
     return this.harnessState.pending(bindingId).map((delivery) => {
@@ -377,8 +380,10 @@ export class DaemonCore {
   }): Thread[] {
     return this.store.list().filter((session) => {
       if (filter?.status && session.status !== filter.status) return false;
+
       if (filter?.workspace?.repoRoot && session.workspace.repoRoot !== filter.workspace.repoRoot)
         return false;
+
       if (filter?.workspace?.branch && session.workspace.branch !== filter.workspace.branch)
         return false;
 
@@ -401,14 +406,17 @@ export class DaemonCore {
       let done = false;
       const timer = setTimeout(() => {
         if (done) return;
+
         done = true;
         const waiterIndex = list.indexOf(waiter);
 
         if (waiterIndex !== -1) list.splice(waiterIndex, 1);
+
         resolve(null);
       }, timeoutMs);
       const waiter = (session: Thread | null) => {
         if (done) return;
+
         done = true;
         clearTimeout(timer);
         resolve(session);
@@ -432,6 +440,7 @@ export class DaemonCore {
 
     // a welcome-playground note is ephemeral by design: never persisted, so never fed back
     if (annotationTarget(annotation).kind === "welcome") return session;
+
     const existing = session.annotations.findIndex((candidate) => candidate.id === annotation.id);
     const full: Annotation = { ...annotation, createdAt: new Date().toISOString() };
 
@@ -449,12 +458,14 @@ export class DaemonCore {
         ...full,
         createdAt: session.annotations[existing]!.createdAt,
       };
+
     if (annotation.author && authorName)
       session.participants = registerParticipant(
         session,
         annotation.author,
         authorName,
       ).participants;
+
     this.store.upsert(session);
     this.emit("session.updated", id, entryId);
 
@@ -473,6 +484,7 @@ export class DaemonCore {
     if (onBehalfOf !== undefined && target !== undefined && target.author !== onBehalfOf) {
       throw new DaemonError("forbidden", `${onBehalfOf} cannot remove another author's comment`);
     }
+
     session.annotations = session.annotations.filter((candidate) => candidate.id !== annotationId);
     let entryId: string | undefined;
 
@@ -508,6 +520,7 @@ export class DaemonCore {
     const session = this.mutable(id);
 
     if (textCuts?.length) this.assertTextCuts(session.artifact.content, workingCopy, textCuts);
+
     const entryId = this.applyWorkingCopy(session, workingCopy, textCuts);
 
     this.store.upsert(session);
@@ -552,6 +565,7 @@ export class DaemonCore {
 
     if (viewedPaths.length === 0) delete session.viewedPaths;
     else session.viewedPaths = [...new Set([...(session.viewedPaths ?? []), ...viewedPaths])];
+
     this.store.upsert(session);
     this.emit("session.updated", id);
 
@@ -565,6 +579,7 @@ export class DaemonCore {
 
     if (trimmed.length === 0) delete session.artifact.meta.title;
     else session.artifact.meta.title = trimmed;
+
     this.store.upsert(session);
     // the title shows in the Threads sidebar, so a rename is an inbox change, not just a content edit
     this.emit("inbox.changed", id);
@@ -668,10 +683,12 @@ export class DaemonCore {
       );
 
     if (open) return { session: open };
+
     // serialize concurrent bare launches for the same repo onto one creation, so they share a thread
     const inFlight = this.workbenchCreation.get(key);
 
     if (inFlight) return inFlight;
+
     const creation = this.vcsSources.capture(cwd, selected.adapter.id).then((diff) => ({
       session: this.sessionCreate({
         workspace,
@@ -716,7 +733,9 @@ export class DaemonCore {
     const session = this.store.get(id);
 
     if (!this.store.delete(id)) throw new DaemonError("not_found", `no session ${id}`);
+
     if (session) this.untrackLiveDiffSession(session);
+
     this.diffRefreshGenerations.delete(id);
     this.herdrThreadSurfaces.delete(id);
     this.ghosttyThreadSurfaces.delete(id);
@@ -740,6 +759,7 @@ export class DaemonCore {
 
     if (!block)
       throw new DaemonError("invalid_params", `no block ${blockIndex} in the working copy`);
+
     const entryId = this.applyWorkingCopy(session, cutBlock(working, block));
 
     this.store.upsert(session);
@@ -764,6 +784,7 @@ export class DaemonCore {
         `no block ${baseBlockIndex} in the submitted revision`,
       );
     }
+
     const working = session.workingCopy ?? base;
 
     if (!isBlockCut(base, working, block)) {
@@ -772,6 +793,7 @@ export class DaemonCore {
         `block ${baseBlockIndex} of the submitted revision is present in the working copy`,
       );
     }
+
     const beforeLine = Math.min(line ?? working.split("\n").length, working.split("\n").length);
     const entryId = this.applyWorkingCopy(session, restoreBlock(base, working, block, beforeLine));
 
@@ -792,11 +814,14 @@ export class DaemonCore {
     if (session.artifact.type !== "diff") {
       throw new DaemonError("invalid_params", "only a diff review is curated by hunk");
     }
+
     if (!session.artifact.files?.length) {
       throw new DaemonError("invalid_params", "hunk curation needs full file contents");
     }
+
     if (rejections.length === 0) delete session.curation;
     else session.curation = rejections;
+
     const entryId = this.applyWorkingCopy(
       session,
       rejections.length === 0 ? undefined : curateDiff(session.artifact.files, rejections),
@@ -828,6 +853,7 @@ export class DaemonCore {
 
     for (const annotation of incoming.annotations) {
       if (known.has(annotation.id)) continue;
+
       known.add(annotation.id);
       session.annotations.push(annotation);
       this.recordOn(session, branch, {
@@ -841,6 +867,7 @@ export class DaemonCore {
 
     for (const removal of incoming.removals ?? []) {
       if (recorded.has(removal.id) || !known.has(removal.annotationId)) continue;
+
       this.recordOn(session, branch, {
         id: removal.id,
         type: "comment-removed",
@@ -849,6 +876,7 @@ export class DaemonCore {
       });
       changed = true;
     }
+
     if (incoming.participants?.length) {
       const registry = new Map(
         (session.participants ?? []).map((participant) => [participant.id, participant]),
@@ -857,8 +885,10 @@ export class DaemonCore {
       for (const participant of incoming.participants) registry.set(participant.id, participant);
       session.participants = [...registry.values()];
     }
+
     if (changed && session.history) this.refreshView(session, session.history);
     else this.store.upsert(session);
+
     this.emit("session.updated", id);
 
     return session;
@@ -880,6 +910,7 @@ export class DaemonCore {
     const receipt = findOperationReceipt(current.messageOperations, operationId, fingerprint);
 
     if (receipt) return { ...structuredClone(current), message: structuredClone(receipt.result) };
+
     const mutable = this.mutable(id);
     const session = operationId ? structuredClone(mutable) : mutable;
     const sentAt = new Date().toISOString();
@@ -906,6 +937,7 @@ export class DaemonCore {
 
     if (operationId)
       (session.messageOperations ??= []).push({ operationId, fingerprint, result: message });
+
     session.message = message;
     session.status = outcome === "comment" ? "pending" : "resolved";
     const entryId = this.record(session, {
@@ -917,11 +949,13 @@ export class DaemonCore {
     this.store.upsert(session);
     this.reconcileDeliveries(session);
     this.emit("message.sent", id, entryId);
+
     if (outcome === "comment") {
       this.emit("session.updated", id, entryId);
 
       return session;
     }
+
     // a resolved diff review is frozen; stop hot-reloading its working tree
     this.untrackLiveDiffSession(session);
     const parked = this.waiters.get(id) ?? [];
@@ -993,6 +1027,7 @@ export class DaemonCore {
 
     for (const annotation of session.annotations) {
       if (isAddressed(annotation) || isAgentNote(annotation)) continue;
+
       if (reportedIds.has(annotation.id)) {
         annotation.resolution = { revision: revisionNumber, source: "agent" };
       } else if (
@@ -1107,8 +1142,10 @@ export class DaemonCore {
     fork.annotations = view.annotations.map((annotation) =>
       forkedAnnotation(annotation, source, fork),
     );
+
     if (source.participants)
       fork.participants = source.participants.map((identity) => ({ ...identity }));
+
     this.store.upsert(fork);
     this.trackLiveDiffSession(fork);
     this.emit("session.created", fork.id);
@@ -1122,8 +1159,10 @@ export class DaemonCore {
     const session = this.mutable(id);
 
     if (session.artifact.type !== "diff") return { changed: false };
+
     // a PR review has no local working tree; re-pull it from the PR instead of clobbering it
     if (session.artifact.meta.pr !== undefined) return this.sessionRefreshPrDiff(id);
+
     const generation = (this.diffRefreshGenerations.get(id) ?? 0) + 1;
 
     this.diffRefreshGenerations.set(id, generation);
@@ -1145,14 +1184,17 @@ export class DaemonCore {
     // capture, and re-read so a resolved review is never mutated and a deleted
     // one is never revived by this upsert.
     if (this.diffRefreshGenerations.get(id) !== generation) return { changed: false };
+
     const current = this.store.get(id);
 
     if (!current || current.status !== "pending" || current.artifact.type !== "diff")
       return { changed: false };
+
     const contentChanged = diff.patch !== current.artifact.content;
     const sourceChanged = diff.source?.revisionId !== current.artifact.meta.vcsRevisionId;
 
     if (!contentChanged && !sourceChanged) return { changed: false };
+
     current.artifact = {
       ...current.artifact,
       content: diff.patch,
@@ -1206,12 +1248,15 @@ export class DaemonCore {
 
       return;
     }
+
     if (changed) {
       const history = withHistory(session).history;
 
       if (history) session.history = recaptureMainHead(history, diff.patch);
     }
+
     if (pinned) return;
+
     const liveRevision = session.revisions.at(-1);
 
     if (liveRevision) {
@@ -1233,9 +1278,11 @@ export class DaemonCore {
 
     if (!session || session.status !== "pending" || session.artifact.type !== "diff")
       return { changed: false };
+
     const pr = session.artifact.meta.prUrl ?? session.artifact.meta.pr;
 
     if (pr === undefined) return { changed: false };
+
     const generation = (this.diffRefreshGenerations.get(id) ?? 0) + 1;
 
     this.diffRefreshGenerations.set(id, generation);
@@ -1243,12 +1290,15 @@ export class DaemonCore {
 
     // gh failed (offline, unauthenticated): keep the diff we have, try again next poll
     if (snapshot === null) return { changed: false };
+
     // the pull yields the event loop: discard a stale capture or a closed session
     if (this.diffRefreshGenerations.get(id) !== generation) return { changed: false };
+
     const current = this.store.get(id);
 
     if (!current || current.status !== "pending" || current.artifact.type !== "diff")
       return { changed: false };
+
     const contentChanged = snapshot.patch !== current.artifact.content;
     const sourceChanged =
       snapshot.baseSha !== current.artifact.meta.prBaseSha ||
@@ -1262,6 +1312,7 @@ export class DaemonCore {
       current.artifact.meta.prRefreshHeadSha === undefined
     )
       return { changed: false };
+
     current.artifact = {
       ...current.artifact,
       content: snapshot.patch,
@@ -1273,6 +1324,7 @@ export class DaemonCore {
         prRefreshHeadSha: undefined,
       },
     };
+
     if (contentChanged || sourceChanged) {
       const now = new Date().toISOString();
 
@@ -1293,6 +1345,7 @@ export class DaemonCore {
         createdAt: now,
       });
     }
+
     this.store.upsert(current);
     this.emit("session.updated", id);
 
@@ -1304,11 +1357,13 @@ export class DaemonCore {
     const session = this.store.get(id);
 
     if (!session || session.status !== "pending" || session.artifact.meta.pr === undefined) return;
+
     if (
       session.artifact.meta.prBaseSha === refs.baseSha &&
       session.artifact.meta.prHeadSha === refs.headSha
     )
       return;
+
     session.artifact = {
       ...session.artifact,
       meta: {
@@ -1361,6 +1416,7 @@ export class DaemonCore {
 
   private untrackLiveDiffSession(session: Thread): void {
     if (session.artifact.type !== "diff") return;
+
     this.diffWatcher.untrackDiffRepo(session.workspace.repoRoot, session.id);
     this.prPoller.untrackPr(session.id);
   }
@@ -1382,8 +1438,10 @@ export class DaemonCore {
 
     if (textCuts?.length) session.textCuts = textCuts;
     else delete session.textCuts;
+
     if (next === undefined) delete session.workingCopy;
     else session.workingCopy = next;
+
     const after = next ?? session.artifact.content;
 
     if (after === before) return undefined;
@@ -1415,6 +1473,7 @@ export class DaemonCore {
       return operation();
     } catch (error) {
       if (error instanceof HistoryError) throw new DaemonError("invalid_params", error.message);
+
       throw error;
     }
   }
@@ -1434,6 +1493,7 @@ export class DaemonCore {
     const history = withHistory(session).history;
 
     if (!history) return undefined;
+
     const appended = appendEntry(history, entry);
 
     session.history = appended.history;
@@ -1451,6 +1511,7 @@ export class DaemonCore {
     const history = withHistory(session).history;
 
     if (!history) return undefined;
+
     const appended = appendEntry(switchBranch(history, branch), entry);
 
     session.history = { ...appended.history, branch: history.branch };
@@ -1464,6 +1525,7 @@ export class DaemonCore {
 
     if (shareId !== undefined && !link)
       throw new DaemonError("not_found", `no share link ${shareId}`);
+
     const branch = link?.shareBranch ?? MAIN_BRANCH;
 
     return session.history?.tips[branch] === undefined ? MAIN_BRANCH : branch;
@@ -1491,6 +1553,7 @@ function forkedAnnotation(annotation: Annotation, source: Thread, fork: Thread):
   const { resolution, ...open } = annotation;
 
   if (resolution === undefined) return { ...annotation };
+
   const addressedBy = source.revisions.find(
     (revision) => revision.revision === resolution.revision,
   );
@@ -1503,6 +1566,7 @@ function forkedAnnotation(annotation: Annotation, source: Thread, fork: Thread):
 
 function applyRevisionSource(artifact: Artifact, source?: DiffSource): void {
   if (source) artifact.meta.vcs = source.vcs;
+
   if (artifact.type !== "diff") return;
 
   artifact.meta.vcsChangeId = source?.changeId;
@@ -1527,10 +1591,3 @@ function isPrReviewSession(session: Thread): boolean {
     session.artifact.meta.pr !== undefined
   );
 }
-
-/** Convenience for adapters: map a resolved session to the agent contract. */
-export function messageResponse(session: Thread) {
-  if (!session.message) throw new DaemonError("pending", "session has no message");
-
-  return { allow: messageAllows(session.message.outcome), message: session.message };
-}

package/src/client-reliability.test.ts

@@ -84,6 +84,7 @@ test("deadlines, local abort and close reject outstanding requests without cance
 
             return;
           }
+
           socket.write(
             JSON.stringify({
               id: request.id,
@@ -154,6 +155,7 @@ test("malformed frames reject all pending requests as protocol failures", async
 
             return;
           }
+
           socket.write(
             JSON.stringify({
               id: request.id,

package/src/client.ts

@@ -80,7 +80,11 @@ type PendingRequest = {
 const EmptyResultSchema = v.object({});
 // version is optional: a daemon from before the handshake carried one reads as
 // undefined, which never equals this build.
-const PingResultSchema = v.object({ pid: v.number(), version: v.optional(v.string()) });
+const PingResultSchema = v.object({
+  pid: v.number(),
+  version: v.optional(v.string()),
+  agentHarness: v.optional(v.string()),
+});
 const RefreshDiffResultSchema = v.object({ changed: v.boolean() });
 const HerdrThreadSurfaceResultSchema = v.nullable(
   v.object({
@@ -125,6 +129,7 @@ export interface ThreadClient {
   sessionCurate(id: string, rejections: HunkRejection[]): Promise<Thread>;
   sessionSetViewed(id: string, viewedPaths: string[]): Promise<Thread>;
   sessionSetTitle(id: string, title: string): Promise<Thread>;
+  agentGet?(id: string): Promise<ThreadAgentState>;
   projectFiles?(sessionId: string): Promise<string[]>;
   fileContents?(sessionId: string, path: string): Promise<string | null>;
   repoFiles?(cwd: string): Promise<string[]>;
@@ -181,6 +186,7 @@ function readOwnerToken(home: string): string | undefined {
   const path = ownerTokenPath(home);
 
   if (!existsSync(path)) return undefined;
+
   const parsed = v.safeParse(OwnerTokenSchema, readFileSync(path, "utf8"));
 
   if (!parsed.success) {
@@ -219,7 +225,9 @@ export class DaemonClient implements ThreadClient {
     client.home = home;
     try {
       await client.dial(path);
+
       if (client.daemonVersion === DAEMON_VERSION) return client;
+
       const daemonVersion = client.daemonVersion ?? "unknown";
 
       client.close();
@@ -273,8 +281,10 @@ export class DaemonClient implements ThreadClient {
       while (Date.now() < deadline) {
         try {
           await this.dial(path);
+
           if (this.daemonVersion !== DAEMON_VERSION) {
             this.close();
+
             if (typeof Bun === "undefined") {
               throw new DaemonClientError(
                 "version_mismatch",
@@ -288,6 +298,7 @@ export class DaemonClient implements ThreadClient {
           return this;
         } catch (err) {
           if (err instanceof DaemonClientError) throw err;
+
           this.socket?.end();
           this.resetConnection();
           lastError = err;
@@ -315,6 +326,7 @@ export class DaemonClient implements ThreadClient {
 
     const close = () => {
       if (this.connectionEpoch !== epoch) return;
+
       this.closed = true;
       for (const pendingRequest of this.pending.values())
         pendingRequest.reject(
@@ -365,6 +377,7 @@ export class DaemonClient implements ThreadClient {
         },
       });
     }
+
     // Verify liveness: a dead socket file accepts connects on some platforms
     // only to fail later, so a ping is the actual handshake. It also carries the
     // daemon's build version, so connect() can reject incompatible clients.
@@ -383,6 +396,7 @@ export class DaemonClient implements ThreadClient {
         ? { role: this.role, clientVersion: DAEMON_VERSION }
         : { role: this.role, clientVersion: DAEMON_VERSION, author: this.author };
     }
+
     const token = readOwnerToken(this.home);
 
     // a daemon from before owner tokens has no file; it still knows the bare hello
@@ -432,15 +446,19 @@ export class DaemonClient implements ThreadClient {
 
       return;
     }
+
     if ("event" in frame) {
       for (const listener of this.eventListeners) listener(frame);
 
       return;
     }
+
     const pendingRequest = this.pending.get(frame.id);
 
     if (!pendingRequest) return;
+
     this.pending.delete(frame.id);
+
     if (frame.error)
       pendingRequest.reject(new DaemonClientError(frame.error.code, frame.error.message));
     else pendingRequest.resolve(frame.result);
@@ -460,10 +478,12 @@ export class DaemonClient implements ThreadClient {
       return Promise.reject(
         new DaemonTransportError("cancelled", `request ${method} cancelled`, "not_sent", method),
       );
+
     if (this.closed || !this.socket)
       return Promise.reject(
         new DaemonTransportError("connection", "not connected", "not_sent", method),
       );
+
     const id = this.nextId++;
 
     return new Promise<TOutput>((resolve, reject) => {
@@ -498,6 +518,7 @@ export class DaemonClient implements ThreadClient {
                 method,
                 { cause: parsed.issues },
               );
+
             resolve(parsed.output);
           } catch (cause) {
             reject(
@@ -579,7 +600,7 @@ export class DaemonClient implements ThreadClient {
   }): Promise<ThreadAgentState> {
     return this.request("agent.permission", params, ThreadAgentSchema);
   }
-  ping(): Promise<{ pid: number }> {
+  ping(): Promise<{ pid: number; agentHarness?: string }> {
     return this.request("daemon.ping", {}, PingResultSchema);
   }
   subscribe(): Promise<void> {
@@ -642,6 +663,7 @@ export class DaemonClient implements ThreadClient {
     const params: v.InferInput<(typeof Params)["session.navigate"]> = { id, entryId };
 
     if (summary !== undefined) params.summary = summary;
+
     if (branch !== undefined) params.branch = branch;
 
     return this.request("session.navigate", params, ThreadRecordSchema);
@@ -864,6 +886,7 @@ export function daemonSpawnCommand(
     moduleUrl.includes("$bunfs") || moduleUrl.includes("~BUN") || moduleUrl.includes("%7EBUN");
 
   if (compiled) return [execPath, "daemon", "--autostart"];
+
   const mainPath = entry ?? new URL("./main.ts", moduleUrl).pathname;
 
   const args = entry ? ["daemon", "--autostart"] : [];

package/src/curate.ts

@@ -64,6 +64,7 @@ function curateFilePatch(file: DiffFileContents, rejections: HunkRejection[]): s
   const curatedNew = model.additionLines.join("");
 
   if (curatedNew === file.oldContents) return null;
+
   const patch = unifiedDiffText(file.oldContents, curatedNew, file.path);
 
   if (patch === null) return null;
@@ -84,6 +85,7 @@ function withFileStateHeaders(
   curatedNew: string,
 ): string {
   if (status === "added") return patch.replace(`--- a/${path}`, "--- /dev/null");
+
   if (status === "deleted" && curatedNew === "") {
     return patch.replace(`+++ b/${path}`, "+++ /dev/null");
   }