jj-octo 0.2.3 → 0.3.0

package/README.md

@@ -56,6 +56,14 @@ bun update --global --latest jj-octo
 
 It uses only GitHub's REST API, so that it works in a [Claude Code](https://claude.com/claude-code) cloud session. There, GitHub is reached through a proxy that allows REST calls for the session's repository and blocks GraphQL, which `gh pr` depends on.
 
+Where git reaches github.com through a proxy that adds the credentials itself, as in a Claude Code cloud session that keeps the token outside the sandbox, have `jj-octo` use that proxy too:
+
+```
+jj config set --repo jj-octo.github-auth git-proxy
+```
+
+`jj-octo` then sends its requests through the `http.proxy` that git uses for `https://github.com`, trusts the certificate authorities in git's `http.sslCAInfo` for it, and sends a placeholder token that the proxy replaces. It reads git's settings on each run, so it follows a proxy that moves to another port. `token`, the default, sends your own token.
+
 ## Development
 
 ```

package/dist/jj-octo.js

@@ -18112,7 +18112,7 @@ var layer14 = /* @__PURE__ */ layerMergedContext(/* @__PURE__ */ succeed6(fetch)
 // package.json
 var package_default = {
   name: "jj-octo",
-  version: "0.2.3",
+  version: "0.3.0",
   description: "A jj subcommand for working with GitHub that supports stacking",
   license: "MIT",
   repository: {
@@ -18382,6 +18382,18 @@ var colocate = gen2(function* () {
   const root = yield* resolve(yield* git.read(["rev-parse", "--show-toplevel"]));
   const jjRoot = yield* jj.read(["root"]).pipe(flatMap4(resolve), orElseSucceed2(() => ""));
   if (jjRoot !== root) {
+    const [gitDirectory, commonDirectory] = (yield* git.read([
+      "rev-parse",
+      "--path-format=absolute",
+      "--git-dir",
+      "--git-common-dir"
+    ])).split(`
+`);
+    if (gitDirectory !== commonDirectory) {
+      yield* new GitFailed({
+        message: "this is a git worktree, where jj would make a second repository; run `jj workspace add` in the main checkout instead"
+      });
+    }
     yield* jj.run(["git", "init", "--colocate", root]);
   }
 });
@@ -18481,24 +18493,21 @@ var MergeRequest = Struct({
 });
 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) => {
+var GitHubLive = (repository, connection) => {
   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({
+    const requestInit = match(connection.proxy, {
+      onNone: () => ({}),
+      onSome: ({ ca, url }) => match(ca, {
+        onNone: () => ({ proxy: url }),
+        onSome: (certificates) => ({ proxy: url, tls: { ca: certificates } })
+      })
+    });
+    const client = (yield* HttpClient).pipe(mapRequest((request) => request.pipe(prependUrl("https://api.github.com"), acceptJson, bearerToken(connection.token), 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({
+    const send = (request) => client.execute(request).pipe(provideService2(RequestInit, requestInit), 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({
@@ -18555,6 +18564,60 @@ var GitHubLive = (repository) => {
   }));
 };
 
+// src/clients/github/connection.ts
+var authKey = "jj-octo.github-auth";
+var ownToken = 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 gitSetting = (name) => gen2(function* () {
+  const git = yield* Git;
+  const value = (yield* git.read(["config", "--get-urlmatch", name, "https://github.com"]).pipe(orElseSucceed2(() => ""))).trim();
+  return value === "" ? none2() : some2(value);
+});
+var gitProxy = gen2(function* () {
+  const fs = yield* FileSystem;
+  const url = yield* gitSetting("http.proxy");
+  if (isNone2(url)) {
+    return yield* new GitHubFailed({
+      message: `${authKey} is git-proxy, but git has no http.proxy for https://github.com`
+    });
+  }
+  const caFile = yield* gitSetting("http.sslCAInfo");
+  const ca = isNone2(caFile) ? none2() : some2(yield* fs.readFileString(caFile.value).pipe(mapError2((error) => new GitHubFailed({
+    message: `can't read git's http.sslCAInfo ${caFile.value}: ${error.message}`
+  }))));
+  const connection = {
+    proxy: some2({ ca, url: url.value }),
+    token: make19("proxy-injected")
+  };
+  return connection;
+});
+var connection = gen2(function* () {
+  const jj = yield* Jj;
+  const auth = (yield* jj.read(["config", "get", authKey]).pipe(orElseSucceed2(() => ""))).trim();
+  switch (auth) {
+    case "":
+    case "token": {
+      const own = { proxy: none2(), token: yield* ownToken };
+      return own;
+    }
+    case "git-proxy": {
+      return yield* gitProxy;
+    }
+    default: {
+      return yield* new GitHubFailed({
+        message: `${authKey} is ${JSON.stringify(auth)}; set it to token or git-proxy`
+      });
+    }
+  }
+});
+
 // src/clients/github/repository.ts
 var repositoryFromUrl = (url) => {
   const match = /github\.com[:/](?<owner>[^/]+)\/(?<name>[^/]+?)(?:\.git)?\/?$/u.exec(url.trim());
@@ -18573,7 +18636,7 @@ var GitHubFromOrigin = unwrap(gen2(function* () {
   if (isNone2(repository)) {
     return yield* new GitHubFailed({ message: "the `origin` remote isn't a GitHub repository" });
   }
-  return GitHubLive(repository.value);
+  return GitHubLive(repository.value, yield* connection);
 }));
 
 // src/cli/gh/log.ts

package/package.json

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