TargetWorkflowViewModel (719 lines) is the composition root and Stage 1 form and Stage 2 form and CUPS print session and preset CRUD, while also owning measurement, profile, and calibration. Print-queue state sitting next to customPatchCount makes Stage 2 and Stage 1 PRs collide and is why print notices were a second banner system.
Writes wizard.printerName after a successful spool (Stage 5 history #95)
Optional but recommended in the same PR if it stays mechanical: PresetSession holding presets, selectedPresetID, save/manage sheet flags, import/export. applyPreset / saveCurrentAsPreset can remain on the target VM because they touch Stage 1/2 form fields — or they take the form snapshot as input. Do not move targen form fields into the preset type.
TargetWorkflowViewModel keeps:
Stage 1/2 form + buildTargenConfig / buildPrinttargConfig
generateTarget, createLayout, resume/import
ownership of wizard + measurement + profile + calibration
print: PrintSessionViewModel property
Stage2View print panel / gallery Print buttons bind to workflow.print.
RootView preset sheets can bind to workflow or workflow.presets without reaching into print state.
Out
Changing lp argv or ColorSync suppression.
Merging measurement/profile/calibration into one VM.
AppEnvironment.cupsService is injected into PrintSessionViewModel; do not construct a second CupsService.
printAllPages still stops on first failure.
Strong printTask reference stays so unstructured Task is not deallocated mid-spool.
onChange(of: selectedPrinter) still clears tray/media and reloads caps.
Rewrite invariants
Never -o raw on macOS.
Both AP_ColorMatchingMode and AP.ColorMatchingMode still come from LpArgs / ColorMatchingAttempts, not from this VM.
Cancelled NSPrintPanel → info notice, cache untouched.
Dependencies
Blocks-on: notice-unification ticket (Notice must exist for print chrome before the type moves).
Unblocks: none.
Test
Tests/ICCeryUITests/Milestone3UITests.swift is the gate:
refresh printers / default selection
preferences cancel → info
preferences OK captures options
print all / print page disable rules
ICCERY_TEST_LP_ARGV still records both AP_* keys
If you extract spool into a testable type, add a Core-level test that wizard.printerName is assigned after success (can be a small fake CupsService).
Milestone 2 tests must still generate + layout without constructing print state beyond init.
Acceptance criteria
TargetWorkflowViewModel no longer contains CUPS/spool stored properties.
Stage 2 identifiers unchanged.
Milestone 3 UI tests green.
Milestone 2 UI tests green.
## Summary
`TargetWorkflowViewModel` (719 lines) is the composition root **and** Stage 1 form **and** Stage 2 form **and** CUPS print session **and** preset CRUD, while also owning `measurement`, `profile`, and `calibration`. Print-queue state sitting next to `customPatchCount` makes Stage 2 and Stage 1 PRs collide and is why print notices were a second banner system.
## Spec refs
- Issues 12–15, 17 (print panel)
- Issue 11 (presets)
- `Sources/ICCery/TargetWorkflowViewModel.swift`
- `Sources/ICCery/RootView.swift` / `Stage2View.swift`
## Scope
**In**
1. `PrintSessionViewModel` (`Sources/ICCery/Print/PrintSessionViewModel.swift`):
- `printers`, `selectedPrinter`, `printerCaps`, tray/media/orientation
- `capturedCupsOptions`
- `printNotice: Notice?` (from the notice-unification ticket)
- `isPrinting`, `printTask`
- `refreshPrinters`, `reloadSelectedCapabilities`, `openPrinterPreferences`, `printAllPages`, `printPage`, `spool`
- Writes `wizard.printerName` after a successful spool (Stage 5 history #95)
2. Optional but recommended in the same PR if it stays mechanical: `PresetSession` holding `presets`, `selectedPresetID`, save/manage sheet flags, import/export. `applyPreset` / `saveCurrentAsPreset` can remain on the target VM because they touch Stage 1/2 form fields — or they take the form snapshot as input. Do not move targen form fields into the preset type.
3. `TargetWorkflowViewModel` keeps:
- Stage 1/2 form + `buildTargenConfig` / `buildPrinttargConfig`
- `generateTarget`, `createLayout`, resume/import
- ownership of wizard + measurement + profile + calibration
- `print: PrintSessionViewModel` property
4. `Stage2View` print panel / gallery Print buttons bind to `workflow.print`.
5. `RootView` preset sheets can bind to `workflow` or `workflow.presets` without reaching into print state.
**Out**
- Changing `lp` argv or ColorSync suppression.
- Merging measurement/profile/calibration into one VM.
- Changing accessibility ids (`printerSelect`, `btnPrintAll`, `btnPrintPage-N`, `rawPrintPanel`, …).
## Full solution
- `AppEnvironment.cupsService` is injected into `PrintSessionViewModel`; do not construct a second `CupsService`.
- `printAllPages` still stops on first failure.
- Strong `printTask` reference stays so unstructured `Task` is not deallocated mid-spool.
- `onChange(of: selectedPrinter)` still clears tray/media and reloads caps.
## Rewrite invariants
- Never `-o raw` on macOS.
- Both `AP_ColorMatchingMode` and `AP.ColorMatchingMode` still come from `LpArgs` / `ColorMatchingAttempts`, not from this VM.
- Cancelled NSPrintPanel → info notice, cache untouched.
## Dependencies
Blocks-on: notice-unification ticket (`Notice` must exist for print chrome before the type moves).
Unblocks: none.
## Test
- `Tests/ICCeryUITests/Milestone3UITests.swift` is the gate:
- refresh printers / default selection
- preferences cancel → info
- preferences OK captures options
- print all / print page disable rules
- `ICCERY_TEST_LP_ARGV` still records both AP_* keys
- If you extract spool into a testable type, add a Core-level test that `wizard.printerName` is assigned after success (can be a small fake CupsService).
- Milestone 2 tests must still generate + layout without constructing print state beyond init.
## Acceptance criteria
- [ ] `TargetWorkflowViewModel` no longer contains CUPS/spool stored properties.
- [ ] Stage 2 identifiers unchanged.
- [ ] Milestone 3 UI tests green.
- [ ] Milestone 2 UI tests green.
gronod
added this to the M7 — Deduplicate & consolidate (develop) milestone 2026-09-10 18:23:15 +01:00
Closing #85. Implementation landed via stacked commit d4261ba (PR #87). Verified that PrintSessionViewModel owns print session state, TargetWorkflowViewModel is decoupled from spooling, Stage2View bindings remain intact, and UI test coverage passed in baseline verification at 0332a2bb4f. Acceptance criteria fully satisfied.
Closing #85. Implementation landed via stacked commit d4261ba (PR #87). Verified that PrintSessionViewModel owns print session state, TargetWorkflowViewModel is decoupled from spooling, Stage2View bindings remain intact, and UI test coverage passed in baseline verification at 0332a2bb4f26f7f88e7ff8e36b084a145f69b01c. Acceptance criteria fully satisfied.
gronod
removed a dependency 2026-09-11 10:22:59 +01:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Summary
TargetWorkflowViewModel(719 lines) is the composition root and Stage 1 form and Stage 2 form and CUPS print session and preset CRUD, while also owningmeasurement,profile, andcalibration. Print-queue state sitting next tocustomPatchCountmakes Stage 2 and Stage 1 PRs collide and is why print notices were a second banner system.Spec refs
Sources/ICCery/TargetWorkflowViewModel.swiftSources/ICCery/RootView.swift/Stage2View.swiftScope
In
PrintSessionViewModel(Sources/ICCery/Print/PrintSessionViewModel.swift):printers,selectedPrinter,printerCaps, tray/media/orientationcapturedCupsOptionsprintNotice: Notice?(from the notice-unification ticket)isPrinting,printTaskrefreshPrinters,reloadSelectedCapabilities,openPrinterPreferences,printAllPages,printPage,spoolwizard.printerNameafter a successful spool (Stage 5 history #95)Optional but recommended in the same PR if it stays mechanical:
PresetSessionholdingpresets,selectedPresetID, save/manage sheet flags, import/export.applyPreset/saveCurrentAsPresetcan remain on the target VM because they touch Stage 1/2 form fields — or they take the form snapshot as input. Do not move targen form fields into the preset type.TargetWorkflowViewModelkeeps:buildTargenConfig/buildPrinttargConfiggenerateTarget,createLayout, resume/importprint: PrintSessionViewModelpropertyStage2Viewprint panel / gallery Print buttons bind toworkflow.print.RootViewpreset sheets can bind toworkfloworworkflow.presetswithout reaching into print state.Out
lpargv or ColorSync suppression.printerSelect,btnPrintAll,btnPrintPage-N,rawPrintPanel, …).Full solution
AppEnvironment.cupsServiceis injected intoPrintSessionViewModel; do not construct a secondCupsService.printAllPagesstill stops on first failure.printTaskreference stays so unstructuredTaskis not deallocated mid-spool.onChange(of: selectedPrinter)still clears tray/media and reloads caps.Rewrite invariants
-o rawon macOS.AP_ColorMatchingModeandAP.ColorMatchingModestill come fromLpArgs/ColorMatchingAttempts, not from this VM.Dependencies
Blocks-on: notice-unification ticket (
Noticemust exist for print chrome before the type moves).Unblocks: none.
Test
Tests/ICCeryUITests/Milestone3UITests.swiftis the gate:ICCERY_TEST_LP_ARGVstill records both AP_* keyswizard.printerNameis assigned after success (can be a small fake CupsService).Acceptance criteria
TargetWorkflowViewModelno longer contains CUPS/spool stored properties.Closing #85. Implementation landed via stacked commit
d4261ba(PR #87). Verified that PrintSessionViewModel owns print session state, TargetWorkflowViewModel is decoupled from spooling, Stage2View bindings remain intact, and UI test coverage passed in baseline verification at0332a2bb4f. Acceptance criteria fully satisfied.