Skip to content

Commit c2905d5

Browse files
author
Hermes PR Integrator
committed
docs: refresh auto-integration manifest
Refresh the unattended auto-integration manifest after the 2026-06-01 10:34 run. No contributor PR head advanced; direct probes still leave Luce-Org#305, Luce-Org#237, Luce-Org#221, Luce-Org#154, Luce-Org#153, and Luce-Org#135 as selective-port/runtime-validation candidates.
1 parent a30e204 commit c2905d5

2 files changed

Lines changed: 22 additions & 16 deletions

File tree

.github/auto-integration/stack.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
updated_at: 2026-06-01T10:14:48-04:00
1+
updated_at: 2026-06-01T10:49:10-04:00
22
repository: Luce-Org/lucebox-hub
33
integration_branch: auto-integration
44
remotes:
55
upstream: origin
66
writable: easel
77
heads:
88
upstream_main: 8305b6c2
9-
easel_auto_integration_before_refresh: 8b8713a3
10-
current_integration_head_before_refresh: 8b8713a3
11-
refreshed_head: 87ce1d9d
9+
easel_auto_integration_before_refresh: a30e2049
10+
current_integration_head_before_refresh: a30e2049
11+
refreshed_head: a30e2049
1212
base_before_run: auto-integration
1313
stack:
1414
included:
@@ -56,12 +56,12 @@ stack:
5656
- {pr: 298, note: Gemma4 destructor-link fix}
5757
- {pr: 292, note: backend IPC payload-pipe support}
5858
attempted_this_run:
59-
- {pr: 305, head: 1de45e4d, status: conflicts-selective-port-candidate, worktree: /tmp/luce-auto-cron-20260601-100813/probe-pr-305, note: fresh direct merge probe still broad (61 status entries / 38 unmerged paths); broader common/Laguna refactor deferred}
60-
- {pr: 237, head: 02c6a6c4, status: conflicts-selective-port-candidate, worktree: /tmp/luce-auto-cron-20260601-100813/probe-pr-237, note: fresh direct merge probe still old-layout MTP foundation conflicts (33 status entries / 27 unmerged paths); tmux Claude reached max turns without a usable report, no source slice promoted}
61-
- {pr: 221, head: 05502974, status: conflicts-suggested-close-superseded, worktree: /tmp/luce-auto-cron-20260601-100813/probe-pr-221, note: fresh direct merge probe still broad (88 status entries / 25 unmerged paths); prior Codex review found no safe current-layout behavior slice without Qwen36 MTP module/runtime validation}
62-
- {pr: 154, head: 2f4ede79, status: conflicts-dependency-blocked, worktree: /tmp/luce-auto-cron-20260601-100813/probe-pr-154, note: fresh direct merge probe still conflicts (13 status entries / 12 unmerged paths); prior Codex review found no safe independent slice before PR153/PR237 reconciliation}
63-
- {pr: 153, head: e9b17cb1, status: conflicts-dependency-blocked, worktree: /tmp/luce-auto-cron-20260601-100813/probe-pr-153, note: fresh direct merge probe still conflicts (10 status entries / 10 unmerged paths); old-layout target graph/MTP runtime conflicts remain coupled to PR237 foundation}
64-
- {pr: 135, head: 561b0ac1, status: partial-selective-port-promoted, worktree: /tmp/luce-auto-cron-20260601-100813/probe-pr-135, note: direct merge still conflicts in internal.h, qwen35_target_graph.cpp, and test_dflash.cpp; Codex identified/promoted reset_target_cache last_tok=-1 slice and rejected broader runtime/test conflict content without runtime validation}
59+
- {pr: 305, head: 1de45e4d, status: conflicts-selective-port-candidate, worktree: /tmp/luce-auto-cron-20260601-103804/probe-pr-305, note: fresh direct merge probe still broad (61 status entries / 38 unmerged paths); broader common/Laguna refactor deferred}
60+
- {pr: 237, head: 02c6a6c4, status: conflicts-selective-port-candidate, worktree: /tmp/luce-auto-cron-20260601-103804/probe-pr-237, note: fresh direct merge probe still old-layout MTP foundation conflicts (33 status entries / 27 unmerged paths); no source slice promoted this run}
61+
- {pr: 221, head: 05502974, status: conflicts-suggested-close-superseded, worktree: /tmp/luce-auto-cron-20260601-103804/probe-pr-221, note: fresh direct merge probe still broad (88 status entries / 25 unmerged paths); tmux Codex transcript streamed conflicted excerpts but produced no final feasibility report; no safe current-layout behavior slice promoted}
62+
- {pr: 154, head: 2f4ede79, status: conflicts-dependency-blocked, worktree: /tmp/luce-auto-cron-20260601-103804/probe-pr-154, note: fresh direct merge probe still conflicts (13 status entries / 12 unmerged paths); prior Codex review found no safe independent slice before PR153/PR237 reconciliation}
63+
- {pr: 153, head: e9b17cb1, status: conflicts-dependency-blocked, worktree: /tmp/luce-auto-cron-20260601-103804/probe-pr-153, note: fresh direct merge probe still conflicts (10 status entries / 10 unmerged paths); old-layout target graph/MTP runtime conflicts remain coupled to PR237 foundation}
64+
- {pr: 135, head: 561b0ac1, status: partial-selective-port-candidate, worktree: /tmp/luce-auto-cron-20260601-103804/probe-pr-135, note: direct merge still conflicts in internal.h, qwen35_target_graph.cpp, and test_dflash.cpp; no additional source slice promoted this run}
6565
pending: []
6666
blocked_needs_human:
6767
- {pr: 305, reason: remaining Laguna/common-MoE hybrid refactor is broad/non-minimal beyond existing selective ports}
@@ -90,7 +90,7 @@ stack:
9090
- combined local Python/YAML validation command was blocked by unattended command guard and not retried
9191
- full CMake not rerun; prior local CUDA compiler-id sm_52 ptxas failure and missing server/deps/llama.cpp still block local full configure
9292
notes:
93-
- Primary checkout /home/erik/Projects/luce2 was clean at start on auto-integration; reconciliation happened in /tmp/luce-auto-cron-20260601-100813.
93+
- Primary checkout /home/erik/Projects/luce2 was clean at start on auto-integration; reconciliation happened in /tmp/luce-auto-cron-20260601-103804.
9494
- origin/main 8305b6c2 remains ancestor of auto-integration.
9595
- Open PR enumeration reported 36 non-draft PRs and 4 draft/excluded PRs; after this run 30 current non-draft PR heads are exact ancestors and 6 remain blocked/selective-port candidates.
96-
- This run promoted a narrow PR135 cache-reset seed fix; broader PR305 common/Laguna refactor and remaining MTP/scheduler candidates stay selective-port/runtime-validation blocked.
96+
- This run was manifest-only; no open non-draft PR head advanced and no source slice was promoted. Broader PR305 common/Laguna refactor and remaining MTP/scheduler candidates stay selective-port/runtime-validation blocked.

docs/auto-integration.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ Repository: `Luce-Org/lucebox-hub`
44
Integration branch: `auto-integration`
55
Writable remote: `easel`
66
Upstream remote: `origin` / `Luce-Org`
7-
Last refresh: `2026-06-01T10:14:48-04:00`
7+
Last refresh: `2026-06-01T10:49:10-04:00`
88
Current base: `origin/main` `8305b6c2`
9-
Previous integration tip: `easel/auto-integration` `8b8713a3`
10-
Current integration source tip before this refresh: `8b8713a3`
9+
Previous integration tip: `easel/auto-integration` `a30e2049`
10+
Current integration source tip before this refresh: `a30e2049`
1111

1212
This branch is maintained as a reproducible patch stack over `origin/main`. This unattended run started from a clean primary checkout on `auto-integration`, verified GitHub/Claude/Codex auth using the real user credential home, fetched `origin` and `easel` separately, fetched current non-draft PR heads, and checked exact PR-head containment against the stack tip.
1313

14-
The current stack contains 30 exact current open non-draft PR heads after integrating PR #329 in the previous refresh, plus an additional narrow #135 selective-port fix from this run (`reset_target_cache` now clears `TargetCache::last_tok` together with `cur_pos`). Six current non-draft PRs remain non-ancestor/selective-port candidates: #305, #237, #221, #154, #153, and #135. Fresh direct-merge probes reconfirmed conflicts for all six remaining candidates. Tmux-driven Codex for #135 identified the promoted cache-reset seed fix and rejected the broader conflicted runtime/test changes as structurally incompatible without runtime validation; tmux-driven Claude for #237 reached its max-turn limit without a usable report. Existing selective salvage still covers #305's `DFLASH_EXPERT_BUDGET_PCT`, Qwen35MoE gallocr/full-chunk FFN work, and PR305 persistent prefill `StepGraph` reuse slice; #237's common MTP helper scaffold; and #135's diagnostic/control-plane multi-request scheduler scaffolds. The remaining live runtime paths are blocked on broad current-layout reconciliation and runtime validation.
14+
The current stack still contains 30 exact current open non-draft PR heads; no open non-draft PR head advanced since the prior pushed refresh. Six current non-draft PRs remain non-ancestor/selective-port candidates: #305, #237, #221, #154, #153, and #135. Fresh direct-merge probes reconfirmed conflicts for all six remaining candidates. A tmux-driven Codex pass for #221 was stopped after it streamed conflicted file excerpts rather than a final feasibility report; no source slice was promoted this run. Existing selective salvage still covers #305's `DFLASH_EXPERT_BUDGET_PCT`, Qwen35MoE gallocr/full-chunk FFN work, and PR305 persistent prefill `StepGraph` reuse slice; #237's common MTP helper scaffold; and #135's diagnostic/control-plane multi-request scheduler scaffolds plus cache-reset seed fix. The remaining live runtime paths are blocked on broad current-layout reconciliation and runtime validation.
1515

