Skip to content

Default registry is https://registry.zpkg.net - #44

Closed
ORESoftware wants to merge 1 commit into
mainfrom
feat/default-registry-zpkg-net
Closed

ORESoftware wants to merge 1 commit into
mainfrom
feat/default-registry-zpkg-net

Conversation

@ORESoftware

@ORESoftware ORESoftware commented Aug 7, 2026 •

Copy link
Copy Markdown
Contributor

Superseded by clean current-main PR #47.

The intended src/registry.rs change was salvaged byte-for-byte into a one-file commit on current main. This PR carried an accidental 257-file / 500k-line history and is closed to prevent unrelated bulk changes from entering the interface contract.

Salvaged:

  • DEFAULT_REGISTRY_URL = "https://registry.zpkg.net"
  • adjacent production-host comment

Successor: #47

Matches zed-cli, which already ships pointing at registry.zpkg.net;
zpkg.tech is parked.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@ORESoftware

Copy link
Copy Markdown
Contributor Author

Coordination: this PR and #44 are on structurally different trees

Flagging before either merges, because whichever lands first forces the other to be redone rather than rebased.

#43 (this) #44 (feat/default-registry-zpkg-net)
Layout polyglot — src/rust/, src/dart/, src/ts/ flat — src/manifest.rs, src/registry.rs
Merge base d36ac52 d36ac52
Vendored node_modules files 0 250

#44 edits src/registry.rs; on this branch that file is src/rust/registry.rs. Git sees modify-vs-rename across the whole tree, so this is not an ordinary conflict — the loser gets re-applied by hand.

This is upstream of more than these two PRs. Phase 1 of zpkg Self-Hosted Registries and Private Deps is "Protocol v1 RFC in zed-interfaces" — it lands in whichever layout wins, so the decision gates that project's first phase too.

Two secondary notes on #44, offered as observations rather than review:

  • It commits 250 node_modules/ files and src/dart/.dart_tool/ build artifacts, including a .snapshot binary. The polyglot-layout commit on this branch added CI that gates generated slices; vendored dependency trees would be caught by it.
  • Its change (src/registry.rs, default registry URL) is small and self-contained. If the polyglot layout is the intended direction, re-applying Default registry is https://registry.zpkg.net #44 on top is a handful of lines; the reverse is a full re-authoring of a ~1,800-line module.

No action requested here — recording it so whoever sequences these two is choosing deliberately.

Related coordination: DEN-2880 records three contracts this work shares with the self-hosted-registries project (URL-embedded credentials, ZPKG_TOKEN_* vs ZED_*_TOKEN, and why per-registry name normalization cannot be one global lowercase rule).

@linear-code

linear-code Bot commented Aug 8, 2026

Copy link
Copy Markdown

DEN-2831

ORESoftware added a commit that referenced this pull request Aug 8, 2026
Replace the non-resolving registry.zpkg.tech interface default with registry.zpkg.net in the shared contract. Exact-head Rust, schema, Nix, and policy checks passed; supersedes the accidental bulk-history PR #44.
@ORESoftware

Copy link
Copy Markdown
Contributor Author

Heads-up from a parallel thread — 98 of this PR's 100 changed files are build artifacts: src/ts/node_modules/**, src/dart/.dart_tool/**, pubspec.lock, package-lock.json.

They are not yours. They were untracked leftovers in the shared working tree from the polyglot-slice work, and this branch was cut from main at d36ac52 — whose .gitignore predates the entries that cover them. A git add -A on that base sweeps them in.

Two ways out, both cheap:

  1. Rebase onto baseline/polyglot-layout (6ad1ad3), which carries the .gitignore update (node_modules/, src/dart/.dart_tool/, src/dart/pubspec.lock) plus the src/rust/ restructure this PR will otherwise conflict with; or
  2. Stay on main and drop the paths: git rm -r --cached src/ts/node_modules src/dart/.dart_tool and cherry-pick the .gitignore hunk.

Worth resolving before merge either way: this PR touches src/registry.rs, which baseline/polyglot-layout has moved to src/rust/registry.rs. Whichever lands second inherits the rename conflict, so it is cheaper to pick the order deliberately than to discover it at merge time.

Context on the baseline: it is validated end to end — all workflows green in the zed-pkg-test fixture org, and the four-target publish/install now proven against an R2-backed registry (see DEN-2752).

@ORESoftware

Copy link
Copy Markdown
Contributor Author

Update: the polyglot layout is now on main (#58 merged). Two consequences for this PR.

The rename collision is live. main no longer has src/registry.rs — it is src/rust/registry.rs. This branch still edits the old path, so it needs a rebase before it can merge.

The good news is the rebase also cleans this up for free. 98 of the 100 changed files here are build artifacts (src/ts/node_modules/**, src/dart/.dart_tool/**, lockfiles) that were swept in because this branch was cut from a base whose .gitignore predated them. Current main ignores all of those paths, so rebasing onto it and re-staging leaves only the two files this PR is actually about.

git fetch origin
git rebase origin/main          # resolve src/registry.rs -> src/rust/registry.rs
git rm -r --cached src/ts/node_modules src/dart/.dart_tool  # if any survive

Not touching the branch myself — it is yours. Flagging because the conflict grows with every commit to either side.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant