git gtr new hardcodes origin for default base ref

[scarf005]

git gtr new <branch> defaults to origin/<default-branch> and fetches origin only.

In repos where origin is a fork and upstream is the canonical remote, new worktrees start from an outdated base even when upstream/main is current.

Current behavior:

• resolves the default branch from refs/remotes/origin/HEAD
• falls back to origin/main or origin/master
• fetches origin only
• creates the new branch from origin/<default-branch>

Expected behavior:

• allow choosing the base remote explicitly
• or detect and use the canonical remote instead of hardcoding origin

[traycerai]

Warning

Ticket Assist will be discontinued on May 1, 2026. After that date, the feature will no longer be available. We suggest installing the Traycer IDE Extension for continued AI-powered, spec-driven development. Thank you for choosing Traycer!

Plan

Observations

The hardcoding of origin is spread across three places:

1. resolve_default_branch in file:lib/core.sh (lines 134, 142–144) — reads refs/remotes/origin/HEAD and falls back to origin/main / origin/master
2. _create_resolve_from_ref in file:lib/commands/create.sh (lines 76, 81) — prepends origin/ to the resolved default branch
3. create_worktree in file:lib/core.sh (lines 427, 378, 391, 396, 446, 449) — calls git fetch origin and hardcodes origin/ in tracking messages and _check_branch_refs

The existing config system (cfg_default) already supports a gtr.defaultBranch / GTR_DEFAULT_BRANCH override, so the same pattern can be used for a new gtr.defaultRemote / GTR_DEFAULT_REMOTE setting.

Approach

Introduce a resolve_default_remote helper that reads a new gtr.defaultRemote / GTR_DEFAULT_REMOTE config key (defaulting to origin). Thread this resolved remote name through resolve_default_branch, _check_branch_refs, _worktree_add_tracked, create_worktree, and _create_resolve_from_ref. Also add a --remote flag to cmd_create for per-invocation overrides. This is the minimal, idiomatic change that mirrors how gtr.defaultBranch already works.

---

Implementation Steps

1. Add resolve_default_remote to file:lib/core.sh

Add a new function immediately before resolve_default_branch:

• Read config key gtr.defaultRemote with env fallback GTR_DEFAULT_REMOTE, defaulting to "origin" (use cfg_default exactly as resolve_default_branch does for gtr.defaultBranch).
• Print the resolved remote name.

2. Update resolve_default_branch in file:lib/core.sh

Change the function signature to accept an optional remote parameter (second positional arg, defaulting to the result of resolve_default_remote):

• Replace the hardcoded refs/remotes/origin/HEAD with refs/remotes/${remote}/HEAD and strip refs/remotes/${remote}/ in the sed expression.
• Replace refs/remotes/origin/main and refs/remotes/origin/master fallback checks with refs/remotes/${remote}/main and refs/remotes/${remote}/master.

3. Update _check_branch_refs in file:lib/core.sh

Change the function signature to accept a remote parameter (second positional arg):

• Replace the hardcoded refs/remotes/origin/$1 with refs/remotes/${remote}/$1.

4. Update _worktree_add_tracked in file:lib/core.sh

Change the function signature to accept a remote parameter (third positional arg, after branch_name):

• Replace origin/$branch_name in the git branch --track call and in log messages with ${remote}/$branch_name.

5. Update create_worktree in file:lib/core.sh

Add a remote parameter (tenth positional arg, defaulting to resolve_default_remote):

• Pass "$remote" to _check_branch_refs "$branch_name" "$remote".
• Replace git fetch origin with git fetch "$remote" and update the warning message accordingly.
• Pass "$remote" to _worktree_add_tracked.
• In track_mode=remote branch, replace hardcoded origin/$branch_name refs and messages with ${remote}/$branch_name.

6. Update _create_resolve_from_ref in file:lib/commands/create.sh

Add a remote parameter (fourth positional arg):

• Replace both occurrences of "origin/$(resolve_default_branch "$repo_root")" with "${remote}/$(resolve_default_branch "$repo_root" "$remote")".

7. Add --remote flag to cmd_create in file:lib/commands/create.sh

• Add --remote: value to the _spec string in cmd_create.
• Capture local remote="${_arg_remote:-$(resolve_default_remote)}".
• Pass "$remote" as the fourth argument to _create_resolve_from_ref.
• Pass "$remote" as the tenth argument to create_worktree.

8. Update _check_branch_refs call sites in file:lib/core.sh

Ensure the auto|* and remote track-mode branches in create_worktree also use ${remote}/$branch_name in their _try_worktree_add calls (lines 446, 449).

---

Data Flow After Changes

sequenceDiagram
    participant User
    participant cmd_create
    participant _create_resolve_from_ref
    participant resolve_default_remote
    participant resolve_default_branch
    participant create_worktree
    participant _check_branch_refs
    participant _worktree_add_tracked

    User->>cmd_create: git gtr new <branch> [--remote upstream]
    cmd_create->>resolve_default_remote: (if no --remote flag)
    resolve_default_remote-->>cmd_create: remote (from gtr.defaultRemote / GTR_DEFAULT_REMOTE / "origin")
    cmd_create->>_create_resolve_from_ref: from_ref, from_current, repo_root, remote
    _create_resolve_from_ref->>resolve_default_branch: repo_root, remote
    resolve_default_branch-->>_create_resolve_from_ref: default branch name
    _create_resolve_from_ref-->>cmd_create: remote/default-branch
    cmd_create->>create_worktree: ..., remote
    create_worktree->>create_worktree: git fetch <remote>
    create_worktree->>_check_branch_refs: branch_name, remote
    create_worktree->>_worktree_add_tracked: wt_path, branch_name, remote, force_args

Loading

---

Configuration Reference (README update)

Add a row to the configuration table in file:README.md:

Key	Env var	Default	Description
gtr.defaultRemote	GTR_DEFAULT_REMOTE	origin	Remote used for fetch, default branch detection, and new branch base

Document the --remote flag under the git gtr new section alongside the existing --from flag.

Import In IDE

🤖 Prompt for AI Agents

## Observations

The hardcoding of `origin` is spread across three places:
1. `resolve_default_branch` in `file:lib/core.sh` (lines 134, 142–144) — reads `refs/remotes/origin/HEAD` and falls back to `origin/main` / `origin/master`
2. `_create_resolve_from_ref` in `file:lib/commands/create.sh` (lines 76, 81) — prepends `origin/` to the resolved default branch
3. `create_worktree` in `file:lib/core.sh` (lines 427, 378, 391, 396, 446, 449) — calls `git fetch origin` and hardcodes `origin/` in tracking messages and `_check_branch_refs`

The existing config system (`cfg_default`) already supports a `gtr.defaultBranch` / `GTR_DEFAULT_BRANCH` override, so the same pattern can be used for a new `gtr.defaultRemote` / `GTR_DEFAULT_REMOTE` setting.

## Approach

Introduce a `resolve_default_remote` helper that reads a new `gtr.defaultRemote` / `GTR_DEFAULT_REMOTE` config key (defaulting to `origin`). Thread this resolved remote name through `resolve_default_branch`, `_check_branch_refs`, `_worktree_add_tracked`, `create_worktree`, and `_create_resolve_from_ref`. Also add a `--remote` flag to `cmd_create` for per-invocation overrides. This is the minimal, idiomatic change that mirrors how `gtr.defaultBranch` already works.

---

## Implementation Steps

### 1. Add `resolve_default_remote` to `file:lib/core.sh`

Add a new function immediately before `resolve_default_branch`:

- Read config key `gtr.defaultRemote` with env fallback `GTR_DEFAULT_REMOTE`, defaulting to `"origin"` (use `cfg_default` exactly as `resolve_default_branch` does for `gtr.defaultBranch`).
- Print the resolved remote name.

### 2. Update `resolve_default_branch` in `file:lib/core.sh`

Change the function signature to accept an optional `remote` parameter (second positional arg, defaulting to the result of `resolve_default_remote`):

- Replace the hardcoded `refs/remotes/origin/HEAD` with `refs/remotes/${remote}/HEAD` and strip `refs/remotes/${remote}/` in the `sed` expression.
- Replace `refs/remotes/origin/main` and `refs/remotes/origin/master` fallback checks with `refs/remotes/${remote}/main` and `refs/remotes/${remote}/master`.

