2 changed files with 8 additions and 0 deletions
@@ -8,6 +8,8 @@ Baseline: 8e54cdbc. CI aggregate success verified remotely. This is an open-work
 - Task 4 moderation authority and guarded legacy entrypoints: implemented in 8a894617; pool-starvation review finding fixed in 54f0345a with 112 focused tests passing. Independent scoped re-review clean. No live DB/RCON contention or emulator acknowledgment evidence.
 - Task 2 radio settings/cache: implemented in f24adfcf and compatibility fix 36ac116d. Legacy Promise<void> forms delegate to transactional Hotel operations, support all 102 curated keys within a 500-entry bound, redact values, display sanitized success/partial/error notices, and invalidate the shared cache only after commit. Independent fix re-review clean; cross-process instant freshness is not claimed.
 - origin/main through 775d14f8 integrated by merge 9b83cdc3. Upstream Catalog Studio Git export, inspection/review, advisory source preflight, streamed errors, asset validation, ID reservation/remapping and conversion recovery were preserved alongside HK cancellation/completion/reset behavior. The cancellation-during-ID-queue defect found in integration review was fixed in e7549bbb and re-reviewed clean. No live import, browser or database acceptance was performed.
+- Task6 System atomic configuration/access: implemented in1360b0ed with review fix3c23c6e6. Canonical and legacy settings, maintenance, ACL/rank and command-center paths share validated mutations and transactional audits. Rank changes invalidate permissions after commit even if RCON fails; editable rank snapshots include staff presentation fields. Emulator synchronization has correlated intent/outcome records; external commands retain bounded operation-specific audit details. Dispatcher preserves cache partials. Four Important review findings were corrected and the scoped re-review is clean. Full implementation suite2089 passed/5 skipped; post-fix45 focused tests/typecheck/scopedBiome passed. Transaction-double fidelity remains a deferred Minor; no live rollback/emulator acceptance claim.
+- Origin/main advanced again to2619bec1 during Task6, introducing queued furniture imports with filesystem history and attachments. Task18 integrates that upstream before further Studio work; it does not complete the planned HK durable repository or shared finalization tasks.
 - All other findings below remain open until their implementation, tests and review are recorded. A baseline finding is retained here for traceability even after its corresponding checkpoint is delivered.

 ## Hotel / Studio / Operations
@@ -118,6 +118,12 @@ Support ticket, Help Center, template and CFH state mutations must lock the real

 Converge active staff entrypoints in actions/tickets.ts, admin-help-tickets.ts, ticket-templates.ts and the CFH assign/state/close handlers in actions/moderation.ts on canonical services. Keep public ticket submission/customer replies separate and preserve notifications and redirect/result contracts. Test locked state transitions, concurrent stale reads, absent targets, unauthorized assignment, audit rollback and post-commit notification/cache failures. Reuse Task5 reason propagation and Task4 CFH sanction authority; do not acquire locks in reverse order or log via a second pooled connection while holding a transaction.

+## Task 18: Integrate upstream queued furniture imports before further Studio work
+
+Run after the Task6 checkpoint and before Task5. Origin/main advanced to 2619bec1 while System was implemented, adding filesystem-backed furniture import jobs, a Redis-coordinated worker, attachment upload and queue/history UI. Merge the verified origin/main head into the dedicated branch without discarding HK cancellation, normalized inventory, audit contracts, previews or the System changes. Resolve overlapping Studio/import edits semantically. No new dependency, live import, worker execution against real services, deployment or cutover.
+
+Verify queue/attachment APIs, worker/store tests, cancellation-after-ID-reservation regressions, affected Studio contracts and typecheck/scoped Biome. Add focused regressions for integration defects found. Review the complete merge diff against the pre-merge task base, not only its first conflict-fix commit. Preserve upstream queue/history/attachment behavior; do not rewrite the queue during this merge. Record concrete gaps for Tasks13/14: filesystem history and a Redis lease do not by themselves satisfy the planned durable cross-process HK operation repository or complete shared import finalization. Do not claim those tasks complete from this integration.
+
 ## Remaining inventory (not completion claims)

 - Hotel union query filtering; durable Studio history; furniture import orchestration parity; radio API-key delivery and full radio CRUD review.