DEN-3945: consolidate all branches into main (2026-09-12 sweep) - #159
Draft
ORESoftware wants to merge 13 commits into
Draft
ORESoftware wants to merge 13 commits into
ORESoftware wants to merge 13 commits into
Conversation
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.15.0 to 3.15.1. - [Changelog](https://github.com/nodeca/js-yaml/blob/3.15.1/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.15.0...3.15.1) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 3.15.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.12 to 1.1.18. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v1.1.12...v1.1.18) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.18 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps and [socket.io-parser](https://github.com/socketio/socket.io). These dependencies needed to be updated together. Updates `socket.io-parser` from 3.3.4 to 3.3.6 - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/socket.io-parser@3.3.6/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io/commits/socket.io-parser@3.3.6) Updates `socket.io-parser` from 3.4.3 to 3.4.5 - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/socket.io-parser@3.3.6/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io/commits/socket.io-parser@3.3.6) --- updated-dependencies: - dependency-name: socket.io-parser dependency-version: 3.3.6 dependency-type: indirect - dependency-name: socket.io-parser dependency-version: 3.4.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Merge the exact-head Dependabot lockfile update carrying the socket.io-parser attachment-limit and zero-attachment fixes. Safety and dependency-drift checks passed; no review threads were open.
Merge the exact-head patch-level security update for js-yaml quadratic !!omap duplicate-key detection. The safety check passed and no review threads were open.
Merge the exact-head lockfile update carrying the v1 backports for GHSA-mh99-v99m-4gvg and CVE-2026-13149. Safety and dependency-drift checks passed, the image job was non-applicable to this lockfile-only change, and no review threads were open.
branch: live-mutex: repair/live-mutex-pr148-check
branch: live-mutex: repair/live-mutex-pr149
Land uncommitted work from the local checkout (5 paths)
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.15.1 to 3.15.2. - [Changelog](https://github.com/nodeca/js-yaml/blob/3.15.2/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.15.1...3.15.2) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 3.15.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Merge dependabot js-yaml security backport into dev after exact-head lock safety contracts, ores-lint, and Dockerfile drift checks passed.
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 found under
~/codeswas published without force (diverged locals →rescue/local-20260912/*, uncommitted work →rescue/wip-20260912/*, never auto-merged). This PR merges every remaining branch with merge commits only — no rebase, reset, stash or force-push.Merged cleanly (0)
Not merged yet — textual conflict, queued for semantic resolution per ORESoftware/my-ai/AGENTS.md (5)
rescue/orphan-b24fcace2c82-wip-on-dev-e5f18a0-fix-test-runner-timeorecovered/stash-semaphore-fix-20251115rescue/stash-0-20260904rescue/stash-0-20260906rescue/stash-0-semaphore-fix-20251115Not merged — the branch has its own open PR (that PR is canonical)
rescue/orphan-f9f0db32e262-on-codex-json-parser-delay-default-codex#147Contracts
Interfaces crossing language/runtime boundaries stay under fail-closed admission by ORESoftware/typespec-json-schema-validator (TJSV): human-authored TypeSpec and JSON Schema Draft 2020-12 are peer authorities; any discrepancy stops promotion.
Merge policy
Draft until verified on the exact head. Where this org has no GitHub Actions minutes, a zero-step job is an admission refusal, not a pass — verify locally and re-run hosted CI when minutes return.
🤖 Generated with Claude Code