jj-octo 0.1.0 → 0.2.0

package/README.md

@@ -27,12 +27,14 @@ version = "X.Y.Z"
 allow_low_downloads = true
 ```
 
-Then make it a jj subcommand. The alias isn't committed, so run this once in each checkout:
+Then set up each checkout, since jj doesn't read config from a committed file:
 
 ```
-jj config set --repo aliases.gh '["util", "exec", "--", "jj-octo"]'
+jj-octo init
 ```
 
+It makes the checkout a jj repository colocated with git, makes GitHub's default branch `trunk()`, and sets the `jj gh` alias.
+
 ### For every repository
 
 ```
@@ -40,6 +42,8 @@ bun install --global jj-octo
 jj config set --user aliases.gh '["util", "exec", "--", "jj-octo"]'
 ```
 
+Then run `jj-octo init` once in each checkout, as above.
+
 To update it later:
 
 ```

package/dist/jj-octo.js

@@ -18116,7 +18116,7 @@ var layer14 = /* @__PURE__ */ layerMergedContext(/* @__PURE__ */ succeed6(fetch)
 // package.json
 var package_default = {
   name: "jj-octo",
-  version: "0.1.0",
+  version: "0.2.0",
   description: "A jj subcommand for working with GitHub that supports stacking",
   license: "MIT",
   repository: {
@@ -18169,117 +18169,61 @@ var withHelp = (summary, ...paragraphs) => (command) => command.pipe(withShortDe
 
   `)));
 var revisionFlag = (description) => String8("revision").pipe(withAlias2("r"), withDefault5("@"), withDescription2(`${description}, the working copy by default`));
-// src/clients/github/openapi.ts
-var responseOf = () => (schema) => schema;
-var bodyOf = (body) => bodyJsonUnsafe(body);
-
-// src/clients/github/types.ts
-var PullRequestNumberSchema = Number6.pipe(brand2("PullRequestNumber"));
-var StackNumberSchema = Number6.pipe(brand2("StackNumber"));
-
-// src/clients/github/client.ts
-class GitHubFailed extends TaggedError2("GitHubFailed") {
+// src/clients/git.ts
+class GitFailed extends TaggedError2("GitFailed") {
 }
 
-class GitHub extends Service()("jj-octo/GitHub") {
+class Git extends Service()("jj-octo/Git") {
 }
-var CreatedPullRequest = responseOf()(Struct({ number: PullRequestNumberSchema }));
-var CreatedStack = responseOf()(Struct({ number: StackNumberSchema }));
-var PullRequests = responseOf()(ArraySchema(Struct({
-  base: Struct({ ref: String4 }),
-  body: NullOr(String4),
-  draft: optionalKey2(Boolean2),
-  number: PullRequestNumberSchema,
-  title: String4
-})));
-var StackedPullRequest = Struct({
-  number: PullRequestNumberSchema,
-  state: Literals(["closed", "open"])
-});
-var Stacks = responseOf()(ArraySchema(Struct({ number: StackNumberSchema, pull_requests: ArraySchema(StackedPullRequest) })));
-var RepositoryDetails = responseOf()(Struct({ default_branch: String4 }));
-var MergeRequest = Struct({
-  details: Struct({
-    message: String4,
-    uuid: optionalKey2(String4)
-  }),
-  status: Literals(["enqueued", "failed", "merged", "pending"])
-});
-var StartedMerge = responseOf()(MergeRequest);
-var MergeResult = responseOf()(MergeRequest);
-var token = gen2(function* () {
-  const fromEnvironment = yield* option2(Redacted2("GH_TOKEN").pipe(orElse(() => Redacted2("GITHUB_TOKEN"))));
-  if (isSome2(fromEnvironment)) {
-    return fromEnvironment.value;
-  }
+var gitLayer = ({ cwd, env } = {}) => effect(Git, gen2(function* () {
   const spawner = yield* ChildProcessSpawner;
-  const stored = (yield* spawner.string(make14("gh", ["auth", "token"]))).trim();
-  return stored === "" ? yield* fail6("no token") : make19(stored);
-}).pipe(mapError2(() => new GitHubFailed({ message: "no GitHub token: set GH_TOKEN, or run `gh auth login`" })));
-var GitHubLive = (repository) => {
-  const repo = (path) => `/repos/${repository.owner}/${repository.name}${path}`;
-  return effect(GitHub, gen2(function* () {
-    const bearer = yield* token;
-    const client = (yield* HttpClient).pipe(mapRequest((request) => request.pipe(prependUrl("https://api.github.com"), acceptJson, bearerToken(bearer), setHeaders({
-      "user-agent": "jj-octo",
-      "x-github-api-version": "2022-11-28"
-    }))));
-    const send = (request) => client.execute(request).pipe(flatMap4((response) => response.status < 400 ? succeed6(response) : response.text.pipe(orElseSucceed2(() => ""), flatMap4((text) => fail6(new GitHubFailed({
-      message: `${request.method} ${request.url} returned ${response.status}: ${text}`
-    }))))), catchTag2("HttpClientError", (error) => fail6(new GitHubFailed({ message: error.message }))));
-    const json = (schema) => (request) => send(request).pipe(flatMap4(schemaBodyJson(schema)), catchTags2({
-      HttpClientError: (error) => fail6(new GitHubFailed({ message: error.message })),
-      SchemaError: (error) => fail6(new GitHubFailed({
-        message: `unexpected response to ${request.url}: ${error.message}`
-      }))
-    }));
-    const stackOf = (pullRequest) => json(Stacks)(get4(repo(`/stacks?pull_request=${pullRequest}`))).pipe(map7((stacks) => map(fromNullishOr(stacks[0]), (stack) => ({
-      number: stack.number,
-      open: stack.pull_requests.filter(({ state }) => state === "open").map(({ number }) => number)
-    }))));
-    const mergeRequest = (path) => json(MergeResult)(get4(repo(path)));
-    return {
-      addToStack: (stack, pullRequests) => send(post(repo(`/stacks/${stack}/add`)).pipe(bodyOf({ pull_requests: [...pullRequests] }))).pipe(asVoid2),
-      createPullRequest: ({ base, body, draft, head, title }) => json(CreatedPullRequest)(post(repo("/pulls")).pipe(bodyOf({ base, body, draft, head, title }))).pipe(map7(({ number }) => number)),
-      createStack: (pullRequests) => json(CreatedStack)(post(repo("/stacks")).pipe(bodyOf({ pull_requests: [...pullRequests] }))).pipe(map7(({ number }) => number)),
-      defaultBranch: json(RepositoryDetails)(get4(repo(""))).pipe(map7(({ default_branch }) => default_branch)),
-      mergePullRequest: (pullRequest) => send(put(repo(`/pulls/${pullRequest}/merge`)).pipe(bodyOf({ merge_method: "squash" }))).pipe(asVoid2),
-      mergeStack: (pullRequest) => gen2(function* () {
-        const started = yield* json(StartedMerge)(put(repo(`/pulls/${pullRequest}/merge-async`)).pipe(bodyOf({
-          merge_action: "default",
-          merge_method: "squash"
-        })));
-        const { uuid } = started.details;
-        if (uuid === undefined) {
-          return yield* new GitHubFailed({
-            message: `merging #${pullRequest} returned no request to follow`
-          });
-        }
-        const settled = yield* mergeRequest(`/pulls/${pullRequest}/merge-async/${uuid}`).pipe(repeat2({
-          schedule: spaced("5 seconds"),
-          until: ({ status }) => status !== "pending"
-        }));
-        if (settled.status === "merged" || settled.status === "enqueued") {
-          return settled.status;
-        }
-        return yield* new GitHubFailed({
-          message: `merging #${pullRequest} ended ${settled.status}: ${settled.details.message}`
-        });
-      }),
-      openPullRequest: (branch) => json(PullRequests)(get4(repo(`/pulls?state=open&head=${repository.owner}:${encodeURIComponent(branch)}`))).pipe(map7((found) => map(fromNullishOr(found[0]), ({ base, body, draft, number, title }) => ({
-        base: base.ref,
-        body: body ?? "",
-        draft: draft ?? false,
-        number,
-        title
-      })))),
-      setBase: (pullRequest, base) => send(patch(repo(`/pulls/${pullRequest}`)).pipe(bodyOf({ base }))).pipe(asVoid2),
-      setDescription: (pullRequest, { body, title }) => send(patch(repo(`/pulls/${pullRequest}`)).pipe(bodyOf({ body, title }))).pipe(asVoid2),
-      stackOf,
-      unstack: (stack) => send(post(repo(`/stacks/${stack}/unstack`))).pipe(asVoid2)
-    };
-  }));
-};
+  const fs = yield* FileSystem;
+  const path = yield* Path;
+  return {
+    mergeText: ({ base, local, remote }) => scoped2(gen2(function* () {
+      const directory = yield* fs.makeTempDirectoryScoped();
+      const written = { base: `${base}
+`, github: `${remote}
+`, local: `${local}
+` };
+      yield* all2(Object.entries(written).map(([name, text]) => fs.writeFileString(path.join(directory, name), text)));
+      const handle = yield* spawner.spawn(make14("git", [
+        "merge-file",
+        "-p",
+        "-L",
+        "local",
+        "-L",
+        "base",
+        "-L",
+        "GitHub",
+        "local",
+        "base",
+        "github"
+      ], { cwd: directory }));
+      const [text, stderr, code] = yield* all2([
+        mkString(decodeText(handle.stdout)),
+        mkString(decodeText(handle.stderr)),
+        handle.exitCode
+      ], { concurrency: "unbounded" });
+      if (code > 127) {
+        return yield* new GitFailed({ message: `git merge-file failed: ${stderr.trim()}` });
+      }
+      return { conflicted: code > 0, text: text.trimEnd() };
+    })).pipe(catchTag2("PlatformError", (error) => fail6(new GitFailed({ message: `git merge-file failed: ${error.message}` })))),
+    read: (args) => scoped2(gen2(function* () {
+      const handle = yield* spawner.spawn(make14("git", args, { cwd, env, extendEnv: true }));
+      const [stdout, stderr, code] = yield* all2([
+        mkString(decodeText(handle.stdout)),
+        mkString(decodeText(handle.stderr)),
+        handle.exitCode
+      ], { concurrency: "unbounded" });
+      return code === 0 ? stdout : yield* new GitFailed({
+        message: `git ${args.join(" ")} failed${stderr.trim() === "" ? "" : `: ${stderr.trim()}`}`
+      });
+    })).pipe(catchTag2("PlatformError", (error) => fail6(new GitFailed({ message: `git ${args.join(" ")} failed: ${error.message}` }))))
+  };
+}));
+var GitLive = gitLayer();
 
 // src/clients/jj.ts
 class JjFailed extends TaggedError2("JjFailed") {
@@ -18308,27 +18252,6 @@ var jjLayer = ({ cwd, env, quiet = false } = {}) => effect(Jj, gen2(function* ()
 }));
 var JjLive = jjLayer();
 
