Why: include the current integration baseline before verification.
Evidence: fetched origin/main=ae465d24441ab349c961a55e9b04f8c4ccaf6de8.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=b6307db015da4a3718baadb242c52cb66b024f74.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
# Conflicts:
# modules/backend
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=af9c2de663be5ff102dcab7698464a645832f569.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=af9c2de663be5ff102dcab7698464a645832f569.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: Component PRs #167 and #77 merged; Dev should track the merge
commits rather than pre-merge feature tips.
Evidence: IMPORT make test receipt; make build exit 0
Impact: Ready for Dev composite PR.
Refs: backend#167 documents#77
Co-authored-by: Cursor <cursoragent@cursor.com>
Why: Land the first Generative UI B-class allowlist entries with the
independent review record and button-intent hardening.
Evidence: Backend go test ./internal/genui/ ./internal/surfacesvc/ ./internal/server/
Impact: Dev composite pin to backend#167 / documents#77 heads.
Refs: plan GenUI boundaries T1
Co-authored-by: Cursor <cursoragent@cursor.com>
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=3fa0d3ade8beb6b534c7ffa7505426001c58e284.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: pages with kv/table/list nodes failed invalid-spec under
MiniMax-M3's item-style wrappers and delegated submission lacked the
present tool; backend 3d850a2 fixes both.
Evidence: composite make test runs on this worktree after the bump
(SELF); backend suites green on the branch.
Impact: generative-ui page commits restore; merge backend PR #166
before this one.
Refs: backend PR #166; task card feature/genui-spec-repair.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=3fa0d3ade8beb6b534c7ffa7505426001c58e284.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: Frontend #64 moved AdminZoneSection out of the generated contracts
mirror; the composite must validate against the fixed main.
Evidence: make test rerun follows via make evidence; CI is authoritative.
Impact: submodule pointer only (frontend c1225bb -> #64 merge).
Refs: WP3-I3.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=475654363de3ec72df68d246ffab8217b1cfeab6.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: card sections were placeholders; gitlinks point the composite at
backend a80d3c3 / frontend c1225bb (both merged component mains) so
make test validates the shipping combination.
Evidence: make test green in this worktree at these gitlinks (local log
/tmp/i3-make-test.log; CI is authoritative); card edits are SELF.
Impact: task card content + submodule pointers.
Refs: WP3-I3; Backend #165, Frontend #63, RDM #240.
Why: Dev main moved the frontend pin to 41f6ce8 (U6, PR #408) while
this branch pinned fdedaa1 (admin me-refresh, frontend #61); frontend
main 360d640 contains both, so the gitlink resolves there.
Evidence: git merge-base --is-ancestor fdedaa1 360d640 and 41f6ce8
360d640 both hold in the frontend repo (SELF).
Impact: pin-only merge resolution; composite make test reruns next.
Refs: frontend PR #61/#62; Dev PR #407/#408.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=3f32fdacbc5af91bd9212b2ded69f6559d1d92b2.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: collaboration storage U7 (proposal sections 3/5/7) requires two-process
HTTP-level acceptance over shared PG, a reproducible load-test entry honoring
the load contract, and an auditable pre-release checklist; capacity windows and
dual-host runs need user-scheduled resources, so the deliverable here is the
verifiable entry, not capacity claims.
Evidence: make test green (composite); make test-multi-instance green locally
against an isolated PG (five scenarios incl. crash-takeover and restart
invariants); run_load.sh --profile smoke end-to-end green (SSE probe p95~18ms,
zero seq duplicates, stack auto-recycled); backend pinned to feature branch
with the three cross-instance fixes.
Impact: new tests/integration/multi-instance (CI test-pg job step), new
tests/load/collaboration (k6 + SSE probe + run_load.sh), release checklist at
docs/release-multi-instance.md; no runtime behavior change in Dev repo itself.
Refs: backend PR #164; task card feature/u7-load-fault-release.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=df18c35203601bdec8d1671c60e0f4cf7d0b5aef.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: the admin entry vanished after every reload because store.me was
never repopulated outside the forced-change gate; frontend fdedaa1
adds store.refreshMe() to the authState ok effect.
Evidence: composite make test exit=0 on this worktree with the bumped
pin (SELF); frontend vitest 100/100 and tsc+vite build clean on
feature/me-refresh-on-auth.
Impact: dev UI keeps the system-management entry for admins across
reloads and re-logins; merge frontend PR #61 before this one so the
pin points at a merged commit.
Refs: frontend PR #61; task card feature/fe-me-refresh.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=a1ac948155eb8957a87f37d8da4a9feb870dd532.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: card sections were placeholders (policy requires goal, requirements
and test plan before evidence/review); the gitlinks point the composite
at the I4 sub-repo commits so make test validates the real combination.
Evidence: make test green in this worktree at these gitlinks (log kept
locally; CI is authoritative); card edit is SELF.
Impact: task card content + submodule pointers (backend 9aa51e5,
frontend 01b853f).
Refs: WP3-I4.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=89174a0f5c28ff7f49c794f37ea7e9528f9b526e.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: U2's first slice landed via main (PR #396/#401); the plan card's next-task line must point at the remaining U2 delta instead of the closed task.
Evidence: SELF - documents gitlink advanced; merged main range 555fb2162f..c622372 (96 commits) inspected.
Impact: task metadata and submodule pointer only.
Refs: .task/archive/feature-svc-autorecover.md
Why: stage-review table, phase line and next-task line must carry the 2026-10-12 approval and vehicle decision.
Evidence: SELF - user decision; documents gitlink advanced to the approval-record commit.
Impact: task metadata and submodule pointer only.
Refs: modules/documents/docs/records/2026-10-12-service-restart-data-recovery-review.md
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=dc97048556caebd03168866075d959f0f55d02a7.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: the parent must pin the merged component SHA for combined build and CI.
Evidence: backend origin-main tip e49f165 (includes #159 and later merges) fetched post-recovery; internal core pin 89f3906 matches Dev modules/core.
Impact: gitlink only.
Refs: backend PR #159.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=aa1f87602471cc567afd5756326e994315984fc8.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: U4 acceptance needs a reproducible real-browser run: build the
RDM binary from its origin/main, seed projects/ingest via the command
API, serve with auth on, and drive Playwright against vite preview.
Evidence: scripts/e2e.sh --seed-only smoke (in progress this task);
frontend pin points at the Playwright harness commit.
Impact: dev tooling only (.tmp artifacts ignored; no runtime changes).
Refs: task feature/rdm-e2e-acceptance; frontend feature branch of
the same name.
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=94314361563d12271913eb5dabd4c42d03e69c19.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
# Conflicts:
# modules/backend
Why: combined validation and review must run on the exact component versions of this task.
Evidence: gitlink updates only; make test to follow in the task card via make evidence.
Impact: modules/backend -> 16ed7b2 (I1-I3), modules/ui -> bfecf8b (pending-filter fix).
Refs: .task/feature-material-intake-flow.md I3.
Why: the reviewed candidate moves from untracked drafts to a fixed two-repo combination; task card and project index must reference r2 and record the svc-autorecover ownership decision as a human gate.
Evidence: SELF - documents gitlink cbc64eb (r1 pinned at 54fc24e, revised to r2 with SHA256 9cfda252...); resume precheck receipt imported above; task-sync merged origin/main 555fb2162f cleanly.
Impact: task metadata, submodule pointer and index only; no business code, no push/PR.
Refs: modules/documents/docs/records/2026-10-12-service-restart-data-recovery-review.md (round 2)
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=555fb2162fe47e13835c592013bc3a69e46239e2.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: finish the prior session's in-flight records so the tree is clean before the resume precheck (P1.1 object pinning).
Evidence: SELF - documents gitlink now points at 54fc24e (proposal r1 + review record + INDEX); task card carries the prior session's evidence rows and authorization scope.
Impact: task metadata and submodule pointer only; no business code.
Refs: modules/documents/docs/proposals/2026-10-12-service-restart-data-recovery.md
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=555fb2162fe47e13835c592013bc3a69e46239e2.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: include the current integration baseline before verification.
Evidence: fetched origin/main=5e57029b439e5690f28dc6002f9784f0b08920eb.
Impact: integrate upstream changes without rewriting task history.
Refs: task-sync
Why: the parent must pin the merged component SHA for combined build and CI.
Evidence: backend origin-main merge of #157 fetched post-merge.
Impact: gitlink only.
Refs: backend PR #157.
Why: U5 introduced a TS error on main; frontend branch includes the one-line fix.
Evidence: frontend tsc zero errors; push aaced87.
Impact: modules/frontend gitlink.
Refs: Dev #367/#368
weichen
