@cueloop/daemon 0.1.0-alpha.11 → 0.1.0-alpha.111

package/src/thread-review.test.ts

@@ -0,0 +1,487 @@
+/** The shared review core against a real DaemonServer in a temp home: workspace resolution, title derivation, open-or-revise by agentSessionId, and both awaitMessage shapes (one long-poll and the chunked loop with progress and abort). */
+
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import type { Thread } from "@cueloop/schema";
+import { DaemonServer } from "./server";
+import { DaemonClient } from "./client";
+import { awaitResolve, openReview, resolveWorkspace } from "./thread-review";
+import { VcsSourceManager } from "./vcs-source";
+
+const PLAN = "# Rollout Plan\n\nShip it in two stages.\n";
+
+let home: string;
+let server: DaemonServer;
+let client: DaemonClient;
+
+beforeEach(async () => {
+  home = mkdtempSync(join(tmpdir(), "cueloop-review-core-"));
+  server = new DaemonServer({ home, idleExitMs: 0 });
+  server.start();
+  client = await DaemonClient.connect({ home });
+});
+afterEach(() => {
+  client.close();
+  server.stop();
+  rmSync(home, { recursive: true, force: true });
+});
+
+function sh(args: string[], cwd: string): void {
+  const gitResult = Bun.spawnSync(args, { cwd, stdout: "ignore", stderr: "ignore" });
+
+  if (gitResult.exitCode !== 0) throw new Error(`${args.join(" ")} failed`);
+}
+
+describe("resolveWorkspace", () => {
+  test("a git repo resolves to its root and branch", async () => {
+    const repo = mkdtempSync(join(tmpdir(), "cueloop-ws-"));
+
+    try {
+      // Arrange
+      sh(["git", "init", "-q", "-b", "main"], repo);
+      sh(["git", "config", "user.email", "t@t"], repo);
+      sh(["git", "config", "user.name", "t"], repo);
+      sh(["git", "commit", "-q", "--allow-empty", "-m", "init"], repo);
+
+      // Act
+      const ws = await resolveWorkspace(repo);
+
+      // Assert
+      expect(ws.branch).toBe("main");
+      // macOS tmpdirs can resolve through /private; compare the tail
+      expect(ws.repoRoot.endsWith(repo.split("/").at(-1)!)).toBe(true);
+    } finally {
+      rmSync(repo, { recursive: true, force: true });
+    }
+  });
+
+  test("outside a repo the cwd itself is the workspace, branch detached", async () => {
+    // Act
+    const ws = await resolveWorkspace(home);
+
+    // Assert
+    expect(ws).toEqual({ repoRoot: home, branch: "detached" });
+  });
+});
+
+describe("openReview", () => {
+  test("a submitted JJ diff follows the same change through a rewrite", async () => {
+    const repo = mkdtempSync(join(tmpdir(), "cueloop-review-jj-"));
+
+    try {
+      sh(["git", "init", "-q", "-b", "main"], repo);
+      sh(["git", "config", "user.email", "t@t"], repo);
+      sh(["git", "config", "user.name", "t"], repo);
+      writeFileSync(join(repo, "a.txt"), "before\n");
+      sh(["git", "add", "a.txt"], repo);
+      sh(["git", "commit", "-qm", "initial"], repo);
+      sh(["jj", "git", "init", "--colocate", repo], repo);
+      writeFileSync(join(repo, "a.txt"), "first\n");
+      const sources = new VcsSourceManager(join(home, "vcs-config.toml"));
+      const firstDiff = await sources.capture(repo, "jj");
+      const first = await openReview(client, {
+        type: "diff",
+        content: firstDiff.patch,
+        cwd: repo,
+        vcs: "jj",
+        agent: "codex",
+        agentSessionId: "one-agent-session",
+      });
+
+      writeFileSync(join(repo, "a.txt"), "second\n");
+      const secondDiff = await sources.capture(repo, "jj");
+      const second = await openReview(client, {
+        type: "diff",
+        content: secondDiff.patch,
+        cwd: repo,
+        vcs: "jj",
+        agent: "codex",
+        agentSessionId: "one-agent-session",
+      });
+
+      expect(first.session.artifact.meta.vcs).toBe("jj");
+      expect(first.session.artifact.files?.[0]?.newContents).toBe("first\n");
+      expect(first.session.artifact.meta.vcsChangeId).toBe(
+        second.session.artifact.meta.vcsChangeId,
+      );
+      expect(second.id).toBe(first.id);
+      expect(second.session.revisions.map((revision) => revision.content)).toEqual([
+        firstDiff.patch,
+        secondDiff.patch,
+      ]);
+      const unmatched = await openReview(client, {
+        type: "diff",
+        content: "diff --git a/elsewhere b/elsewhere\n",
+        cwd: repo,
+        vcs: "jj",
+        agent: "codex",
+        agentSessionId: "one-agent-session",
+      });
+
+      expect(unmatched.id).toBe(first.id);
+      expect(unmatched.session.artifact.files).toEqual([]);
+      expect(unmatched.session.artifact.meta.vcsRevisionId).toBeUndefined();
+      sh(["jj", "new", "-m", "next change"], repo);
+      writeFileSync(join(repo, "b.txt"), "third\n");
+      const thirdDiff = await sources.capture(repo, "jj");
+      const third = await openReview(client, {
+        type: "diff",
+        content: thirdDiff.patch,
+        cwd: repo,
+        vcs: "jj",
+        agent: "codex",
+        agentSessionId: "one-agent-session",
+      });
+
+      expect(third.id).not.toBe(first.id);
+      const unmatchedAfterTwoChanges = await openReview(client, {
+        type: "diff",
+        content: "diff --git a/unmatched b/unmatched\n",
+        cwd: repo,
+        vcs: "jj",
+        agent: "codex",
+        agentSessionId: "one-agent-session",
+      });
+
+      expect(unmatchedAfterTwoChanges.id).not.toBe(first.id);
+      expect(unmatchedAfterTwoChanges.id).not.toBe(third.id);
+      expect((await client.sessionGet(third.id)).artifact.meta.vcsChangeId).toBe(
+        third.session.artifact.meta.vcsChangeId,
+      );
+    } finally {
+      rmSync(repo, { recursive: true, force: true });
+    }
+  });
+
+  test("shapes the artifact: agent, derived title, cwd", async () => {
+    // Act
+    const review = await openReview(client, {
+      type: "plan",
+      content: PLAN,
+      cwd: home,
+      agent: "test-agent",
+    });
+
+    // Assert
+    const session = review.session;
+
+    expect(session.status).toBe("pending");
+    expect(session.artifact.type).toBe("plan");
+    expect(session.artifact.meta.agent).toBe("test-agent");
+    expect(session.artifact.meta.title).toBe("Rollout Plan");
+    expect(session.artifact.meta.cwd).toBe(home);
+    expect(session.workspace).toEqual({ repoRoot: home, branch: "detached" });
+  });
+
+  test("an explicit title wins; diffs never derive one from content", async () => {
+    // Act
+    const titled = await openReview(client, {
+      type: "plan",
+      content: PLAN,
+      cwd: home,
+      title: "Custom",
+    });
+
+    // Assert
+    expect(titled.session.artifact.meta.title).toBe("Custom");
+
+    // Act
+    const diff = await openReview(client, {
+      type: "diff",
+      content: "# not a heading\n",
+      cwd: home,
+    });
+
+    // Assert
+    expect(diff.session.artifact.meta.title).toBeUndefined();
+  });
+
+  test("a pre-resolved workspace skips git resolution", async () => {
+    // Arrange
+    const ws = { repoRoot: "/elsewhere", branch: "feature" };
+
+    // Act
+    const review = await openReview(client, {
+      type: "diff",
+      content: "d",
+      cwd: home,
+      workspace: ws,
+    });
+
+    // Assert
+    expect(review.session.workspace).toEqual(ws);
+  });
+
+  test("the same agentSessionId revises instead of opening a new session", async () => {
+    // Arrange
+    const first = await openReview(client, {
+      type: "plan",
+      content: PLAN,
+      cwd: home,
+      agentSessionId: "agent-1",
+    });
+
+    // Act
+    const second = await openReview(client, {
+      type: "plan",
+      content: PLAN + "\nStage three.\n",
+      cwd: home,
+      agentSessionId: "agent-1",
+    });
+
+    // Assert
+    expect(second.id).toBe(first.id);
+    expect(second.session.revisions.length).toBe(2);
+    expect(second.session.status).toBe("pending");
+
+    // Act
+    const other = await openReview(client, {
+      type: "plan",
+      content: PLAN,
+      cwd: home,
+      agentSessionId: "agent-2",
+    });
+
+    // Assert
+    expect(other.id).not.toBe(first.id);
+  });
+
+  test("the same agentSessionId with a different type opens a new session, never a type mismatch", async () => {
+    // Arrange - the agent session's plan review is open
+    const plan = await openReview(client, {
+      type: "plan",
+      content: PLAN,
+      cwd: home,
+      agentSessionId: "agent-cross",
+    });
+
+    // Act - the same agent session now submits a reply for review
+    const reply = await openReview(client, {
+      type: "reply",
+      content: "# Findings\n\nThe cache is fine.\n",
+      cwd: home,
+      agentSessionId: "agent-cross",
+    });
+
+    // Assert - a fresh reply session; the plan session keeps its type and history
+    expect(reply.id).not.toBe(plan.id);
+    expect(reply.session.artifact.type).toBe("reply");
+    expect(reply.session.revisions.length).toBe(1);
+    expect((await client.sessionGet(plan.id)).artifact.type).toBe("plan");
+  });
+
+  test("per-file notes land as note annotations anchored at the file path", async () => {
+    // Act
+    const review = await openReview(client, {
+      type: "diff",
+      content: "d",
+      cwd: home,
+      notes: [
+        { path: "src/a.ts", body: "Renames b and adds c." },
+        { path: "src/b.ts", body: "Swaps the line." },
+      ],
+    });
+
+    // Assert
+    const notes = review.session.annotations;
+
+    expect(notes.length).toBe(2);
+    expect(notes.every((annotation) => annotation.kind === "note")).toBe(true);
+    expect(notes.map((annotation) => annotation.anchor.quote)).toEqual(["src/a.ts", "src/b.ts"]);
+    expect(notes[0]!.body).toBe("Renames b and adds c.");
+  });
+});
+
+describe("awaitMessage: one long-poll (the hook shape)", () => {
+  test("times out to pending; a later wait collects the stored message", async () => {
+    // Arrange
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+
+    // Assert
+    expect(await review.awaitMessage({ timeoutMs: 50 })).toBe("pending");
+
+    // Act
+    await client.sessionSendMessage(review.id, "approved", "Fine.");
+    const message = await review.awaitMessage({ timeoutMs: 1_000 });
+
+    // Assert
+    expect(message).not.toBe("pending");
+
+    if (message === "pending") throw new Error("unreachable");
+
+    expect(message.allow).toBe(true);
+    expect(message.message.body).toContain("Fine.");
+    expect(message.session.message!.outcome).toBe("approved");
+  });
+
+  test("changes_requested maps to allow=false with feedback.md attached", async () => {
+    // Arrange
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+    const waiting = review.awaitMessage({ timeoutMs: 5_000 });
+
+    // Act
+    await client.sessionSendMessage(review.id, "changes_requested", "One stage only.");
+    const message = await waiting;
+
+    // Assert
+    if (message === "pending") throw new Error("expected a message");
+
+    expect(message.allow).toBe(false);
+    expect(message.message.body).toContain("# Review: changes requested");
+    expect(message.message.body).toContain("One stage only.");
+  });
+});
+
+describe("awaitMessage: chunked loop (the pi shape)", () => {
+  test("onProgress sees fresh sessions between chunks; the message ends the loop", async () => {
+    // Arrange
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+    const seen: Thread[] = [];
+    const waiting = review.awaitMessage({
+      timeoutMs: Infinity,
+      pollMs: 100,
+      onProgress: (progress) => seen.push(progress),
+    });
+
+    // Act
+    await client.sessionAnnotate(review.id, {
+      id: "a1",
+      kind: "comment",
+      anchor: { quote: "two stages", prefix: "in ", suffix: "." },
+      body: "Name them.",
+    });
+
+    // Assert
+    // give the loop a chunk to observe the annotation before resolving
+    for (let i = 0; i < 100 && !seen.some((snapshot) => snapshot.annotations.length === 1); i++)
+      await Bun.sleep(20);
+    expect(seen.some((snapshot) => snapshot.annotations.length === 1)).toBe(true);
+
+    // Act
+    await client.sessionSendMessage(review.id, "changes_requested", "Too vague.");
+    const message = await waiting;
+
+    // Assert
+    if (message === "pending") throw new Error("expected a message");
+
+    expect(message.allow).toBe(false);
+    expect(message.session.annotations.length).toBe(1);
+  }, 15_000);
+
+  test("abort surfaces as pending and leaves the session collectable", async () => {
+    // Arrange
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+    const controller = new AbortController();
+    const waiting = review.awaitMessage({
+      timeoutMs: Infinity,
+      pollMs: 100,
+      signal: controller.signal,
+    });
+
+    // Act
+    controller.abort();
+
+    // Assert
+    expect(await waiting).toBe("pending");
+    expect((await client.sessionGet(review.id)).status).toBe("pending");
+  });
+
+  test("a finite budget runs out to pending", async () => {
+    // Arrange
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+
+    // Assert
+    expect(await review.awaitMessage({ timeoutMs: 120, pollMs: 50 })).toBe("pending");
+  });
+});
+
+describe("awaitResolve: the adapter wake seam (session id only)", () => {
+  test("resolves to the outcome when the message lands during the wait", async () => {
+    // Arrange
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+    const waiting = awaitResolve(client, review.id, { pollMs: 100 });
+
+    // Act
+    await client.sessionSendMessage(review.id, "approved", "Ship it.");
+    const message = await waiting;
+
+    // Assert
+    expect(message).not.toBeNull();
+    expect(message!.allow).toBe(true);
+    expect(message!.message.body).toContain("Ship it.");
+    expect(message!.session.message!.outcome).toBe("approved");
+  });
+
+  test("returns the stored message immediately when the session already resolved", async () => {
+    // Arrange - a detached waiter that only attaches after the human decided
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+
+    await client.sessionSendMessage(review.id, "changes_requested", "One stage only.");
+
+    // Act
+    const message = await awaitResolve(client, review.id);
+
+    // Assert
+    expect(message).not.toBeNull();
+    expect(message!.allow).toBe(false);
+    expect(message!.message.body).toContain("One stage only.");
+  });
+
+  test("returns null when the signal aborts first", async () => {
+    // Arrange
+    const review = await openReview(client, { type: "plan", content: PLAN, cwd: home });
+    const controller = new AbortController();
+    const waiting = awaitResolve(client, review.id, { pollMs: 100, signal: controller.signal });
+
+    // Act
+    controller.abort();
+
+    // Assert
+    expect(await waiting).toBeNull();
+    expect((await client.sessionGet(review.id)).status).toBe("pending");
+  });
+});
+
+describe("awaitResolve: the held wait keeps the daemon alive", () => {
+  test("a pending session does not idle-exit while a waiter is parked, then the message lands", async () => {
+    // Arrange - a daemon with an aggressive idle timer and its own home
+    const idleHome = mkdtempSync(join(tmpdir(), "cueloop-idle-"));
+    let idleExits = 0;
+    const idleServer = new DaemonServer({
+      home: idleHome,
+      idleExitMs: 30,
+      onIdleExit: () => idleExits++,
+    });
+
+    idleServer.start();
+    const waiterClient = await DaemonClient.connect({ home: idleHome });
+
+    try {
+      const review = await openReview(waiterClient, { type: "plan", content: PLAN, cwd: idleHome });
+      const waiting = awaitResolve(waiterClient, review.id, { pollMs: 40 });
+
+      // Act - wait well past the idle window while the review is still pending
+      await Bun.sleep(120);
+
+      // Assert - the parked waiter and the pending session both keep it alive
+      expect(idleExits).toBe(0);
+      expect((await waiterClient.ping()).pid).toBe(process.pid);
+
+      // Act - the human returns a message; the parked wait collects it
+      const resolver = await DaemonClient.connect({ home: idleHome });
+
+      await resolver.sessionSendMessage(review.id, "approved", "Good to go.");
+      resolver.close();
+      const message = await waiting;
+
+      // Assert
+      expect(message!.allow).toBe(true);
+    } finally {
+      waiterClient.close();
+      idleServer.stop();
+      rmSync(idleHome, { recursive: true, force: true });
+    }
+  }, 15_000);
+});