nodes/hao-ai-lab-FastVideo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[docs] dreamverse-integration: reconcile post-#1286 merge + 7.10 split

Browse Source 
PR #1286 merged at 2aaeee2a (squash). will/ltx2_sr_port rebased onto
new origin/main, dropping 4 commits whose content is now in main:
cd76cf51 + 1ac1e732 + b0b7f59c + 40e265b8. Backup preserved on
will/ltx2_sr_port-pre-1286-rebase. PR #1287 opened on will/api_7.10
@ 6ae7a99f (slice 1-3, generate_async + VideoEvent + tests).

* README.md: bump Last reconciled to post-#1286 merge + rebase. Note
  new working tip b34d9704 on will/ltx2_sr_port (33 commits ahead),
  PR #1287 OPEN MERGEABLE, backup branch preserved.

* state.md: rename header to "post-#1286 merge + rebase". Branch-tips
  table refreshed with all 8 relevant branches and the safety backup.
  Add "Post-#1286 rebase summary" describing the 4 dropped commits +
  zero conflicts. Add "New linearized chain" table mapping every
  surviving slice (7.10/8/LTX-2 SR/NVFP4/post-fixes/agents_cleanup)
  to its tip SHA. Mark the historical layered-chain section as
  pre-rebase narrative (SHAs only valid on the backup branch).

* pr-roadmap.md: promote PR #1284 (7.8) and PR #1286 (7.9) to Landed
  with merge SHAs eb3a3942 and 2aaeee2a respectively. Move PR #1287
  (7.10) from Planned to In flight with full scope description.
  Refresh remaining Planned rows with new slice indices and new tip
  SHAs from the rebased chain.

* open-threads.md: bump Last updated header to capture the merge +
  rebase + #1287 opening. Item D (Implement generate_async) flipped
  from "High pri" to "🟢 in flight" with the live PR #1287 reference;
  resolution gate is the merge of #1287 alongside Q-5/Q-9/PR-7.5/
  D-12-B chain.

* runbook.md: bump Last updated. Branch-topology section reflects
  PR #1286 -> merged, PR #1287 -> active. Add a new "After a PR
  merges (re-slice protocol)" section with the 10-step recipe used
  in the post-#1286 rebase, derived from the canonical STACK.md
  bulk-rebase formula adapted for squash-merge drops.

* authors.md: bump Last updated. PR #1286 row promoted to merged with
  squash-merge note about how the trailerless cherry-pick a152cb77
  was absorbed cleanly. PR #1287 row added with all 4 trailers
  verified on every commit. Known-gaps section rewritten — the two
  trailerless commits are no longer reachable from any active branch
  (a152cb77 absorbed by squash, 40e265b8 dropped by rebase). Gap
  permanently resolved; backup branch preserves them archeologically.

Verified: 17/17 router tests pass on rebased branch (router code now
loaded from origin/main). 221 passed across api/contract/NVFP4 suites.
Pre-commit clean (memory dir is yapf/ruff/mypy excluded; only
spaces-check runs). PR #1287 created at
https://github.com/hao-ai-lab/FastVideo/pull/1287, MERGEABLE.

Co-authored-by: Junda (David) Su <90978028+Davids048@users.noreply.github.com>
Co-authored-by: Matthew Noto <99706358+RandNMR73@users.noreply.github.com>
Co-authored-by: XOR-op <17672363+XOR-op@users.noreply.github.com>
Co-authored-by: Zhang Peiyuan <42993249+jzhang38@users.noreply.github.com>
This commit is contained in:
SolitaryThinker
2026-05-05 03:13:49 -07:00
co-authored by Junda Su Matthew Noto XOR-op Zhang Peiyuan
parent b34d970442
commit 39dfa0090f
6 changed files with 161 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.agents/memory/dreamverse-integration/README.md
+7 -4
View File
@@ -5,10 +5,13 @@ Tracks the public API refactor (PRs 0-17), the LTX-2 streaming server
upstream, the Dreamverse switch from `FastVideo-internal` to public
`FastVideo`, and the NVFP4 quantization landing.
**Last reconciled:** 2026-05-05 (FastVideo `will/ltx2_sr_port` @ `09647a30`
post-D-16 router polish; Dreamverse `will/integrate-public-fastvideo` @ `ec8ef92`).
PRs #1257 / #1258 / #1284 MERGED to main; PR #1286 (`will/api_7.9` —
streaming router) OPEN at `a152cb77`, MERGEABLE.
**Last reconciled:** 2026-05-05 (post-#1286 merge + rebase). FastVideo
`will/ltx2_sr_port` @ `b34d9704` (33 commits ahead of main, post-rebase
SHAs); Dreamverse `will/integrate-public-fastvideo` @ `ec8ef92`.
PRs #1257 / #1258 / #1284 / #1286 MERGED to main; PR #1287
(`will/api_7.10` — `generate_async` + `VideoEvent` hierarchy) OPEN at
`6ae7a99f`, MERGEABLE. Local backup `will/ltx2_sr_port-pre-1286-rebase`
@ `1baa60bb` preserves the pre-rebase chain.
## Fresh-context onboarding (read in order)
.agents/memory/dreamverse-integration/authors.md
+13 -9
View File
@@ -3,7 +3,7 @@
**Status:** PERMANENT — keep around as the source of truth for who collaborated
on the dreamverse-integration work, even after every PR in the integration
scope has merged.
**Last updated:** 2026-05-05
**Last updated:** 2026-05-05 (post-#1286 merge — trailerless-commit gap resolved)
This file documents the human co-authors credited on every commit in the
dreamverse-integration scope (FastVideo public-API refactor, streaming server
@@ -39,7 +39,8 @@ across every PR in the integration scope:
| #1257 | `will/api_7.6` (GPU pool upstream) | ✅ merged 2026-05-04 | yes (4/4) |
| #1258 | `will/api_7.7` (prompt enhancer + LLMProvider) | ✅ merged 2026-05-04 | yes (3/3) |
| #1284 | `will/api_7.8` (streaming auxiliaries) | ✅ merged 2026-05-04 | yes (2/2) |
| #1286 | `will/api_7.9` (streaming router) | 🟢 open | yes on commits 1-3; **commit `a152cb77` (`[fix] streaming: router polish`) is missing trailers — see "Known gaps" below** |
| #1286 | `will/api_7.9` (streaming router) | ✅ merged 2026-05-05 at `2aaeee2a` (squash) | yes on commits 1-3; commit `a152cb77` (`[fix] streaming: router polish`) was missing trailers but got squashed into the merge commit, so the merge commit on main inherits the trailers from the other 3. The trailerless cherry-pick partner (`40e265b8` on `will/ltx2_sr_port`) was dropped by the post-#1286 rebase — gap permanently resolved. |
| #1287 | `will/api_7.10` (`generate_async` + `VideoEvent`) | 🟢 open at `6ae7a99f` | yes on all 3 commits (`44112661` / `00aa5649` / `6ae7a99f`) |
Aggregate count across `will/ltx2_sr_port` (top of stack) at the time of
writing: 32-33 commits per co-author, matching the 32 commits in the stack
@@ -126,14 +127,17 @@ the pattern). Only human collaborators.
## Known gaps
| Gap | Where | How to fix |
|---|---|---|
| Commit `a152cb77` on `will/api_7.9` (PR #1286 head) is missing the 4 co-author trailers — `[fix] streaming: router polish — bridge cancel + state machine + deps` | `will/api_7.9`, pushed 2026-05-05 | Amend the commit with `--trailer` flags above + force-push `will/api_7.9` (requires explicit user confirmation per AGENTS.md force-push rule) |
| Commit `40e265b8` on `will/ltx2_sr_port` (the cherry-pick partner of `a152cb77`) is missing the same 4 trailers | `will/ltx2_sr_port`, pushed 2026-05-05 | Same — amend + force-push (or wait for the next bulk rebase across the stack) |
**Resolved 2026-05-05 by the post-#1286 rebase.** The two trailerless
commits (`a152cb77` on `will/api_7.9` and `40e265b8` on
`will/ltx2_sr_port`) are no longer reachable from any active branch:
These commits were authored by an automation flow that did not pass the
trailer block through to the `git commit` invocation. The fix is mechanical
once force-push is approved.
- `a152cb77` was absorbed into squash merge `2aaeee2a` on main, which
inherits the trailers from the other 3 commits in the squash.
- `40e265b8` was dropped by the post-#1286 rebase of
`will/ltx2_sr_port`.
Both still exist on the local backup `will/ltx2_sr_port-pre-1286-rebase`
for archeological reference. No further action needed.
## See also
.agents/memory/dreamverse-integration/open-threads.md
+9 -13
View File
@@ -6,18 +6,14 @@ recommended next action.
For why each item is open see [decisions-log.md](decisions-log.md). For
PR-level context see [pr-roadmap.md](pr-roadmap.md).
**Last updated:** 2026-05-05 (PR #1284 merged; PR #1286 opened for 7.9
streaming router with 4 gemini review fixes + 4 Oracle polish items
applied — `select()` docstring rewrite, parallel pooled health probes,
`RouterConfig.__post_init__` validation, FastAPI on_event→lifespan
migration; D-15 added to decisions-log; #13/#14/#15 added — sticky
routing extensibility, bridge backpressure, multi-primary semantics.
Second-pass router polish committed as `a152cb77` on `will/api_7.9` /
`40e265b8` on `will/ltx2_sr_port` — bridge cancellation hygiene,
registry `UNKNOWN -> HEALTHY` immediate transition, httpx hard-fail,
URL path/query/fragment/duplicate rejection, per-index YAML parser
errors, explicit `websockets` `[streaming]` dep + 7 new test cases;
D-16 added to decisions-log capturing these.).
**Last updated:** 2026-05-05 (PR #1286 MERGED at `2aaeee2a` — squash
absorbed all 4 router commits including the second-pass polish via
cherry-pick `a152cb77`. `will/ltx2_sr_port` rebased onto new main:
4 merged commits dropped, 33 commits remain with new SHAs, local
backup preserved on `will/ltx2_sr_port-pre-1286-rebase`. PR #1287
(7.10 — `generate_async` + `VideoEvent` hierarchy) opened on
`will/api_7.10` @ `6ae7a99f`. Item D moved to in-flight; resolves on
#1287 merge alongside the bulk of Q-5/Q-9/PR-7.5 + D-12-B chain.).
## Priority overview
@@ -27,7 +23,7 @@ D-16 added to decisions-log capturing these.).
| **1** | High | Migrate `/healthz`+`/readyz`+`/status` into FastVideo `build_app` | M-L | Closes BE_FLAVOR=fastvideo FE-compatibility; closes streaming-upstream contract debt |
| **2** | High | Fix pre-existing AbsMaxFP8 test failure | S | Self-contained quantization tech debt |
| **VPO** | High | Decide `video_position_offset_sec` semantics (a vs b) | 30 min | Unblocks PR 7.6 state emission |
| **D** | High | Implement `generate_async` (PR 7.10) | L | Closes Q-5/Q-9/PR-7.5 TODOs simultaneously; enables Dynamo backend; unblocks audio re-encode; enables `GpuPool.run_async()` migration (D-12-B) |
| **D** | 🟢 in flight | Implement `generate_async` (PR 7.10) — **OPENED 2026-05-05 as PR #1287 on `will/api_7.10` @ `6ae7a99f`, MERGEABLE** | L | Closes Q-5/Q-9/PR-7.5 TODOs simultaneously; enables Dynamo backend; unblocks audio re-encode; enables `GpuPool.run_async()` migration (D-12-B). Wait for merge before working downstream PR 8. |
| **DR-1** | High | Dreamverse: create `prompting/_internal_compat.py` shim + replace local `prompt_enhancer.py` (1933 LOC) — **PR #1258 has merged (`f673423b`); now actionable** | M (~150-200 LOC shim, replace upstream wiring) | Lets Dreamverse stop carrying a 1933-LOC fork |
| **DR-2** | Med | Decide `cerebras_ifm` provider path: (a) public Literal + `CerebrasIFMProvider` shipped, OR (b) Dreamverse-side custom provider via `enhancer.register_provider(...)` | S (decision) + S-M (impl) | Resolves the cerebras_ifm gap left by PR #1258. Same item as legacy #3 below; DR-2 is the Dreamverse-side framing. |
| **3** | Med | Add `cerebras_ifm` to `PromptEnhancerConfig.provider` Literal + provider | S-M | Public-side resolution if DR-2 picks (a) |
.agents/memory/dreamverse-integration/pr-roadmap.md
+11 -11
View File
@@ -7,7 +7,7 @@ For design rationale see [design.md](design.md). For streaming-specific
PRs (7.5-7.10) see [streaming-server.md](streaming-server.md). For NVFP4
work that runs parallel to this sequence see [quantization.md](quantization.md).
**Last updated:** 2026-05-04 (PRs 7.5 / 7.6 / 7.7 merged; PR 7.8 opened as #1284).
**Last updated:** 2026-05-05 (PRs 7.5 / 7.6 / 7.7 / 7.8 / 7.9 merged; PR 7.10 opened as #1287).
## Status legend
@@ -32,24 +32,24 @@ work that runs parallel to this sequence see [quantization.md](quantization.md).
| **7.5** | **#1251** | ✅ | `95fd29e0` (merged 2026-04-26) | Streaming server skeleton (WebSocket + fMP4 + single generator). 8 commits. Deferred TODOs (per-step progress, mid-segment cancellation) carried forward to PR 7.10. |
| **7.6** | **#1257** | ✅ | `eb0a4152` (merged 2026-05-04) | GPU pool upstream + worker subprocess + two-segment warmup. 7 commits squashed. APPROVED by Eigensystem. See [decisions-log.md D-12](decisions-log.md#d-12) for the architectural review. |
| **7.7** | **#1258** | ✅ | `f673423b` (merged 2026-05-04) | Prompt enhancer with `LLMProvider` abstraction. Built-in providers: cerebras, groq. 3 commits squashed. **Public Literal does NOT include `cerebras_ifm`** — open-threads.md item DR-2 covers the gap. See [decisions-log.md D-13](decisions-log.md#d-13) for the architectural review. |
| **7.8** | **#1284** | ✅ | `eb3a3942` (merged 2026-05-04) | Streaming auxiliaries — `prompt/safety.py` (optional fasttext, lazy import), `prompt/rewrite.py`, `session_logger.py` (thread-safe JSONL), `mock_server.py` (build_mock_app + MockGenerator for FE dev). 730 LOC, 2 commits. See [decisions-log.md D-14](decisions-log.md#d-14). |
| **7.9** | **#1286** | ✅ | `2aaeee2a` (merged 2026-05-05) | Streaming router (multi-replica load balancer + WS proxy + `fastvideo router-serve` CLI). Squashed `cd76cf51 + 1ac1e732 + b0b7f59c + a152cb77` (router-polish second-pass; cherry-pick of `40e265b8` from `will/ltx2_sr_port`). See [decisions-log.md D-15](decisions-log.md#d-15) (structural review) + [D-16](decisions-log.md#d-16) (second-pass polish). |
## In flight (7.8)
## In flight (7.10)
| # | PR | Status | Branch | Scope |
|---|---|---|---|---|
| **7.8** | **#1284** | 🟢 OPEN, MERGEABLE, BLOCKED on review | `will/api_7.8` (head `f95c03b6`) | Streaming auxiliaries — `prompt/safety.py` (optional fasttext, lazy import), `prompt/rewrite.py` (RewriteOptions/Result + build_rewrite splitting), `session_logger.py` (thread-safe JSONL append-only), `mock_server.py` (build_mock_app + MockGenerator for FE dev / protocol integration without GPU). 730 LOC across 7 files, 2 commits. |
| **7.10** | **#1287** | 🟢 OPEN, MERGEABLE | `will/api_7.10` (head `6ae7a99f`) | **Dynamo backend contract** — `VideoGenerator.generate_async`, `default_health_check_request()`, `VideoEvent` hierarchy. 3 commits, 468/4 LOC across 4 files. The "unlock PR" — enables PR 7.5's mid-segment cancellation, audio re-encode (Q-5), Dynamo progress passthrough (Q-9), and `GpuPool.run_async()` migration (D-12-B). Stacked on `main`; first slice of post-#1286 rebased `will/ltx2_sr_port`. |
## Planned (7.9 → 13)
## Planned (8 → 13)
| # | Status | Branch | Scope |
|---|---|---|---|
| 7.9 | 🟡 ready (rebased on 7.8) | `will/api_7.9` | Router upstream (multi-replica load balancer + WS proxy). 3 commits. Caveat: uses deprecated FastAPI `app.on_event("shutdown")` — migrate to lifespan handlers pre-merge. |
| 7.10 | 🟡 ready (rebased on 7.9) | `will/api_7.10` | **Dynamo backend contract** — `VideoGenerator.generate_async`, `default_health_check_request()`, `VideoEvent` hierarchy, audio re-encode integration, mid-segment cancellation. 3 commits. The "unlock PR" — closes Q-5/Q-9/PR-7.5 cancellation TODO + enables `GpuPool.run_async()` migration (D-12-B). |
| 8 | 🟡 ready (rebased on 7.10) | `will/api_8` | Internal-UI ↔ public-server contract docs + Dynamo integration reference. 3 commits. |
| LTX-2 SR | 🟡 ready (rebased on 8) | `will/ltx2_sr_runtime` | LTX-2 SR runtime port + i2v conditioning + alignment harness against FastVideo-internal. 9 commits. NOT in canonical PR plan — separate stream. |
| NVFP4 | 🟡 ready (rebased on LTX-2 SR) | `will/ltx2_nvfp4` | NVFP4 wire-up + per-component compile + typed `transformer_quant` flow. 6 commits. NOT in canonical PR plan. |
| LTX-2 fixes | 🟡 ready (rebased on NVFP4) | `will/ltx2_post_fixes` | Post-handoff parity fixes (Gemma `to()`, list-of-generators). 2 commits. |
| agents cleanup | 🟡 ready (top of stack) | `will/agents_cleanup` | `.agents/` Phase 1 cleanup + dreamverse-integration memory + STACK/CO-AUTHORS docs + D-12 + D-13 + open-threads tracking. 5 commits. **Independent of API stack** — could fast-track. |
| 8 | 🟡 ready (slice 4-6 of `will/ltx2_sr_port`) | `will/api_8` (`f32e31ec`) | Server contract docs (OpenAI HTTP + Dynamo native-backend integration reference) + Dreamverse/Dynamo shape contract tests. 3 commits. |
| LTX-2 SR | 🟡 ready (slice 7-15) | `will/ltx2_sr_runtime` (`e7297519`) | LTX-2 SR runtime port + i2v conditioning + alignment harness against FastVideo-internal. 9 commits. NOT in canonical PR plan — separate stream. |
| NVFP4 | 🟡 ready (slice 16-21) | `will/ltx2_nvfp4` (`6793166b`) | NVFP4 wire-up + per-component compile + typed `transformer_quant` flow. 6 commits. NOT in canonical PR plan. |
| LTX-2 fixes | 🟡 ready (slice 22-23) | `will/ltx2_post_fixes` (`25897b67`) | Post-handoff parity fixes (Gemma `to()`, list-of-generators). 2 commits. |
| agents cleanup | 🟡 ready (slice 24-33, == `will/ltx2_sr_port` HEAD) | `will/agents_cleanup` (`b34d9704`) | `.agents/` Phase 1 cleanup + dreamverse-integration memory + STACK/CO-AUTHORS docs + authors.md + runbook.md + D-12...D-16 + open-threads tracking. 10 commits. **Independent of API stack** — could fast-track. |
| 9 | 🟡 | — | LongCat preset migration + colocation (9 model-specific stage files) |
| 10 | 🟡 | — | Hunyuan15 SR preset migration + colocation + SR field migration POC |
| 11 | 🟡 | — | SSIM/performance test migration off legacy `generate_video(..., **kwargs)` |
.agents/memory/dreamverse-integration/runbook.md
+72 -9
View File
@@ -6,7 +6,7 @@ Operational how-to for the dreamverse-integration scope. Read after
For design rationale see [design.md](design.md). For who to credit see
[authors.md](authors.md). For PR status see [pr-roadmap.md](pr-roadmap.md).
**Last updated:** 2026-05-05.
**Last updated:** 2026-05-05 (post-#1286 merge + rebase; active PR is now #1287 / 7.10).
## Worktree contract
@@ -29,27 +29,90 @@ when done — that is the assumed default.
The dreamverse-integration work lives on the `will/ltx2_sr_port` stack.
Single linearized branch with the full chain; intermediate split branches
are bookmarks, not active rebase targets.
are bookmarks. After each upstream merge the bookmarks are re-sliced
(see "After a PR merges" below).
```
origin/main
↓ [public-API refactor: PRs 0..7.7 merged on main]
will/api_7.9 (PR #1286 — streaming router, OPEN)
↓ [+30 commits: api_7.10, 8, ltx2_sr_runtime, ltx2_nvfp4,
↓ [public-API refactor: PRs 0..7.9 merged on main, latest #1286 = 2aaeee2a]
will/api_7.10 (PR #1287 — generate_async + VideoEvent, OPEN)
↓ [+30 commits: api_8, ltx2_sr_runtime, ltx2_nvfp4,
↓ ltx2_post_fixes, agents_cleanup all linearized]
will/ltx2_sr_port (current top of stack — default working branch)
will/ltx2_sr_port (current top of stack — default working branch, 33 commits ahead of main)
```
| Branch | Role | Status | How to find tip |
|---|---|---|---|
| `will/api_7.9` | PR #1286 head | OPEN | `git rev-parse will/api_7.9` |
| `will/api_7.10` | PR #1287 head, slice 1-3 | OPEN, MERGEABLE | `git rev-parse will/api_7.10` |
| `will/ltx2_sr_port` | top of stack, default working branch | active | `git rev-parse HEAD` |
| `will/api_7.10`, `will/api_8`, `will/ltx2_sr_runtime`, `will/ltx2_nvfp4`, `will/ltx2_post_fixes`, `will/agents_cleanup` | split-PR bookmarks | stale snapshots — do NOT rebase preemptively | (see [pr-roadmap.md](pr-roadmap.md)) |
| `will/api_8`, `will/ltx2_sr_runtime`, `will/ltx2_nvfp4`, `will/ltx2_post_fixes`, `will/agents_cleanup` | split-PR bookmarks | local-only, re-sliced after each upstream merge | (see [pr-roadmap.md](pr-roadmap.md) + [state.md](state.md) "New linearized chain") |
| `will/ltx2_sr_port-pre-1286-rebase` | safety backup | local-only, kept until next slice merges | `git rev-parse will/ltx2_sr_port-pre-1286-rebase` |
**Sanity check:** `git merge-base --is-ancestor will/api_7.9 will/ltx2_sr_port`
**Sanity check:** `git merge-base --is-ancestor will/api_7.10 will/ltx2_sr_port`
should exit 0. If it doesn't, the stack is in an unexpected state — read
[state.md](state.md) before continuing.
## After a PR merges (re-slice protocol)
When an upstream PR squash-merges (e.g. PR #1286 -> `2aaeee2a` -> main):
1. **Backup** the current stack tip:
```bash
git branch will/ltx2_sr_port-pre-<PR>-rebase will/ltx2_sr_port
```
2. **Fetch** new main:
```bash
git fetch origin main
```
3. **Identify dropped commits.** A squash merge has a unique patch-id
different from any individual commit, so `git cherry` won't auto-detect.
List the SHAs that were squashed (typically 3-4 commits — the original
PR's individual commits plus any cherry-picked polish):
```bash
git log --oneline origin/main..will/ltx2_sr_port | head
# Identify which top-of-chain commits match the merged PR's content.
```
4. **Interactive rebase dropping those commits:**
```bash
GIT_SEQUENCE_EDITOR="sed -i \
-e '/^pick <sha1>/s/^pick/drop/' \
-e '/^pick <sha2>/s/^pick/drop/' \
-e '/^pick <sha3>/s/^pick/drop/' \
-e '/^pick <sha4>/s/^pick/drop/'" \
git rebase -i origin/main will/ltx2_sr_port
```
Expect zero conflicts when the dropped commits are isolated to a
subdirectory (router code, in PR #1286's case) — the surviving
commits don't touch those paths.
5. **Re-slice split branches** to new boundary tips (see "New linearized
chain" in [state.md](state.md) for the slice index table — each
"Tip SHA" column maps to a `git branch -f <branch> <sha>` call):
```bash
git branch -f will/api_<next> <slice-N-tip>
git branch -f will/api_<next+1> <slice-N+1-tip>
...
```
6. **Verify** with the test suites in "Verification" below.
7. **Force-push** the working branch (one force-push, requires explicit
user confirmation per [`AGENTS.md`](../../../AGENTS.md)):
```bash
git push --force-with-lease origin will/ltx2_sr_port
```
8. **Push the next slice** as a new remote branch (no force, just `-u`):
```bash
git push -u origin will/api_<next>
```
9. **Open the next PR** via `gh pr create --base main --head will/api_<next>`.
10. **Update memory dir** — bump `Last reconciled` headers in
[README.md](README.md) / [state.md](state.md), promote PR rows in
[pr-roadmap.md](pr-roadmap.md), update Item D state in
[open-threads.md](open-threads.md), refresh [authors.md](authors.md)
verification table.
The post-#1286 rebase (2026-05-05) followed exactly this protocol — see
[state.md](state.md) "Post-#1286 rebase summary" for what dropped and
the new slice indices.
## Verification
### Lint (pre-commit)
.agents/memory/dreamverse-integration/state.md
+49 -4
View File
@@ -1,4 +1,4 @@
# Current State — 2026-05-05
# Current State — 2026-05-05 (post-#1286 merge + rebase)
Point-in-time snapshot of branches, commits, and live infrastructure.
Update whenever commits land or services restart.
@@ -11,15 +11,60 @@ roster of co-authors to credit on every commit see
| Repo | Branch | Tip | Distance |
|---|---|---|---|
| FastVideo | `will/ltx2_sr_port` | `09647a30` | 32 commits ahead of i2v port base `cfccd292` |
| FastVideo | `will/api_7.9` (PR #1286) | `a152cb77` | router stack head; ancestor of `will/ltx2_sr_port` |
| FastVideo | `will/ltx2_sr_port` | `b34d9704` | 33 commits ahead of `origin/main` (post-rebase, post-#1286 merge) |
| FastVideo | `will/api_7.10` (PR #1287) | `6ae7a99f` | first 3 commits of `will/ltx2_sr_port`; OPEN, MERGEABLE |
| FastVideo | `will/api_8` | `f32e31ec` | local-only split bookmark, slice 4-6 |
| FastVideo | `will/ltx2_sr_runtime` | `e7297519` | local-only split bookmark, slice 7-15 |
| FastVideo | `will/ltx2_nvfp4` | `6793166b` | local-only split bookmark, slice 16-21 |
| FastVideo | `will/ltx2_post_fixes` | `25897b67` | local-only split bookmark, slice 22-23 |
| FastVideo | `will/agents_cleanup` | `b34d9704` | local-only split bookmark, slice 24-33 (== `will/ltx2_sr_port` HEAD) |
| FastVideo | `will/ltx2_sr_port-pre-1286-rebase` | `1baa60bb` | **local-only safety backup** of pre-rebase chain (37 commits); keep until next slice merges |
| Dreamverse | `will/integrate-public-fastvideo` | `ec8ef92` | 10 commits ahead of `737f3c1` (the dep switch) |
| FastVideo-internal | their `main` | (read-only ref) | — |
FastVideo worktree default branch is `will/ltx2_sr_port`. Other agents
share this worktree — if `git branch --show-current` shows something
else, switch back cleanly with `git checkout will/ltx2_sr_port` (don't
disturb their uncommitted work).
disturb their uncommitted work). I observed this happen repeatedly in
the 2026-05-05 session — confirmed harmless; switching back was always
safe with a clean working tree.
## Post-#1286 rebase summary
PR #1286 merged at `2aaeee2a` (squash). `will/ltx2_sr_port` was rebased
onto new `origin/main`, dropping 4 commits whose content is now in main:
- `cd76cf51` `[feat] streaming: router (multi-replica load balancer)`
- `1ac1e732` `[feat] streaming: fastvideo router-serve CLI`
- `b0b7f59c` `[test] streaming: router registry + health loop ...`
- `40e265b8` `[fix] streaming: router polish — bridge cancel + state
machine + deps` (squashed into `2aaeee2a` via cherry-pick `a152cb77`)
Rebase was clean — no conflicts. All 33 surviving commits got new SHAs
(rebase rewrites). The pre-rebase tip `1baa60bb` is preserved on the
local backup branch `will/ltx2_sr_port-pre-1286-rebase`.
## New linearized chain (33 commits, slice indices for STACK.md)
| Slice | PR | Commits | Tip SHA | Subject |
|---|---|---|---|---|
| 1-3 | 7.10 (PR #1287) | 3 | `6ae7a99f` | `[test] streaming: generate_async coverage + refreshed streaming test` |
| 4-6 | 8 | 3 | `f32e31ec` | `[test] streaming: contract tests for Dreamverse + Dynamo shapes` |
| 7-15 | LTX-2 SR | 9 | `e7297519` | `feat(ltx2): full i2v conditioning + continuation latent port` |
| 16-21 | NVFP4 | 6 | `6793166b` | `test(nvfp4): lock LTX-2 wiring + typed transformer_quant flow` |
| 22-23 | LTX-2 post-fixes | 2 | `25897b67` | `[fix]: unwrap list-of-generator before torch.randn in LTX-2 latent prep` |
| 24-33 | agents_cleanup | 10 | `b34d9704` | `[docs] dreamverse-integration: add runbook + fresh-context onboarding` |
5 PRs landed (7.5, 7.6, 7.7, 7.8, 7.9), 1 in flight (7.10), 5 remaining
(8 / LTX-2 SR / NVFP4 / post-fixes / agents_cleanup).
## Historical commit chain analysis (pre-#1286 rebase)
The layered chain analysis below documented the pre-rebase SHAs (LTX-2
SR layer, NVFP4 layer, post-handoff fixes layer). Those SHAs no longer
exist on `will/ltx2_sr_port` — they live only on
`will/ltx2_sr_port-pre-1286-rebase`. Content semantics are unchanged;
SHAs were rewritten by the rebase. Kept here for narrative continuity.
## FastVideo: commit chain `cfccd292..156103b9`