Repository navigation
DEN-3945: consolidate all branches into main (2026-09-12 sweep) - #24
Draft
ORESoftware wants to merge 19 commits into
Draft
ORESoftware wants to merge 19 commits into
ORESoftware wants to merge 19 commits into
Conversation
…policy reconciliation
3 file(s) that existed only in this working tree, committed on a side branch without touching the checked-out main or the working tree. Explicit paths; env/dec, keys, build output, files >5MB and secret-bearing files are excluded. Review before merging. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KAAGBnXTSw7zE5xnY4tiBY
Document the authorized worktree location and ensure repository-local temporary directories stay outside version control.
Captured non-destructively from a temporary git index. The working tree, the real index and the stash list were not modified: nothing was stashed, reset, cleaned or popped. This exists so the work is recoverable from GitHub, not only from one laptop. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QXZDwJtqoKithFZQiHMyg8
AGENTS.md requires every repository's .gitignore to ignore both tmp/ and temp/ in trailing-slash form. tmp/ is the one sanctioned scratch location, and this ignore rule is what makes committing with explicit paths safe in a checkout that also holds scratch work. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VntudBLaPGetQaXDbRguZp
…en-3945-consolidate-all-branches-20260912 (DEN-3945)
…nsolidate-all-branches-20260912 (DEN-3945)
Uncommitted changes captured via a temporary index; the working tree, index and stash were not modified.
…tegrate 20260912) Branch a37465a is a 2026-09-05 working-tree snapshot on top of 17dba56; it adopts the ORES lint toolkit (ores-lint workflow, eslint.config.mjs, lint:ores package scripts). Its other differences vs main are older copies that main has since replaced; those are not carried (merge keeps main). .github/workflows/opto-sync-real-web.yml (conflict): kept main's pin c8e03dd + mock_api_origin. The branch's pin 0560cd1 is an ancestor of c8e03dd in opto-sync/opto-sync-e2e, so main's is strictly newer. package.json (conflict): kept main's engines, owls:materialize/check/ test:unit scripts, astro 7.3.1 and devDependencies; added the branch's lint:ores, prepublishOnly, prebuild scripts and the oresLint declaration. lint.sh is warn-only (exit 0 unless ORES_LINT_STRICT=1), so prebuild cannot break the deploy build. Dependencies are unchanged, so package-lock.json stays main's. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…te 20260912) Rescue snapshot 12d12be (2026-09-05, base 17dba56) is the wip/land- uncommitted-20260905 tree plus the vendored .ores-lint/ v1.3 toolkit that the workflow and lint:ores scripts call. Carried: .ores-lint/. package.json (conflict): kept HEAD, which is already main's manifest plus the branch's lint:ores/prepublishOnly/prebuild scripts and oresLint (resolved in the previous merge). The branch's astro ^5.0.0 and bare dev/build scripts are the pre-DEN-3970 manifest that main replaced (19966ab, f9d83d0). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…t integrate 20260912) Snapshot bde34e7 (macs-mbp, 2026-09-12, base 17dba56) has a tree identical to rescue/worktree-20260905 (12d12be), which was merged in the previous commit. Nothing unique remains; recorded for ancestry only. package.json (conflict): kept HEAD, same resolution and reasoning as the rescue/worktree-20260905 merge (main's DEN-3970 manifest + lint:ores scripts); no tree change. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…idate-all-branches-20260912 (DEN-3945)
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Consolidation of all branches into
main— DEN-3945 fleet sweep (2026-09-12)Linear: DEN-3945. Every local branch, worktree and uncommitted change under
~/codeswas published without force; this PR merges every branch not already inmainwith merge commits only, conflicts resolved semantically perORESoftware/my-ai/AGENTS.md. Durable sweep record:ORESoftware/den-3945-fleet-sweep.Semantically resolved and merged
Not merged — already landed / superseded (evidence)
macs-mbp/wip-20260912/main— c1-every-changed-path-landed, and the tip is already an ancestor of the sweep head 433e487 (git merge-base --is-ancestor true).recovered/claude/autosave-997b1775d004-20260822— c1-every-changed-path-landed against the sweep head.recovered/detached/zed-pkg.github.io-f27a10a1f90b-20260822— c3-all-patches-applied; the tip is already an ancestor of the sweep head 433e487.recovered/heads/main-17dba56721d1-20260822— c3-all-patches-applied; the tip is already an ancestor of the sweep head 433e487.rescue/worktree-20260905— c1-every-changed-path-landed; the tip is already an ancestor of the sweep head 433e487.macs-mbp/detached-20260912/560755aa1c93— Stale vendored-toolkit generation. It installs ores-lint 1.0.0 while the sweep head already carries 1.3.0, which additionally ships dart.sh, gleam.sh, nested-repos.json and require-send.mjs. Per-path: eslint.config.mjs and .ores-lint/install-git-hooks.sh are byte-identical on the head, the other 11 .ores-lint paths plus .github/workflows/ores-lint.yml are the 1.0.0 generation, and package.json is strictly older (astro ^5.0.0 instead of the pinned 7.3.1, no engines node pin, and missing the owls:materialize, check, check:state and test:unit scripts the head has).macs-mbp/wip-20260912/detached-560755a— All 19 changed paths are byte-identical on the sweep head except package.json, which is the same strictly older variant described above (astro ^5.0.0 vs pinned 7.3.1, no engines pin, missing four scripts). Contributes nothing.wip/sync-preserve-20260911— Identical situation: all 19 paths byte-identical on the sweep head except the same strictly older package.json. Contributes nothing.test-noop— A pointer into the dist publication chain rather than a feature branch. Its tip 51c0900 is an ancestor of dist/ores-runtime-server-v0.1.1, -v0.1.1-final and -v0.1.2, so its content is fully preserved there, and its tree is a Rust crate snapshot (Cargo.toml, crates/, src/, PROVENANCE.md), not the Astro site that lives on main.Not merged — the branch has its own open PR
Not merged — needs a human/product decision
dist/ores-lru-redis-v0.1.0-4f7c46f, dist/ores-runtime-server-v0.1.0, dist/ores-runtime-server-v0.1.1, dist/ores-runtime-server-v0.1.1-docs, dist/ores-runtime-server-v0.1.1-final, dist/ores-runtime-server-v0.1.2— OUT OF SCOPE BY DESIGN - permanent distribution branches that must be neither merged nor deleted, so they should be excluded from this sweep rather than resolved. Each carries a PROVENANCE.md that states it verbatim: 'This branch is an immutable, source-derived distribution snapshot of the Rust crate maintained in ores-redis-lru-cache/ores-lru-redis.rs' and 'This public branch exists only so repositories in other organizations can resolve an immutable Git dependency without receiving access to the private canonical repository.' Their trees are a Rust crate (Cargo.toml, Cargo.lock, crates/, src/, PROVENANCE.md, RUNTIME_SERVER_PROVENANCE.md); main is the Astro marketing site for zed-pkg deployed to GitHub Pages, so merging any of them would replace the website with a crate. They form one linear chain with a shared merge base at bbdce19 (main, 2026-09-01) and all five earlier ones are ancestors of dist/ores-runtime-server-v0.1.2. Deleting them would break outside consumers that pin them as immutable Git dependencies. Recommend adding a dist/* entry to exclude-branch-globs.txt so future sweep generations skip them.Local verification (exact head
433e487c829c)No new commit was needed: all 15 branches in this claim are either superseded or out of scope by design, so the sweep head 433e487 pushed by a prior generation still stands, and local HEAD equals the remote sweep ref. Its diff against origin/main is 21 files: the ores-lint 1.3.0 toolkit plus .github/workflows/ores-lint.yml, a .gitignore tmp/ temp/ addition, an agents.md worktrees-policy append, eslint.config.mjs, and package.json. Verified on that head with an exported tree: npm ci clean; npm run check (astro check plus the check:state tsc pass) 0 errors, 0 warnings, 0 hints across 23 files; npm run test:unit 10/10 pass; npm run build succeeds, 7 pages built. That build matters because the sweep adds a prebuild hook running lint:ores before every astro build, and .github/workflows/deploy.yml deploys the live site with npm run build. Checked directly: .ores-lint/lint.sh exits 0 unless ORES_LINT_STRICT=1 (it reports only 'no eslint found - skipping' here), so the new hook cannot break the Pages deploy. git diff --check against origin/main clean; git check-ignore probes confirm tmp/, temp/, node_modules/ and dist/ resolve correctly; actionlint clean on all workflows and equally clean on the origin/main baseline. TOOLCHAIN CAVEAT: .node-version pins 24.19.0 and package.json engines requires >=22.19.0, while this machine has Node v22.13.0, so npm ci warned EBADENGINE; the gates above therefore ran on a lower Node than CI uses and are corroborating evidence, not a pass on the pinned runtime. NOT RUN: .github/workflows/agents-policy.yml, which calls a reusable workflow in zed-pkg/zed-monorepo and cannot be executed locally. PRE-EXISTING ISSUE RECORDED, NOT FIXED: .ores-lint/selftest.sh fails here with MODULE_NOT_FOUND because ores-lint 1.3.0 references .ores-lint/require-send.test.mjs, which the toolkit does not ship. This is the known fleet-wide 1.3.0 breakage and it is latent here, since no workflow and no npm script invokes selftest.sh (ores-lint.yml runs lint.sh only).
Contracts (TJSV)
not applicable: this repository contains no TypeSpec files at all (no .tsp anywhere in the tree) and therefore has no TypeSpec plus JSON Schema peer pair. The sweep also touches no schema or contract path - git diff --name-only origin/main HEAD over *.tsp, schema.json and contracts/ is empty.
Merge policy
Draft until verified on the exact head. Where this org has no GitHub Actions minutes, zero-step jobs are admission refusals, not passes.
🤖 Generated with Claude Code