Skip to content

feat(capture): recover rejected scans through shared Core review - #61

Merged
wstein merged 5 commits into
mainfrom
feat/capture-recovery-search
Nov 17, 2026
Merged

wstein merged 5 commits into
mainfrom
feat/capture-recovery-search

Conversation

@wstein

@wstein wstein commented Nov 17, 2026 •

Copy link
Copy Markdown
Owner

A rejected guided proposal or physical-guide conflict now offers Find a matching cube. The existing photos and reviewed colors enter an explicit bounded PuzlWerk ReScript search; no camera retake or free assignment editor is required.

  • Canonical questions skip resolved faces and update the productive net/3D preview, preserving exact photo IDs and absolute rotations.
  • Only final Use this cube installs the rechecked Core confirmation once. Cancel restores the preceding approval or conflict.
  • Single-face color review resumes Core constraints; Back removes the last manual constraint through Core. Original photos and recognition provenance stay unchanged.
  • Initial capped-empty results retain neutral capture slots and color review. Search further increases the actual budget; incomplete search and NxN checks remain explicit.
  • Preserves immutable capture lineage across retakes and keeps the dialog open when the external install rejects a stale result.

Validation: 11/11 browser and 2/2 actual-checker adapter cases on 7a582b8; final 6/6 browser delta on 5da6a04. Ten compiled counter-mutants detected across both stages. Final typecheck, lint, format, build and typos exit 0. Original 19:08 and 21:28 captures are exercised without photo/color/protocol edits; selected source hashes and export/reimport are checked.

Base: #60 is merged; this PR is rebased onto main (head bfbf79c, same patch-id as the reviewed 5da6a04). Private Core 0.3.0 is pinned to PuzlWerk source f1fa30ac2c12b507be9c6f3041fe7ef316378c37 (an earlier wstein/puzlwerk#85 head; the archive differs from the current one only in provenance.json); no registry publication or sibling checkout is needed.

R1 follow-up binds actions to their exact opaque review/Core revision and active capture; neutral source review now carries Photo-N names through title, dialog and image alt.

Review CLEAR at the pre-rebase head 5da6a04 and carried over to this head with the same patch-id (Carried-over comment on this PR). CI at this head: CI run 44136132716 success; CI at the pre-rebase head: 1436 unit cases (6 expected failures, 2 skips) and 203/203 browser cases without retries.

Owner gates at merge: license/distribution (EUPL-1.2 Core in the MIT app), physical-owner acceptance, M1 sequence per Cubistry #21. Parent #60 and wstein/puzlwerk#85 are merged. Complete NxN reachability remains unverified.
Merge publishes: pages.yml deploys on every push to main, so merging ships the vendored EUPL-1.2 Core in the app bundle via GitHub Pages.
Blocker: None.

Manual steps are in docs/orientation-recovery.md. Local before/after desktop and touch captures accompany the author report.

🤖 Generated with Claude Code

@wstein

wstein commented Nov 17, 2026

Copy link
Copy Markdown
Owner Author

Review: FINDINGS head=7a582b8e560782d877b8e6b13787a96f9aa74a54 patch-id=e3dadc1219f6b4a2e54e661dcd23f8649e799618 pr=61
F1 (P1): saved Use callbacks are not bound to their original capture/search/review context (useExplicitCaptureRecovery.ts:37-38,106-117).
Independent typed hook repro: save Use, reset capture, invoke saved Use; the hidden old search still invokes external installation once.
A second repro saves Use from search A, cancels, completes search B over the same capture, then invokes old Use A; B is installed without its current Use.
Bind callback intent to the rendered capture/session/review revision; comparing against an old captured closure or substituting the latest review is insufficient.
F2 (P2): initial zero-candidate color review has an empty dialog title and image alt “Captured photo of undefined”; preserve its neutral Photo-N source label.
Both errors were reproduced with real Core/checker code; no search or legality mock was used.
Existing focused checks passed: two adapter cases and 11 browser cases; five typechecked counter-mutants failed at intended assertions.
Original conflict metadata and six JPEGs remain byte-identical; the reviewed Core 0.3.0 artifact pin was verified.
Exact-head CI is green (1436 unit passes, six expected failures, two skips; 200 browser passes), but does not cover F1/F2 yet.
Keep Draft pending these fixes and exact-head checks; owner live/distribution gates remain separate.
No merge, publication or deployment approval.

@wstein

wstein commented Nov 17, 2026

Copy link
Copy Markdown
Owner Author