### 3. Update `_check_branch_refs` in `file:lib/core.sh`

Change the function signature to accept a `remote` parameter (second positional arg):

- Replace the hardcoded `refs/remotes/origin/$1` with `refs/remotes/${remote}/$1`.

### 4. Update `_worktree_add_tracked` in `file:lib/core.sh`

Change the function signature to accept a `remote` parameter (third positional arg, after `branch_name`):

- Replace `origin/$branch_name` in the `git branch --track` call and in log messages with `${remote}/$branch_name`.

### 5. Update `create_worktree` in `file:lib/core.sh`

Add a `remote` parameter (tenth positional arg, defaulting to `resolve_default_remote`):

- Pass `"$remote"` to `_check_branch_refs "$branch_name" "$remote"`.
- Replace `git fetch origin` with `git fetch "$remote"` and update the warning message accordingly.
- Pass `"$remote"` to `_worktree_add_tracked`.
- In `track_mode=remote` branch, replace hardcoded `origin/$branch_name` refs and messages with `${remote}/$branch_name`.

### 6. Update `_create_resolve_from_ref` in `file:lib/commands/create.sh`

Add a `remote` parameter (fourth positional arg):

- Replace both occurrences of `"origin/$(resolve_default_branch "$repo_root")"` with `"${remote}/$(resolve_default_branch "$repo_root" "$remote")"`.

### 7. Add `--remote` flag to `cmd_create` in `file:lib/commands/create.sh`

- Add `--remote: value` to the `_spec` string in `cmd_create`.
- Capture `local remote="${_arg_remote:-$(resolve_default_remote)}"`.
- Pass `"$remote"` as the fourth argument to `_create_resolve_from_ref`.
- Pass `"$remote"` as the tenth argument to `create_worktree`.

### 8. Update `_check_branch_refs` call sites in `file:lib/core.sh`

Ensure the `auto|*` and `remote` track-mode branches in `create_worktree` also use `${remote}/$branch_name` in their `_try_worktree_add` calls (lines 446, 449).

---

## Data Flow After Changes

```mermaid
sequenceDiagram
    participant User
    participant cmd_create
    participant _create_resolve_from_ref
    participant resolve_default_remote
    participant resolve_default_branch
    participant create_worktree
    participant _check_branch_refs
    participant _worktree_add_tracked

    User->>cmd_create: git gtr new <branch> [--remote upstream]
    cmd_create->>resolve_default_remote: (if no --remote flag)
    resolve_default_remote-->>cmd_create: remote (from gtr.defaultRemote / GTR_DEFAULT_REMOTE / "origin")
    cmd_create->>_create_resolve_from_ref: from_ref, from_current, repo_root, remote
    _create_resolve_from_ref->>resolve_default_branch: repo_root, remote
    resolve_default_branch-->>_create_resolve_from_ref: default branch name
    _create_resolve_from_ref-->>cmd_create: remote/default-branch
    cmd_create->>create_worktree: ..., remote
    create_worktree->>create_worktree: git fetch <remote>
    create_worktree->>_check_branch_refs: branch_name, remote
    create_worktree->>_worktree_add_tracked: wt_path, branch_name, remote, force_args
```

---

## Configuration Reference (README update)

Add a row to the configuration table in `file:README.md`:

| Key | Env var | Default | Description |
|---|---|---|---|
| `gtr.defaultRemote` | `GTR_DEFAULT_REMOTE` | `origin` | Remote used for fetch, default branch detection, and new branch base |

Document the `--remote` flag under the `git gtr new` section alongside the existing `--from` flag.

---

Execution Information

Branch: main
Commit: 025de7f

---

💡 Tips

Supported Commands (Inside Comments)

• Use @traycerai generate to iterate on the previous version of the implementation plan.

Supported Commands (Inside Description)

• Add @traycerai ignore anywhere in the ticket description to prevent this ticket from being processed.
• Add @traycerai branch:<branch-name> anywhere in the ticket description to specify the target branch for the implementation plan.

Community

• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.