jj-octo 0.4.0 → 0.5.0

package/README.md

@@ -1,6 +1,6 @@
 # jj-octo
 
-A [jj](https://github.com/jj-vcs/jj) subcommand for working with GitHub that supports stacking.
+A [jj](https://github.com/jj-vcs/jj) subcommand for GitHub that supports stacked pull requests and works in Claude Code cloud sessions.
 
 > [!WARNING]
 > `jj-octo` is in early development, and its commands may change. So far it is largely vibe coded.
@@ -30,13 +30,27 @@ Then run `jj-octo init` once in each checkout. It makes the checkout a jj reposi
 
 ## GitHub access
 
-`jj-octo` reads the repository from the `origin` remote. It takes its token from `GH_TOKEN` or `GITHUB_TOKEN`, and otherwise from `gh auth token`. It sends requests through the proxy that `HTTPS_PROXY` names, and trusts the certificate authorities in `NODE_EXTRA_CA_CERTS` as well as Bun's own.
+`jj-octo` reads the repository from the `origin` remote.
 
-## In a Claude Code cloud session
+By default, it reads its token from `GH_TOKEN` or `GITHUB_TOKEN`, and otherwise runs `gh auth token`.
 
-In a [Claude Code](https://claude.com/claude-code) cloud session, a proxy carries all traffic to GitHub. It allows REST calls only for the session's repositories, and blocks GraphQL. That's why `jj-octo` uses only GitHub's REST API, while `gh pr` and other tools that depend on GraphQL fail there.
+With `jj-octo.github-auth` set to `git-proxy`, it sends a placeholder token instead. It sends requests through git's proxy for github.com, and trusts git's certificate authorities for it in place of Bun's own. [In a self-hosted environment](#in-a-self-hosted-environment) describes when to use it.
 
-mise can't read this repository's releases there, since it reads them through the GitHub API. Install the npm package instead:
+## In Claude Code cloud sessions
+
+A Claude Code [cloud session](https://code.claude.com/docs/en/claude-code-on-the-web) runs in an Anthropic-hosted environment, or in your organization's self-hosted environment. Each needs its own setup.
+
+The session's GitHub proxy can append a "Generated by Claude Code" footer to each pull request body that it creates or edits. `jj gh submit` would read the footer as an edit made on GitHub, and write it into the change. To have `submit` leave the footer out when it compares a pull request's body with its change's description, set:
+
+```
+jj config set --repo jj-octo.ignore-claude-code-footer true
+```
+
+### In an Anthropic-hosted environment
+
+There, the [GitHub proxy](https://code.claude.com/docs/en/cloud-environments#github-proxy) carries all GitHub traffic. It serves GitHub API requests only for the repositories attached to the session, and rejects GraphQL requests. That's why `jj-octo` uses only GitHub's REST API, while `gh pr` and other tools that depend on GraphQL fail there.
+
+mise reads this repository's releases through the GitHub API, so it can't install them unless the session has this repository attached. Install the npm package instead:
 
 ```toml
 [tools]
@@ -48,11 +62,11 @@ version = "X.Y.Z"
 allow_low_downloads = true
 ```
 
-The session sets `HTTPS_PROXY`, `NODE_EXTRA_CA_CERTS` and a placeholder `GH_TOKEN`. Its proxy replaces the placeholder with real credentials. So `jj-octo` works there with its default settings.
+The session sets `HTTPS_PROXY`, `NODE_EXTRA_CA_CERTS`, and `GH_TOKEN` to the placeholder `proxy-injected`. The GitHub proxy replaces the placeholder with your real credentials. So `jj-octo` works there with its default settings.
 
-## In a Claude Code self-hosted environment
+### In a self-hosted environment
 
-A self-hosted runner started with `--use-anthropic-git-proxy` sends git through Anthropic's git proxy, which adds the session user's credentials. The sandbox then holds no GitHub token, and only git's config names the proxy. There, have `jj-octo` use the same proxy:
+A [self-hosted runner](https://code.claude.com/docs/en/self-hosted-environments-deploy#use-the-anthropic-git-proxy) started with `--use-anthropic-git-proxy` sends git through the Anthropic git proxy. That proxy adds the GitHub credentials of the session's creator. The session then holds no GitHub token, and only git's config names the proxy. There, have `jj-octo` use the same proxy:
 
 ```
 jj config set --repo jj-octo.github-auth git-proxy

package/dist/jj-octo.js

@@ -18239,8 +18239,8 @@ var layer14 = /* @__PURE__ */ layerMergedContext(/* @__PURE__ */ succeed6(fetch)
 // package.json
 var package_default = {
   name: "jj-octo",
-  version: "0.4.0",
-  description: "A jj subcommand for working with GitHub that supports stacking",
+  version: "0.5.0",
+  description: "A jj subcommand for GitHub that supports stacked pull requests and works in Claude Code cloud sessions",
   license: "MIT",
   repository: {
     type: "git",
@@ -18839,9 +18839,13 @@ var descriptionFrom = ({
 }) => body === "" ? title : `${title}
 
 ${body}`;
-var normalizedDescription = (description) => descriptionFrom(titleAndBody(description.replaceAll(`\r
+var claudeCodeFooter = /\n*---\n_Generated by \[Claude Code\]\(https:\/\/claude\.ai\/code[^\s)]*\)_\s*$/u;
+var normalizedDescription = (description, { ignoreClaudeCodeFooter }) => {
+  const text = description.replaceAll(`\r
 `, `
-`)));
+`);
+  return descriptionFrom(titleAndBody(ignoreClaudeCodeFooter ? text.replace(claudeCodeFooter, "") : text));
+};
 var descriptionSyncFor = ({
   local,
   onGitHub,
@@ -18859,18 +18863,39 @@ var descriptionSyncFor = ({
 // src/cli/gh/stack/descriptions.ts
 class DescriptionConflict extends TaggedError2("DescriptionConflict") {
 }
+var ignoreClaudeCodeFooterKey = "jj-octo.ignore-claude-code-footer";
+var ignoresClaudeCodeFooter = gen2(function* () {
+  const jj = yield* Jj;
+  const value = (yield* jj.read(["config", "get", ignoreClaudeCodeFooterKey]).pipe(orElseSucceed2(() => ""))).trim();
+  switch (value) {
+    case "":
+    case "false": {
+      return false;
+    }
+    case "true": {
+      return true;
+    }
+    default: {
+      return yield* new JjFailed({
+        message: `${ignoreClaudeCodeFooterKey} is ${JSON.stringify(value)}; set it to true or false`
+      });
+    }
+  }
+});
 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 : ""];
 }))));
-var syncDescription = ({ bookmark, description }, pullRequest, { overwriteDescriptions, pushedDescription }) => gen2(function* () {
+var syncDescription = ({ bookmark, 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]);
-  const local = normalizedDescription(description);
-  const onGitHub = normalizedDescription(descriptionFrom(pullRequest));
-  const pushed = normalizedDescription(pushedDescription);
+  const local = normalizedDescription(description, { ignoreClaudeCodeFooter });
+  const onGitHub = normalizedDescription(descriptionFrom(pullRequest), {
+    ignoreClaudeCodeFooter
+  });
+  const pushed = normalizedDescription(pushedDescription, { ignoreClaudeCodeFooter });
   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);
@@ -18920,12 +18945,14 @@ var publish = (stack, { draft, overwriteDescriptions }) => gen2(function* () {
   const found = yield* all2(stack.map((change, index) => github.openPullRequest(change.bookmark).pipe(map7((pullRequest) => ({ base: bases[index] ?? trunk, change, pullRequest })))), { concurrency: "unbounded" });
   const targets = yield* bookmarkTargets;
   const pushedDescriptions = yield* descriptionsOf(bookmarks.flatMap((bookmark) => targets.get(bookmark)?.origin ?? []));
+  const ignoreClaudeCodeFooter = yield* ignoresClaudeCodeFooter;
   const changes = [];
   for (const entry of found) {
     const pushed = targets.get(entry.change.bookmark)?.origin;
     changes.push({
       ...entry,
       description: isNone2(entry.pullRequest) ? none2() : yield* syncDescription(entry.change, entry.pullRequest.value, {
+        ignoreClaudeCodeFooter,
         overwriteDescriptions,
         pushedDescription: (pushed === undefined ? undefined : pushedDescriptions.get(pushed)) ?? ""
       })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jj-octo",
-  "version": "0.4.0",
-  "description": "A jj subcommand for working with GitHub that supports stacking",
+  "version": "0.5.0",
+  "description": "A jj subcommand for GitHub that supports stacked pull requests and works in Claude Code cloud sessions",
   "license": "MIT",
   "repository": {
     "type": "git",