cueloop 0.1.0-alpha.58 → 0.1.0-alpha.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cueloop",
-  "version": "0.1.0-alpha.58",
+  "version": "0.1.0-alpha.59",
   "description": "Terminal review surface for coding agents: annotate plans and diffs, return a verdict, send structured feedback back",
   "homepage": "https://github.com/mmurakaru/cueloop#readme",
   "bugs": {
@@ -30,10 +30,10 @@
     "build:binary": "bun build --compile --external cpu-features ./src/main.ts --outfile dist/cueloop"
   },
   "dependencies": {
-    "@cueloop/adapters": "0.1.0-alpha.58",
-    "@cueloop/client": "0.1.0-alpha.58",
-    "@cueloop/daemon": "0.1.0-alpha.58",
-    "@cueloop/schema": "0.1.0-alpha.58"
+    "@cueloop/adapters": "0.1.0-alpha.59",
+    "@cueloop/client": "0.1.0-alpha.59",
+    "@cueloop/daemon": "0.1.0-alpha.59",
+    "@cueloop/schema": "0.1.0-alpha.59"
   },
   "engines": {
     "bun": ">=1.3.0"

package/src/main.ts

@@ -29,103 +29,93 @@ import { openReview, resolveWorkspace } from "@cueloop/daemon/review";
 const argv = process.argv.slice(2);
 const cmd = argv[0];
 
+async function daemonCommand(): Promise<number> {
+  const { DaemonServer } = await import("@cueloop/daemon");
+  const server = new DaemonServer({ idleExitMs: 0 });
+  const path = server.start();
+  if (path === null) {
+    console.error("a cueloop daemon already owns this home - nothing to do");
+    return 1;
+  }
+  console.log(`cueloop daemon (foreground) on ${path}`);
+  await new Promise(() => {}); // run until signalled
+  return 0;
+}
+
+async function serveEntry(rest: string[]): Promise<number> {
+  const { positional, flags } = parseArgs(rest);
+  const port = stringFlag(flags, "port");
+  const { serveClient } = await import("@cueloop/client");
+  const handle = await serveClient({
+    port: port !== undefined ? Number(port) : undefined,
+    host: stringFlag(flags, "host"),
+    sessionId: positional[0],
+  });
+  console.log(
+    [
+      "",
+      `observers join with:  ssh -p ${handle.port} ${handle.host === "0.0.0.0" || handle.host === "::" ? "<this-host>" : handle.host}`,
+      "",
+      "no passwords, no keys: anyone who can reach this address can watch.",
+      "share the address deliberately (SSH tunnel, tailnet). observers are",
+      "read-only; you stay the one writable controller via `cueloop` locally.",
+      "ctrl-c stops serving.",
+    ].join("\n"),
+  );
+  const stop = () => void handle.close().finally(() => process.exit(0));
+  process.on("SIGINT", stop);
+  process.on("SIGTERM", stop);
+  await new Promise(() => {}); // serve until signalled
+  return 0;
+}
+
+async function shareEntry(rest: string[]): Promise<number> {
+  const { positional, flags } = parseArgs(rest);
+  const { shareCommand, sharePullCommand } = await import("./share-command");
+  const port = stringFlag(flags, "port");
+  const target = {
+    host: stringFlag(flags, "host"),
+    port: port !== undefined ? Number(port) : undefined,
+  };
+  if (positional[0] === "pull") return sharePullCommand({ ...target, sessionId: positional[1] });
+  return shareCommand({ ...target, sessionId: positional[0] });
+}
+
+type CommandHandler = (rest: string[]) => number | Promise<number>;
+
+const commandHandlers: Record<string, CommandHandler> = {
+  session: (rest) => sessionCommand(rest),
+  daemon: () => daemonCommand(),
+  plan: (rest) => planCommand(rest),
+  diff: (rest) => diffCommand(rest),
+  prototype: (rest) => prototypeCommand(rest),
+  serve: (rest) => serveEntry(rest),
+  share: (rest) => shareEntry(rest),
+  wake: async (rest) => (await import("./wake-command")).wakeCommand(rest),
+  actions: async (rest) => (await import("./actions-command")).actionsCommand(rest),
+  refine: async (rest) => (await import("./refine-command")).refineCommand(rest),
+  review: (rest) => reviewEntry(rest),
+  "review-post": async (rest) => (await import("./pr")).reviewPostCommand(rest),
+};
+
+const versionAliases = new Set(["-v", "--version", "version"]);
+const helpAliases = new Set(["-h", "--help", "help"]);
+
 async function main(): Promise<number> {
-  switch (cmd) {
-    case "session":
-      return sessionCommand(argv.slice(1));
-    case "daemon": {
-      const { DaemonServer } = await import("@cueloop/daemon");
-      const server = new DaemonServer({ idleExitMs: 0 });
-      const path = server.start();
-      if (path === null) {
-        console.error("a cueloop daemon already owns this home - nothing to do");
-        return 1;
-      }
-      console.log(`cueloop daemon (foreground) on ${path}`);
-      await new Promise(() => {}); // run until signalled
-      return 0;
-    }
-    case "plan":
-      return planCommand(argv.slice(1));
-    case "diff":
-      return diffCommand(argv.slice(1));
-    case "prototype":
-      return prototypeCommand(argv.slice(1));
-    case "serve": {
-      const { positional, flags } = parseArgs(argv.slice(1));
-      const port = stringFlag(flags, "port");
-      const { serveClient } = await import("@cueloop/client");
-      const handle = await serveClient({
-        port: port !== undefined ? Number(port) : undefined,
-        host: stringFlag(flags, "host"),
-        sessionId: positional[0],
-      });
-      console.log(
-        [
-          "",
-          `observers join with:  ssh -p ${handle.port} ${handle.host === "0.0.0.0" || handle.host === "::" ? "<this-host>" : handle.host}`,
-          "",
-          "no passwords, no keys: anyone who can reach this address can watch.",
-          "share the address deliberately (SSH tunnel, tailnet). observers are",
-          "read-only; you stay the one writable controller via `cueloop` locally.",
-          "ctrl-c stops serving.",
-        ].join("\n"),
-      );
-      const stop = () => void handle.close().finally(() => process.exit(0));
-      process.on("SIGINT", stop);
-      process.on("SIGTERM", stop);
-      await new Promise(() => {}); // serve until signalled
-      return 0;
-    }
-    case "share": {
-      const { positional, flags } = parseArgs(argv.slice(1));
-      const { shareCommand, sharePullCommand } = await import("./share-command");
-      const port = stringFlag(flags, "port");
-      const target = {
-        host: stringFlag(flags, "host"),
-        port: port !== undefined ? Number(port) : undefined,
-      };
-      if (positional[0] === "pull")
-        return sharePullCommand({ ...target, sessionId: positional[1] });
-      return shareCommand({ ...target, sessionId: positional[0] });
-    }
-    case "wake": {
-      const { wakeCommand } = await import("./wake-command");
-      return wakeCommand(argv.slice(1));
-    }
-    case "actions": {
-      const { actionsCommand } = await import("./actions-command");
-      return actionsCommand(argv.slice(1));
-    }
-    case "refine": {
-      const { refineCommand } = await import("./refine-command");
-      return refineCommand(argv.slice(1));
-    }
-    case "review":
-      return reviewEntry(argv.slice(1));
-    case "review-post": {
-      const { reviewPostCommand } = await import("./pr");
-      return reviewPostCommand(argv.slice(1));
-    }
-    case "-v":
-    case "--version":
-    case "version":
-      console.log(CLI_VERSION);
-      return 0;
-    case "-h":
-    case "--help":
-    case "help":
-      printHelp();
-      return 0;
-    case undefined:
-      return runTui();
-    default: {
-      // `cueloop <session-id>` opens the TUI on that session
-      if (cmd.startsWith("ses_")) return runTui(cmd);
-      printHelp();
-      return 2;
-    }
+  if (cmd === undefined) return runTui();
+  const handler = commandHandlers[cmd];
+  if (handler !== undefined) return handler(argv.slice(1));
+  if (versionAliases.has(cmd)) {
+    console.log(CLI_VERSION);
+    return 0;
+  }
+  if (helpAliases.has(cmd)) {
+    printHelp();
+    return 0;
   }
+  if (cmd.startsWith("ses_")) return runTui(cmd);
+  printHelp();
+  return 2;
 }
 
 /**

package/src/session-commands.ts

@@ -19,6 +19,126 @@ function out(value: unknown): void {
   console.log(JSON.stringify(value, null, 2));
 }
 
+type SessionFlags = Record<string, string | boolean>;
+type SessionContext = { client: DaemonClient; positional: string[]; flags: SessionFlags };
+type SessionVerbHandler = (context: SessionContext) => Promise<number>;
+
+async function sessionCreate({ client, flags }: SessionContext): Promise<number> {
+  const contentFile = stringFlag(flags, "content-file");
+  const content = contentFile ? await Bun.file(contentFile).text() : await readStdin();
+  // per-file agent notes for diff sessions: a JSON array of { path, body }
+  const notesFile = stringFlag(flags, "notes-file");
+  const notes = notesFile
+    ? (JSON.parse(await Bun.file(notesFile).text()) as ReviewNote[])
+    : undefined;
+  const review = await openReview(client, {
+    type: (stringFlag(flags, "type") ?? "plan") as ArtifactType,
+    content,
+    cwd: stringFlag(flags, "cwd"),
+    agent: stringFlag(flags, "agent"),
+    agentSessionId: stringFlag(flags, "agent-session-id"),
+    planPath: stringFlag(flags, "plan-path"),
+    prototypePath: stringFlag(flags, "prototype-path"),
+    title: stringFlag(flags, "title"),
+    notes,
+  });
+  // herdr auto-open: render the review in a tab (no-op outside herdr).
+  await openHerdrPaneForReview(review.session, client);
+  out(review.session);
+  return 0;
+}
+
+async function sessionGetCommand({ client, positional }: SessionContext): Promise<number> {
+  out(await client.sessionGet(required(positional[1], "session id")));
+  return 0;
+}
+
+async function sessionListCommand({ client, flags }: SessionContext): Promise<number> {
+  const status = stringFlag(flags, "status") as "pending" | "resolved" | undefined;
+  out(await client.sessionList(status ? { status } : undefined));
+  return 0;
+}
+
+async function sessionWaitCommand({ client, positional, flags }: SessionContext): Promise<number> {
+  const id = required(positional[1], "session id");
+  const timeoutMs = Number(stringFlag(flags, "timeout-ms") ?? "60000");
+  const session = await client.sessionWait(id, timeoutMs);
+  if (session === null) {
+    out({ status: "pending" });
+    return 0;
+  }
+  const { allow, feedback } = verdictResponse(session);
+  out({ status: "resolved", allow, verdict: session.verdict!.kind, feedback });
+  return 0;
+}
+
+async function sessionAnnotateCommand({
+  client,
+  positional,
+  flags,
+}: SessionContext): Promise<number> {
+  const id = required(positional[1], "session id");
+  const quote = required(stringFlag(flags, "quote"), "--quote");
+  const author = stringFlag(flags, "author");
+  const body = await annotateBody(flags, client, id);
+  out(
+    await client.sessionAnnotate(
+      id,
+      {
+        id: stringFlag(flags, "annotation-id") ?? newAnnotationId(),
+        kind: stringFlag(flags, "kind") ?? "comment",
+        anchor: {
+          quote,
+          prefix: stringFlag(flags, "prefix") ?? "",
+          suffix: stringFlag(flags, "suffix") ?? "",
+        },
+        body,
+        ...(author ? { author } : {}),
+      },
+      stringFlag(flags, "author-name"),
+    ),
+  );
+  return 0;
+}
+
+async function sessionResolveCommand({
+  client,
+  positional,
+  flags,
+}: SessionContext): Promise<number> {
+  const id = required(positional[1], "session id");
+  const kind = required(stringFlag(flags, "verdict"), "--verdict") as VerdictKind;
+  out(await client.sessionResolve(id, kind, stringFlag(flags, "summary") ?? ""));
+  return 0;
+}
+
+async function sessionSubmitRevisionCommand({
+  client,
+  positional,
+  flags,
+}: SessionContext): Promise<number> {
+  const id = required(positional[1], "session id");
+  const contentFile = stringFlag(flags, "content-file");
+  const content = contentFile ? await Bun.file(contentFile).text() : await readStdin();
+  // --addressed a_1,a_2 - the annotation ids this revision acted on
+  const addressed = (stringFlag(flags, "addressed") ?? "")
+    .split(",")
+    .map((annotationId) => annotationId.trim())
+    .filter(Boolean);
+  out(await client.sessionSubmitRevision(id, content, addressed));
+  return 0;
+}
+
+const sessionVerbHandlers: Record<string, SessionVerbHandler> = {
+  create: sessionCreate,
+  get: sessionGetCommand,
+  list: sessionListCommand,
+  wait: sessionWaitCommand,
+  annotate: sessionAnnotateCommand,
+  resolve: sessionResolveCommand,
+  "submit-revision": sessionSubmitRevisionCommand,
+};
+
 export async function sessionCommand(argv: string[]): Promise<number> {
   const { positional, flags } = parseArgs(argv);
   const verb = positional[0];
@@ -27,100 +147,14 @@ export async function sessionCommand(argv: string[]): Promise<number> {
   const role = stringFlag(flags, "role") === "agent" ? "agent" : undefined;
   const client = await DaemonClient.connect({ autostart: true, role });
   try {
-    switch (verb) {
-      case "create": {
-        const contentFile = stringFlag(flags, "content-file");
-        const content = contentFile ? await Bun.file(contentFile).text() : await readStdin();
-        // per-file agent notes for diff sessions: a JSON array of { path, body }
-        const notesFile = stringFlag(flags, "notes-file");
-        const notes = notesFile
-          ? (JSON.parse(await Bun.file(notesFile).text()) as ReviewNote[])
-          : undefined;
-        const review = await openReview(client, {
-          type: (stringFlag(flags, "type") ?? "plan") as ArtifactType,
-          content,
-          cwd: stringFlag(flags, "cwd"),
-          agent: stringFlag(flags, "agent"),
-          agentSessionId: stringFlag(flags, "agent-session-id"),
-          planPath: stringFlag(flags, "plan-path"),
-          prototypePath: stringFlag(flags, "prototype-path"),
-          title: stringFlag(flags, "title"),
-          notes,
-        });
-        // herdr auto-open: render the review in a tab (no-op outside herdr).
-        await openHerdrPaneForReview(review.session, client);
-        out(review.session);
-        return 0;
-      }
-      case "get": {
-        out(await client.sessionGet(required(positional[1], "session id")));
-        return 0;
-      }
-      case "list": {
-        const status = stringFlag(flags, "status") as "pending" | "resolved" | undefined;
-        out(await client.sessionList(status ? { status } : undefined));
-        return 0;
-      }
-      case "wait": {
-        const id = required(positional[1], "session id");
-        const timeoutMs = Number(stringFlag(flags, "timeout-ms") ?? "60000");
-        const session = await client.sessionWait(id, timeoutMs);
-        if (session === null) {
-          out({ status: "pending" });
-          return 0;
-        }
-        const { allow, feedback } = verdictResponse(session);
-        out({ status: "resolved", allow, verdict: session.verdict!.kind, feedback });
-        return 0;
-      }
-      case "annotate": {
-        const id = required(positional[1], "session id");
-        const quote = required(stringFlag(flags, "quote"), "--quote");
-        const author = stringFlag(flags, "author");
-        const body = await annotateBody(flags, client, id);
-        out(
-          await client.sessionAnnotate(
-            id,
-            {
-              id: stringFlag(flags, "annotation-id") ?? newAnnotationId(),
-              kind: stringFlag(flags, "kind") ?? "comment",
-              anchor: {
-                quote,
-                prefix: stringFlag(flags, "prefix") ?? "",
-                suffix: stringFlag(flags, "suffix") ?? "",
-              },
-              body,
-              ...(author ? { author } : {}),
-            },
-            stringFlag(flags, "author-name"),
-          ),
-        );
-        return 0;
-      }
-      case "resolve": {
-        const id = required(positional[1], "session id");
-        const kind = required(stringFlag(flags, "verdict"), "--verdict") as VerdictKind;
-        out(await client.sessionResolve(id, kind, stringFlag(flags, "summary") ?? ""));
-        return 0;
-      }
-      case "submit-revision": {
-        const id = required(positional[1], "session id");
-        const contentFile = stringFlag(flags, "content-file");
-        const content = contentFile ? await Bun.file(contentFile).text() : await readStdin();
-        // --addressed a_1,a_2 - the annotation ids this revision acted on
-        const addressed = (stringFlag(flags, "addressed") ?? "")
-          .split(",")
-          .map((annotationId) => annotationId.trim())
-          .filter(Boolean);
-        out(await client.sessionSubmitRevision(id, content, addressed));
-        return 0;
-      }
-      default:
-        console.error(
-          "usage: cueloop session <create|get|list|wait|annotate|resolve|submit-revision> [flags]",
-        );
-        return 2;
+    const handler = verb !== undefined ? sessionVerbHandlers[verb] : undefined;
+    if (handler === undefined) {
+      console.error(
+        "usage: cueloop session <create|get|list|wait|annotate|resolve|submit-revision> [flags]",
+      );
+      return 2;
     }
+    return await handler({ client, positional, flags });
   } finally {
     client.close();
   }