feat: prepare PhotoDock for marketplace review

Author: rodrix2000

CHANGELOG.md

@@ -6,6 +6,14 @@ All notable changes follow Keep a Changelog-style sections.
 
 ### Changed
 
+- Prepared truthful marketplace copy and a privacy-safe preview workflow that
+  does not claim the still-guarded mount, unmount, or eject actions.
+- Kept the dynamic Clear selection action in the explicit keyboard focus chain
+  and generalized the safety banner to cover folders and camera media.
+- Serialized job startup, bound backups to the recorded primary hash, and made
+  every failed transaction clean or retain recoverable owned-temp evidence.
+- Bounded whole-source traversal and preview-helper output, rejected unsafe
+  filename encodings, honored engine idle timeout, and isolated QML smoke state.
 - Repositioned PhotoDock as an Omarchy photo and image viewer first, with safe
   camera-media import as an optional companion workflow.
 - Renamed the pre-release product from Shutter Bar to PhotoDock, including the

Panel.qml

@@ -76,6 +76,9 @@ Item {
   readonly property real mediaListViewportHeight: mediaList.height
   readonly property real mediaDetailViewportWidth: mediaDetailFocus.width
   readonly property real mediaDetailViewportHeight: mediaDetailFocus.height
+  readonly property bool mediaGridFocusRequested: mediaGrid.focus
+  readonly property bool mediaListFocusRequested: mediaList.focus
+  readonly property bool clearSelectionFocusRequested: clearSelectionButton.focus
   readonly property real responsiveLayoutWidth: testLayoutWidth > 0 ? testLayoutWidth : window.width
   readonly property real responsiveLayoutHeight: testLayoutHeight > 0 ? testLayoutHeight : window.height
   readonly property bool compactLayout: responsiveLayoutWidth < 900
@@ -96,6 +99,9 @@ Item {
   readonly property real primaryImportActionHeight: primaryImportActionBar.height
   readonly property bool primaryImportActionVisible: primaryImportActionBar.visible
   readonly property bool emptySourceStateVisible: photoDockEmptyStateCard.visible
+  readonly property bool clearSelectionInKeyboardChain:
+    individualFilesCheck.KeyNavigation.tab === clearSelectionButton
+    && clearSelectionButton.KeyNavigation.backtab === individualFilesCheck
 
   function mediaGridDelegateAt(index) {
     return mediaGrid.itemAtIndex(index)
@@ -494,6 +500,19 @@ Item {
     })
   }
 
+  function showMediaBrowseMode(mode) {
+    if (mode !== "grid" && mode !== "list") return
+    mediaBrowseMode = mode
+    Qt.callLater(function() {
+      if (mode === "grid") mediaGrid.forceActiveFocus(Qt.TabFocusReason)
+      else mediaList.forceActiveFocus(Qt.TabFocusReason)
+    })
+  }
+
+  function focusClearSelectionForTesting() {
+    if (clearSelectionButton.visible) clearSelectionButton.forceActiveFocus(Qt.TabFocusReason)
+  }
+
   function metadataRows() {
     if (!inspectedMedia || !inspectedMedia.metadata) return []
     var values = inspectedMedia.metadata
@@ -703,7 +722,7 @@ Item {
             anchors.fill: parent
             anchors.margins: 10
             text: root.effectiveService && root.effectiveService.snapshot ? root.effectiveService.snapshot.safetyStatement
-              : "Your source stays untouched. PhotoDock never deletes, renames, edits, or formats files on camera media."
+              : "Your source stays untouched. PhotoDock never deletes, renames, edits, or formats source files."
             color: Color.foreground
             wrapMode: Text.WordWrap
           }
@@ -717,6 +736,10 @@ Item {
           color: Qt.rgba(Color.urgent.r, Color.urgent.g, Color.urgent.b, 0.10)
           border.width: 1
           border.color: Qt.rgba(Color.urgent.r, Color.urgent.g, Color.urgent.b, 0.25)
+          Accessible.role: Accessible.AlertMessage
+          Accessible.name: root.errorText || (root.effectiveService && root.effectiveService.lastError
+            ? (root.effectiveService.lastError.message || root.effectiveService.lastError.code)
+            : "")
           RowLayout {
             id: errorRow
             anchors.fill: parent
@@ -748,6 +771,8 @@ Item {
           color: Color.muted
           font.pixelSize: 11
           wrapMode: Text.WordWrap
+          Accessible.role: Accessible.AlertMessage
+          Accessible.name: root.notice
         }
 
         Controls.ScrollView {
@@ -788,7 +813,7 @@ Item {
                 }
                 Text {
                   Layout.fillWidth: true
-                  text: "Choose a photo folder, or insert an SD card, CFexpress card, supported USB mass-storage camera, or card reader. Browse photos before deciding what to import."
+                  text: "Choose a mounted photo folder or removable camera source that Omarchy has already mounted. PhotoDock does not mount or eject media in this alpha."
                   color: Color.muted
                   wrapMode: Text.WordWrap
                 }
@@ -937,7 +962,7 @@ Item {
                       checked: root.mediaBrowseMode === "grid"
                       KeyNavigation.tab: listModeButton
                       KeyNavigation.backtab: forgetFolderButton.visible ? forgetFolderButton : addFolderButton
-                      onClicked: root.mediaBrowseMode = "grid"
+                      onClicked: root.showMediaBrowseMode("grid")
                       Accessible.name: "Show media as a thumbnail grid"
                     }
                     Controls.Button {
@@ -947,15 +972,16 @@ Item {
                       checked: root.mediaBrowseMode === "list"
                       KeyNavigation.tab: individualFilesCheck
                       KeyNavigation.backtab: gridModeButton
-                      onClicked: root.mediaBrowseMode = "list"
+                      onClicked: root.showMediaBrowseMode("list")
                       Accessible.name: "Show media as a compact list"
                     }
                     Controls.CheckBox {
                       id: individualFilesCheck
                       text: "Choose individual files"
                       checked: root.limitToSelectedFiles
                       enabled: root.inventoryTotal > 0 && !root.activeJob
-                      KeyNavigation.tab: previousPageButton.enabled ? previousPageButton
+                      KeyNavigation.tab: clearSelectionButton.visible ? clearSelectionButton
+                        : previousPageButton.enabled ? previousPageButton
                         : nextPageButton.enabled ? nextPageButton : continueImportButton
                       KeyNavigation.backtab: listModeButton
                       onToggled: {
@@ -976,9 +1002,13 @@ Item {
                       font.pixelSize: 11
                     }
                     Controls.Button {
+                      id: clearSelectionButton
                       text: "Clear"
                       visible: root.selectedFileIds.length > 0
                       enabled: !root.activeJob
+                      KeyNavigation.tab: previousPageButton.enabled ? previousPageButton
+                        : nextPageButton.enabled ? nextPageButton : continueImportButton
+                      KeyNavigation.backtab: individualFilesCheck
                       onClicked: root.clearFileSelection()
                       Accessible.name: "Clear selected files"
                     }
@@ -992,7 +1022,8 @@ Item {
                       text: "‹ Previous"
                       enabled: root.inventoryOffset > 0 && !root.inventoryBusy
                       KeyNavigation.tab: nextPageButton.enabled ? nextPageButton : continueImportButton
-                      KeyNavigation.backtab: individualFilesCheck
+                      KeyNavigation.backtab: clearSelectionButton.visible
+                        ? clearSelectionButton : individualFilesCheck
                       onClicked: root.loadInventory(Math.max(0, root.inventoryOffset - root.inventoryPageSize))
                       Accessible.name: "Previous media page"
                     }
@@ -1001,7 +1032,8 @@ Item {
                       text: "Next ›"
                       enabled: root.inventoryHasMore && !root.inventoryBusy
                       KeyNavigation.tab: continueImportButton
-                      KeyNavigation.backtab: previousPageButton.enabled ? previousPageButton : individualFilesCheck
+                      KeyNavigation.backtab: previousPageButton.enabled ? previousPageButton
+                        : clearSelectionButton.visible ? clearSelectionButton : individualFilesCheck
                       onClicked: root.loadInventory(root.inventoryOffset + root.inventoryPageSize)
                       Accessible.name: "Next media page"
                     }
@@ -1012,7 +1044,8 @@ Item {
                       enabled: root.inventoryTotal > 0
                       KeyNavigation.tab: root.mediaBrowseMode === "grid" ? mediaGrid : mediaList
                       KeyNavigation.backtab: nextPageButton.enabled ? nextPageButton
-                        : previousPageButton.enabled ? previousPageButton : individualFilesCheck
+                        : previousPageButton.enabled ? previousPageButton
+                        : clearSelectionButton.visible ? clearSelectionButton : individualFilesCheck
                       onClicked: {
                         root.revealWorkflowItem(importDetailsHeader)
                         shootNameField.forceActiveFocus()
@@ -1104,7 +1137,7 @@ Item {
                         keyNavigationWraps: false
                         activeFocusOnTab: true
                         Accessible.role: Accessible.List
-                        Accessible.name: "Media thumbnail grid; arrow keys move, Shift plus arrow selects a range, Enter opens, Space toggles selection, Control-click toggles, and Shift-click selects a range"
+                        Accessible.name: "Media thumbnail grid; arrow keys move, Shift plus arrow selects a range, Enter opens, Space toggles selection, Control or Command click toggles, Shift click selects a range, and Control or Command plus Shift click adds a range"
                         KeyNavigation.tab: shootNameField
                         KeyNavigation.backtab: continueImportButton
                         Keys.priority: Keys.BeforeItem
@@ -1162,7 +1195,7 @@ Item {
                             highlighted: root.isFileSelected(mediaTile.modelData.fileId)
                             onClicked: root.activateMediaItem(mediaTile.index, Qt.NoModifier)
                             Accessible.name: "Open " + mediaTile.modelData.fileName
-                            Accessible.description: "Control-click toggles this file; Shift-click selects a range"
+                            Accessible.description: "Control or Command click toggles this file; Shift click selects a range; Control or Command plus Shift click adds a range"
                             contentItem: ColumnLayout {
                               spacing: 4
                               Rectangle {
@@ -1282,6 +1315,8 @@ Item {
                         spacing: 2
                         model: root.inventoryItems
                         activeFocusOnTab: true
+                        Accessible.role: Accessible.List
+                        Accessible.name: "Media list; Up and Down arrows move, Shift plus arrow selects a range, Enter opens, Space toggles selection, Control or Command click toggles, Shift click selects a range, and Control or Command plus Shift click adds a range"
                         KeyNavigation.tab: shootNameField
                         KeyNavigation.backtab: continueImportButton
                         Keys.priority: Keys.BeforeItem
@@ -1370,7 +1405,7 @@ Item {
                               event.accepted = true
                             }
                             Accessible.name: "Open " + mediaRow.modelData.fileName + "; press Space to select it"
-                            Accessible.description: "Control-click toggles this file; Shift-click selects a range"
+                            Accessible.description: "Control or Command click toggles this file; Shift click selects a range; Control or Command plus Shift click adds a range"
                             contentItem: Column {
                               spacing: 2
                               Text { width: parent.width; text: mediaRow.modelData.fileName; color: Color.foreground; elide: Text.ElideMiddle }
@@ -1633,7 +1668,7 @@ Item {
               visible: root.lastOutcome !== null && root.activeJob === null
               Text { text: "LAST OUTCOME"; color: Color.muted; font.pixelSize: 11; font.weight: Font.DemiBold }
               Text { Layout.fillWidth: true; text: root.lastOutcome ? root.lastOutcome.summary : ""; color: Color.foreground; wrapMode: Text.WordWrap }
-              Text { Layout.fillWidth: true; text: root.lastOutcome ? "Primary: " + root.lastOutcome.primary + " · Verification: " + root.lastOutcome.verification + " · Backup: " + root.lastOutcome.backup + " · Eject: " + root.lastOutcome.eject : ""; color: Color.muted; wrapMode: Text.WordWrap }
+              Text { Layout.fillWidth: true; text: root.lastOutcome ? "Primary: " + root.lastOutcome.primary + " · Verification: " + root.lastOutcome.verification + " · Backup: " + root.lastOutcome.backup : ""; color: Color.muted; wrapMode: Text.WordWrap }
             }
           }
         }
@@ -1684,8 +1719,10 @@ Item {
               highlighted: true
               enabled: root.effectiveService && !root.activeJob && !root.planBusy
               onClicked: root.primaryImportAction()
-              Accessible.name: root.reviewedPlanReady
-                ? "Start the reviewed import plan" : "Review settings and prepare to start import"
+              Accessible.name: root.activeJob ? "Import in progress"
+                : root.planBusy ? "Checking import settings"
+                : root.reviewedPlanReady ? "Start the reviewed import plan"
+                : "Review settings and prepare to start import"
               Accessible.description: root.primaryImportActionHint
             }
           }

README.md

@@ -2,14 +2,19 @@
 
 **View photos and safely import camera media on Omarchy.**
 
-> **Connect → View → Select → Import → Verify → Back Up → Eject**
+> **Connect → View → Select → Import → Verify → Back Up**
+
+![PhotoDock viewing a synthetic demo photo on Omarchy](preview.png)
+
+_Marketplace preview captured from PhotoDock with a synthetic demo image. It
+contains no personal photo, camera serial number, GPS data, or source metadata._
 
 PhotoDock is a local-first photo and image viewer for Omarchy. Open a mounted
 folder or camera card to browse thumbnails, switch between Grid and List views,
 and open a large photo view—even when you only want to look at photos and do not
-want to import them. When you are ready, PhotoDock can safely move selected
+want to import them. When you are ready, PhotoDock can safely copy selected
 photos and videos into durable local storage, verify the copies, create an
-optional independent backup, and eject the source when you ask.
+optional independent backup, and leave the source files untouched.
 
 **PhotoDock never deletes, renames, edits, or formats files on source media.**
 
@@ -93,7 +98,8 @@ make validate
   proven.
 - Completed primary files survive cancel, backup failure, UI reload, and
   recovery.
-- Unmount/eject is explicit and never forced.
+- The planned unmount/eject flow is explicit and never forced; it remains
+  guarded in this candidate until its disposable-hardware matrix is complete.
 
 See [docs/safety.md](docs/safety.md) for the complete invariant contract.
 

Service.qml

@@ -17,7 +17,7 @@ Item {
   property bool subscriptionRequested: false
   property var snapshot: ({
     sources: [], activeJob: null, lastOutcome: null,
-    safetyStatement: "Your source stays untouched. PhotoDock never deletes, renames, edits, or formats files on camera media."
+    safetyStatement: "Your source stays untouched. PhotoDock never deletes, renames, edits, or formats source files."
   })
   property var capabilities: ({})
   property var lastError: null
@@ -48,6 +48,16 @@ Item {
   }
 
   function request(method, params, callback) {
+    var connectionRequired = method === "start_job" || method === "request_cancel_job"
+    if (connectionRequired && (!ready || !commandHandshaken || !commandSocket.connected)) {
+      var connectionError = {
+        code: "PD_ENGINE_DISCONNECTED",
+        message: "Reconnect and refresh PhotoDock status before retrying this action."
+      }
+      lastError = connectionError
+      if (callback) callback(false, connectionError)
+      return
+    }
     var queue = requestQueue.slice()
     queue.push({ method: String(method), params: params || ({}), callback: callback || null })
     requestQueue = queue
@@ -102,6 +112,26 @@ Item {
     commandSocket.flush()
   }
 
+  function failPendingRequest(message) {
+    if (!pendingRequest) return
+    var completed = pendingRequest
+    pendingRequest = null
+    var error = {
+      code: "PD_ENGINE_DISCONNECTED",
+      message: message || "The import engine connection closed before the request completed."
+    }
+    lastError = error
+    if (completed.callback) completed.callback(false, error)
+  }
+
+  function handleCommandDisconnect() {
+    commandHandshaken = false
+    ready = false
+    engineAvailable = false
+    failPendingRequest("The engine connection closed before PhotoDock could confirm the request. Reconnect and refresh status before retrying.")
+    reconnectTimer.restart()
+  }
+
   function handleCommandFrame(raw) {
     var frame
     try { frame = JSON.parse(String(raw)) }
@@ -159,6 +189,9 @@ Item {
     commandHandshaken = false
     subscriptionHandshaken = false
     subscriptionRequested = false
+    ready = false
+    engineAvailable = false
+    failPendingRequest("The engine connection reset before PhotoDock could confirm the request. Reconnect and refresh status before retrying.")
     commandSocket.connected = false
     subscriptionSocket.connected = false
     if (!ensureProcess.running) ensureProcess.running = true
@@ -192,9 +225,9 @@ Item {
     parser: SplitParser { onRead: function(data) { root.handleCommandFrame(data) } }
     onConnectionStateChanged: {
       if (connected) root.sendHello(commandSocket, "qml-command-hello")
-      else root.commandHandshaken = false
+      else root.handleCommandDisconnect()
     }
-    onError: reconnectTimer.restart()
+    onError: root.handleCommandDisconnect()
   }
 
   Socket {