- Swap parent order in reconcile_filter_change(): josh-filtered must
be first parent so josh can follow first-parent traversal to map
history back to the monorepo. Old subrepo history on parent 2.
- Add tree comparison in reverse_sync() before commit detection:
if subrepo tree matches josh-filtered tree, skip immediately.
Prevents false positive PRs after reconciliation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Add --ancestry-path to git log in reverse_sync() to prevent old
subrepo history from leaking through reconciliation merge parents.
Without this, every old subrepo commit appears as a "human commit"
triggering a spurious 0-commit PR on the monorepo.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Three bugs found during first CI run after enabling :exclude:
- Derive old filter (:/subfolder) when state has no josh_filter stored
(pre-v1.2 upgrade path)
- Detect unrelated histories in forward_sync() and fall back to
reconcile_filter_change() instead of creating a useless conflict PR
- Skip state update on conflict result (prevents storing wrong filter
and mono SHA that blocks retries)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
When the exclude list changes, josh-proxy recomputes filtered history
with new SHAs, breaking common ancestry with the subrepo. Instead of
requiring a manual reset (force-push), forward sync now detects the
filter change and creates a reconciliation merge commit that connects
the old and new histories — no force-push, no re-clone needed.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The :+ stored filter syntax doesn't work in josh-proxy URLs.
Inline :exclude[::p1,::p2] works directly — no files to generate
or commit, no extra dependencies.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Josh-proxy's parser treats "/" in :+ paths as a filter separator,
so :+.josh-filters/backend fails. Use flat naming at repo root:
.josh-filter-<target>.josh referenced as :+.josh-filter-<target>.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
New `exclude` config field per target generates .josh-filters/<name>.josh
files with josh :exclude clauses. Josh-proxy applies exclusions at the
transport layer — excluded files never appear in the subrepo.
Preflight checks that generated filter files are committed.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Instead of fetching the API diff (which has context-sensitive patches
that break after josh-filtered reset), fetch the archived repo's
branches directly as a second remote and compute the diff locally.
Apply with git apply --3way for resilience against context mismatches.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
initial_import() now accepts an optional clone URL override parameter.
onboard_flow() passes the archived repo URL so content is cloned from
the right source.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
New commands for safely onboarding existing subrepos into the monorepo
without losing open PRs:
- josh-sync onboard <target>: interactive, resumable 5-step flow
(import → wait for merge → reset to new repo)
- josh-sync migrate-pr <target> [PR#...] [--all]: migrate PRs from
archived repo to new repo via patch application
Also refactors create_pr() to wrap create_pr_number(), eliminating
duplicated curl/jq logic.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- SC2015: Wrap A && B || C patterns in brace groups for directive scope
- SC2064: Suppress for intentional early trap expansion (local vars)
- SC2164: Add || exit to cd commands in subshells
- SC2001: Suppress for sed URL injection (clearer than parameter expansion)
- SC1083: Handle {tree} git syntax (quote or suppress)
- SC1091: Suppress for runtime-resolved source paths
- SC2034: Remove unused exit codes (E_OK, E_CONFIG, E_AUTH)
- SC2116: Eliminate useless echo in mono_auth_url construction
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
