@ramon-sg/issue-flow 0.3.0 → 0.3.1

package/dist/commands/pr-worktree.js

@@ -13,7 +13,7 @@ import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { getPr } from "@ramon-sg/github-rest";
 import { canonicalPath } from "../docker.js";
-import { checkedOutAt, git, hasLocal, locateRepo, worktrees } from "../git.js";
+import { checkedOutAt, git, hasLocal, locateRepo, trackOrigin, untracked, worktrees } from "../git.js";
 import { permissionArgs } from "../launch.js";
 import { warn } from "../output.js";
 import { copyWorktreeIncludes } from "../start-place.js";
@@ -45,7 +45,7 @@ function mustGit(cwd, args, message) {
 }
 /**
  * Makes the worktree on the PR's branch: the local branch if there is one (moved forward to
- * origin's when it can be), or a new one tracking origin's.
+ * origin's when it can be), or a new one; either way tracking origin's when it can.
  * @param mainRoot - The main checkout.
  * @param branch - The PR's branch.
  * @param path - The worktree.
@@ -57,14 +57,14 @@ function addWorktree(mainRoot, branch, path, out) {
     const elsewhere = checkedOutAt(mainRoot, branch);
     if (elsewhere !== null)
         throw new StartError(`${branch} is checked out in ${elsewhere}; review it there, or switch that checkout to another branch.`);
-    if (!hasLocal(mainRoot, branch)) {
-        mustGit(mainRoot, ["worktree", "add", "-q", "--track", "-b", branch, path, `origin/${branch}`], `could not make the worktree of ${branch}`);
-        return;
-    }
-    mustGit(mainRoot, ["worktree", "add", "-q", path, branch], `could not make the worktree of ${branch}`);
-    if (!git(path, ["branch", "-q", "--set-upstream-to", `origin/${branch}`]).ok)
-        warn(out, `could not make ${branch} track origin/${branch}.`);
-    if (!git(path, ["merge", "-q", "--ff-only", `origin/${branch}`]).ok)
+    // NOTE: the tracking goes apart, after the worktree: it writes .git/config, which Claude
+    // Code's sandbox forbids, and the worktree is still useful without it.
+    const local = hasLocal(mainRoot, branch);
+    const args = local ? [path, branch] : ["--no-track", "-b", branch, path, `origin/${branch}`];
+    mustGit(mainRoot, ["worktree", "add", "-q", ...args], `could not make the worktree of ${branch}`);
+    if (!trackOrigin(path, branch))
+        warn(out, untracked(branch));
+    if (local && !git(path, ["merge", "-q", "--ff-only", `origin/${branch}`]).ok)
         warn(out, `the local ${branch} does not move forward to origin/${branch}: you see other commits than the PR's.`);
 }
 /**

package/dist/git.d.ts

@@ -28,6 +28,22 @@ export declare function gitLines(cwd: string, args: string[]): string[];
  * @example hasRef("/repo", "refs/heads/main")
  */
 export declare function hasRef(cwd: string, ref: string): boolean;
