jj-octo 0.7.0 → 0.7.2

package/dist/jj-octo.js

@@ -18239,7 +18239,7 @@ var layer14 = /* @__PURE__ */ layerMergedContext(/* @__PURE__ */ succeed6(fetch)
 // package.json
 var package_default = {
   name: "jj-octo",
-  version: "0.7.0",
+  version: "0.7.2",
   description: "A jj subcommand for GitHub that supports stacked pull requests and works in Claude Code cloud sessions",
   license: "MIT",
   repository: {
@@ -18377,20 +18377,26 @@ class Jj extends Service()("jj-octo/Jj") {
 var failed = (args, detail) => new JjFailed({
   message: detail.trim() === "" ? `jj ${args.join(" ")} failed` : detail.trim().replace(/^Error: /u, "")
 });
-var jjLayer = ({ cwd, env, quiet = false } = {}) => effect(Jj, gen2(function* () {
+var jjLayer = ({ cwd, env, printed } = {}) => effect(Jj, gen2(function* () {
   const spawner = yield* ChildProcessSpawner;
   const location2 = { cwd, env, extendEnv: true };
-  const output = quiet ? "ignore" : "inherit";
-  const read = (args) => scoped2(gen2(function* () {
+  const captured = (args) => scoped2(gen2(function* () {
     const handle = yield* spawner.spawn(make15("jj", args, location2));
-    const [stdout, stderr, code] = yield* all2([
+    return yield* all2([
       mkString(decodeText(handle.stdout)),
       mkString(decodeText(handle.stderr)),
       handle.exitCode
     ], { concurrency: "unbounded" });
-    return code === 0 ? stdout : yield* failed(args, stderr);
   })).pipe(catchTag2("PlatformError", (error) => fail6(failed(args, error.message))));
-  const run = (args) => spawner.exitCode(make15("jj", args, { ...location2, stderr: output, stdout: output })).pipe(catchTag2("PlatformError", (error) => fail6(failed(args, error.message))), flatMap4((code) => code === 0 ? void_3 : fail6(failed(args, ""))));
+  const read = (args) => flatMap4(captured(args), ([stdout, stderr, code]) => code === 0 ? succeed6(stdout) : fail6(failed(args, stderr)));
+  const run = (args) => printed === undefined ? spawner.exitCode(make15("jj", args, {
+    ...location2,
+    stderr: "inherit",
+    stdout: "inherit"
+  })).pipe(catchTag2("PlatformError", (error) => fail6(failed(args, error.message))), flatMap4((code) => code === 0 ? void_3 : fail6(failed(args, "")))) : flatMap4(captured(args), ([stdout, stderr, code]) => {
+    printed(stdout + stderr);
+    return code === 0 ? void_3 : fail6(failed(args, stderr));
+  });
   return { read, run };
 }));
 var JjLive = jjLayer();
@@ -18443,6 +18449,10 @@ var anyOf = (revsets) => ["none()", ...revsets].join(" | ");
 var bookmarkRevset = (bookmark) => `bookmarks(exact:"${bookmark}")`;
 var lines2 = (output) => output.split(`
 `).filter((line) => line !== "");
+var parseDescription = (json) => {
+  const parsed = JSON.parse(json);
+  return typeof parsed === "string" ? parsed : "";
+};
 var readLog = (revset, template) => gen2(function* () {
   const jj = yield* Jj;
   return yield* jj.read(["log", "--no-graph", "--reversed", "-r", revset, "-T", template]);
@@ -18490,8 +18500,7 @@ var loggedChanges = (revset) => logLines(revset, CHANGE).pipe(map7((logged) => l
     bookmarks = "",
     json = '""'
   ] = line.split("\t");
-  const parsed = JSON.parse(json);
-  const description = typeof parsed === "string" ? parsed : "";
+  const description = parseDescription(json);
   return {
     bookmarks: bookmarks === "" ? [] : bookmarks.split(" "),
     changeId,
@@ -18975,10 +18984,24 @@ var ignoreClaudeCodeFooterKey = "jj-octo.ignore-claude-code-footer";
 var ignoresClaudeCodeFooter = jjFlag(ignoreClaudeCodeFooterKey);
 var descriptionsOf = (commits) => commits.length === 0 ? succeed6(new Map) : readLog(commits.join(" | "), String.raw`commit_id ++ "\t" ++ description.escape_json() ++ "\n"`).pipe(map7((output) => new Map(lines2(output).map((line) => {
   const [commit = "", json = '""'] = line.split("\t");
-  const parsed = JSON.parse(json);
-  return [commit, typeof parsed === "string" ? parsed : ""];
+  return [commit, parseDescription(json)];
 }))));
-var syncDescription = ({ bookmark, description }, pullRequest, { ignoreClaudeCodeFooter, overwriteDescriptions, pushedDescription }) => gen2(function* () {
+var ownDescriptions = (bookmark, changeId) => gen2(function* () {
+  const jj = yield* Jj;
+  const output = yield* jj.read([
+    "evolog",
+    "--no-graph",
+    "-r",
+    bookmarkRevset(bookmark),
+    "-T",
+    String.raw`commit.change_id() ++ "\t" ++ commit.description().escape_json() ++ "\n"`
+  ]);
+  return lines2(output).flatMap((line) => {
+    const [change = "", json = '""'] = line.split("\t");
+    return change === changeId ? [parseDescription(json)] : [];
+  });
+});
+var syncDescription = ({ bookmark, changeId, description }, pullRequest, { ignoreClaudeCodeFooter, overwriteDescriptions, pushedDescription }) => gen2(function* () {
   const git = yield* Git;
   const jj = yield* Jj;
   const describe = (text) => jj.run(["describe", "-r", bookmarkRevset(bookmark), "-m", text]);
@@ -18987,6 +19010,10 @@ var syncDescription = ({ bookmark, description }, pullRequest, { ignoreClaudeCod
     ignoreClaudeCodeFooter
   });
   const pushed = normalizedDescription(pushedDescription, { ignoreClaudeCodeFooter });
+  const isOwnEarlier = local !== onGitHub && onGitHub !== pushed && (yield* ownDescriptions(bookmark, changeId)).some((text) => normalizedDescription(text, { ignoreClaudeCodeFooter }) === onGitHub);
+  if (isOwnEarlier) {
+    return some2(local);
+  }
   return yield* value4(descriptionSyncFor({ local, onGitHub, pushed })).pipe(tag3("InSync", () => succeed6(none2())), tag3("TakeGitHub", () => describe(onGitHub).pipe(andThen2(error(`took the description of #${pullRequest.number} from GitHub`)), as2(none2()))), tag3("SendLocal", () => succeed6(some2(local))), tag3("Merge", () => gen2(function* () {
     if (overwriteDescriptions) {
       return some2(local);
@@ -19147,13 +19174,15 @@ var mergedIn = (bookmarks, heads) => gen2(function* () {
 });
 var mergedOnGitHub = (bookmarks) => flatMap4(mergedHeadsOf(bookmarks), (heads) => mergedIn(bookmarks, heads));
 var forget = (names) => gen2(function* () {
-  if (names.length > 0) {
+  const listed = yield* bookmarkTargets;
+  const present = names.filter((name) => listed.has(name));
+  if (present.length > 0) {
     const jj = yield* Jj;
     yield* jj.run([
       "bookmark",
       "forget",
       "--include-remotes",
-      ...names.map((name) => `exact:${name}`)
+      ...present.map((name) => `exact:${name}`)
     ]);
   }
 });
@@ -19464,7 +19493,7 @@ var submitCommand = make31("submit", {
   overwriteDescriptions: Boolean6("overwrite-descriptions").pipe(withDefault5(false), withDescription2("Where a description changed both locally and on GitHub, send the local one instead of merging the two")),
   publish: Boolean6("publish").pipe(withDefault5(false), withDescription2("Open new pull requests ready for review, instead of as drafts")),
   revision: revisionFlag("The top change to submit")
-}, ({ overwriteDescriptions, publish, revision }) => asUserError(submit(revision, { draft: !publish, overwriteDescriptions }).pipe(provide3(GitHubFromOrigin)))).pipe(withHelp("Push a change and the ones below it, and open their pull requests", "Pushes the bookmark of each of those changes. An empty working copy means the change below it, so from the top of a stack this submits all of it. Opens a pull request for each branch that has none, with the title and body from the change's description. Points each pull request at the branch below it, and the bottom one at the default branch.", "New pull requests are opened as drafts, or ready for review with `--publish`. The flag doesn't change a pull request that already exists.", "Keeps each pull request's title and body the same as its change's description. A description edited on GitHub is written into the change, one edited locally is sent to the pull request, and edits on both sides are merged line by line. Edits to the same lines stop the submit before anything is pushed.", "First, where any of those changes' pull requests merged or any of their branches changed on GitHub, syncs their stack as `jj gh sync` does, and leaves other stacks alone. That drops the merged changes, takes what GitHub added to the branches, and rebases the rest onto the trunk, so the push doesn't undo GitHub's work.", "Stops before changing anything where one of their branches was deleted on GitHub and their change doesn't count as merged: no pull request from it merged, another commit merged, or the change was edited since. It says how to push the change again, or drop it.", "Registers the pull requests as one GitHub stack. A stack of one change is a single pull request, which GitHub has no stack for.", "If changes were reordered, inserted or dropped since the last submit, the GitHub stack is dissolved and registered again under a new number. The pull requests stay open, including the one of a dropped change."));
+}, ({ overwriteDescriptions, publish, revision }) => asUserError(submit(revision, { draft: !publish, overwriteDescriptions }).pipe(provide3(GitHubFromOrigin)))).pipe(withHelp("Push a change and the ones below it, and open their pull requests", "Pushes the bookmark of each of those changes. An empty working copy means the change below it, so from the top of a stack this submits all of it. Opens a pull request for each branch that has none, with the title and body from the change's description. Points each pull request at the branch below it, and the bottom one at the default branch.", "New pull requests are opened as drafts, or ready for review with `--publish`. The flag doesn't change a pull request that already exists.", "Keeps each pull request's title and body the same as its change's description. A description edited on GitHub is written into the change, one edited locally is sent to the pull request, and edits on both sides are merged line by line. A local edit pushed with `jj git push` from this repository is sent too, unless the pull request was also edited on GitHub since the last submit. Edits to the same lines stop the submit before anything is pushed.", "First, where any of those changes' pull requests merged or any of their branches changed on GitHub, syncs their stack as `jj gh sync` does, and leaves other stacks alone. That drops the merged changes, takes what GitHub added to the branches, and rebases the rest onto the trunk, so the push doesn't undo GitHub's work.", "Stops before changing anything where one of their branches was deleted on GitHub and their change doesn't count as merged: no pull request from it merged, another commit merged, or the change was edited since. It says how to push the change again, or drop it.", "Registers the pull requests as one GitHub stack. A stack of one change is a single pull request, which GitHub has no stack for.", "If changes were reordered, inserted or dropped since the last submit, the GitHub stack is dissolved and registered again under a new number. The pull requests stay open, including the one of a dropped change."));
 
 // src/cli/gh/command.ts
 var jjGhCommand = make31("jj gh").pipe(withSubcommands([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jj-octo",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "A jj subcommand for GitHub that supports stacked pull requests and works in Claude Code cloud sessions",
   "license": "MIT",
   "repository": {