-// src/clients/github/repository.ts
-var repositoryFromUrl = (url) => {
-  const match = /github\.com[:/](?<owner>[^/]+)\/(?<name>[^/]+?)(?:\.git)?\/?$/u.exec(url.trim());
-  const owner = match?.groups?.["owner"];
-  const name = match?.groups?.["name"];
-  return owner === undefined || name === undefined ? none2() : some2({ name, owner });
-};
-
-// src/clients/github/origin.ts
-var GitHubFromOrigin = unwrap(gen2(function* () {
-  const jj = yield* Jj;
-  const remotes = yield* jj.read(["git", "remote", "list"]);
-  const origin = remotes.split(`
-`).find((line) => line.startsWith("origin "));
-  const repository = repositoryFromUrl(origin?.slice("origin ".length) ?? "");
-  if (isNone2(repository)) {
-    return yield* new GitHubFailed({ message: "the `origin` remote isn't a GitHub repository" });
-  }
-  return GitHubLive(repository.value);
-}));
-
 // src/cli/gh/stack/changes.ts
 class NotAStack extends TaggedError2("NotAStack") {
 }
@@ -18442,6 +18365,221 @@ var chain = (revset, revision) => gen2(function* () {
 var stackChanges = (revision) => chain(stackRevset(revision), revision);
 var downstackChanges = (revision) => chain(downstackRevset(revision), revision);
 
+// src/cli/gh/stack/trunk.ts
+class TrunkMismatch extends TaggedError2("TrunkMismatch") {
+}
+var trunkRevset = (branch) => `${JSON.stringify(branch)}@origin`;
+var checkTrunk = (branch) => gen2(function* () {
+  if ((yield* commitsAt(`trunk() & present(${trunkRevset(branch)})`)).length === 0) {
+    yield* new TrunkMismatch({
+      message: `trunk() isn't ${branch}@origin, GitHub's default branch; run \`jj gh init\``
+    });
+  }
+});
+
+// src/cli/gh/init.ts
+var colocate = gen2(function* () {
+  const fs = yield* FileSystem;
+  const git = yield* Git;
+  const jj = yield* Jj;
+  const resolve = (output) => fs.realPath(output.trim()).pipe(orElseSucceed2(() => ""));
+  const root = yield* resolve(yield* git.read(["rev-parse", "--show-toplevel"]));
+  const jjRoot = yield* jj.read(["root"]).pipe(flatMap4(resolve), orElseSucceed2(() => ""));
+  if (jjRoot !== root) {
+    yield* jj.run(["git", "init", "--colocate", root]);
+  }
+});
+var copyIdentity = gen2(function* () {
+  const git = yield* Git;
+  const jj = yield* Jj;
+  for (const key of ["user.name", "user.email"]) {
+    const own = (yield* jj.read(["config", "get", key])).trim();
+    const value = (yield* git.read(["config", key]).pipe(orElseSucceed2(() => ""))).trim();
+    if (own === "" && value !== "") {
+      yield* jj.run(["config", "set", "--repo", key, value]);
+    }
+  }
+});
+var defaultBranch = gen2(function* () {
+  const git = yield* Git;
+  const output = yield* git.read(["ls-remote", "--symref", "origin", "HEAD"]);
+  const branch = /^ref: refs\/heads\/(?<branch>\S+)\tHEAD$/mu.exec(output)?.groups?.["branch"];
+  if (branch === undefined) {
+    return yield* new GitFailed({ message: "origin names no default branch" });
+  }
+  return branch;
+});
+var setTrunk = gen2(function* () {
+  const jj = yield* Jj;
+  const branch = yield* defaultBranch;
+  if ((yield* commitsAt(`present(${trunkRevset(branch)})`)).length === 0) {
+    yield* jj.run(["git", "fetch", "--remote", "origin", "--branch", `exact:${branch}`]);
+  }
+  if ((yield* bookmarkTargets).get(branch)?.tracked !== true) {
+    yield* jj.run(["bookmark", "track", `exact:${branch}`, "--remote", "origin"]);
+  }
+  yield* jj.run([
+    "config",
+    "set",
+    "--repo",
+    'revset-aliases."trunk()"',
+    JSON.stringify(trunkRevset(branch))
+  ]);
+  return branch;
+});
+var init = gen2(function* () {
+  const jj = yield* Jj;
+  yield* colocate;
+  yield* copyIdentity;
+  const anonymous = 'mutable() & (author_name(exact:"") | author_email(exact:""))';
+  if ((yield* commitsAt(anonymous)).length > 0) {
+    yield* jj.run(["metaedit", "--quiet", "--update-author", "-r", anonymous]);
+  }
+  const branch = yield* setTrunk;
+  yield* jj.run([
+    "config",
+    "set",
+    "--repo",
+    "aliases.gh",
+    JSON.stringify(["util", "exec", "--", "jj-octo"])
+  ]);
+  yield* error(`set up jj, with trunk() as ${branch}@origin`);
+});
+var initCommand = make30("init", {}, () => asUserError(init)).pipe(withHelp("Set up a git checkout for the other commands", "Makes it a jj repository colocated with git, unless it already is one, and copies git's name and email into the repository's jj config where jj has none.", "Reads the default branch from `origin`, fetches and tracks it, and sets `trunk()` to it in the repository's config. jj's own `trunk()` guesses from branch names, so without this a default branch it doesn't guess would be the base of pull requests but not of local rebases. `submit`, `merge` and `sync` check that the two agree.", "Sets the `jj gh` alias to run `jj-octo` from `PATH`, in the repository's config. Set it again afterwards to run another build.", "Needs no GitHub token. Running it again changes nothing that is already set up. Run it again after the default branch changes on GitHub."));
+
+// src/clients/github/openapi.ts
+var responseOf = () => (schema) => schema;
+var bodyOf = (body) => bodyJsonUnsafe(body);
+
+// src/clients/github/types.ts
+var PullRequestNumberSchema = Number6.pipe(brand2("PullRequestNumber"));
+var StackNumberSchema = Number6.pipe(brand2("StackNumber"));
+
+// src/clients/github/client.ts
+class GitHubFailed extends TaggedError2("GitHubFailed") {
+}
+
+class GitHub extends Service()("jj-octo/GitHub") {
+}
+var CreatedPullRequest = responseOf()(Struct({ number: PullRequestNumberSchema }));
+var CreatedStack = responseOf()(Struct({ number: StackNumberSchema }));
+var PullRequests = responseOf()(ArraySchema(Struct({
+  base: Struct({ ref: String4 }),
+  body: NullOr(String4),
+  draft: optionalKey2(Boolean2),
+  number: PullRequestNumberSchema,
+  title: String4
+})));
+var StackedPullRequest = Struct({
+  number: PullRequestNumberSchema,
+  state: Literals(["closed", "open"])
+});
+var Stacks = responseOf()(ArraySchema(Struct({ number: StackNumberSchema, pull_requests: ArraySchema(StackedPullRequest) })));
+var RepositoryDetails = responseOf()(Struct({ default_branch: String4 }));
+var MergeRequest = Struct({
+  details: Struct({
+    message: String4,
+    uuid: optionalKey2(String4)
+  }),
+  status: Literals(["enqueued", "failed", "merged", "pending"])
+});
+var StartedMerge = responseOf()(MergeRequest);
+var MergeResult = responseOf()(MergeRequest);
+var token = gen2(function* () {
+  const fromEnvironment = yield* option2(Redacted2("GH_TOKEN").pipe(orElse(() => Redacted2("GITHUB_TOKEN"))));
+  if (isSome2(fromEnvironment)) {
+    return fromEnvironment.value;
+  }
+  const spawner = yield* ChildProcessSpawner;
+  const stored = (yield* spawner.string(make14("gh", ["auth", "token"]))).trim();
+  return stored === "" ? yield* fail6("no token") : make19(stored);
+}).pipe(mapError2(() => new GitHubFailed({ message: "no GitHub token: set GH_TOKEN, or run `gh auth login`" })));
+var GitHubLive = (repository) => {
+  const repo = (path) => `/repos/${repository.owner}/${repository.name}${path}`;
+  return effect(GitHub, gen2(function* () {
+    const bearer = yield* token;
+    const client = (yield* HttpClient).pipe(mapRequest((request) => request.pipe(prependUrl("https://api.github.com"), acceptJson, bearerToken(bearer), setHeaders({
+      "user-agent": "jj-octo",
+      "x-github-api-version": "2022-11-28"
+    }))));
+    const send = (request) => client.execute(request).pipe(flatMap4((response) => response.status < 400 ? succeed6(response) : response.text.pipe(orElseSucceed2(() => ""), flatMap4((text) => fail6(new GitHubFailed({
+      message: `${request.method} ${request.url} returned ${response.status}: ${text}`
+    }))))), catchTag2("HttpClientError", (error) => fail6(new GitHubFailed({ message: error.message }))));
+    const json = (schema) => (request) => send(request).pipe(flatMap4(schemaBodyJson(schema)), catchTags2({
+      HttpClientError: (error) => fail6(new GitHubFailed({ message: error.message })),
+      SchemaError: (error) => fail6(new GitHubFailed({
+        message: `unexpected response to ${request.url}: ${error.message}`
+      }))
+    }));
+    const stackOf = (pullRequest) => json(Stacks)(get4(repo(`/stacks?pull_request=${pullRequest}`))).pipe(map7((stacks) => map(fromNullishOr(stacks[0]), (stack) => ({
+      number: stack.number,
+      open: stack.pull_requests.filter(({ state }) => state === "open").map(({ number }) => number)
+    }))));
+    const mergeRequest = (path) => json(MergeResult)(get4(repo(path)));
+    return {
+      addToStack: (stack, pullRequests) => send(post(repo(`/stacks/${stack}/add`)).pipe(bodyOf({ pull_requests: [...pullRequests] }))).pipe(asVoid2),
+      createPullRequest: ({ base, body, draft, head, title }) => json(CreatedPullRequest)(post(repo("/pulls")).pipe(bodyOf({ base, body, draft, head, title }))).pipe(map7(({ number }) => number)),
+      createStack: (pullRequests) => json(CreatedStack)(post(repo("/stacks")).pipe(bodyOf({ pull_requests: [...pullRequests] }))).pipe(map7(({ number }) => number)),
+      defaultBranch: json(RepositoryDetails)(get4(repo(""))).pipe(map7(({ default_branch }) => default_branch)),
+      mergePullRequest: (pullRequest) => send(put(repo(`/pulls/${pullRequest}/merge`)).pipe(bodyOf({ merge_method: "squash" }))).pipe(asVoid2),
+      mergeStack: (pullRequest) => gen2(function* () {
+        const started = yield* json(StartedMerge)(put(repo(`/pulls/${pullRequest}/merge-async`)).pipe(bodyOf({
+          merge_action: "default",
+          merge_method: "squash"
+        })));
+        const { uuid } = started.details;
+        if (uuid === undefined) {
+          return yield* new GitHubFailed({
+            message: `merging #${pullRequest} returned no request to follow`
+          });
+        }
+        const settled = yield* mergeRequest(`/pulls/${pullRequest}/merge-async/${uuid}`).pipe(repeat2({
+          schedule: spaced("5 seconds"),
+          until: ({ status }) => status !== "pending"
+        }));
+        if (settled.status === "merged" || settled.status === "enqueued") {
+          return settled.status;
+        }
+        return yield* new GitHubFailed({
+          message: `merging #${pullRequest} ended ${settled.status}: ${settled.details.message}`
+        });
+      }),
+      openPullRequest: (branch) => json(PullRequests)(get4(repo(`/pulls?state=open&head=${repository.owner}:${encodeURIComponent(branch)}`))).pipe(map7((found) => map(fromNullishOr(found[0]), ({ base, body, draft, number, title }) => ({
+        base: base.ref,
+        body: body ?? "",
+        draft: draft ?? false,
+        number,
+        title
+      })))),
+      setBase: (pullRequest, base) => send(patch(repo(`/pulls/${pullRequest}`)).pipe(bodyOf({ base }))).pipe(asVoid2),
+      setDescription: (pullRequest, { body, title }) => send(patch(repo(`/pulls/${pullRequest}`)).pipe(bodyOf({ body, title }))).pipe(asVoid2),
+      stackOf,
+      unstack: (stack) => send(post(repo(`/stacks/${stack}/unstack`))).pipe(asVoid2)
+    };
+  }));
+};
+
+// src/clients/github/repository.ts
+var repositoryFromUrl = (url) => {
+  const match = /github\.com[:/](?<owner>[^/]+)\/(?<name>[^/]+?)(?:\.git)?\/?$/u.exec(url.trim());
+  const owner = match?.groups?.["owner"];
+  const name = match?.groups?.["name"];
+  return owner === undefined || name === undefined ? none2() : some2({ name, owner });
+};
+
+// src/clients/github/origin.ts
+var GitHubFromOrigin = unwrap(gen2(function* () {
+  const jj = yield* Jj;
+  const remotes = yield* jj.read(["git", "remote", "list"]);
+  const origin = remotes.split(`
+`).find((line) => line.startsWith("origin "));
+  const repository = repositoryFromUrl(origin?.slice("origin ".length) ?? "");
+  if (isNone2(repository)) {
+    return yield* new GitHubFailed({ message: "the `origin` remote isn't a GitHub repository" });
+  }
+  return GitHubLive(repository.value);
+}));
+
 // src/cli/gh/log.ts
 var logLines2 = (entries) => {
   const rows = entries.toReversed().map(({ bookmark, pullRequest, pushed }) => [
@@ -18469,50 +18607,6 @@ var log2 = (revision) => gen2(function* () {
 var logCommand = make30("log", { revision: revisionFlag("A change of the stack to show") }, ({ revision }) => asUserError(log2(revision).pipe(provide3(GitHubFromOrigin))).pipe(flatMap4((printed) => log(printed.join(`
 `))))).pipe(withHelp("Show changes and their pull requests", "Prints one line per change, top first: its bookmark, its pull request with whether that is a draft or ready for review, and whether the change is pushed, changed since the push, or not pushed.", "Fails if the changes aren't a chain, if one has conflicts, or if one doesn't have exactly one bookmark. `submit` makes the same check before it changes anything.", "Changes nothing, locally or on GitHub."));
 
-// src/clients/git.ts
-class GitFailed extends TaggedError2("GitFailed") {
-}
-
-class Git extends Service()("jj-octo/Git") {
-}
-var GitLive = effect(Git, gen2(function* () {
-  const spawner = yield* ChildProcessSpawner;
-  const fs = yield* FileSystem;
-  const path = yield* Path;
-  return {
-    mergeText: ({ base, local, remote }) => scoped2(gen2(function* () {
-      const directory = yield* fs.makeTempDirectoryScoped();
-      const written = { base: `${base}
-`, github: `${remote}
-`, local: `${local}
-` };
-      yield* all2(Object.entries(written).map(([name, text]) => fs.writeFileString(path.join(directory, name), text)));
-      const handle = yield* spawner.spawn(make14("git", [
-        "merge-file",
-        "-p",
-        "-L",
-        "local",
-        "-L",
-        "base",
-        "-L",
-        "GitHub",
-        "local",
-        "base",
-        "github"
-      ], { cwd: directory }));
-      const [text, stderr, code] = yield* all2([
-        mkString(decodeText(handle.stdout)),
-        mkString(decodeText(handle.stderr)),
-        handle.exitCode
-      ], { concurrency: "unbounded" });
-      if (code > 127) {
-        return yield* new GitFailed({ message: `git merge-file failed: ${stderr.trim()}` });
-      }
-      return { conflicted: code > 0, text: text.trimEnd() };
-    })).pipe(catchTag2("PlatformError", (error) => fail6(new GitFailed({ message: `git merge-file failed: ${error.message}` }))))
-  };
-}));
-
 // src/cli/gh/stack/plan.ts
 var basesFor = (branches, trunk) => [
   trunk,
@@ -18687,7 +18781,10 @@ var publish = (stack, { draft, overwriteDescriptions }) => gen2(function* () {
   }
   yield* register(dissolve ? none2() : existing, numbers);
 });
-var submit = (revision, options) => downstackChanges(revision).pipe(flatMap4((stack) => publish(stack, options)));
+var submit = (revision, options) => gen2(function* () {
+  yield* checkTrunk(yield* (yield* GitHub).defaultBranch);
+  yield* publish(yield* downstackChanges(revision), options);
+});
 var republish = (revision) => gen2(function* () {
   if ((yield* changesIn(stackRevset(revision))).length === 0) {
     return;
@@ -18820,7 +18917,10 @@ var sync4 = (required = []) => gen2(function* () {
     });
   }
 });
-var syncCommand = make30("sync", {}, () => asUserError(sync4())).pipe(withHelp("Fetch, and rebase every change onto the trunk", "Fetches, then rebases every change that isn't merged yet onto the trunk, keeping each on the changes below it. A change that has merged is empty after the rebase, so it's abandoned and its bookmark forgotten.", "A stack that would conflict with the trunk is left where it was, and named. Rebase it yourself with `jj rebase` when you want to resolve it.", "Commits added to a branch on GitHub are squashed into the branch's local change, whether or not that change was also edited locally. Where GitHub only rebased a branch, the local change is kept.", "Pushes nothing. Run `jj gh submit` to update the pull requests of a change and the ones below it."));
+var syncCommand = make30("sync", {}, () => asUserError(gen2(function* () {
+  yield* checkTrunk(yield* (yield* GitHub).defaultBranch);
+  yield* sync4();
+}).pipe(provide3(GitHubFromOrigin)))).pipe(withHelp("Fetch, and rebase every change onto the trunk", "Fetches, then rebases every change that isn't merged yet onto the trunk, keeping each on the changes below it. A change that has merged is empty after the rebase, so it's abandoned and its bookmark forgotten.", "A stack that would conflict with the trunk is left where it was, and named. Rebase it yourself with `jj rebase` when you want to resolve it.", "Commits added to a branch on GitHub are squashed into the branch's local change, whether or not that change was also edited locally. Where GitHub only rebased a branch, the local change is kept.", "Fails before fetching if `trunk()` isn't GitHub's default branch, which `jj gh init` sets.", "Pushes nothing. Run `jj gh submit` to update the pull requests of a change and the ones below it."));
 
 // src/cli/gh/merge.ts
 class NotMergeable extends TaggedError2("NotMergeable") {
@@ -18836,7 +18936,7 @@ var openPullRequestOf = (bookmark) => gen2(function* () {
   }
   return opened.value;
 });
-var mergeOnGitHub = ({ base, number }) => gen2(function* () {
+var mergeOnGitHub = ({ base, number }, trunk) => gen2(function* () {
   const github = yield* GitHub;
   const stack = yield* github.stackOf(number);
   if (isSome2(stack)) {
@@ -18844,7 +18944,7 @@ var mergeOnGitHub = ({ base, number }) => gen2(function* () {
     yield* error(`merging ${numbered(open.slice(0, open.indexOf(number) + 1))}`);
     return yield* github.mergeStack(number);
   }
-  if (base !== (yield* github.defaultBranch)) {
+  if (base !== trunk) {
     return yield* new NotMergeable({
       message: `#${number} isn't in a GitHub stack, and its base is ${base}, so merging it wouldn't reach the trunk; run \`jj gh submit\` to register the stack, or merge the changes below it first`
     });
@@ -18854,6 +18954,8 @@ var mergeOnGitHub = ({ base, number }) => gen2(function* () {
   return "merged";
 });
 var merge5 = (revision) => gen2(function* () {
+  const trunk = yield* (yield* GitHub).defaultBranch;
+  yield* checkTrunk(trunk);
   const changes = yield* downstackChanges(revision);
   const top = changes.at(-1)?.bookmark ?? "";
   const targets = yield* bookmarkTargets;
@@ -18866,7 +18968,7 @@ var merge5 = (revision) => gen2(function* () {
   const pullRequest = yield* openPullRequestOf(top);
   const above = yield* bookmarksAt(upstackRevset(bookmarkRevset(top)));
   const stackChanges = yield* changeIdsAt(stackRevset(revision));
-  if ((yield* mergeOnGitHub(pullRequest)) === "enqueued") {
+  if ((yield* mergeOnGitHub(pullRequest, trunk)) === "enqueued") {
     yield* error("queued to merge; run `jj gh sync` once it has");
   } else {
     yield* error(`merged up to #${pullRequest.number}`);
@@ -18889,7 +18991,7 @@ var submitCommand = make30("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.", "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 = make30("jj gh").pipe(withSubcommands([logCommand, mergeCommand, submitCommand, syncCommand]), withHelp("Commands for publishing jj changes as GitHub pull requests", "A stack is a chain of changes, each published as one pull request on the branch its bookmark names. Each pull request targets the branch of the change below it, so it shows only that change's diff. A single change is a stack of one, and is published as an ordinary pull request.", "The stack of a change is every change connected to it through mutable changes. An empty working copy with no description isn't part of it. `log` shows the whole stack. `submit` and `merge` act on a change and the ones below it, which must be a chain: no merges, no conflicts, and exactly one bookmark on each change.", "The repository is the one the `origin` remote points to. The token is read from `GH_TOKEN` or `GITHUB_TOKEN`, and otherwise from `gh auth token`."));
+var jjGhCommand = make30("jj gh").pipe(withSubcommands([initCommand, logCommand, mergeCommand, submitCommand, syncCommand]), withHelp("Commands for publishing jj changes as GitHub pull requests", "A stack is a chain of changes, each published as one pull request on the branch its bookmark names. Each pull request targets the branch of the change below it, so it shows only that change's diff. A single change is a stack of one, and is published as an ordinary pull request.", "The stack of a change is every change connected to it through mutable changes. An empty working copy with no description isn't part of it. `log` shows the whole stack. `submit` and `merge` act on a change and the ones below it, which must be a chain: no merges, no conflicts, and exactly one bookmark on each change.", "The repository is the one the `origin` remote points to. The token is read from `GH_TOKEN` or `GITHUB_TOKEN`, and otherwise from `gh auth token`."));
 
 // src/main.ts
 runMain2(run5(jjGhCommand, { version: package_default.version }).pipe(provide3([GitLive, JjLive]), provide3(layer13({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jj-octo",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A jj subcommand for working with GitHub that supports stacking",
   "license": "MIT",
   "repository": {