Skip to content

merge queue: checking #52 + #37 + #54 + #44 together on main (49113bc) - #55

Closed
mergify[bot] wants to merge 13 commits into
mainfrom
mergify/merge-queue/37feafcb6f
Closed

mergify[bot] wants to merge 13 commits into
mainfrom
mergify/merge-queue/37feafcb6f

Conversation

@mergify

@mergify mergify Bot commented Oct 2, 2026 •

Copy link
Copy Markdown
Contributor

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

#52 + #37 + #54 + #44 are queued together for merge on branch main (49113bc).

This pull request has been created by Mergify to check the mergeability of [#52 + #37 + #54 + #44].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: 49113bc2a99cab3e89d68ec1391b58b7950995d5
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 52
    scopes: []
  - number: 37
    scopes: []
  - number: 54
    scopes: []
  - number: 44
    scopes: []
scopes: []
...

Cuarroc and others added 13 commits September 26, 2026 16:29
@tauri-apps/plugin-updater 2.12.0, @tauri-apps/cli 2.11.5,
@types/node 24.13.6, jsdom 30.1.1, typescript-eslint 8.70.1.

@xterm/addon-fit 0.11 and @xterm/addon-search 0.16 from the same group
are deliberately NOT taken: they are the xterm 6 companion addons and
this project stays on xterm 5.5 (docs/decisions.md 2026-09-23).
addon-fit 0.11 fails xtermFitCompat.test.ts ("expected 100 to be 99").

The updater crate already resolves to 2.12.0 in Cargo.lock, so JS and
Rust match; allowDowngrades is not used anywhere (default false).

No-Test: dependency bump; covered by the existing suites (npm test 342 passed, lint, tsc, build)

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Ignore @xterm/addon-fit and @xterm/addon-search like @xterm/xterm and
@xterm/addon-webgl, so the monthly npm group does not reopen the red
PR #2. Record the decision and the plugin-updater 2.12 finding.

No-Test: dependabot config and decision log, no executable behaviour

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Migration 23 adds audit_log (id, ts, actor, action, subject, detail_json) with
BEFORE UPDATE / BEFORE DELETE triggers that abort, a json_valid CHECK, and
Store::append_audit as the only writer. No caller yet: the kill switch
(W5-04a) is the first user.

Test-First: src-tauri/src/store/audit.rs
No-Test: documentation only
Test-First: src-tauri/src/store/audit.rs::replace_cannot_rewrite_an_existing_audit_id
Test-First: src-tauri/src/store/audit.rs::migration_rejects_preexisting_objects_with_the_wrong_shape
Validate idempotent migration objects and reject replacement of existing audit ids. Narrow the documented protection boundary to ordinary DML.

Test-First: src-tauri/src/store/audit.rs::replace_cannot_rewrite_an_existing_audit_id
Test-First: src-tauri/src/store/audit.rs::migration_rejects_preexisting_objects_with_the_wrong_shape
Test-First: src-tauri/src/store/audit.rs::replace_cannot_rewrite_an_existing_audit_id
Test-First: src-tauri/src/store/audit.rs::migration_rejects_preexisting_objects_with_the_wrong_shape
Add the MIT LICENSE file and declare `license = "MIT"` in package.json,
the package-lock root entry and src-tauri/Cargo.toml. User decision
2026-10-02.

No-Test: license metadata only; no runtime behavior changed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
E2: W4-01 benchmark shrinks to 5 tasks. E7: extended W5 core confirmed.
E8: Codex gpt-6-astra first for seams/security confirmed. SETUP-14:
ollama sign-in and OpenCode models observed working on 2026-10-02.

No-Test: documentation-only plan status update; no runtime behavior changed.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
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