Repository navigation
DEN-3945: consolidate macs-mbp local branches into main (2026-09-12 sweep) - #20
Merged
Merged
Conversation
4 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
Uncommitted changes captured via a temporary index; the working tree, index and stash were not modified.
…tegrate 20260912) Branch 162aba2 is a 2026-09-05 working-tree snapshot adding the ORES lint v1.3 wiring (ores-lint workflow, analysis_options.yaml, eslint.config.mjs, sdk lint:ores scripts). .github/workflows/ores-lint.yml (add/add): took the branch version. Main's copy is the unmodified v1.0 rollout file (only 490772e touched it); the branch's copy is a strict superset (detects JS/Rust/Dart/Gleam from tracked sources, installs Node for the require-send scanner, optional setup-dart). The matching v1.3 .ores-lint scripts arrive with the macs-mbp snapshot merge. sdk/package.json (conflict): kept main's rxjs subpath export, rxjs peer/dev dependencies and compact formatting (DEN-3970 bffd17e); added the branch's lint:ores and prepublishOnly scripts and the oresLint declaration. No dependency change, so sdk/package-lock.json stays main's. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…t integrate 20260912) Snapshot 3dd1237 (macs-mbp, base 64717d0) carries the ORES lint toolkit at v1.3.0. Main vendored v1.0.0 in 490772e and has not modified .ores-lint/ since, so this is a pure vendored-toolkit upgrade. .ores-lint/{README.md,VERSION,config.sh,eslint/base.mjs,eslint/formatter.mjs, eslint/plugin.mjs,js.sh,lint.sh,required-tools.json,rust.sh,selftest.sh} (add/add): took the v1.3.0 copies; new dart.sh, gleam.sh, require-send.mjs, nested-repos.json added. This matches the v1.3 ores-lint.yml already taken from wip/land-uncommitted-20260905. sdk/package.json (conflict): kept HEAD (main's rxjs export/peer deps plus the lint:ores scripts from the previous merge); the snapshot's side lacks the DEN-3970 rxjs boundary. Snapshot's other tree differences vs main (ci.yml, dart.yml, source-policy-lint.yml, formal-methods.yml) come from its older base and are not part of its own changes; the merge keeps main's. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Bring the DEN-3945 consolidation branch up to date with current main. No conflicts: main and this branch touched disjoint paths. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Contributor
Author
|
Refreshed against current This PR was opened 2026-09-12 and Verification: Local verification only: several of these orgs have no GitHub Actions budget, so the results above are from this machine. gitleaks exit 0 on the pushed range. No build output, no submodule pin changes. Linear: DEN-3945. 🤖 Generated with Claude Code |
ORESoftware
marked this pull request as ready for review
September 18, 2026 21:25
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.
DEN-3945 branch consolidation — laptop
macs-mbp(2026-09-12)Linear: DEN-3945. This is one laptop's half of the fleet sweep. The other laptop's consolidation PR for this repo is #18; the two cover different local disks and should both land.
Every local branch, linked worktree and uncommitted working-tree change on this machine was first published to GitHub without force (local-only
maincommits →macs-mbp/main-unpushed-20260912, dirty trees →macs-mbp/wip-20260912/*snapshot commits built through a temporary index). This branch starts atorigin/mainandgit merge --no-ffs each branch that is not already contained in or patch-equivalent tomain, oldest first. No rebase, reset, stash or force-push.Merged cleanly
wip/land-uncommitted-20260905— resolved semantically on this branch (decision recorded in the merge commit)origin/macs-mbp/wip-20260912/main— resolved semantically on this branch (decision recorded in the merge commit)Not merged yet — needs semantic resolution per
ORESoftware/my-ai/AGENTS.mdnone
Published refs from this machine
macs-mbp/integrate-20260912macs-mbp/wip-20260912/mainmacs-mbp/wip-20260912/main-170703macs-mbp/wip-20260912/main-171532Status
Draft: not yet verified locally. Conflicted branches will be resolved on this branch conceptually (both intents carried), then the repo's own checks run locally where the org has no Actions budget. Cross-language contracts in these changes are expected to pass
ORESoftware/typespec-json-schema-validatoradmission before this leaves draft.🤖 Generated with Claude Code