cueloop 0.1.0-alpha.6 → 0.1.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cueloop",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-alpha.7",
   "license": "Apache-2.0",
   "type": "module",
   "bin": {
@@ -10,9 +10,9 @@
     ".": "./src/main.ts"
   },
   "dependencies": {
-    "@cueloop/schema": "0.1.0-alpha.6",
-    "@cueloop/daemon": "0.1.0-alpha.6",
-    "@cueloop/client": "0.1.0-alpha.6"
+    "@cueloop/schema": "0.1.0-alpha.7",
+    "@cueloop/daemon": "0.1.0-alpha.7",
+    "@cueloop/client": "0.1.0-alpha.7"
   },
   "publishConfig": {
     "access": "public"

package/src/main.ts

@@ -9,8 +9,9 @@
 
 import { parseArgs, flagStr } from "./args";
 import { sessionCommand } from "./session-cmds";
-import { resolveWorkspace, workingTreeDiff } from "./workspace";
+import { workingTreeDiff } from "./working-tree";
 import { DaemonClient } from "@cueloop/daemon/client";
+import { openReview, resolveWorkspace } from "@cueloop/daemon/review";
 
 const argv = process.argv.slice(2);
 const cmd = argv[0];
@@ -39,13 +40,14 @@ async function main(): Promise<number> {
         return 1;
       }
       const client = await DaemonClient.connect({ autostart: true });
-      const session = await client.sessionCreate(workspace, {
+      const review = await openReview(client, {
         type: "diff",
         content: diff,
-        meta: { title: `working tree @ ${workspace.branch}`, cwd: process.cwd() },
+        workspace,
+        title: `working tree @ ${workspace.branch}`,
       });
       client.close();
-      return runTui(session.id);
+      return runTui(review.id);
     }
     case "serve": {
       const { positional, flags } = parseArgs(argv.slice(1));

package/src/pr.ts

@@ -8,8 +8,8 @@
 
 import type { ReviewSession, VerdictKind } from "@cueloop/schema";
 import { DaemonClient } from "@cueloop/daemon/client";
+import { openReview } from "@cueloop/daemon/review";
 import { parseArgs } from "./args";
-import { resolveWorkspace } from "./workspace";
 
 /** The gh binary is injectable so tests can stub it. */
 function ghBin(): string {
@@ -55,13 +55,14 @@ export async function reviewCommand(argv: string[]): Promise<number> {
     console.error(`PR ${pr} has an empty diff - nothing to review`);
     return 1;
   }
-  const workspace = await resolveWorkspace();
   const client = await DaemonClient.connect({ autostart: true });
-  const session = await client.sessionCreate(workspace, {
+  const review = await openReview(client, {
     type: "diff",
     content: diff.stdout,
-    meta: { title: `PR ${pr}`, pr, cwd: process.cwd() },
+    title: `PR ${pr}`,
+    pr,
   });
+  const session = review.session;
   client.close();
 
   if (flags["no-tui"]) {

package/src/session-cmds.ts

@@ -4,10 +4,10 @@
  * JSON on stdout; exit code 0 unless the daemon returned an error.
  */
 
-import type { ArtifactType, VerdictKind } from "@cueloop/schema";
+import { newAnnotationId, type ArtifactType, type VerdictKind } from "@cueloop/schema";
 import { DaemonClient } from "@cueloop/daemon/client";
+import { openReview, verdictResponse } from "@cueloop/daemon/review";
 import { parseArgs, flagStr } from "./args";
-import { resolveWorkspace } from "./workspace";
 
 async function readStdin(): Promise<string> {
   return await new Response(Bun.stdin.stream()).text();
@@ -24,21 +24,18 @@ export async function sessionCommand(argv: string[]): Promise<number> {
   try {
     switch (verb) {
       case "create": {
-        const workspace = await resolveWorkspace(flagStr(flags, "cwd"));
         const contentFile = flagStr(flags, "content-file");
         const content = contentFile ? await Bun.file(contentFile).text() : await readStdin();
-        const session = await client.sessionCreate(workspace, {
+        const review = await openReview(client, {
           type: (flagStr(flags, "type") ?? "plan") as ArtifactType,
           content,
-          meta: {
-            agent: flagStr(flags, "agent"),
-            agentSessionId: flagStr(flags, "agent-session-id"),
-            planPath: flagStr(flags, "plan-path"),
-            title: flagStr(flags, "title"),
-            cwd: flagStr(flags, "cwd") ?? process.cwd(),
-          },
+          cwd: flagStr(flags, "cwd"),
+          agent: flagStr(flags, "agent"),
+          agentSessionId: flagStr(flags, "agent-session-id"),
+          planPath: flagStr(flags, "plan-path"),
+          title: flagStr(flags, "title"),
         });
-        out(session);
+        out(review.session);
         return 0;
       }
       case "get": {
@@ -58,12 +55,8 @@ export async function sessionCommand(argv: string[]): Promise<number> {
           out({ status: "pending" });
           return 0;
         }
-        out({
-          status: "resolved",
-          allow: session.verdict!.kind === "approve",
-          verdict: session.verdict!.kind,
-          feedback: session.verdict!.feedback,
-        });
+        const { allow, feedback } = verdictResponse(session);
+        out({ status: "resolved", allow, verdict: session.verdict!.kind, feedback });
         return 0;
       }
       case "annotate": {
@@ -72,7 +65,7 @@ export async function sessionCommand(argv: string[]): Promise<number> {
         const quote = required(flagStr(flags, "quote"), "--quote");
         out(
           await client.sessionAnnotate(id, {
-            id: flagStr(flags, "annotation-id") ?? `a_${Date.now().toString(36)}`,
+            id: flagStr(flags, "annotation-id") ?? newAnnotationId(),
             kind: flagStr(flags, "kind") ?? "comment",
             anchor: {
               quote,

package/src/{workspace.ts → working-tree.ts}

@@ -1,6 +1,4 @@
-/** Workspace key resolution (#9): repo root + branch from the cwd. */
-
-import type { WorkspaceKey } from "@cueloop/schema";
+/** Working-tree diff capture for `cueloop diff`, untracked files included. */
 
 async function git(args: string[], cwd: string): Promise<string | null> {
   const proc = Bun.spawn(["git", ...args], { cwd, stdout: "pipe", stderr: "ignore" });
@@ -9,12 +7,6 @@ async function git(args: string[], cwd: string): Promise<string | null> {
   return out.trim();
 }
 
-export async function resolveWorkspace(cwd = process.cwd()): Promise<WorkspaceKey> {
-  const repoRoot = (await git(["rev-parse", "--show-toplevel"], cwd)) ?? cwd;
-  const branch = (await git(["rev-parse", "--abbrev-ref", "HEAD"], cwd)) ?? "detached";
-  return { repoRoot, branch };
-}
-
 export async function workingTreeDiff(cwd = process.cwd()): Promise<string> {
   const tracked = (await git(["diff", "HEAD"], cwd)) ?? "";
   // untracked files included by default (map note: changed-first)