Review: FINDINGS head=5da6a04090ad10bb55a9a012cd17c4fa2755a1a6 patch-id=36734facedfb926c2b41051b544eb187e84e1d57 pr=61
Scoped WI2 R2 review is technically CLEAR; F1 and F2 are fixed with no open scoped technical findings.
Use callbacks now retain their rendered capture/search/review context; old callbacks cannot install after reset or approve a newer search over the same capture.
Neutral zero-candidate color review retains its Photo-N title, accessible dialog name and original-photo alt text.
Independent focused run: six browser cases passed, including both original stale-Use repros, current Use exactly once, resume/retake and projection roundtrip.
Three typechecked counter-mutants failed directly at reset-CAS, same-capture review-instance CAS and neutral-photo alt assertions.
Earlier two adapter cases, 11 browser cases, five counterchecks and original fixture/package provenance checks remain applicable.
Exact-head CI 44006123798 succeeded: 1436 unit passes, six expected failures, two skips; 203 browser passes with no retry/flaky entries.
This is not a whole-stack approval: parent #60, Core source/parent acceptance, owner live acceptance and production-license/distribution gates remain separate.
Keep Draft while named gates remain; no Ready, merge, publication or production deployment approval is given.

wstein commented Nov 17, 2026

Copy link
Copy Markdown
Owner Author

Cross-project architecture gate — 2026-11-17 (documentation only)

This child Draft implements bounded capture-recovery UI using the existing private PuzlWerk ReScript package; technical review CLEAR and green CI on this head do not establish cross-project prioritization or CubeAssembler M2 approval. Per Cubistry #21, the existing-solver 2×2 Counter M1 (ReScript core, TypeScript viewer and loadable/oriented sticker assets) must be accepted first; M2 and CubeLab M3 need separate owner gates.

The implementation exception recorded in PuzlWerk #85 is specifically scoped to that Core Draft, not a blanket consumer rollout authorization. Before Ready/merge, explicitly document any owner-approved pre-M1 scope for this application feature, alongside parent #60, live/physical acceptance, bounded-versus-full NxN evidence and license/distribution clearance. Existing source/photograph identity and working functionality should remain intact. This is not a request to implement or merge anything.

@wstein

wstein commented Nov 17, 2026

Copy link
Copy Markdown
Owner Author

Review: CLEAR head=5da6a04090ad10bb55a9a012cd17c4fa2755a1a6 patch-id=c9d382d0ef112f55ea237acfc0d8bb3e380c46b5 pr=61
Scope: exact head vs origin/fix/capture-photo-provenance, 5 commits; no blocking findings. Prior F1 (Use/Cancel/Select bound to review, revision and capture) and F2 (Photo N title and alt) are fixed.
CI run 44006123798 attempt 1 success (typos, test incl. e2e). Local: typecheck, lint, format:check, typos, build exit 0; vitest 1382 pass, 47 fail only in 3 Git LFS JPEG suites.
Local e2e 173/203; the 30 failures read Git LFS JPEGs, and 21 of them fail the same way on origin/main; explicit-capture-recovery passes 14/14.
Mutations 11 distinct typed: 10 killed at the intended test (2 only by e2e); 1 survivor (nit).
Core pin: archive SHA256 2750f457... matches capture-core.json; 22 source files equal core/res at f1fa30ac and at puzlwerk#85 head 46edbcf.
Nit: the pin references f1fa30ac, a superseded #85 head; only provenance.json differs from the 46edbcf archive.
Nit: vendor keeps the unreferenced 0.1.0 archive; the checker sourceRevision is a hardcoded main SHA.
Nit: the commitSearch photo-evidence check has no test; reviewedGrids and fork lineage are covered only by e2e.
Nit: PR text needs "Blocker: None.", an "Owner gates at merge:" line and the Generated line last.
Fact: Core is EUPL-1.2, not AGPL; the bundle includes it. Rebase clean; identity correct; no session links.

@wstein
wstein marked this pull request as ready for review November 17, 2026 17:10
Base automatically changed from fix/capture-photo-provenance to main November 17, 2026 17:14
wstein and others added 5 commits November 17, 2026 17:18
Co-Authored-By: Codex <noreply@openai.com>
Co-Authored-By: Codex <noreply@openai.com>
Co-Authored-By: Codex <noreply@openai.com>
Co-Authored-By: Codex <noreply@openai.com>
Co-Authored-By: Codex <noreply@openai.com>
@wstein
wstein force-pushed the feat/capture-recovery-search branch from 5da6a04 to bfbf79c Compare November 17, 2026 17:21
@wstein
wstein merged commit 8836374 into main Nov 17, 2026
2 checks passed
@wstein
wstein deleted the feat/capture-recovery-search branch November 17, 2026 17:23
@wstein

wstein commented Nov 17, 2026

Copy link
Copy Markdown
Owner Author

Carried-over: from=5da6a04090ad10bb55a9a012cd17c4fa2755a1a6 to=bfbf79cc1d3372c874bd7c3db028a416e3208f94 patch-id=c9d382d0ef112f55ea237acfc0d8bb3e380c46b5 pr=61
patch-id equal, no merge commits, range-diff =, label set again: no, reason: no heavy-lane label in this repo

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