Waiting ' + deliveryCenter.counts.waiting + ' · ' + 'Sending ' + deliveryCenter.counts.sending + ' · ' + 'Needs attention ' + deliveryCenter.counts.attention + ' · ' + diff --git a/frontend/drafts.js b/frontend/drafts.js index 4decd5c..60a8d62 100644 --- a/frontend/drafts.js +++ b/frontend/drafts.js @@ -240,7 +240,14 @@ function createDraftInbox({ storage, getCurrentLogin = () => '', now = () => Dat } function partition(items = list()) { - const deliveries = items.filter(item => item.kind === 'issue-outbox' || item.kind === 'authored-outbox'); + const isDelivery = item => item.kind === 'issue-outbox' || item.kind === 'authored-outbox'; + const needsAction = item => isDelivery(item) && ( + item.status === 'attention' || item.status === 'authorization' || item.status === 'completion' || + item.delivery_state === 'uncertain' || item.quarantined + ); + const deliveries = items.filter(isDelivery).sort((left, right) => + Number(needsAction(right)) - Number(needsAction(left)) + ); const drafts = items.filter(item => item.kind !== 'issue-outbox' && item.kind !== 'authored-outbox'); const counts = deliveries.reduce((summary, item) => { const state = item.status === 'sending' ? 'sending' : (item.status === 'attention' ? 'attention' : @@ -251,7 +258,7 @@ function createDraftInbox({ storage, getCurrentLogin = () => '', now = () => Dat const retryable = deliveries.filter(item => item.status === 'queued' && !item.authorization_required && !item.quarantined && item.delivery_state !== 'uncertain' ); - return { drafts, deliveries, counts, retryable }; + return { drafts, deliveries, counts, retryable, actionable:deliveries.filter(needsAction).length }; } function deliveryLabel(item) { diff --git a/frontend/mobile-queue-launcher.js b/frontend/mobile-queue-launcher.js index 22d8c9e..1a5ef30 100644 --- a/frontend/mobile-queue-launcher.js +++ b/frontend/mobile-queue-launcher.js @@ -28,6 +28,7 @@ } function open(name) { + if (name === 'delivery' && options.openDelivery) return options.openDelivery(); if (name === 'today') return options.openToday(); if (name === 'agenda') return options.openAgenda(); if (name === 'update' && options.openUpdates) return options.openUpdates(); diff --git a/frontend/mobile-start-day.js b/frontend/mobile-start-day.js index b666cb2..e3ccae2 100644 --- a/frontend/mobile-start-day.js +++ b/frontend/mobile-start-day.js @@ -5,6 +5,7 @@ const checkpointKey = 'stackchain.mobile-start-day.v1'; const storage = options.storage || (typeof localStorage !== 'undefined' ? localStorage : null); const reviewOrder = [ + ['delivery', 'Delivery recovery'], ['agenda', 'Agenda'], ['attention', 'Attention'], ['update', 'Updates'], @@ -73,13 +74,19 @@ .filter(phase => phase.count > 0); const total = phases.reduce((sum, phase) => sum + phase.count, 0); const today = count(counts.today); + const delivery = count(counts.delivery); + const other = total - delivery; const next = phases.length ? phases[0].name : (today ? 'today' : 'find'); - const nextLabel = phases.length ? 'Review ' + phases[0].label : (today ? 'Continue Today' : 'Find Work'); + const nextLabel = next === 'delivery' ? 'Review Delivery' : + (phases.length ? 'Review ' + phases[0].label : (today ? 'Continue Today' : 'Find Work')); return { total, next, label: nextLabel, - summary: total ? total + ' items before Today · ' + today + ' planned' : + summary: delivery ? delivery + (delivery === 1 ? ' delivery needs' : ' deliveries need') + + ' action before Today' + (other ? ' · ' + other + ' other ' + (other === 1 ? 'item' : 'items') : '') + + ' · ' + today + ' planned' : + total ? total + ' items before Today · ' + today + ' planned' : (today ? 'Review clear · ' + today + ' planned' : 'Review clear · Today is empty'), phases, }; @@ -107,9 +114,9 @@ return true; } - function reconcile({authoritative = false} = {}) { + function reconcile({authoritative = false, authoritativePhases = []} = {}) { const saved = checkpoint(); - if (!authoritative || !saved?.phase) return false; + if (!saved?.phase || (!authoritative && !authoritativePhases.includes(saved.phase))) return false; const counts = options.getCounts ? options.getCounts() : {}; if (count(counts[saved.phase]) > 0) return false; return completePhase(saved.phase); diff --git a/frontend/service-worker.js b/frontend/service-worker.js index 826cec9..2134b55 100644 --- a/frontend/service-worker.js +++ b/frontend/service-worker.js @@ -1,7 +1,7 @@ const BASE = new URL('./', self.location.href).pathname; importScripts(BASE + 'static/private-data-registry.js'); importScripts(BASE + 'static/background-issue-sync.js'); -const CACHE = 'stackchain-dashboard-shell-v116'; +const CACHE = 'stackchain-dashboard-shell-v117'; const OFFLINE_LEASE_URL = new URL(BASE + '__offline-session-lease', self.location.origin).href; const OUTAGE_STATUSES = new Set([500, 502, 503, 504]); const NAVIGATION_TIMEOUT_MS = self.__STACKCHAIN_NAVIGATION_TIMEOUT_MS || 4000; diff --git a/tests/test_comment_next.py b/tests/test_comment_next.py index 19d5f12..78b96e6 100644 --- a/tests/test_comment_next.py +++ b/tests/test_comment_next.py @@ -303,4 +303,4 @@ async def test_unread_update_offers_reply_mark_read_and_next_independent_of_toda assert '.update-reply-actions { display:grid; grid-template-columns:repeat(2,minmax(0,1fr));' in html assert '.update-reply-actions button { min-height:44px;' in html worker = (Path(__file__).parents[1] / "frontend" / "service-worker.js").read_text() - assert "stackchain-dashboard-shell-v116" in worker + assert "stackchain-dashboard-shell-v117" in worker diff --git a/tests/test_drafts.py b/tests/test_drafts.py index 75c36f1..a1d2271 100644 --- a/tests/test_drafts.py +++ b/tests/test_drafts.py @@ -213,6 +213,37 @@ process.stdout.write(JSON.stringify({{item,partition:inbox.partition()}})); assert output["partition"]["retryable"] == [] +def test_delivery_partition_counts_human_action_and_orders_it_before_waiting_work(): + script = f""" +const createDraftInbox = require({json.dumps(str(DRAFTS))}); +const values = new Map([ + ['stackchain.issue-outbox.v1', JSON.stringify({{version:3,items:[ + {{id:'waiting',repository:'o/r',title:'Waiting',body:'',ownerLogin:'timmy',status:'queued',queuedAt:500}}, + {{id:'uncertain',repository:'o/r',title:'Verify',body:'',ownerLogin:'timmy',status:'queued',deliveryState:'uncertain',queuedAt:100}}, + {{id:'sending',repository:'o/r',title:'Sending',body:'',ownerLogin:'timmy',status:'sending',queuedAt:400}}, + {{id:'attention',repository:'o/r',title:'Fix me',body:'',ownerLogin:'timmy',status:'attention',queuedAt:200}}, + ]}})], + ['stackchain.authored-outbox.v1', JSON.stringify({{version:2,items:[ + {{id:'authorize',kind:'pull-review',repository:'o/r',number:8,body:'Review',ownerLogin:'timmy',status:'authorization',queuedAt:300}}, + ]}})], +]); +const storage={{get length(){{return values.size}},key:i=>Array.from(values.keys())[i]||null,getItem:k=>values.get(k)||null,setItem:(k,v)=>values.set(k,v)}}; +const partition=createDraftInbox({{storage,getCurrentLogin:()=>'timmy'}}).partition(); +process.stdout.write(JSON.stringify({{ + actionable:partition.actionable, + titles:partition.deliveries.map(item=>item.title), + waiting:partition.counts.waiting, + sending:partition.counts.sending, +}})); +""" + assert run_node(script) == { + "actionable": 3, + "titles": ["o/r#8", "Fix me", "Verify", "Waiting", "Sending"], + "waiting": 2, + "sending": 1, + } + + def test_draft_inbox_exposes_created_issue_waiting_for_create_and_start_continuation(): script = f""" const createDraftInbox = require({json.dumps(str(DRAFTS))}); @@ -347,6 +378,10 @@ async def test_mobile_dashboard_renders_delivery_center_separately_and_retries_w assert "item.last_attempt_error ? 'Last attempt '" in html assert '.delivery-center { display:flex; align-items:center; justify-content:space-between; gap:12px; flex-wrap:wrap;' in html assert '.delivery-center button { min-height:44px;' in html + assert "counts.delivery = draftInbox.partition(lastDrafts).actionable;" in html + assert "openDelivery: openDeliveryRecovery" in html + assert "deliveryCenterTitle.focus({preventScroll:true});" in html + assert "authoritativePhases:['delivery']" in html @pytest.mark.anyio diff --git a/tests/test_later_sync.py b/tests/test_later_sync.py index a0ff904..8f382c8 100644 --- a/tests/test_later_sync.py +++ b/tests/test_later_sync.py @@ -435,5 +435,5 @@ async def test_dashboard_syncs_every_later_change_and_exposes_account_status(): def test_later_sync_ships_atomically_in_the_offline_shell(): source = (Path(__file__).parents[1] / "frontend" / "service-worker.js").read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/later-sync.js'" in source diff --git a/tests/test_markdown_renderer.py b/tests/test_markdown_renderer.py index 6692209..2755693 100644 --- a/tests/test_markdown_renderer.py +++ b/tests/test_markdown_renderer.py @@ -256,4 +256,4 @@ def test_markdown_work_bodies_are_mobile_safe_block_containers(): assert ".markdown-content { min-width:0; max-width:100%; overflow-wrap:anywhere;" in css assert ".markdown-content pre { max-width:100%; overflow-x:auto;" in css assert ".markdown-content a { min-height:44px;" in css - assert "stackchain-dashboard-shell-v116" in worker + assert "stackchain-dashboard-shell-v117" in worker diff --git a/tests/test_mobile_composer_integration.py b/tests/test_mobile_composer_integration.py index 3255b0e..1e78924 100644 --- a/tests/test_mobile_composer_integration.py +++ b/tests/test_mobile_composer_integration.py @@ -45,7 +45,7 @@ def test_offline_shell_contains_every_local_dashboard_runtime_asset(): shell_assets = set(re.findall(r"BASE \+ '([^']+)'", worker.split("async function sessionCsrf", 1)[0])) assert local_assets <= shell_assets, f"Offline shell is missing: {sorted(local_assets - shell_assets)}" - assert "stackchain-dashboard-shell-v116" in worker + assert "stackchain-dashboard-shell-v117" in worker def test_all_conversation_composers_offer_accessible_mobile_mentions(): diff --git a/tests/test_mobile_device_setup.py b/tests/test_mobile_device_setup.py index 174b1d0..ec8b3c4 100644 --- a/tests/test_mobile_device_setup.py +++ b/tests/test_mobile_device_setup.py @@ -223,7 +223,7 @@ def test_mobile_dashboard_mounts_phone_safe_device_setup_flow(): assert "promptStorage:localStorage" in dashboard assert "pushControllerReady.then(ensureDeviceSetup)" in dashboard assert "BASE + 'static/mobile-device-setup.js'" in worker - assert "stackchain-dashboard-shell-v116" in worker + assert "stackchain-dashboard-shell-v117" in worker assert ".device-setup-panel" in css assert ".device-readiness-card" in css assert "overflow-x:hidden" in css diff --git a/tests/test_mobile_insights.py b/tests/test_mobile_insights.py index a0cb9bc..76f4121 100644 --- a/tests/test_mobile_insights.py +++ b/tests/test_mobile_insights.py @@ -174,5 +174,5 @@ async def test_mobile_home_progressively_discloses_secondary_panels_as_insights( def test_mobile_insights_rolls_into_the_offline_shell(): worker = (CONTROLLER.parent / "service-worker.js").read_text() - assert "stackchain-dashboard-shell-v116" in worker + assert "stackchain-dashboard-shell-v117" in worker assert "BASE + 'static/mobile-insights.js'" in worker diff --git a/tests/test_mobile_start_day.py b/tests/test_mobile_start_day.py index 1229a76..634f4eb 100644 --- a/tests/test_mobile_start_day.py +++ b/tests/test_mobile_start_day.py @@ -72,6 +72,44 @@ process.stdout.write(JSON.stringify({{first, second, ready, opened}})); } +def test_prepare_today_puts_actionable_delivery_recovery_before_other_work(): + script = f""" +const createStartDay = require({json.dumps(str(START_DAY))}); +let counts = {{delivery:2, agenda:1, attention:0, update:0, filed:0, today:4}}; +const opened = []; +const handoffs = []; +const saved = new Map(); +const controller = createStartDay({{ + getCounts: () => counts, + getLogin: () => 'timmy', + getDay: () => '2026-08-17', + storage: {{getItem:key=>saved.get(key)||null,setItem:(key,value)=>saved.set(key,value),removeItem:key=>saved.delete(key)}}, + openQueue: name => opened.push(name), + onHandoff: state => handoffs.push(state.next), +}}); +const blocked = controller.briefing(); +controller.startNext(); +counts = {{delivery:0, agenda:1, attention:0, update:0, filed:0, today:4}}; +const handed = controller.reconcile({{authoritative:true}}); +process.stdout.write(JSON.stringify({{blocked, handed, opened, handoffs}})); +""" + + output = run_node(script) + assert output["blocked"] == { + "total": 3, + "next": "delivery", + "label": "Review Delivery", + "summary": "2 deliveries need action before Today · 1 other item · 4 planned", + "phases": [ + {"name": "delivery", "label": "Delivery recovery", "count": 2}, + {"name": "agenda", "label": "Agenda", "count": 1}, + ], + } + assert output["handed"] is True + assert output["opened"] == ["delivery"] + assert output["handoffs"] == ["agenda"] + + def test_start_day_view_renders_refreshed_phases_and_launches_primary_action(): script = f""" const createStartDay = require({json.dumps(str(START_DAY))}); @@ -273,7 +311,8 @@ async def test_dashboard_wires_thumb_safe_start_day_briefing_into_offline_mobile assert "mobileStartDay.completePhase('agenda')" in html assert "mobileStartDay.completePhase('update')" in html assert "mobileStartDay.completePhase('filed')" in html - assert "mobileStartDay.reconcile({authoritative:authoritativeMyWorkRefresh})" in html + assert "authoritative:authoritativeMyWorkRefresh" in html + assert "authoritativePhases:['delivery']" in html assert "mobileStartDay.finish()" in html assert "openQueue: name =>" in html assert "if (sheet.open) sheet.close();" in html @@ -283,4 +322,4 @@ async def test_dashboard_wires_thumb_safe_start_day_briefing_into_offline_mobile assert ".mobile-start-day-finish { min-height:44px;" in html assert "max-width:100%; overflow-wrap:anywhere;" in html assert "BASE + 'static/mobile-start-day.js'" in service_worker - assert "stackchain-dashboard-shell-v116" in service_worker + assert "stackchain-dashboard-shell-v117" in service_worker diff --git a/tests/test_mobile_task_dock.py b/tests/test_mobile_task_dock.py index db2981e..fceff82 100644 --- a/tests/test_mobile_task_dock.py +++ b/tests/test_mobile_task_dock.py @@ -485,6 +485,24 @@ process.stdout.write(JSON.stringify({{result, calls}})); } +def test_mobile_queue_launcher_uses_dedicated_delivery_recovery_flow(): + script = f""" +const createLauncher = require({json.dumps(str(QUEUE_LAUNCHER))}); +const calls = []; +const launcher = createLauncher({{ + openDelivery: () => {{ calls.push('delivery-recovery'); return 'opened'; }}, + selectFilter: name => calls.push('generic-filter:' + name), + firstAction: () => {{ throw new Error('generic card launch must not run'); }}, +}}); +const result = launcher.open('delivery'); +process.stdout.write(JSON.stringify({{result, calls}})); +""" + result = subprocess.run(["node", "-e", script], capture_output=True, text=True) + + assert result.returncode == 0, result.stderr + assert json.loads(result.stdout) == {"result": "opened", "calls": ["delivery-recovery"]} + + def test_mobile_work_continues_into_filed_follow_up_before_later_work(): script = f""" const createLauncher = require({json.dumps(str(QUEUE_LAUNCHER))}); diff --git a/tests/test_plan_today.py b/tests/test_plan_today.py index bd53770..d2a6f9d 100644 --- a/tests/test_plan_today.py +++ b/tests/test_plan_today.py @@ -410,7 +410,7 @@ async def test_plan_today_wires_cancel_back_and_success_through_overlay_history( def test_plan_today_controller_is_available_in_the_offline_shell(): source = SERVICE_WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/plan-today.js'" in source assert "BASE + 'static/plan-today-readiness.js'" in source assert "BASE + 'static/plan-today-preview.js'" in source diff --git a/tests/test_service_worker.py b/tests/test_service_worker.py index dfe3bba..405cf2e 100644 --- a/tests/test_service_worker.py +++ b/tests/test_service_worker.py @@ -165,13 +165,13 @@ async function dispatchPush(payload) {{ def test_offline_activation_migration_rolls_the_shell_cache(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source def test_resumable_today_session_ships_in_a_new_offline_shell(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/my-work.js'" in source assert "BASE + 'static/dashboard.js'" in source assert "BASE + 'static/dashboard.css'" in source @@ -180,7 +180,7 @@ def test_resumable_today_session_ships_in_a_new_offline_shell(): def test_mobile_conversation_photo_bundles_roll_the_offline_shell(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/dashboard.js'" in source assert "BASE + 'static/authored-outbox.js'" in source assert "BASE + 'static/background-issue-sync.js'" in source @@ -189,7 +189,7 @@ def test_mobile_conversation_photo_bundles_roll_the_offline_shell(): def test_photo_metadata_sanitizer_rolls_the_cached_optimizer_atomically(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/issue-evidence-review.js'" in source assert "BASE + 'static/issue-attachment.js'" in source @@ -197,14 +197,14 @@ def test_photo_metadata_sanitizer_rolls_the_cached_optimizer_atomically(): def test_ownership_exit_runtime_rolls_the_offline_shell_cache(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/dashboard.js'" in source def test_offline_review_next_ships_today_completion_atomically(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/today-completion.js'" in source assert "BASE + 'static/dashboard.js'" in source @@ -212,7 +212,7 @@ def test_offline_review_next_ships_today_completion_atomically(): def test_duplicate_aware_capture_ships_in_a_new_offline_shell(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/create-issue-sheet.js'" in source assert "BASE + 'static/dashboard.js'" in source @@ -220,7 +220,7 @@ def test_duplicate_aware_capture_ships_in_a_new_offline_shell(): def test_inline_checklist_step_flow_rolls_the_offline_shell_atomically(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/issue-sheet.js'" in source assert "BASE + 'static/checklist-conflict.js'" in source assert "BASE + 'static/dashboard.js'" in source @@ -230,14 +230,14 @@ def test_inline_checklist_step_flow_rolls_the_offline_shell_atomically(): def test_exact_later_picker_ships_atomically_in_a_new_offline_shell(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/later-picker.js'" in source def test_navigation_deadline_ships_in_a_new_shell_cache(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/dashboard.css'" in source assert "BASE + 'static/dashboard.js'" in source assert "BASE + 'static/install-app.js'" in source @@ -246,21 +246,21 @@ def test_navigation_deadline_ships_in_a_new_shell_cache(): def test_today_convergence_ships_in_a_new_shell_cache(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/today-sync.js'" in source def test_mobile_search_viewport_ships_in_a_new_offline_shell(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/mobile-search-viewport.js'" in source def test_update_ownership_flow_ships_atomically_in_a_new_offline_shell(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/update-ownership.js'" in source @@ -930,7 +930,7 @@ def test_one_session_bound_csrf_proof_is_reused_for_a_background_drain(): def test_queue_today_ships_atomically_in_a_new_offline_shell(): source = WORKER.read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/queue-today.js'" in source diff --git a/tests/test_today_readiness.py b/tests/test_today_readiness.py index 31448d7..40642c4 100644 --- a/tests/test_today_readiness.py +++ b/tests/test_today_readiness.py @@ -221,7 +221,7 @@ async def test_today_blocker_opens_existing_preview_and_preserves_readiness_gate def test_readiness_runtime_is_available_in_offline_shell(): service_worker = SERVICE_WORKER.read_text() - assert "const CACHE = 'stackchain-dashboard-shell-v116';" in service_worker + assert "const CACHE = 'stackchain-dashboard-shell-v117';" in service_worker assert "BASE + 'static/today-readiness.js'" in service_worker diff --git a/tests/test_today_sync.py b/tests/test_today_sync.py index 71ffeb2..edc7ad7 100644 --- a/tests/test_today_sync.py +++ b/tests/test_today_sync.py @@ -127,7 +127,7 @@ sync.enqueueConfiguration(120, {{'issue:r:1:':60}}); def test_inflight_today_drain_ships_in_a_new_offline_shell(): source = (Path(__file__).parents[1] / "frontend" / "service-worker.js").read_text() - assert "stackchain-dashboard-shell-v116" in source + assert "stackchain-dashboard-shell-v117" in source assert "BASE + 'static/today-sync.js'" in source