1616
## Included in the current non-draft stack
1717

@@ -54,6 +54,12 @@ Closed, upstreamed, or no-longer-open PRs still represented by the stack/base in
5454

5555
This run performed (latest first):
5656

57+
- `date -Is` -> `2026-06-01T10:34:40-04:00` / `2026-06-01T10:49:10-04:00` during this refresh; primary checkout was clean on `auto-integration`, auth/tooling checks succeeded using the real user credential home (`gh auth status`, `claude auth status --text`, and `codex --help`), and `origin` / `easel` were fetched separately. Current refs were `origin/main` `8305b6c2`, `easel/auto-integration` `a30e2049`, and source tip `a30e2049`; `origin/main` was already represented.
58+
- Open PR enumeration reported 36 non-draft PRs and 4 draft/excluded PRs. Exact-head containment after explicit PR ref fetch showed 30 current open non-draft PR heads included; remaining non-ancestor/selective-port candidates remain #305, #237, #221, #154, #153, and #135.
59+
- Fresh worktree direct-merge probes were run under `/tmp/luce-auto-cron-20260601-103804/`. Conflict counts remain #305 (61 status / 38 unmerged), #237 (33 / 27), #221 (88 / 25), #154 (13 / 12), #153 (10 / 10), and #135 (3 / 3).
60+
- Tmux-driven Codex session `luce1038-pr221-codex` in `/tmp/luce-auto-cron-20260601-103804/probe-pr-221` wrote transcript `/tmp/luce-codex-pr221-103804.txt` but was stopped after streaming conflicted file excerpts rather than a final feasibility report. Manual status inspection confirmed no source changes were made in the reconcile worktree and no #221 slice was promoted.
61+
- Validation for this manifest-only refresh: `git diff --check` passed and targeted conflict-marker search in changed files found none. Full CMake validation was not rerun because no source code changed and prior attempts in this checkout remain blocked by missing populated `server/deps/llama.cpp` plus the local CUDA compiler-id `sm_52` `ptxas` failure before project compilation.
62+
5763
- `date -Is` -> `2026-06-01T10:06:55-04:00` / `2026-06-01T10:14:48-04:00` during this refresh; primary checkout was clean on `auto-integration`, auth/tooling checks succeeded using the real user credential home (`gh auth status`, `claude auth status --text`, `codex --help`, and `tmux -V`), and `origin` / `easel` were fetched separately. Current refs were `origin/main` `8305b6c2`, `easel/auto-integration` `8b8713a3`, and source tip `8b8713a3`; `origin/main` was already represented.
5864
- Open PR enumeration reported 36 non-draft PRs and 4 draft/excluded PRs. Exact-head containment after explicit PR ref fetch showed 30 current open non-draft PR heads included; remaining non-ancestor/selective-port candidates remain #305, #237, #221, #154, #153, and #135.
5965
- Fresh worktree direct-merge probes were run under `/tmp/luce-auto-cron-20260601-100813/`. Conflict counts remain #305 (61 status / 38 unmerged), #237 (33 / 27), #221 (88 / 25), #154 (13 / 12), #153 (10 / 10), and #135 (3 / 3).

0 commit comments

Comments
 (0)