pinsay-cli 0.7.1 → 0.7.3

package/dist/cli.js

@@ -15,7 +15,7 @@ var init_build_constants = __esm({
   "src/build-constants.ts"() {
     "use strict";
     BUILD_DEFAULT_SERVER = true ? "https://app.pinsay.dev" : "https://app.pinsay.dev";
-    BUILD_CLI_VERSION = true ? "0.7.1" : "0.0.0-dev";
+    BUILD_CLI_VERSION = true ? "0.7.3" : "0.0.0-dev";
   }
 });
 
@@ -5506,6 +5506,16 @@ function headSha(cwd2) {
   }
   return result.stdout.trim();
 }
+function resolveCommit(ref, cwd2) {
+  const result = spawnSync2("git", ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`], {
+    cwd: cwd2,
+    encoding: "utf8"
+  });
+  if (result.status !== 0) {
+    throw new Error(`Not a commit in this repository: ${ref}`);
+  }
+  return result.stdout.trim();
+}
 function getRemoteUrl(cwd2, remote = "origin") {
   const result = spawnSync2("git", ["remote", "get-url", remote], {
     cwd: cwd2,
@@ -5666,11 +5676,21 @@ async function markApplied(options, ctx) {
   const warning = delegationWarning(projectCtx.delegation ?? "auto", models);
   if (warning)
     console.error(warning);
+  let existingSha;
+  if (options.noCommit) {
+    try {
+      existingSha = resolveCommit(options.commit ?? "HEAD", ctx.cwd);
+    } catch (err) {
+      console.error(err.message);
+      process.exit(1);
+    }
+  }
   if (options.dryRun) {
     console.log(`[dry-run] Would mark comment ${options.id} as applied`);
     console.log(`[dry-run] Reply: ${options.reply}`);
     console.log(`[dry-run] AppliedBy: ${appliedByLabel}`);
     console.log(`[dry-run] Models: ${describeModels(models)}`);
+    console.log(`[dry-run] Commit: ${existingSha ?? "a new commit of the staged changes"}`);
     return {
       committed: false,
       patchedIds: typeof options.id === "number" ? [options.id] : []
@@ -5698,6 +5718,9 @@ async function markApplied(options, ctx) {
       sha = headSha(ctx.cwd);
       const remote = getRemoteUrl(ctx.cwd);
       commitUrl = commitUrlFor(sha, remote);
+    } else {
+      sha = existingSha;
+      commitUrl = sha ? commitUrlFor(sha, getRemoteUrl(ctx.cwd)) : null;
     }
     for (const item of pending) {
       await api(ctx.server, `/api/comments/${item.id}`, {
@@ -5746,6 +5769,9 @@ async function markApplied(options, ctx) {
       sha = headSha(ctx.cwd);
       const remote = getRemoteUrl(ctx.cwd);
       commitUrl = commitUrlFor(sha, remote);
+    } else {
+      sha = existingSha;
+      commitUrl = sha ? commitUrlFor(sha, getRemoteUrl(ctx.cwd)) : null;
     }
     await api(ctx.server, `/api/comments/${id}`, {
       method: "PATCH",
@@ -5816,6 +5842,18 @@ async function exitIfWorkspaceFrozen(server, token) {
   } catch {
   }
 }
+async function checkMetaAndNotify(server, config, root, parsed) {
+  try {
+    const meta = await api(server, "/api/meta");
+    const minCli = meta?.minCliVersion || "0.0.0";
+    if (compareSemver(BUILD_CLI_VERSION, minCli) < 0) {
+      console.error(tooOldMessage(BUILD_CLI_VERSION, minCli));
+      process.exit(5);
+    }
+    await checkAndNotifyUpdates({ meta, config, cwd: root, silent: Boolean(parsed["json"]) });
+  } catch {
+  }
+}
 function parseModelFlags(parsed) {
   try {
     return resolveModels({
@@ -5859,23 +5897,7 @@ async function applyCommand(cwd2, parsed, positionals = []) {
     return;
   }
   const project = resolved.ok ? resolved.project.key : "";
-  try {
-    const meta = await api(server, "/api/meta");
-    const minCli = meta?.minCliVersion || "0.0.0";
-    if (compareSemver(BUILD_CLI_VERSION, minCli) < 0) {
-      console.error(tooOldMessage(BUILD_CLI_VERSION, minCli));
-      process.exit(5);
-    }
-    await checkAndNotifyUpdates({
-      meta,
-      config,
-      cwd: root,
-      silent: Boolean(parsed["json"])
-    });
-  } catch (err) {
-    if (!(err instanceof ApiError && err.code === 404)) {
-    }
-  }
+  await checkMetaAndNotify(server, config, root, parsed);
   const explicitKey = typeof parsed["key"] === "string" ? parsed["key"] : void 0;
   const token = await resolveToken(server, root, explicitKey);
   const apiKey = explicitKey || await readApiKey(root, server);
@@ -5918,6 +5940,11 @@ async function applyCommand(cwd2, parsed, positionals = []) {
     }
     const noCommit = parsed["no-commit"] === true;
     const dryRun = parsed["dry-run"] === true;
+    const commitRef = typeof parsed["commit"] === "string" ? parsed["commit"] : void 0;
+    if (commitRef && !noCommit) {
+      console.error("--commit <sha> needs --no-commit (plain --mark records the commit it makes).");
+      process.exit(2);
+    }
     const toolExplicit = typeof parsed["tool"] === "string" ? parsed["tool"] : void 0;
     const tool2 = toolExplicit || config.aiTool;
     if (!toolExplicit && config.aiTool) {
@@ -5946,6 +5973,7 @@ async function applyCommand(cwd2, parsed, positionals = []) {
         id: markId,
         reply,
         noCommit,
+        commit: commitRef,
         dryRun,
         tool: tool2,
         models,
@@ -6014,23 +6042,7 @@ async function applyAllProjects(root, cwd2, config, server, parsed) {
     console.error("--tool needs a single project \u2014 pass --project <key> (several are configured).");
     process.exit(2);
   }
-  try {
-    const meta = await api(server, "/api/meta");
-    const minCli = meta?.minCliVersion || "0.0.0";
-    if (compareSemver(BUILD_CLI_VERSION, minCli) < 0) {
-      console.error(tooOldMessage(BUILD_CLI_VERSION, minCli));
-      process.exit(5);
-    }
-    await checkAndNotifyUpdates({
-      meta,
-      config,
-      cwd: root,
-      silent: Boolean(parsed["json"])
-    });
-  } catch (err) {
-    if (!(err instanceof ApiError && err.code === 404)) {
-    }
-  }
+  await checkMetaAndNotify(server, config, root, parsed);
   const explicitKey = typeof parsed["key"] === "string" ? parsed["key"] : void 0;
   const token = await resolveToken(server, root, explicitKey);
   const apiKey = explicitKey || await readApiKey(root, server);
@@ -12862,7 +12874,8 @@ Options:
   --tool <name>      Hand off prompt to claude, opencode, cursor, or clipboard
   --mark <id>|all    Commit staged changes and mark comment(s) applied
   --reply <text>     Reply text for applied comment (required with --mark)
-  --no-commit        Skip git commit during --mark (PATCH only)
+  --no-commit        Mark without committing: the fix is already committed (records --commit, default HEAD)
+  --commit <sha>     With --no-commit: the commit that holds the fix (default HEAD)
   --dry-run          Print what --mark would do without making git/API changes
   --models <list>    Every model that worked on the item, with its role, for --mark/--fail:
                      "<id>=<role>,<id>=<role>" (role: planner|implementer|reviewer, optional;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinsay-cli",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Click-to-comment feedback for your web app: install the widget, then turn pending comments into AI apply prompts.",
   "type": "module",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "directory": "."
   },
   "bugs": {
-    "url": "https://github.com/moamen-ui/pinsay-api/issues"
+    "url": "https://github.com/moamen-ui/pinsay-cli/issues"
   },
   "keywords": [
     "feedback",