+/**
+ * Makes a branch track origin's of the same name, unless it already does. The upstream lives
+ * in `.git/config`, which Claude Code's sandbox forbids writing, so this is the only step that
+ * writes it: branches are made with `--no-track` and pushed without `-u`.
+ * @param cwd - The checkout.
+ * @param branch - The branch.
+ * @returns True if it tracks `origin/<branch>` now; false if git could not write it.
+ * @example trackOrigin("/repo", "feat/42-x")
+ */
+export declare function trackOrigin(cwd: string, branch: string): boolean;
+/**
+ * The warning when a branch cannot track origin's.
+ * @param branch - The branch.
+ * @returns The warning.
+ */
+export declare function untracked(branch: string): string;
 /**
  * Whether the branch exists locally.
  * @param cwd - The checkout.

package/dist/git.js

@@ -41,6 +41,29 @@ export function gitLines(cwd, args) {
 export function hasRef(cwd, ref) {
     return git(cwd, ["rev-parse", "-q", "--verify", ref]).ok;
 }
+/**
+ * Makes a branch track origin's of the same name, unless it already does. The upstream lives
+ * in `.git/config`, which Claude Code's sandbox forbids writing, so this is the only step that
+ * writes it: branches are made with `--no-track` and pushed without `-u`.
+ * @param cwd - The checkout.
+ * @param branch - The branch.
+ * @returns True if it tracks `origin/<branch>` now; false if git could not write it.
+ * @example trackOrigin("/repo", "feat/42-x")
+ */
+export function trackOrigin(cwd, branch) {
+    const upstream = git(cwd, ["rev-parse", "-q", "--symbolic-full-name", `${branch}@{u}`]);
+    if (upstream.ok && upstream.out === `refs/remotes/origin/${branch}`)
+        return true;
+    return git(cwd, ["branch", "-q", `--set-upstream-to=origin/${branch}`, branch]).ok;
+}
+/**
+ * The warning when a branch cannot track origin's.
+ * @param branch - The branch.
+ * @returns The warning.
+ */
+export function untracked(branch) {
+    return `could not make ${branch} track origin/${branch} (is .git/config read-only, as in a sandbox?); push with 'git push origin HEAD'.`;
+}
 /**
  * Whether the branch exists locally.
  * @param cwd - The checkout.

package/dist/start-modes.js

@@ -188,7 +188,8 @@ export function prepareHere(state) {
         throw new StartError(`branch ${branch} is only local (on another machine or checkout): push it from there and run this again.`);
     if (hasLocal(mainRoot, branch) && git(mainRoot, ["rev-list", "--count", branch, "--not", `origin/${branch}`]).out !== "0")
         throw new StartError(`the local branch ${branch} has commits that are not in origin; push them or sort it out by hand.`);
-    checkout(["-B", branch, `origin/${branch}`]);
+    // NOTE: --no-track: publish sets the upstream when it can (see trackOrigin).
+    checkout(["--no-track", "-B", branch, `origin/${branch}`]);
 }
 /**
  * The cloud session noted in the PR's body, or null (no PR, none noted, or the PR cannot

package/dist/start-place.js

@@ -9,7 +9,7 @@ import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync } from "node:f
 import { dirname, join, relative } from "node:path";
 import { assign, createPr, findPr, getPr, updatePr } from "@ramon-sg/github-rest";
 import { confirm } from "./ask.js";
-import { checkedOutAt, currentBranch, git, gitLines, hasLocal, isClean, onOrigin, safeToDelete } from "./git.js";
+import { checkedOutAt, currentBranch, git, gitLines, hasLocal, isClean, onOrigin, safeToDelete, trackOrigin, untracked } from "./git.js";
 import { bodyToPartOf, dirName, fill, prBody } from "./issue-text.js";
 import { forgetSession } from "./launch.js";
 import { warn } from "./output.js";
@@ -75,7 +75,9 @@ export function prepareBranch(state) {
     if (state.mode === "worktree") {
         if (existsSync(state.workDir))
             return;
-        const args = found === null ? ["-b", branch, `origin/${base}`] : [branch];
+        // NOTE: --no-track, since tracking writes .git/config, which Claude Code's sandbox
+        // forbids; publish sets the branch's upstream when it can (see trackOrigin).
+        const args = found === null ? ["--no-track", "-b", branch, `origin/${base}`] : hasLocal(mainRoot, branch) ? [branch] : ["--no-track", "-b", branch, `origin/${branch}`];
         const result = git(mainRoot, ["worktree", "add", "-q", state.workDir, ...args]);
         if (!result.ok)
             throw new StartError(`could not create the worktree: ${result.err}. If a sandbox stopped it, run in a terminal: ${again(state.options.number, "--yes")}`);
@@ -85,8 +87,10 @@ export function prepareBranch(state) {
         return;
     if (!isClean(mainRoot))
         throw new StartError("the main checkout has uncommitted changes; commit or stash them first. No stash is made.");
-    if (found !== null)
-        return mustGit(mainRoot, ["checkout", "-q", branch], `could not check out ${branch}`);
+    if (found !== null) {
+        const args = hasLocal(mainRoot, branch) ? [branch] : ["--no-track", "-b", branch, `origin/${branch}`];
+        return mustGit(mainRoot, ["checkout", "-q", ...args], `could not check out ${branch}`);
+    }
     if (currentBranch(mainRoot) !== base)
         throw new StartError(`the main checkout is not on ${base}.`);
     if (git(mainRoot, ["rev-list", "--count", `origin/${base}..${base}`]).out !== "0")
@@ -133,9 +137,9 @@ export async function publish(state) {
         mustGit(workDir, ["commit", "-q", "--allow-empty", "--only", "-m", message], "could not make the start commit");
     }
     if (commit || !onOrigin(workDir, branch))
-        mustGit(workDir, ["push", "-q", "-u", "origin", branch], `could not push ${branch}`);
-    if (!git(workDir, ["rev-parse", "-q", "--verify", "@{u}"]).ok)
-        git(workDir, ["branch", "-q", `--set-upstream-to=origin/${branch}`, branch]);
+        mustGit(workDir, ["push", "-q", "origin", branch], `could not push ${branch}`);
+    if (!trackOrigin(workDir, branch))
+        warn(state.out, untracked(branch));
     let number = state.pr?.number ?? null;
     if (number === null) {
         const created = await createPr(options.repo, {

package/dist/start-summary.d.ts

@@ -22,7 +22,7 @@ export declare function describeBranch(state: StartState, branch: string, withPr
  * The actions it will take, joined with " + ".
  * @param state - The start.
  * @returns The text.
- * @example plannedActions(state) // "create the branch from origin/main + empty commit + push -u + …"
+ * @example plannedActions(state) // "create the branch from origin/main + empty commit + push + …"
  */
 export declare function plannedActions(state: StartState): string;
 /**

package/dist/start-summary.js

@@ -53,7 +53,7 @@ export function describeBranch(state, branch, withPr) {
  * The actions it will take, joined with " + ".
  * @param state - The start.
  * @returns The text.
- * @example plannedActions(state) // "create the branch from origin/main + empty commit + push -u + …"
+ * @example plannedActions(state) // "create the branch from origin/main + empty commit + push + …"
  */
 export function plannedActions(state) {
     if (state.mode === "cloud")
@@ -65,7 +65,7 @@ export function plannedActions(state) {
     if (commit)
         actions.push("empty commit");
     if (commit || !onOrigin(mainRoot, branch))
-        actions.push("push -u");
+        actions.push("push");
     if (state.pr === null) {
         const first = prBody(state.options.config.start.prBody, number, state.kind, state.issue.url).split("\n")[0];
         actions.push(`draft PR (${first})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramon-sg/issue-flow",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Issue-to-PR workflow for any repo: names each issue's branch, creates its worktree, opens the draft PR and launches Claude Code, locally and in Claude's cloud.",
   "license": "MIT",
   "type": "module",