dsh-offwork 1.1.0 → 1.1.2

package/client.source.js

@@ -6,13 +6,49 @@ window.__ModuleLoader__.load({
     const h = React.createElement;
     /* PURE_MODULES */
     /* PET_SPRITES */
+    /* PET_CLIPS */
     const messages = {
       zh: {
         ...COMPANION_MESSAGES.zh,
         ...PET_MESSAGES.zh,
         ...PET_INTERACTION_MESSAGES.zh,
         ...PET_SURFACE_MESSAGES.zh,
+        detailHelp: '使用说明',
+        detailApply: '应用',
+        detailShift: '班次详情',
+        detailWaterRule: '全天按自然时间提醒，需保持页面打开。',
+        detailSavedInterval: '已生效间隔',
+        detailDraftHint: '保存后生效',
+        detailNextInterval: '用于下一轮计时',
         title: '下班计时器',
+        classicMiniWorking: '距下班',
+        classicMiniBefore: '距开工',
+        classicMiniLunch: '午休中',
+        classicMiniStatus: '本班状态',
+        classicMiniWaiting: '待开启',
+        classicMiniFinished: '已结束',
+        classicOverview: '今日概览',
+        classicReturn: '返回概览',
+        classicMore: '展开作息详情',
+        classicLess: '收起作息详情',
+        classicNoSession: '等待会话',
+        classicUnavailable: '暂时无法计时',
+        classicRetryHint: '重新读取作息后恢复计时。',
+        classicLoading: '正在准备计时',
+        classicLoadingHint: '正在读取已保存的作息。',
+        classicBeforeHint: '班次尚未开始，显示距离开工的时间。',
+        classicWorkingHint: '本班工作进行中。',
+        classicLunchRemaining: '距离午休结束',
+        classicLunchHint: '午休结束后继续工作；喝水提醒照常计时。',
+        classicDoneHint: '本班计时已结束，下一班开始后继续。',
+        classicRestHint: '今天不计工作时长，计时会在工作日恢复。',
+        classicWaterHint: '自然时间计时',
+        classicSmokeHint: '自然时间计时',
+        classicConfigure: '设置作息与薪资',
+        classicIncome: '本班收入',
+        classicIncomeEntry: '查看收入详情',
+        classicShift: '本班作息',
+        classicEnd: '下班时间',
         working: '距离下班',
         before: '距离开工',
         lunch: '午休中',
@@ -73,7 +109,7 @@ window.__ModuleLoader__.load({
         opacityHint: '只影响背景，不影响文字。',
         waterTitle: '喝水提醒',
         waterEnable: '开启喝水提醒',
-        waterInterval: '自定义间隔（分钟）',
+        waterInterval: '提醒间隔（分钟）',
         waterSave: '保存提醒设置',
         waterEdit: '设置喝水提醒',
         waterBack: '返回',
@@ -83,21 +119,21 @@ window.__ModuleLoader__.load({
         waterEffective: '当前间隔',
         waterManage: '数据管理',
         waterSaveHint: '修改后点击保存，按新间隔重新计时。',
-        waterBrief: '按工作时间计时，午休暂停。关闭页面后不提醒。',
+        waterBrief: '按自然时间计时，午休、下班和休息日均可提醒。需要保持页面打开。',
         waterApply: '应用间隔',
         waterInvalid: '请输入 5–240 的整数。',
         waterNext: '下次喝水',
         waterDue: '该喝水啦',
         waterDrink: '喝了',
-        waterSnooze: '工作 10 分钟后',
-        waterPause: '本班暂停',
-        waterResume: '恢复本班提醒',
-        waterCount: '本班打卡',
+        waterSnooze: '10 分钟后',
+        waterPause: '暂停提醒',
+        waterResume: '恢复提醒',
+        waterCount: '饮水计数',
         waterManual: '喝了一杯',
         waterQuick: '喝水快捷操作',
         waterQuickClose: '收起喝水快捷操作',
         waterRecorded: '这杯记下啦。',
-        waterRecordHint: '工作和午休期间可以打卡，关闭提醒也能记录。',
+        waterRecordHint: '随时可以打卡，关闭提醒也能记录；计数可手动清零。',
         waterActionStale: '状态已变化，请再试一次。',
         waterQuiet: '免打扰',
         waterQuietAdjust: '调整时长',
@@ -108,32 +144,68 @@ window.__ModuleLoader__.load({
         waterQuietEnded: '免打扰已结束。',
         waterQuietHint: '按自然时间，到期自动恢复；已到期的提醒只提示一次。',
         waterOff: '提醒已关闭',
-        waterWaiting: '等待工作时段',
-        waterBreak: '休息中，提醒计时暂停',
-        waterPaused: '本班已暂停',
-        waterFinished: '本班不再安排新提醒',
+        waterWaiting: '等待开启提醒',
+        waterBreak: '提醒已暂停',
+        waterPaused: '提醒已暂停',
+        waterFinished: '提醒已结束',
         waterOther: '提醒已到期，等待可见标签页处理',
-        waterClear: '清除本班次数',
+        waterClear: '清除饮水计数',
         waterReset: '重置喝水提醒',
         waterConfirm: '确认操作',
-        waterClearHint: '仅清零本班次数，保留下一次提醒和暂停状态。',
-        waterResetHint: '清除喝水提醒设置和记录，恢复默认关闭。',
+        waterClearHint: '仅清零饮水计数，保留下一次提醒和暂停状态。',
+        waterResetHint: '清除当前喝水提醒设置和计数，恢复默认关闭。',
         waterLocal: '提醒设置和打卡仅保存在当前浏览器，不进入会话。与薪资配置分别保存。',
-        waterRules: '按工作分钟计时，午休冻结。开启、修改间隔或作息后重新计时；关闭页面后不提醒。',
+        waterRules:
+          '按自然分钟计时，与作息、薪资和会话无关。开启、修改间隔或手动恢复后重新计时；关闭页面后不提醒。',
         waterUnavailable:
-          '喝水提醒存储不可用或数据无效，自动提醒已停止。可重试；重置将清除原喝水数据。',
+          '喝水提醒存储不可用或数据无效，自动提醒已停止。可重试；重置将清除当前提醒设置和计数。',
         waterRetry: '重试读取',
-        waterSetup: '请先保存薪资与作息。',
+        waterSetup: '开启后按所选间隔提醒。',
         waterLoading: '正在读取喝水提醒…',
-        waterChanged: '提醒设置已在本浏览器生效',
-        waterStale: '作息已变化，请点击“读取最新配置”后继续提醒。',
+        waterChanged: '提醒设置已保存',
+        waterStale: '记录已更新，请重试读取。',
       },
       en: {
         ...COMPANION_MESSAGES.en,
         ...PET_MESSAGES.en,
         ...PET_INTERACTION_MESSAGES.en,
         ...PET_SURFACE_MESSAGES.en,
+        detailHelp: 'How it works',
+        detailApply: 'Apply',
+        detailShift: 'Shift details',
+        detailWaterRule: 'Reminds you throughout the day. Keep the page open.',
+        detailSavedInterval: 'Saved interval',
+        detailDraftHint: 'Applies when saved',
+        detailNextInterval: 'Applies to the next timer',
         title: 'Offwork Clock',
+        classicMiniWorking: 'To end',
+        classicMiniBefore: 'To start',
+        classicMiniLunch: 'Break',
+        classicMiniStatus: 'Status',
+        classicMiniWaiting: 'Waiting',
+        classicMiniFinished: 'Done',
+        classicOverview: 'Today at a glance',
+        classicReturn: 'Back to overview',
+        classicMore: 'Show schedule details',
+        classicLess: 'Hide schedule details',
+        classicNoSession: 'Waiting for a session',
+        classicUnavailable: 'Timer unavailable',
+        classicRetryHint: 'Reload your schedule to restore the timer.',
+        classicLoading: 'Preparing your timer',
+        classicLoadingHint: 'Loading your saved schedule.',
+        classicBeforeHint: 'Your shift has not started. This is the time until work begins.',
+        classicWorkingHint: 'Your shift is in progress.',
+        classicLunchRemaining: 'Until lunch ends',
+        classicLunchHint: 'Work resumes after lunch. Water reminders continue as usual.',
+        classicDoneHint: 'This shift has ended. Timing resumes with your next shift.',
+        classicRestHint: 'No work time is counted today. Timing resumes on a scheduled workday.',
+        classicWaterHint: 'Clock time',
+        classicSmokeHint: 'Clock time',
+        classicConfigure: 'Set schedule and pay',
+        classicIncome: 'Shift earnings',
+        classicIncomeEntry: 'View earnings',
+        classicShift: 'Shift schedule',
+        classicEnd: 'Shift ends',
         working: 'Until clock-out',
         before: 'Until work starts',
         lunch: 'On break',
@@ -195,7 +267,7 @@ window.__ModuleLoader__.load({
         opacityHint: 'Affects the background only.',
         waterTitle: 'Water reminder',
         waterEnable: 'Enable water reminders',
-        waterInterval: 'Custom interval (minutes)',
+        waterInterval: 'Interval (minutes)',
         waterSave: 'Save reminder settings',
         waterEdit: 'Reminder settings',
         waterBack: 'Back',
@@ -205,21 +277,23 @@ window.__ModuleLoader__.load({
         waterEffective: 'Current interval',
         waterManage: 'Manage data',
         waterSaveHint: 'Save changes to restart with the new interval.',
-        waterBrief: 'Counts working time and pauses on unpaid breaks. Keep the page open.',
+        waterBrief:
+          'Uses clock time, including breaks, off-hours and days off. Keep the page open.',
         waterApply: 'Apply interval',
         waterInvalid: 'Enter a whole number from 5 to 240.',
         waterNext: 'Next water break',
         waterDue: 'Time for some water',
         waterDrink: 'Drank water',
-        waterSnooze: 'In 10 working minutes',
-        waterPause: 'Pause this shift',
-        waterResume: 'Resume this shift',
-        waterCount: 'Drinks this shift',
+        waterSnooze: 'In 10 minutes',
+        waterPause: 'Pause reminders',
+        waterResume: 'Resume reminders',
+        waterCount: 'Drinks recorded',
         waterManual: 'Had a glass',
         waterQuick: 'Quick water actions',
         waterQuickClose: 'Close quick water actions',
         waterRecorded: 'Got it, your drink is recorded.',
-        waterRecordHint: 'Check in during work or breaks, even with reminders off.',
+        waterRecordHint:
+          'Check in at any time, even with reminders off. Clear the count manually when needed.',
         waterActionStale: 'The state changed. Please try again.',
         waterQuiet: 'Quiet time',
         waterQuietAdjust: 'Change duration',
@@ -231,27 +305,27 @@ window.__ModuleLoader__.load({
         waterQuietHint:
           'Uses clock time. Resumes automatically, with just one reminder if overdue.',
         waterOff: 'Reminders off',
-        waterWaiting: 'Waiting for working hours',
-        waterBreak: 'On break; reminder timer paused',
-        waterPaused: 'Paused for this shift',
-        waterFinished: 'No more reminders this shift',
+        waterWaiting: 'Waiting for reminders to be enabled',
+        waterBreak: 'Reminders paused',
+        waterPaused: 'Reminders paused',
+        waterFinished: 'Reminders ended',
         waterOther: 'Reminder due; waiting for a visible tab',
-        waterClear: 'Clear shift count',
+        waterClear: 'Clear drink count',
         waterReset: 'Reset water reminders',
         waterConfirm: 'Confirm',
         waterClearHint: 'Clear the drink count only. Keep the next reminder and pause state.',
-        waterResetHint: 'Delete water preferences and records, then turn reminders off.',
+        waterResetHint: 'Clear current water preferences and count, then turn reminders off.',
         waterLocal:
           'Reminder preferences and check-ins stay in this browser, outside conversations. Saved separately from salary settings.',
         waterRules:
-          'Counts working minutes; unpaid breaks pause the timer. Enabling or changing interval or schedule restarts it. The page must stay open.',
+          'Uses clock time, independently of work, salary and sessions. Enabling, changing the interval or manually resuming starts a new interval. Keep the page open.',
         waterUnavailable:
-          'Water storage is unavailable or invalid; automatic reminders stopped. Retry, or reset to delete old water data.',
+          'Water storage is unavailable or invalid; automatic reminders stopped. Retry, or reset current water preferences and count.',
         waterRetry: 'Retry loading',
-        waterSetup: 'Save your salary and schedule first.',
+        waterSetup: 'Enable reminders to start the selected interval.',
         waterLoading: 'Loading water reminders…',
-        waterChanged: 'Reminder preferences saved in this browser',
-        waterStale: 'Schedule changed. Reload the latest settings to continue reminders.',
+        waterChanged: 'Reminder settings saved',
+        waterStale: 'Records changed. Retry loading to continue.',
       },
     };
     const STYLE =
@@ -383,6 +457,15 @@ window.__ModuleLoader__.load({
       water: [
         ['path', { d: 'M8 1.5C6.6 4 3.5 7.1 3.5 10a4.5 4.5 0 0 0 9 0C12.5 7.1 9.4 4 8 1.5Z' }],
       ],
+      smoking: [
+        ['rect', { x: 1.5, y: 10, width: 11, height: 3, rx: 0.5 }],
+        [
+          'path',
+          {
+            d: 'M9.5 10v3M14.5 10v3M10 7.5c1-1 .8-1.8 0-2.5s-1-1.5 0-2.5M13 6c1-1 .8-1.8 0-2.5s-1-1.5 0-2.5',
+          },
+        ],
+      ],
       eye: [
         ['path', { d: 'M1.7 8S4.3 3.9 8 3.9 14.3 8 14.3 8 11.7 12.1 8 12.1 1.7 8 1.7 8Z' }],
         ['circle', { cx: 8, cy: 8, r: 2.05 }],
@@ -409,6 +492,7 @@ window.__ModuleLoader__.load({
         ['path', { d: 'M13.1 3v3.2H9.9' }],
       ],
     };
+    const LOCAL_SCREENS = [null, 'appearance', 'smoking', 'water-countdown', 'water', 'home'];
     const iconSvg = (name, size = 15) =>
       h(
         'svg',
@@ -432,8 +516,10 @@ window.__ModuleLoader__.load({
       apply(ctx) {
         for (const [lang, dict] of Object.entries(messages))
           ctx.effect(() => ctx.locale.register('offwork-clock', lang, dict));
-        const viewKey = 'dsh.offwork-clock.view.v5';
-        const previousViewKey = 'dsh.offwork-clock.view.v4';
+        const viewKey = 'dsh.offwork-clock.view.v7';
+        const previousViewKey = 'dsh.offwork-clock.view.v6';
+        const olderViewKey = 'dsh.offwork-clock.view.v5';
+        const oldestViewKey = 'dsh.offwork-clock.view.v4';
         const legacyKey = 'dsh.offwork-clock.view.v3';
 
         function Clock(props) {
@@ -454,12 +540,20 @@ window.__ModuleLoader__.load({
           const waterEditing = ui.screen === 'water';
           const [appearanceDraft, setAppearanceDraft] = React.useState(null);
           const appearanceBase = React.useRef(null);
+          const previewBox = React.useRef(null);
+          const previewMotion = React.useRef(null);
+          const [previewState, setPreviewState] = React.useState({ phase: 'idle', action: null });
+          const [previewReduced, setPreviewReduced] = React.useState(
+            () => window.matchMedia?.('(prefers-reduced-motion: reduce)').matches ?? false,
+          );
           const appearanceWasPet = React.useRef(false);
           const salaryBase = React.useRef(null);
           const menuBox = React.useRef(null);
           const menuTrigger = React.useRef(null);
           const [dragPosition, setDragPosition] = React.useState(null);
-          const [busy, setBusy] = React.useState(false);
+          const requestBusy = React.useRef(false);
+          const [hostBusy, setBusy] = React.useState(false);
+          const busy = hostBusy && (requestBusy.current || !LOCAL_SCREENS.includes(ui.screen));
           const [error, setError] = React.useState('');
           const [notice, setNotice] = React.useState('');
           const [storageError, setStorageError] = React.useState(false);
@@ -485,8 +579,117 @@ window.__ModuleLoader__.load({
           const dragState = React.useRef(null);
           const lastPosition = React.useRef(null);
           const generation = React.useRef(0);
-          const requestBusy = React.useRef(false);
           const focusReturn = React.useRef(null);
+          const [smoking, setSmoking] = React.useState(defaultCountdown);
+          const [smokingReady, setSmokingReady] = React.useState(false);
+          const [smokingBusy, setSmokingBusy] = React.useState(false);
+          const [smokingError, setSmokingError] = React.useState('');
+          const smokingRuntime = React.useRef(null);
+          React.useEffect(() => {
+            let alive = true,
+              reading = false,
+              writing = false,
+              issued = 0,
+              accepted = 0,
+              channel;
+            const makeStore = () => {
+              try {
+                return createStateStore(
+                  window.indexedDB,
+                  SMOKING_TIMER_DB,
+                  defaultCountdown,
+                  validateCountdown,
+                );
+              } catch {
+                return createStateStore(
+                  null,
+                  SMOKING_TIMER_DB,
+                  defaultCountdown,
+                  validateCountdown,
+                );
+              }
+            };
+            let store = makeStore();
+            const accept = (next, order) => {
+              if (!alive || order < accepted) return;
+              accepted = order;
+              setSmoking(next);
+              setNow(Date.now());
+              setSmokingReady(true);
+            };
+            const refresh = async () => {
+              if (!alive || reading || writing) return;
+              reading = true;
+              const source = store,
+                order = ++issued;
+              try {
+                const next = await source.update((current) => current);
+                if (source === store) accept(next, order);
+              } catch {
+                if (alive && source === store && order >= accepted)
+                  setSmokingError('timerStorageError');
+              } finally {
+                reading = false;
+              }
+            };
+            const run = async (action) => {
+              if (!alive || writing) return;
+              writing = true;
+              const order = ++issued;
+              setSmokingBusy(true);
+              try {
+                if (action.type === 'retry') {
+                  store.close();
+                  store = makeStore();
+                }
+                let changedElsewhere = false;
+                const next = await store.update((current) => {
+                  if (action.type === 'retry') return current;
+                  if (current.revision !== action.revision) {
+                    changedElsewhere = true;
+                    return current;
+                  }
+                  return transitionCountdown(current, action, Date.now());
+                });
+                accept(next, order);
+                if (alive) setSmokingError(changedElsewhere ? 'timerChanged' : '');
+                try {
+                  channel?.postMessage(next.revision);
+                } catch {
+                  /* Polling also synchronizes. */
+                }
+              } catch {
+                if (alive) setSmokingError('timerStorageError');
+              } finally {
+                writing = false;
+                if (alive) setSmokingBusy(false);
+              }
+            };
+            smokingRuntime.current = { run };
+            try {
+              channel = new BroadcastChannel(SMOKING_TIMER_DB);
+              channel.onmessage = refresh;
+            } catch {
+              /* Polling is sufficient. */
+            }
+            void refresh();
+            const timer = window.setInterval(refresh, 2000);
+            window.addEventListener('focus', refresh);
+            document.addEventListener('visibilitychange', refresh);
+            return () => {
+              alive = false;
+              smokingRuntime.current = null;
+              window.clearInterval(timer);
+              window.removeEventListener('focus', refresh);
+              document.removeEventListener('visibilitychange', refresh);
+              channel?.close();
+              store.close();
+            };
+          }, []);
+          const smokingState = countdownView(smoking, now);
+          const smokingUnavailable = !smokingReady || smokingError === 'timerStorageError';
+          const smokingAction = (action) =>
+            smokingRuntime.current?.run({ ...action, revision: smoking.revision });
           const [water, setWater] = React.useState(defaultHydration);
           const [waterReady, setWaterReady] = React.useState(false);
           const [waterError, setWaterError] = React.useState(false);
@@ -504,29 +707,33 @@ window.__ModuleLoader__.load({
           const [waterInvalid, setWaterInvalid] = React.useState(false);
           const [waterConfirm, setWaterConfirm] = React.useState(null);
           const [waterNotice, setWaterNotice] = React.useState(false);
+          const [reminderGate, setReminderGate] = React.useState(initialPetReminder);
           const reactionState = React.useRef(null);
+          const petMotion = React.useRef(null);
+          const petReactionToken = React.useRef(null);
           const waterRuntime = React.useRef(null);
           const waterOwner = React.useRef(null);
           if (!waterOwner.current)
             waterOwner.current =
               window.crypto?.randomUUID?.() || String(Math.random()) + Date.now();
           const waterInputs = React.useRef(null);
-          const waterScheduleChange = React.useRef(null);
-          waterInputs.current = {
-            settings: data?.configured && !error ? data.settings : null,
-            editing: editing || waterEditing,
-          };
+          waterInputs.current = { editing: editing || waterEditing };
 
           const settings = data?.settings;
           const workingDraft = draft || settings;
           const state = settings ? safeCalculate(settings) : null;
           const preview = workingDraft ? safeCalculate(workingDraft) : null;
           const safeState = state && !state.error ? state : null;
-          const petMode =
-            ready &&
-            data?.configured &&
-            !!safeState &&
-            (appearanceOnly ? appearanceWasPet.current : view.companion);
+          const petMode = ready && (appearanceOnly ? appearanceWasPet.current : view.companion);
+          const petClockStatus = !sessionId
+            ? 'petNeedsSession'
+            : error || state?.error
+              ? 'petLoadFailed'
+              : !data
+                ? 'loading'
+                : !data.configured
+                  ? 'petNeedsSetup'
+                  : safeState?.status || 'loading';
           const stageModel = appearanceOnly ? savedView.petModel : view.petModel;
           const petGeometry = petLayout(
             dragPosition ?? view.petPosition,
@@ -534,6 +741,8 @@ window.__ModuleLoader__.load({
             appearanceOnly ? savedView.petSize : view.petSize,
             420,
             stageModel,
+            72,
+            196,
           );
           const surfaceScreen = ui.screen || 'reminder';
           const surfaceWidth = petSurfaceWidth(surfaceScreen, viewport);
@@ -577,7 +786,7 @@ window.__ModuleLoader__.load({
           );
           const waterAlertLayout = placePetSurface(anchor, viewport, {
             width: Math.min(140, Math.max(110, alertRoom)),
-            height: 34,
+            height: 44,
             kind: 'menu',
             obstacles: [...(petOpen ? [floatingPanel] : []), ...(ui.menu ? [menuLayout] : [])],
           });
@@ -586,14 +795,15 @@ window.__ModuleLoader__.load({
             height: toastHeight,
             kind: 'menu',
           });
-          const collapsed =
-            !petMode &&
-            !!safeState &&
-            !editing &&
-            !waterEditing &&
-            view.mini &&
-            !error &&
-            !state?.error;
+          const collapsed = !petMode && ui.screen === null && view.mini;
+          const classicClock = classicClockPresentation({
+            hasSession: !!sessionId,
+            loaded: !!data,
+            configured: !!data?.configured,
+            failed: !!error || !!state?.error,
+            state: safeState,
+            now,
+          });
           const seconds = safeState
             ? safeState.status === 'before'
               ? safeState.startRemaining
@@ -621,6 +831,9 @@ window.__ModuleLoader__.load({
             classicSize,
           );
           const cardStyle = {
+            width: ui.screen
+              ? petSurfaceWidth(ui.screen, viewport)
+              : Math.min(collapsed ? 224 : 320, Math.max(1, viewport.width - 24)),
             '--owc-alpha': String(view.opacity),
             '--owc-viewport-height': Math.max(1, viewport.height - 24) + 'px',
             left: classicPosition.x,
@@ -655,7 +868,11 @@ window.__ModuleLoader__.load({
 
           React.useEffect(() => {
             try {
-              const saved = localStorage.getItem(viewKey) ?? localStorage.getItem(previousViewKey);
+              const saved =
+                localStorage.getItem(viewKey) ??
+                localStorage.getItem(previousViewKey) ??
+                localStorage.getItem(olderViewKey) ??
+                localStorage.getItem(oldestViewKey);
               const legacy = !saved ? JSON.parse(localStorage.getItem(legacyKey) || 'null') : null;
               setView(
                 normalizeView(
@@ -699,17 +916,8 @@ window.__ModuleLoader__.load({
               store = createHydrationStore(null);
             }
             try {
-              channel = new BroadcastChannel('dsh.offwork-clock.hydration.v1');
+              channel = new BroadcastChannel('dsh.offwork-clock.hydration.wall-clock.v3');
             } catch {}
-            const contextAt = (time) => {
-              const current = waterInputs.current.settings;
-              if (!current) return null;
-              try {
-                return hydrationContext(current, calculate(current, time));
-              } catch {
-                return null;
-              }
-            };
             const update = async (action = { type: 'tick' }, automatic = false) => {
               if (!active || (automatic && (running || failed))) return;
               running++;
@@ -725,59 +933,31 @@ window.__ModuleLoader__.load({
                 let changed = false;
                 let recorded = false;
                 let quietChanged = false;
-                let usedPermit = null;
                 const result = await store.update(
                   (current) => {
                     const time = Date.now();
-                    const context = contextAt(time);
                     if (action.type === 'sync') return current;
-                    const permit = waterScheduleChange.current;
-                    const operation =
-                      permit && context && permit.schedule === context.schedule
-                        ? { ...action, baseSchedule: permit.baseSchedule }
-                        : action;
-                    let next = transitionHydration(
-                      current,
-                      context,
-                      operation,
-                      time,
-                      waterOwner.current,
-                    );
+                    let next = transitionHydration(current, action, time, waterOwner.current);
                     recorded =
-                      ['drink', 'manual-drink'].includes(action.type) &&
-                      next.shift?.count >
-                        (current.shift?.id === next.shift?.id ? (current.shift?.count ?? 0) : 0);
+                      ['drink', 'manual-drink'].includes(action.type) && next.count > current.count;
                     quietChanged =
                       ['quiet', 'end-quiet'].includes(action.type) &&
-                      next.shift?.quietUntil !== current.shift?.quietUntil;
+                      next.quietUntil !== current.quietUntil;
                     if (automatic) {
                       const allow = !document.hidden && !waterInputs.current.editing;
                       next = transitionHydration(
                         next,
-                        context,
                         { type: allow ? 'claim' : 'release' },
                         time,
                         waterOwner.current,
                       );
                     }
-                    if (
-                      permit &&
-                      context &&
-                      permit.schedule === context.schedule &&
-                      next.shift?.schedule === context.schedule
-                    )
-                      usedPermit = permit;
                     changed = JSON.stringify(next) !== JSON.stringify(current);
                     return next;
                   },
                   { reset: action.type === 'reset' },
                 );
                 if (!active) return;
-                if (
-                  action.type === 'reset' ||
-                  (usedPermit && waterScheduleChange.current === usedPermit)
-                )
-                  waterScheduleChange.current = null;
                 failed = false;
                 setWater(result);
                 setWaterReady(true);
@@ -809,11 +989,14 @@ window.__ModuleLoader__.load({
             const visibility = () => {
               setWaterVisible(!document.hidden);
               setNow(Date.now());
-              if (document.hidden) void update({ type: 'release' });
-              else tick();
+              if (document.hidden) {
+                setReminderGate(initialPetReminder);
+                void update({ type: 'release' });
+              } else tick();
             };
             const pageHide = () => {
               setWaterVisible(false);
+              setReminderGate(initialPetReminder);
               void update({ type: 'release' });
             };
             waterRuntime.current = { update, tick };
@@ -838,8 +1021,7 @@ window.__ModuleLoader__.load({
               channel?.close();
               void store
                 .update((current) => {
-                  if (current.shift?.claim?.owner === waterOwner.current)
-                    current.shift.claim = null;
+                  if (current.claim?.owner === waterOwner.current) current.claim = null;
                   return current;
                 })
                 .catch(() => {})
@@ -849,7 +1031,7 @@ window.__ModuleLoader__.load({
 
           React.useEffect(() => {
             waterRuntime.current?.tick();
-          }, [settings, editing, waterEditing, error]);
+          }, [editing, waterEditing]);
 
           React.useEffect(() => {
             if (!waterNotice) return;
@@ -895,6 +1077,7 @@ window.__ModuleLoader__.load({
             const interval = Number(waterInterval);
             if (!Number.isInteger(interval) || interval < 5 || interval > 240) {
               setWaterInvalid(true);
+              box.current?.querySelector('[name=waterInterval]')?.focus();
               return;
             }
             const result = await waterAction({
@@ -927,7 +1110,7 @@ window.__ModuleLoader__.load({
                   setWaterNotice({ key: 'waterRecorded', kind: 'drink', token: result.revision });
                 if (action.type === 'manual-drink') {
                   setWaterNotice({
-                    key: result.shift?.recentActions.includes(action.actionId)
+                    key: result.recentActions.includes(action.actionId)
                       ? 'waterRecorded'
                       : 'waterActionStale',
                     kind: outcome.recorded ? 'drink' : 'notice',
@@ -938,7 +1121,7 @@ window.__ModuleLoader__.load({
                 if (action.type === 'quiet')
                   setWaterNotice({
                     key:
-                      outcome.quietChanged && result.shift?.quietUntil > Date.now()
+                      outcome.quietChanged && result.quietUntil > Date.now()
                         ? 'waterQuietStarted'
                         : 'waterActionStale',
                     kind: 'notice',
@@ -966,13 +1149,9 @@ window.__ModuleLoader__.load({
                         ? '.owc-pet-handle'
                         : '.owc-grip,.owc-title'
                       : action.type === 'manual-drink'
-                        ? petMode
-                          ? '.owc-pet-water-row .owc-primary'
-                          : '.owc-water-actions .owc-primary'
+                        ? '.owc-water-record,.owc-water-actions .owc-primary'
                         : action.type === 'end-quiet'
-                          ? petMode
-                            ? '.owc-pet-quiet-row button'
-                            : '.owc-water-quiet summary'
+                          ? '.owc-detail-more summary,.owc-water-quiet summary'
                           : '.owc-water-form details > summary';
                     box.current?.querySelector(target)?.focus();
                   });
@@ -1041,7 +1220,7 @@ window.__ModuleLoader__.load({
               window.visualViewport?.removeEventListener('resize', resize);
               window.visualViewport?.removeEventListener('scroll', resize);
             };
-          }, [clamp, petMode]);
+          }, [clamp, petMode, ready]);
 
           React.useEffect(() => {
             if (ui.pending) {
@@ -1093,21 +1272,11 @@ window.__ModuleLoader__.load({
             setBusy(true);
             setError('');
             try {
-              const baseSchedule = (await waterRuntime.current?.update({ type: 'sync' }))?.state
-                ?.shift?.schedule;
-              if (token !== generation.current) return;
               const next = await request('get');
               if (token !== generation.current) return;
-              if (next.configured)
-                waterScheduleChange.current = {
-                  baseSchedule,
-                  schedule: hydrationContext(next.settings, calculate(next.settings, Date.now()))
-                    .schedule,
-                };
               setData(next);
               if (!next.configured) {
                 setDraft({ ...next.settings });
-                dispatchUI({ type: 'navigate', screen: 'schedule', discard: true });
                 salaryBase.current = next.settings;
               }
               if (explicit) setNotice(t('synced'));
@@ -1126,19 +1295,11 @@ window.__ModuleLoader__.load({
             setError('');
             const token = ++generation.current;
             try {
-              const baseSchedule = (await waterRuntime.current?.update({ type: 'sync' }))?.state
-                ?.shift?.schedule;
-              if (token !== generation.current) return;
               const next = await request(
                 'set',
                 changedSettings(salaryBase.current ?? settings, draft),
               );
               if (token === generation.current) {
-                waterScheduleChange.current = {
-                  baseSchedule,
-                  schedule: hydrationContext(next.settings, calculate(next.settings, Date.now()))
-                    .schedule,
-                };
                 setData(next);
                 dispatchUI({ type: 'navigate', screen: ui.back, discard: true });
                 setDraft(null);
@@ -1191,7 +1352,10 @@ window.__ModuleLoader__.load({
             d.moved = true;
             petDragged.current = true;
             const next = clamp({ x: e.clientX - d.dx, y: e.clientY - d.dy });
-            if (petMode) setDragPosition(next);
+            if (petMode) {
+              setDragPosition(next);
+              petMotion.current?.drag(e.clientX - d.x0);
+            }
             lastPosition.current = next;
             if (box.current) {
               box.current.style.left = next.x + 'px';
@@ -1203,6 +1367,7 @@ window.__ModuleLoader__.load({
             const d = dragState.current;
             if (!d) return;
             dragState.current = null;
+            if (petMode && d.moved) petMotion.current?.release(e.type !== 'pointerup');
             if (e.type === 'pointercancel' || e.type === 'lostpointercapture')
               petDragged.current = false;
             if (d.moved && lastPosition.current) commitPosition(lastPosition.current);
@@ -1240,7 +1405,7 @@ window.__ModuleLoader__.load({
             petDragged.current = false;
             if (ui.pending) return true;
             if (!petMode) {
-              if (!busy && !waterBusy) navigateScreen('appearance', event);
+              if (!requestBusy.current && !waterBusy) navigateScreen('appearance', event);
               return true;
             }
             const trigger =
@@ -1256,7 +1421,7 @@ window.__ModuleLoader__.load({
               : trigger;
             const rect = trigger?.getBoundingClientRect();
             const point =
-              event.type === 'keydown'
+              event.type === 'keydown' || (event.type === 'click' && event.detail === 0)
                 ? { x: rect?.right ?? petGeometry.x, y: rect?.top ?? petGeometry.y }
                 : { x: event.clientX, y: event.clientY };
             dispatchUI({ type: 'menu', position: point });
@@ -1297,8 +1462,19 @@ window.__ModuleLoader__.load({
             setWaterConfirm(null);
           }
           function navigateScreen(screen, event) {
-            if (!data?.configured && screen !== 'schedule') return;
-            if (ui.pending || busy || waterBusy || requestBusy.current || waterPending.current)
+            if (
+              screen !== null &&
+              !LOCAL_SCREENS.includes(screen) &&
+              (!data || (!data.configured && screen !== 'schedule'))
+            )
+              return;
+            if (
+              ui.pending ||
+              waterBusy ||
+              requestBusy.current ||
+              waterPending.current ||
+              (hostBusy && !LOCAL_SCREENS.includes(screen))
+            )
               return;
             const root = event?.currentTarget?.getAttribute?.('role') === 'menuitem';
             if (event?.currentTarget) focusReturn.current = event.currentTarget;
@@ -1350,7 +1526,7 @@ window.__ModuleLoader__.load({
             navigateScreen('schedule', event);
           }
           function closeEditor() {
-            if ((!data?.configured && !appearanceOnly) || busy) return;
+            if (busy) return;
             performNavigation(ui.back);
           }
           function update(key, value) {
@@ -1419,19 +1595,17 @@ window.__ModuleLoader__.load({
               'button',
               {
                 type: 'button',
-                className: 'owc-text',
+                className: 'owc-icon',
                 'aria-pressed': view.masked,
+                'aria-label': t(view.masked ? 'show' : 'hide'),
                 title: t(view.masked ? 'show' : 'hide'),
                 onClick: () => setPreference({ masked: !view.masked }),
               },
               iconSvg(view.masked ? 'eyeOff' : 'eye', 13),
-              t(view.masked ? 'show' : 'hide'),
             );
 
-          const waterContext =
-            data?.configured && safeState && !error ? hydrationContext(settings, safeState) : null;
-          const waterState = hydrationView(water, waterContext, now);
-          const waterClaim = water.shift?.claim;
+          const waterState = hydrationView(water, now);
+          const waterClaim = water.claim;
           const waterPrompt =
             waterReady &&
             !waterError &&
@@ -1441,9 +1615,59 @@ window.__ModuleLoader__.load({
             !document.hidden &&
             waterState.phase === 'due' &&
             waterClaim?.owner === waterOwner.current &&
-            waterClaim.sequence === water.shift.sequence &&
+            waterClaim.sequence === water.sequence &&
             waterClaim.until > Date.now() &&
             waterClaim.until <= Date.now() + HYDRATION_LEASE_MS;
+          const reminderReady = !!(petMode && waterReady && !waterError);
+          const reminderVisible = waterVisible && !document.hidden;
+          const reminderAvailable = !petOpen && !ui.menu && !ui.pending && !busy;
+          React.useEffect(() => {
+            setReminderGate((current) =>
+              nextPetReminder(current, {
+                ready: reminderReady,
+                eventId: waterState.eventId,
+                phase: waterState.phase,
+                visible: reminderVisible,
+                available: reminderAvailable,
+                ownsPrompt: waterPrompt,
+              }),
+            );
+          }, [
+            reminderReady,
+            waterState.eventId,
+            waterState.phase,
+            reminderVisible,
+            reminderAvailable,
+            waterPrompt,
+          ]);
+          const autoWaterPrompt =
+            reminderReady &&
+            reminderVisible &&
+            reminderAvailable &&
+            waterPrompt &&
+            reminderGate.open &&
+            reminderGate.eventId === waterState.eventId;
+          function openWaterPopup(event) {
+            if (!waterPrompt || waterBusy) return;
+            if (!reminderAvailable) {
+              navigateScreen('home', event);
+              return;
+            }
+            const trigger = event.currentTarget;
+            setReminderGate({ eventId: waterState.eventId, armed: false, open: true });
+            requestAnimationFrame(() => {
+              const active = document.activeElement;
+              if (active !== trigger && active?.tagName !== 'BODY') return;
+              if (petPanel.current?.dataset.petScreen === 'reminder')
+                petPanel.current.querySelector('.owc-water-actions button')?.focus();
+            });
+          }
+          function dismissWaterPopup() {
+            const hadFocus = petPanel.current?.contains(document.activeElement);
+            setReminderGate(dismissPetReminder);
+            if (hadFocus)
+              requestAnimationFrame(() => box.current?.querySelector('.owc-pet-handle')?.focus());
+          }
           const reactionSurface = [
             collapsed,
             editing,
@@ -1465,13 +1689,116 @@ window.__ModuleLoader__.load({
             workStatus: safeState?.status,
             phase: waterState.phase,
             ownsPrompt: waterPrompt,
-            ready: waterReady && !!safeState,
-            failed: waterError || !!error,
+            ready: waterReady,
+            failed: waterError,
             feedback: waterNotice || null,
             visible: view.companion,
             motion: view.companionMotion && !reactionState.current?.stopped,
             pageVisible: waterVisible && !document.hidden && !editing && !waterEditing,
           });
+          React.useLayoutEffect(() => {
+            if (!petMode) return;
+            const artwork = box.current?.querySelector('.owc-pet-handle > .owc-pet-art');
+            if (!artwork) return;
+            const base = createPetMotion(artwork, window, { enabled: false });
+            const controller = createPetVideoMotion(
+              artwork,
+              window,
+              base,
+              PET_CLIPS.models[stageModel],
+              PET_CLIPS.probe,
+            );
+            petMotion.current = controller;
+            return () => {
+              controller.destroy();
+              petMotion.current = null;
+            };
+          }, [petMode, stageModel]);
+          React.useLayoutEffect(() => {
+            petMotion.current?.configure({
+              enabled:
+                savedView.companionMotion &&
+                waterVisible &&
+                waterReady &&
+                !waterError &&
+                !editing &&
+                !waterEditing &&
+                !ui.menu,
+              resting: ['quiet', 'offline'].includes(companion.pose),
+            });
+          }, [
+            petMode,
+            stageModel,
+            savedView.companionMotion,
+            waterVisible,
+            waterReady,
+            waterError,
+            error,
+            editing,
+            waterEditing,
+            !!ui.menu,
+            companion.pose,
+          ]);
+          React.useLayoutEffect(() => {
+            const token = waterNotice?.token;
+            if (petReactionToken.current === token) return;
+            petReactionToken.current = token;
+            if (petMode && companion.animate) petMotion.current?.play('celebrate');
+          }, [petMode, waterNotice?.token, companion.animate]);
+          React.useEffect(() => {
+            const media = window.matchMedia?.('(prefers-reduced-motion: reduce)');
+            const update = () => setPreviewReduced(!!media?.matches);
+            media?.addEventListener?.('change', update);
+            return () => media?.removeEventListener?.('change', update);
+          }, []);
+          React.useLayoutEffect(() => {
+            if (!appearanceOnly || ui.pending) return;
+            setPreviewState({ phase: 'idle', action: null });
+            if (!view.companion || petModel(view.petModel).renderer !== 'video') return;
+            const artwork = previewBox.current?.querySelector('.owc-pet-art');
+            if (!artwork) return;
+            const base = createPetMotion(artwork, window, { enabled: false, ambient: false });
+            const controller = createPetVideoMotion(
+              artwork,
+              window,
+              base,
+              PET_CLIPS.models[view.petModel],
+              PET_CLIPS.probe,
+              {
+                autoIdle: false,
+                fallback: false,
+                interruptible: true,
+                onStateChange: setPreviewState,
+              },
+            );
+            previewMotion.current = controller;
+            return () => {
+              controller.destroy();
+              previewMotion.current = null;
+            };
+          }, [appearanceOnly, view.companion, view.petModel, !!ui.pending]);
+          React.useLayoutEffect(() => {
+            previewMotion.current?.configure({
+              enabled:
+                appearanceOnly &&
+                view.companion &&
+                view.companionMotion &&
+                waterVisible &&
+                !previewReduced &&
+                !ui.menu &&
+                !ui.pending,
+              resting: false,
+            });
+          }, [
+            appearanceOnly,
+            view.companion,
+            view.petModel,
+            view.companionMotion,
+            waterVisible,
+            previewReduced,
+            !!ui.menu,
+            !!ui.pending,
+          ]);
           const companionCard = (compact = false) =>
             companion.visible &&
             h(
@@ -1502,13 +1829,6 @@ window.__ModuleLoader__.load({
           const waterSummary = () => {
             if (!waterReady) return t('waterLoading');
             if (waterError) return t('waterUnavailable');
-            if (
-              water.enabled &&
-              waterContext &&
-              water.shift &&
-              water.shift.config !== waterContext.config
-            )
-              return t('waterStale');
             const labels = {
               off: 'waterOff',
               waiting: 'waterWaiting',
@@ -1523,19 +1843,258 @@ window.__ModuleLoader__.load({
               ? t('waterNext') + ' · ' + formatDuration(waterState.remaining / 1000)
               : t(labels[waterState.phase]);
           };
-          const waterCanRecord =
-            waterReady &&
-            !waterError &&
-            data?.configured &&
-            ['working', 'lunch'].includes(waterContext?.status) &&
-            (!water.shift || water.shift.config === waterContext.config);
-          const waterCanQuiet = waterCanRecord && water.enabled && !water.shift?.paused;
+          const waterCountdownText = () => {
+            if (waterError) return t('timerUnavailable');
+            if (!waterReady) return t('timerLoading');
+            if (['countdown', 'due', 'break'].includes(waterState.phase))
+              return formatDuration(Math.ceil(waterState.remaining / 1000));
+            if (waterState.phase === 'quiet')
+              return formatDuration(Math.ceil(waterState.quietRemaining / 1000));
+            return t(
+              {
+                off: 'timerOff',
+                waiting: 'timerWaiting',
+                paused: 'timerPaused',
+                finished: 'timerFinished',
+              }[waterState.phase] || 'timerUnavailable',
+            );
+          };
+          const smokingCountdownText = () =>
+            smokingUnavailable
+              ? t(smokingError ? 'timerUnavailable' : 'timerLoading')
+              : smokingState.phase === 'idle'
+                ? t('timerIdle')
+                : formatDuration(Math.ceil(smokingState.remaining / 1000));
+          const timerRow = (kind, value, due, title) => {
+            const phase = kind === 'water' ? waterState.phase : smokingState.phase;
+            const extra = {
+              paused: 'timerPaused',
+              break: 'timerBreak',
+              quiet: 'timerQuiet',
+              due: 'timerDue',
+            }[phase];
+            return h(
+              'div',
+              {
+                className: 'owc-pet-timer-row',
+                'data-countdown': kind,
+                'data-countdown-due': due,
+                'data-countdown-phase': phase,
+                role: 'timer',
+                'aria-label': t(kind === 'water' ? 'waterCountdown' : 'smokingCountdown'),
+                title,
+              },
+              h(
+                'span',
+                { className: 'owc-pet-timer-label' },
+                iconSvg(kind, 14),
+                extra && h('span', { className: 'owc-sr-only' }, t(extra)),
+              ),
+              h(
+                'strong',
+                null,
+                ['paused', 'break'].includes(phase) &&
+                  /^\d/.test(value) &&
+                  h('span', { className: 'owc-timer-pause', 'aria-hidden': true }, 'Ⅱ'),
+                phase === 'quiet' &&
+                  h('span', { className: 'owc-timer-pause', 'aria-hidden': true }, '☾'),
+                value.startsWith('00:') ? value.slice(3) : value.replace(/^0(?=\d:)/, ''),
+              ),
+            );
+          };
+          const waterHero = () => {
+            const ticking =
+              waterReady && !waterError && ['countdown', 'due', 'quiet'].includes(waterState.phase);
+            return h(
+              'div',
+              { className: 'owc-detail-hero' },
+              h(
+                'p',
+                { className: 'owc-detail-kicker', 'data-water-status': true },
+                t(
+                  ticking
+                    ? waterState.phase === 'quiet'
+                      ? 'waterQuiet'
+                      : waterState.phase === 'due'
+                        ? 'waterDue'
+                        : 'waterNext'
+                    : 'waterTitle',
+                ),
+              ),
+              h(
+                'div',
+                {
+                  className: 'owc-detail-value' + (ticking ? '' : ' owc-detail-state'),
+                  role: 'timer',
+                  'aria-label': t('waterCountdown'),
+                },
+                waterCountdownText(),
+              ),
+              h(
+                'div',
+                { className: 'owc-detail-meta' },
+                h(
+                  'span',
+                  { 'data-water-count': true },
+                  t('waterCount') + ' · ' + (waterReady && !waterError ? waterState.count : '—'),
+                ),
+                h(
+                  'span',
+                  { className: 'owc-detail-feedback' },
+                  waterNotice ? t(waterNotice.key) : '',
+                ),
+              ),
+            );
+          };
+          const waterCountdownCard = () =>
+            h(
+              'div',
+              { className: 'owc-countdown-card', 'data-water-countdown-card': true },
+              waterHero(),
+              h(
+                'div',
+                { className: 'owc-countdown-actions' },
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-primary owc-water-record',
+                    disabled: !waterCanRecord || waterBusy,
+                    onClick: recordWater,
+                  },
+                  t('petRecord'),
+                ),
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-text',
+                    onClick: (event) => navigateScreen('home', event),
+                  },
+                  t('timerWaterDetails'),
+                ),
+              ),
+            );
+          const smokingCountdownCard = () =>
+            h(
+              'div',
+              { className: 'owc-countdown-card', 'data-smoking-countdown-card': true },
+              h(
+                'div',
+                {
+                  className: 'owc-countdown-value',
+                  role: 'timer',
+                  'aria-label': t('smokingCountdown'),
+                },
+                !smokingUnavailable && smokingState.phase === 'idle'
+                  ? formatDuration(smoking.minutes * 60)
+                  : smokingCountdownText(),
+              ),
+              h(
+                'p',
+                { role: 'status' },
+                smokingUnavailable
+                  ? t(smokingError ? 'timerUnavailable' : 'timerLoading')
+                  : t(
+                      {
+                        idle: 'timerIdle',
+                        running: 'timerRunning',
+                        paused: 'timerPaused',
+                        due: 'timerDue',
+                      }[smokingState.phase],
+                    ),
+              ),
+              h(
+                'label',
+                null,
+                t('timerInterval'),
+                h(
+                  'select',
+                  {
+                    value: smoking.minutes,
+                    disabled: smokingUnavailable || smokingBusy,
+                    onChange: (event) =>
+                      smokingAction({ type: 'interval', minutes: Number(event.target.value) }),
+                  },
+                  COUNTDOWN_INTERVALS.map((minutes) =>
+                    h('option', { key: minutes, value: minutes }, String(minutes)),
+                  ),
+                ),
+              ),
+              h(
+                'div',
+                { className: 'owc-countdown-actions' },
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-primary',
+                    disabled: smokingUnavailable || smokingBusy,
+                    onClick: () =>
+                      smokingAction({
+                        type:
+                          smokingState.phase === 'running'
+                            ? 'pause'
+                            : smokingState.phase === 'paused'
+                              ? 'resume'
+                              : 'start',
+                      }),
+                  },
+                  t(
+                    smokingState.phase === 'running'
+                      ? 'timerPause'
+                      : smokingState.phase === 'paused'
+                        ? 'timerResume'
+                        : 'timerStart',
+                  ),
+                ),
+                smokingState.phase !== 'idle' &&
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      disabled: smokingUnavailable || smokingBusy,
+                      onClick: () => smokingAction({ type: 'restart' }),
+                    },
+                    t('timerRestart'),
+                  ),
+                smokingState.phase !== 'idle' &&
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      disabled: smokingUnavailable || smokingBusy,
+                      onClick: () => smokingAction({ type: 'stop' }),
+                    },
+                    t('timerStop'),
+                  ),
+              ),
+              h('p', { className: 'owc-hint' }, t('detailNextInterval')),
+              h(
+                'details',
+                { className: 'owc-detail-more' },
+                h('summary', null, t('detailHelp')),
+                h('p', null, t('timerHint')),
+              ),
+              smokingError && h('p', { className: 'owc-error', role: 'alert' }, t(smokingError)),
+              smokingError === 'timerStorageError' &&
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    disabled: smokingBusy,
+                    onClick: () => smokingAction({ type: 'retry' }),
+                  },
+                  t('timerRetry'),
+                ),
+            );
+          const waterCanRecord = waterReady && !waterError;
+          const waterCanQuiet = waterCanRecord && water.enabled && !water.paused;
           const recordWater = (event) => {
             if (event.detail > 1) return;
             if (!manualAttempt.current)
               manualAttempt.current = {
                 type: 'manual-drink',
-                shiftId: waterContext.id,
                 actionId: window.crypto?.randomUUID?.() || String(Math.random()) + Date.now(),
                 ...(waterState.phase === 'due' ? { eventId: waterState.eventId } : {}),
               };
@@ -1604,14 +2163,10 @@ window.__ModuleLoader__.load({
                   'button',
                   {
                     type: 'button',
-                    disabled:
-                      waterError ||
-                      waterBusy ||
-                      !waterContext ||
-                      water.shift?.id !== waterContext.id,
-                    onClick: () => waterAction({ type: water.shift?.paused ? 'resume' : 'pause' }),
+                    disabled: waterError || waterBusy || !waterReady,
+                    onClick: () => waterAction({ type: water.paused ? 'resume' : 'pause' }),
                   },
-                  t(water.shift?.paused ? 'waterResume' : 'waterPause'),
+                  t(water.paused ? 'waterResume' : 'waterPause'),
                 ),
               waterError &&
                 h(
@@ -1661,7 +2216,7 @@ window.__ModuleLoader__.load({
                     className: 'owc-text',
                     style: { marginLeft: 'auto' },
                     'aria-label': t('waterEdit'),
-                    disabled: !waterReady || !data?.configured,
+                    disabled: !waterReady,
                     onClick: openWaterEditor,
                   },
                   t('settings'),
@@ -1694,16 +2249,59 @@ window.__ModuleLoader__.load({
                   { 'data-water-effective': water.interval },
                   t('waterEvery') + ' ' + water.interval + ' ' + t('waterMinutes'),
                 ),
-                h('span', { 'data-water-count': true }, t('waterCount') + ': ' + waterState.count),
+                h(
+                  'span',
+                  { 'data-water-count': true },
+                  t('waterCount') + ': ' + (waterReady && !waterError ? waterState.count : '—'),
+                ),
               ),
               waterControls(),
-              !['working', 'lunch'].includes(waterContext?.status) &&
-                h('p', { className: 'owc-hint' }, t('waterRecordHint')),
+              h('p', { className: 'owc-hint' }, t('waterRecordHint')),
               waterState.phase === 'quiet' &&
                 h('p', { className: 'owc-hint' }, t('waterQuietHint')),
               waterNotice && !view.companion && h('p', null, t(waterNotice.key)),
             );
 
+          const waterIntervalField = () =>
+            h(
+              'label',
+              { className: 'owc-water-interval' },
+              h('span', null, t('waterInterval')),
+              h('input', {
+                name: 'waterInterval',
+                type: 'number',
+                inputMode: 'numeric',
+                min: '5',
+                max: '240',
+                step: '1',
+                value: waterInterval,
+                'aria-invalid': waterInvalid,
+                onChange: (event) => {
+                  setWaterInterval(event.target.value);
+                  setWaterInvalid(false);
+                },
+              }),
+            );
+          const waterSettingsActions = () =>
+            h(
+              'div',
+              { className: 'owc-save' },
+              h(
+                'button',
+                { type: 'button', disabled: waterBusy, onClick: closeWaterEditor },
+                t('cancel'),
+              ),
+              h(
+                'button',
+                {
+                  type: 'submit',
+                  className: 'owc-primary',
+                  'aria-label': t('waterSave'),
+                  disabled: !waterReady || waterError || waterBusy,
+                },
+                t(waterBusy ? 'busy' : 'save'),
+              ),
+            );
           const waterSettings = () =>
             h(
               'form',
@@ -1726,7 +2324,7 @@ window.__ModuleLoader__.load({
                 h('input', {
                   type: 'checkbox',
                   checked: waterEnabledDraft,
-                  disabled: !waterReady || waterError || waterBusy || !data?.configured,
+                  disabled: !waterReady || waterError || waterBusy,
                   onChange: (event) => {
                     setWaterEnabledDraft(event.target.checked);
                     setWaterNotice(false);
@@ -1735,8 +2333,9 @@ window.__ModuleLoader__.load({
               ),
               h(
                 'fieldset',
-                { disabled: !waterReady || waterError || waterBusy || !data?.configured },
-                h('legend', { className: 'owc-muted' }, t('waterPresets')),
+                { disabled: !waterReady || waterError || waterBusy },
+                h('legend', { className: 'owc-sr-only' }, t('waterPresets')),
+                waterIntervalField(),
                 h(
                   'div',
                   { className: 'owc-water-presets' },
@@ -1747,64 +2346,34 @@ window.__ModuleLoader__.load({
                         type: 'button',
                         key: minutes,
                         'aria-pressed': Number(waterInterval) === minutes,
+                        'aria-label': minutes + ' ' + t('waterMinutes'),
                         onClick: () => {
                           setWaterInterval(String(minutes));
                           setWaterInvalid(false);
                         },
                       },
-                      minutes + ' ' + t('waterMinutes'),
+                      String(minutes),
                     ),
                   ),
                 ),
-                h(
-                  'label',
-                  { className: 'owc-field' },
-                  h('span', null, t('waterInterval')),
-                  h('input', {
-                    name: 'waterInterval',
-                    type: 'number',
-                    inputMode: 'numeric',
-                    min: '5',
-                    max: '240',
-                    step: '1',
-                    value: waterInterval,
-                    'aria-invalid': waterInvalid,
-                    onChange: (event) => {
-                      setWaterInterval(event.target.value);
-                      setWaterInvalid(false);
-                    },
-                  }),
-                ),
               ),
               waterInvalid && h('p', { role: 'alert' }, t('waterInvalid')),
-              h(
-                'p',
-                { 'data-water-saved-interval': water.interval },
-                t('waterEffective') + ': ' + water.interval + ' ' + t('waterMinutes'),
-              ),
-              h('p', { className: 'owc-hint' }, t('waterSaveHint')),
-              h('p', { className: 'owc-hint' }, t('waterBrief')),
-              waterError && h('p', { role: 'alert' }, t('waterUnavailable')),
-              !data?.configured && h('p', null, t('waterSetup')),
-              h(
-                'div',
-                { className: 'owc-save' },
+              (Number(waterInterval) !== water.interval || waterEnabledDraft !== water.enabled) &&
                 h(
-                  'button',
-                  { type: 'button', disabled: waterBusy, onClick: closeWaterEditor },
-                  t('cancel'),
+                  'p',
+                  { className: 'owc-hint', 'data-water-saved-interval': water.interval },
+                  t('detailSavedInterval') +
+                    ': ' +
+                    water.interval +
+                    ' ' +
+                    t('waterMinutes') +
+                    ' · ' +
+                    t('detailDraftHint'),
                 ),
-                h(
-                  'button',
-                  {
-                    type: 'submit',
-                    className: 'owc-primary',
-                    disabled: !waterReady || waterError || waterBusy || !data?.configured,
-                  },
-                  t(waterBusy ? 'busy' : 'waterSave'),
-                ),
-              ),
-              waterError &&
+              h('p', { className: 'owc-hint' }, t('detailWaterRule')),
+              waterError && h('p', { role: 'alert' }, t('waterUnavailable')),
+
+              waterError &&
                 h(
                   'button',
                   {
@@ -1866,6 +2435,7 @@ window.__ModuleLoader__.load({
                     ),
                   ),
               ),
+              waterSettingsActions(),
             );
           const waterReminder = () =>
             waterPrompt &&
@@ -1880,6 +2450,7 @@ window.__ModuleLoader__.load({
                   'button',
                   {
                     type: 'button',
+                    className: 'owc-primary',
                     disabled: waterBusy,
                     onClick: () => waterAction({ type: 'drink', eventId: waterState.eventId }),
                   },
@@ -1897,6 +2468,440 @@ window.__ModuleLoader__.load({
               ),
             );
 
+          const classicMini = () => {
+            const countdown = classicClock.seconds !== null;
+            const caption =
+              {
+                working: 'classicMiniWorking',
+                before: 'classicMiniBefore',
+                lunch: 'classicMiniLunch',
+              }[classicClock.phase] || 'classicMiniStatus';
+            const stateTitle =
+              { setup: 'petNeedsSetup', error: 'petLoadFailed', waiting: 'petNeedsSession' }[
+                classicClock.phase
+              ] || classicClock.title;
+            const valid = !!data?.configured && !!safeState && !error;
+            const showIncome = valid && ['working', 'lunch', 'done'].includes(safeState.status);
+            const compact = (value) => {
+              if (value === t('timerUnavailable')) return '—';
+              if (value === t('timerWaiting')) return t('classicMiniWaiting');
+              if (value === t('timerFinished')) return t('classicMiniFinished');
+              return value.startsWith('00:') ? value.slice(3) : value.replace(/^0(?=\d:)/, '');
+            };
+            const tile = (kind, screen, label, value, summary, due) =>
+              h(
+                'button',
+                {
+                  type: 'button',
+                  className: 'owc-classic-mini-timer',
+                  'data-classic-timer': kind,
+                  'data-countdown-due': due,
+                  'aria-label': t(label),
+                  title: t(label) + ' · ' + summary,
+                  disabled: busy || waterBusy,
+                  onClick: (event) => navigateScreen(screen, event),
+                },
+                iconSvg(kind, 13),
+                h('strong', null, compact(value)),
+              );
+            return h(
+              'div',
+              {
+                className: 'owc-classic-mini',
+                'data-classic-overview': true,
+                'data-clock-phase': classicClock.phase,
+              },
+              h(
+                'div',
+                { className: 'owc-classic-mini-top' },
+                h(
+                  'div',
+                  {
+                    className: 'owc-grip',
+                    tabIndex: 0,
+                    title: t(classicClock.hint) + ' · ' + t('drag'),
+                    onKeyDown: gripKeys,
+                  },
+                  h('span', { className: 'owc-classic-mini-label' }, t(caption)),
+                  countdown
+                    ? h(
+                        'strong',
+                        {
+                          className: 'owc-classic-mini-time',
+                          role: 'timer',
+                          'aria-label': t(classicClock.title),
+                        },
+                        formatDuration(classicClock.seconds),
+                      )
+                    : ['setup', 'error'].includes(classicClock.phase)
+                      ? h(
+                          'button',
+                          {
+                            type: 'button',
+                            className: 'owc-classic-mini-state',
+                            disabled: hostBusy,
+                            'aria-label': t(
+                              classicClock.phase === 'setup' ? 'classicConfigure' : 'retry',
+                            ),
+                            onClick:
+                              classicClock.phase === 'setup' ? openEditor : () => reload(true),
+                          },
+                          t(stateTitle),
+                        )
+                      : h(
+                          'strong',
+                          { className: 'owc-classic-mini-state', role: 'status' },
+                          t(stateTitle),
+                        ),
+                ),
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-icon',
+                    title: t('expand'),
+                    'aria-label': t('expand'),
+                    onClick: () => setPreference({ mini: false }),
+                  },
+                  iconSvg('chevronDown', 14),
+                ),
+              ),
+              h(
+                'div',
+                { className: 'owc-classic-mini-timers' },
+                tile(
+                  'water',
+                  'water-countdown',
+                  'waterCountdown',
+                  waterCountdownText(),
+                  waterSummary(),
+                  waterState.phase === 'due',
+                ),
+                tile(
+                  'smoking',
+                  'smoking',
+                  'smokingCountdown',
+                  smokingCountdownText(),
+                  t(
+                    smokingState.phase === 'paused'
+                      ? 'timerPaused'
+                      : smokingState.phase === 'due'
+                        ? 'timerDue'
+                        : smokingState.phase === 'idle'
+                          ? 'timerIdle'
+                          : 'timerRunning',
+                  ),
+                  smokingState.phase === 'due',
+                ),
+                h(
+                  'div',
+                  { className: 'owc-classic-mini-income' },
+                  showIncome &&
+                    !view.masked &&
+                    h(
+                      'button',
+                      {
+                        type: 'button',
+                        className: 'owc-classic-mini-amount',
+                        'aria-label': t('classicIncomeEntry'),
+                        'aria-description': moneyText,
+                        title: moneyText,
+                        onClick: (event) => navigateScreen('earnings', event),
+                      },
+                      moneyText,
+                    ),
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      className: 'owc-icon',
+                      disabled: !valid,
+                      'aria-label': t(
+                        showIncome ? (view.masked ? 'show' : 'hide') : 'classicIncomeEntry',
+                      ),
+                      title: t(showIncome ? (view.masked ? 'show' : 'hide') : 'classicIncomeEntry'),
+                      'aria-pressed': showIncome ? !view.masked : undefined,
+                      onClick: (event) =>
+                        showIncome
+                          ? setPreference({ masked: !view.masked })
+                          : navigateScreen('earnings', event),
+                    },
+                    iconSvg(view.masked || !showIncome ? 'eyeOff' : 'eye', 13),
+                  ),
+                ),
+              ),
+            );
+          };
+
+          const classicHeader = () =>
+            h(
+              'div',
+              { className: 'owc-head owc-classic-head' },
+              ui.screen &&
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-icon',
+                    'aria-label': t(
+                      PET_EDITOR_SCREENS.includes(ui.screen) && ui.back
+                        ? 'petBack'
+                        : 'classicReturn',
+                    ),
+                    title: t(
+                      PET_EDITOR_SCREENS.includes(ui.screen) && ui.back
+                        ? 'petBack'
+                        : 'classicReturn',
+                    ),
+                    disabled: busy || waterBusy || !!ui.pending,
+                    onClick: () =>
+                      navigateScreen(PET_EDITOR_SCREENS.includes(ui.screen) ? ui.back : null),
+                  },
+                  '←',
+                ),
+              h(
+                'strong',
+                { className: 'owc-title', tabIndex: 0, title: t('drag'), onKeyDown: gripKeys },
+                t(ui.screen ? petPageTitle[ui.screen] || 'classicOverview' : 'classicOverview'),
+              ),
+              ['home', 'water-countdown'].includes(ui.screen) &&
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-icon',
+                    'aria-label': t('petWaterSettings'),
+                    title: t('petWaterSettings'),
+                    disabled: busy || waterBusy || !!ui.pending,
+                    onClick: openWaterEditor,
+                  },
+                  iconSvg('sliders', 14),
+                ),
+              waterPrompt &&
+                ui.screen &&
+                !['home', 'water-countdown'].includes(ui.screen) &&
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-icon',
+                    'aria-label': t('waterDue'),
+                    title: t('waterDue'),
+                    onClick: (event) => navigateScreen('home', event),
+                  },
+                  iconSvg('water'),
+                ),
+              !ui.screen &&
+                h(
+                  React.Fragment,
+                  null,
+                  h(
+                    'button',
+                    { type: 'button', className: 'owc-text', onClick: openAppearance },
+                    t('appearanceGroup'),
+                  ),
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      className: 'owc-icon',
+                      'aria-label': t('petWorkSettings'),
+                      title: t('petWorkSettings'),
+                      disabled: hostBusy || !data,
+                      onClick: openEditor,
+                    },
+                    iconSvg('sliders'),
+                  ),
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      className: 'owc-icon',
+                      'aria-label': t(collapsed ? 'classicMore' : 'classicLess'),
+                      title: t(collapsed ? 'classicMore' : 'classicLess'),
+                      onClick: () => setPreference({ mini: !view.mini }),
+                    },
+                    iconSvg(collapsed ? 'chevronDown' : 'chevronUp'),
+                  ),
+                ),
+            );
+          const classicOverview = () => {
+            const countdown = classicClock.seconds !== null;
+            const valid = !!data?.configured && !!safeState && !error;
+            const showIncome = valid && ['working', 'lunch', 'done'].includes(safeState.status);
+            const tile = (kind, screen, label, value, summary) =>
+              h(
+                'button',
+                {
+                  type: 'button',
+                  className: 'owc-classic-tile',
+                  'data-classic-timer': kind,
+                  'aria-label': t(label),
+                  disabled: busy || waterBusy,
+                  onClick: (event) => navigateScreen(screen, event),
+                },
+                h(
+                  'span',
+                  { className: 'owc-classic-tile-title' },
+                  iconSvg(kind, 14),
+                  t(kind === 'water' ? 'waterTimerShort' : 'smokingTimerShort'),
+                ),
+                h('strong', null, value),
+                h('span', { className: 'owc-classic-tile-hint' }, summary),
+              );
+            return h(
+              'div',
+              {
+                className: 'owc-classic-overview',
+                'data-classic-overview': true,
+                'data-clock-phase': classicClock.phase,
+              },
+              h(
+                'div',
+                { className: 'owc-classic-hero' },
+                h(
+                  'div',
+                  { className: 'owc-classic-kicker' },
+                  iconSvg('alarm', 14),
+                  t(countdown ? classicClock.title : 'title'),
+                ),
+                countdown
+                  ? h(
+                      'div',
+                      {
+                        className: 'owc-classic-time',
+                        role: 'timer',
+                        'aria-label': t(classicClock.title),
+                      },
+                      formatDuration(classicClock.seconds),
+                    )
+                  : h(
+                      'h3',
+                      { className: 'owc-classic-state', role: 'status' },
+                      t(classicClock.title),
+                    ),
+                h('p', { className: 'owc-classic-hint' }, t(classicClock.hint)),
+                classicClock.phase === 'setup' &&
+                  h(
+                    'button',
+                    { type: 'button', className: 'owc-primary', onClick: openEditor },
+                    t('classicConfigure'),
+                  ),
+                classicClock.phase === 'error' &&
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      disabled: hostBusy || !sessionId,
+                      onClick: () => reload(true),
+                    },
+                    iconSvg('refresh', 12),
+                    t('retry'),
+                  ),
+                valid &&
+                  h(
+                    'div',
+                    { className: 'owc-classic-schedule' },
+                    h(
+                      'span',
+                      null,
+                      settings.start + ' — ' + settings.end + (safeState.overnight ? ' +1' : ''),
+                    ),
+                    h('span', null, t('classicEnd') + ' ' + settings.end),
+                  ),
+              ),
+              h(
+                'div',
+                { className: 'owc-classic-timers' },
+                tile(
+                  'water',
+                  'water-countdown',
+                  'waterCountdown',
+                  waterCountdownText(),
+                  waterState.phase === 'countdown' ? t('classicWaterHint') : waterSummary(),
+                ),
+                tile(
+                  'smoking',
+                  'smoking',
+                  'smokingCountdown',
+                  smokingCountdownText(),
+                  smokingUnavailable
+                    ? t(smokingError ? 'timerUnavailable' : 'timerLoading')
+                    : t(
+                        {
+                          idle: 'classicSmokeHint',
+                          running: 'classicSmokeHint',
+                          paused: 'timerPaused',
+                          due: 'timerDue',
+                        }[smokingState.phase],
+                      ),
+                ),
+              ),
+              h(
+                'div',
+                { className: 'owc-classic-income' },
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-classic-income-link',
+                    disabled: !valid,
+                    onClick: (event) => navigateScreen('earnings', event),
+                  },
+                  h('span', null, t(showIncome ? 'classicIncome' : 'classicIncomeEntry')),
+                  showIncome &&
+                    h('strong', { 'aria-label': view.masked ? t('masked') : moneyText }, moneyText),
+                  h('span', { 'aria-hidden': true }, '›'),
+                ),
+                showIncome && salaryToggle(),
+              ),
+              !collapsed &&
+                h(
+                  'div',
+                  { className: 'owc-classic-details' },
+                  valid
+                    ? h(
+                        React.Fragment,
+                        null,
+                        h(
+                          'div',
+                          { className: 'owc-classic-detail-title' },
+                          t('classicShift'),
+                          h('span', null, Math.floor(safeState.progress * 100) + '%'),
+                        ),
+                        h(
+                          'div',
+                          {
+                            className: 'owc-progress',
+                            role: 'progressbar',
+                            'aria-label': t('progress'),
+                            'aria-valuenow': Math.floor(safeState.progress * 100),
+                            'aria-valuemin': 0,
+                            'aria-valuemax': 100,
+                          },
+                          h('div', { style: { width: safeState.progress * 100 + '%' } }),
+                        ),
+                        h(
+                          'p',
+                          null,
+                          t('shiftDate') + ' ' + safeState.shiftDate + ' · ' + settings.timezone,
+                        ),
+                        h(
+                          'p',
+                          null,
+                          settings.breakStart === settings.breakEnd
+                            ? t('noBreak')
+                            : t('lunch') + ' ' + settings.breakStart + '–' + settings.breakEnd,
+                        ),
+                        h('button', { type: 'button', onClick: openEditor }, t('petWorkSettings')),
+                      )
+                    : h('p', null, t(classicClock.hint)),
+                ),
+              waterNotice &&
+                h('p', { className: 'owc-classic-feedback', role: 'status' }, t(waterNotice.key)),
+            );
+          };
+
           const strip = () =>
             h(
               'div',
@@ -2133,14 +3138,26 @@ window.__ModuleLoader__.load({
                       type: 'button',
                       className: 'owc-text',
                       onClick: () => reload(true),
-                      disabled: busy || !sessionId,
+                      disabled: hostBusy || !sessionId,
                     },
                     iconSvg('refresh', 12),
                     t('retry'),
                   ),
                 ),
               );
-            const status = safeState.status === 'done' ? '' : t(safeState.status);
+            const clockSeconds = ['done', 'rest'].includes(safeState.status) ? null : seconds;
+            const clockTitle =
+              safeState.status === 'before'
+                ? 'before'
+                : ['working', 'lunch'].includes(safeState.status)
+                  ? 'working'
+                  : safeState.status;
+            const status =
+              clockSeconds === null
+                ? ''
+                : safeState.status === 'lunch'
+                  ? t('lunch') + ' · ' + t('working')
+                  : t(clockTitle);
             return h(
               'div',
               { className: 'owc-main' },
@@ -2150,10 +3167,15 @@ window.__ModuleLoader__.load({
               section !== 'earnings' &&
                 h(
                   'div',
-                  { className: 'owc-time', 'aria-label': status + ' ' + duration },
-                  duration,
+                  {
+                    className: 'owc-time' + (clockSeconds === null ? ' owc-detail-state' : ''),
+                    role: clockSeconds === null ? 'status' : 'timer',
+                    'aria-label': t(clockTitle),
+                  },
+                  clockSeconds === null ? t(clockTitle) : formatDuration(clockSeconds),
                 ),
               section !== 'earnings' &&
+                ['working', 'lunch', 'done'].includes(safeState.status) &&
                 h(
                   'div',
                   {
@@ -2197,24 +3219,29 @@ window.__ModuleLoader__.load({
                   ),
                 ),
               h(
-                'div',
-                { className: 'owc-meta' },
-                h(
-                  'span',
-                  null,
-                  settings.start +
-                    ' — ' +
-                    settings.end +
-                    (settings.end < settings.start ? ' +1' : '') +
-                    ' · ' +
-                    (settings.breakStart === settings.breakEnd
-                      ? t('noBreak')
-                      : settings.breakStart + '–' + settings.breakEnd),
-                ),
+                'details',
+                { className: 'owc-detail-more' },
+                h('summary', null, t('detailShift')),
                 h(
-                  'span',
-                  null,
-                  t('shiftDate') + ' ' + safeState.shiftDate + ' · ' + settings.timezone,
+                  'div',
+                  { className: 'owc-meta' },
+                  h(
+                    'span',
+                    null,
+                    settings.start +
+                      ' — ' +
+                      settings.end +
+                      (settings.end < settings.start ? ' +1' : '') +
+                      ' · ' +
+                      (settings.breakStart === settings.breakEnd
+                        ? t('noBreak')
+                        : settings.breakStart + '–' + settings.breakEnd),
+                  ),
+                  h(
+                    'span',
+                    null,
+                    t('shiftDate') + ' ' + safeState.shiftDate + ' · ' + settings.timezone,
+                  ),
                 ),
               ),
               h(
@@ -2226,7 +3253,7 @@ window.__ModuleLoader__.load({
                     type: 'button',
                     className: 'owc-text',
                     onClick: () => reload(true),
-                    disabled: busy,
+                    disabled: hostBusy,
                   },
                   iconSvg('refresh', 12),
                   t('refresh'),
@@ -2307,7 +3334,6 @@ window.__ModuleLoader__.load({
                   onChange: (event) => updateAppearance({ petSize: event.target.valueAsNumber }),
                 }),
               ),
-              h('p', { className: 'owc-hint' }, t('petAppearanceHint')),
               label(
                 t('opacity'),
                 h(
@@ -2327,32 +3353,108 @@ window.__ModuleLoader__.load({
                   }),
                   h(
                     'span',
-                    { className: 'owc-hint', style: { margin: 0 } },
-                    Math.round(view.opacity * 100) + '% · ' + t('opacityHint'),
+                    { className: 'owc-range-value', title: t('opacityHint') },
+                    Math.round(view.opacity * 100) + '%',
+                  ),
+                ),
+              ),
+            );
+          const previewActions = () => {
+            if (!view.companion || petModel(view.petModel).renderer !== 'video') return null;
+            const labels = {
+              idle: 'petPreviewIdle',
+              greet: 'petPreviewGreet',
+              celebrate: 'petPreviewDrink',
+            };
+            const names = { idle: 'petTryIdle', greet: 'petTryGreet', celebrate: 'petTryDrink' };
+            const clips = PET_CLIPS.models[view.petModel] || {};
+            const blocked =
+              !view.companionMotion || previewReduced || previewState.phase === 'unsupported';
+            const message = previewReduced
+              ? t('petPreviewReduced')
+              : !view.companionMotion
+                ? t('petPreviewEnable')
+                : previewState.phase === 'loading'
+                  ? t('petPreviewLoading')
+                  : previewState.phase === 'playing'
+                    ? t('petPreviewPlaying') + ' · ' + t(labels[previewState.action])
+                    : previewState.phase === 'unsupported'
+                      ? t('petPreviewUnsupported')
+                      : previewState.phase === 'unavailable'
+                        ? t('petPreviewUnavailable')
+                        : t('petPreviewHint');
+            return h(
+              'div',
+              { className: 'owc-preview-tools' },
+              h(
+                'div',
+                {
+                  className: 'owc-preview-actions',
+                  role: 'group',
+                  'aria-label': t('petPreviewActions'),
+                },
+                ...Object.keys(labels)
+                  .filter((action) => Object.hasOwn(clips, action))
+                  .map((action) =>
+                    h(
+                      'button',
+                      {
+                        type: 'button',
+                        key: action,
+                        'aria-label': t(names[action]),
+                        'aria-pressed':
+                          previewState.action === action &&
+                          ['loading', 'playing'].includes(previewState.phase),
+                        disabled: blocked,
+                        onClick: () => previewMotion.current?.retry?.(action),
+                      },
+                      t(labels[action]),
+                    ),
                   ),
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    'aria-label': t('petStopPreview'),
+                    disabled: !['loading', 'playing'].includes(previewState.phase),
+                    onClick: () => previewMotion.current?.stop?.(),
+                  },
+                  t('petPreviewStop'),
                 ),
               ),
+              h(
+                'p',
+                { className: 'owc-hint owc-preview-status', role: 'status', 'aria-atomic': true },
+                message,
+              ),
             );
+          };
           const editor = () => {
             if (appearanceOnly)
               return h(
                 'div',
                 { className: 'owc-form owc-appearance', 'data-appearance-settings': true },
-                h('p', { className: 'owc-hint' }, t('petAppearancePreview')),
+                h('p', { className: 'owc-sr-only' }, t('petAppearancePreview')),
                 h(
                   'div',
-                  { 'data-appearance-preview': true, className: 'owc-appearance-preview' },
+                  {
+                    ref: previewBox,
+                    'data-appearance-preview': true,
+                    className: 'owc-appearance-preview',
+                  },
                   view.companion
                     ? petArtwork(
                         h,
-                        companion,
-                        view.petSize * (petModel(view.petModel).renderer === 'image' ? 0.65 : 1),
+                        { pose: 'calm', animate: false },
+                        view.petSize * (petModel(view.petModel).renderer === 'svg' ? 1 : 0.65),
                         '',
                         view.petModel,
                         PET_SPRITES,
+                        petModel(view.petModel).renderer === 'video',
                       )
                     : h('p', null, t('petClassicPreview')),
                 ),
+                previewActions(),
                 appearanceFields(),
                 h(
                   'div',
@@ -2360,8 +3462,13 @@ window.__ModuleLoader__.load({
                   h('button', { type: 'button', onClick: closeEditor }, t('cancel')),
                   h(
                     'button',
-                    { type: 'button', className: 'owc-primary', onClick: applyAppearance },
-                    t('petApplyAppearance'),
+                    {
+                      type: 'button',
+                      className: 'owc-primary',
+                      'aria-label': t('petApplyAppearance'),
+                      onClick: applyAppearance,
+                    },
+                    t('detailApply'),
                   ),
                 ),
               );
@@ -2369,21 +3476,7 @@ window.__ModuleLoader__.load({
             const payDaily = workingDraft.payMode === 'daily';
             const salaryKey = payDaily ? 'dailySalary' : 'monthlySalary';
             const salaryControl = view.masked
-              ? h(
-                  'div',
-                  { className: 'owc-private' },
-                  h('span', null, '••••'),
-                  h(
-                    'button',
-                    {
-                      type: 'button',
-                      className: 'owc-text',
-                      'aria-label': t('show'),
-                      onClick: () => setPreference({ masked: false }),
-                    },
-                    t('show'),
-                  ),
-                )
+              ? h('div', { className: 'owc-private', 'aria-label': t('masked') }, '••••')
               : numberInput(salaryKey);
             const breakOn = workingDraft.breakStart !== workingDraft.breakEnd;
             const commonZones = [
@@ -2408,6 +3501,20 @@ window.__ModuleLoader__.load({
             const zones = [
               ...new Set([workingDraft.timezone, ...commonZones, ...allZones].filter(Boolean)),
             ];
+            const timezoneField = () =>
+              label(
+                t('timezone'),
+                h(
+                  'select',
+                  {
+                    name: 'timezone',
+                    value: workingDraft.timezone ?? '',
+                    disabled: busy,
+                    onChange: (e) => update('timezone', e.target.value),
+                  },
+                  zones.map((zone) => h('option', { key: zone, value: zone }, zone)),
+                ),
+              );
             return h(
               'form',
               {
@@ -2424,7 +3531,22 @@ window.__ModuleLoader__.load({
               h(
                 'fieldset',
                 { className: 'owc-setting-group' },
-                h('legend', null, t('salaryGroup')),
+                h(
+                  'legend',
+                  { className: 'owc-salary-legend' },
+                  h('span', null, t('salaryGroup')),
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      className: 'owc-icon',
+                      'aria-label': t(view.masked ? 'show' : 'hide'),
+                      title: t(view.masked ? 'show' : 'hide'),
+                      onClick: () => setPreference({ masked: !view.masked }),
+                    },
+                    iconSvg(view.masked ? 'eyeOff' : 'eye', 13),
+                  ),
+                ),
                 label(
                   t('payMode'),
                   h(
@@ -2518,22 +3640,10 @@ window.__ModuleLoader__.load({
                     ),
                   ),
                 ),
-                label(
-                  t('timezone'),
-                  h(
-                    'select',
-                    {
-                      name: 'timezone',
-                      value: workingDraft.timezone ?? '',
-                      disabled: busy,
-                      onChange: (e) => update('timezone', e.target.value),
-                    },
-                    zones.map((zone) => h('option', { key: zone, value: zone }, zone)),
-                  ),
-                ),
               ),
               preview &&
                 !preview.error &&
+                !view.masked &&
                 h(
                   'div',
                   { className: 'owc-preview' },
@@ -2557,6 +3667,7 @@ window.__ModuleLoader__.load({
                 'details',
                 { className: 'owc-advanced' },
                 h('summary', null, t('advanced')),
+                timezoneField(),
                 h('p', { className: 'owc-hint' }, t('sessionHint')),
                 label(t('session'), sessionSelect()),
               ),
@@ -2579,12 +3690,18 @@ window.__ModuleLoader__.load({
             );
           };
 
-          const notices = () =>
+          const notices = (showBusinessError = true) =>
             h(
               React.Fragment,
               null,
-              error && h('p', { className: 'owc-error', role: 'alert' }, error),
-              state?.error && h('p', { className: 'owc-error', role: 'alert' }, state.error),
+              showBusinessError &&
+                !LOCAL_SCREENS.includes(ui.screen) &&
+                error &&
+                h('p', { className: 'owc-error', role: 'alert' }, error),
+              showBusinessError &&
+                !LOCAL_SCREENS.includes(ui.screen) &&
+                state?.error &&
+                h('p', { className: 'owc-error', role: 'alert' }, state.error),
               notice && h('p', { className: 'owc-note', role: 'status' }, notice),
               storageError && h('p', { className: 'owc-note' }, t('storage')),
             );
@@ -2592,15 +3709,13 @@ window.__ModuleLoader__.load({
           function closePetPanel() {
             navigateScreen(null);
           }
-          function togglePetPanel(event) {
+          function interactWithPet(event) {
             if (petDragged.current && event.detail !== 0) {
               petDragged.current = false;
               return;
             }
-            navigateScreen(
-              event.currentTarget.classList.contains('owc-pet-clock') ? 'income' : 'home',
-              event,
-            );
+            petDragged.current = false;
+            if (!ui.pending) petMotion.current?.play('greet');
           }
           function closePetMenu(restore = true) {
             dispatchUI({ type: 'dismiss-menu' });
@@ -2624,8 +3739,15 @@ window.__ModuleLoader__.load({
                 waterPrompt ? t('waterDue') : waterNotice ? t(waterNotice.key) : '',
               ),
             );
+          React.useLayoutEffect(() => {
+            if (!ready) return;
+            const scroll = petMode
+              ? petPanel.current?.querySelector('.owc-pet-scroll')
+              : box.current?.querySelector('.owc-content');
+            if (scroll) scroll.scrollTop = 0;
+          }, [ready, petMode, ui.screen]);
           const petShowing = petOpen;
-          const petFloating = petShowing || waterPrompt;
+          const petFloating = petShowing || autoWaterPrompt;
           React.useLayoutEffect(() => {
             if (!petMode || !petFloating || !cardContent.current) return;
             const content = cardContent.current,
@@ -2729,7 +3851,13 @@ window.__ModuleLoader__.load({
             return () => document.removeEventListener('pointerdown', outside);
           }, [petMode, petShowing, ui.menu, editing, waterEditing, waterBusy]);
           React.useEffect(() => {
-            if (ui.menu) menuBox.current?.querySelector('[role=menuitem]:not(:disabled)')?.focus();
+            if (!ui.menu) return;
+            const waterEntry = menuTrigger.current?.classList.contains('owc-pet-water-alert')
+              ? menuBox.current?.querySelector('[data-pet-menu-screen="home"]:not(:disabled)')
+              : null;
+            (
+              waterEntry || menuBox.current?.querySelector('[role=menuitem]:not(:disabled)')
+            )?.focus();
           }, [ui.menu]);
           React.useEffect(() => {
             if (!petMode || editing || waterEditing || ui.menu) return;
@@ -2745,6 +3873,32 @@ window.__ModuleLoader__.load({
             if (ui.pending && (busy || waterBusy))
               box.current?.querySelector('[data-nav-confirm]')?.focus();
           }, [ui.pending, busy, waterBusy]);
+          const classicNavigation = React.useRef({ screen: ui.screen, pending: !!ui.pending });
+          React.useEffect(() => {
+            const previous = classicNavigation.current;
+            classicNavigation.current = { screen: ui.screen, pending: !!ui.pending };
+            if (
+              petMode ||
+              !ready ||
+              (previous.screen === ui.screen && previous.pending === !!ui.pending)
+            )
+              return;
+            const frame = requestAnimationFrame(() => {
+              if (ui.pending) box.current?.querySelector('[data-keep-editing]')?.focus();
+              else if (!editing && !waterEditing) {
+                const kind = focusReturn.current?.getAttribute?.('data-classic-timer');
+                const target =
+                  !ui.screen && ['water', 'smoking'].includes(kind)
+                    ? box.current?.querySelector(`[data-classic-timer="${kind}"]`)
+                    : box.current?.querySelector(
+                        '.owc-classic-head .owc-title,.owc-classic-mini .owc-grip',
+                      );
+                target?.focus();
+              } else if (previous.pending)
+                box.current?.querySelector('form input,form select,form button')?.focus();
+            });
+            return () => cancelAnimationFrame(frame);
+          }, [petMode, ready, ui.screen, !!ui.pending]);
           const draftGuard = () =>
             h(
               'div',
@@ -2806,6 +3960,8 @@ window.__ModuleLoader__.load({
             );
           const petPageTitle = {
             home: 'petWaterCard',
+            'water-countdown': 'waterCountdown',
+            smoking: 'smokingCountdown',
             income: 'petCountdownCard',
             earnings: 'petEarningsCard',
             water: 'petWaterSettings',
@@ -2832,9 +3988,22 @@ window.__ModuleLoader__.load({
                 ),
               h(
                 'strong',
-                { 'data-pet-page-title': true, tabIndex: -1, style: { flex: 1, fontSize: 12 } },
+                { 'data-pet-page-title': true, tabIndex: -1, style: { flex: 1 } },
                 t(petPageTitle[ui.screen] || 'waterTitle'),
               ),
+              ['home', 'water-countdown'].includes(ui.screen) &&
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-icon',
+                    'aria-label': t('petWaterSettings'),
+                    title: t('petWaterSettings'),
+                    disabled: busy || waterBusy || !!ui.pending,
+                    onClick: openWaterEditor,
+                  },
+                  iconSvg('sliders', 14),
+                ),
               h(
                 'button',
                 {
@@ -2850,102 +4019,91 @@ window.__ModuleLoader__.load({
           const petHome = () =>
             h(
               'div',
-              { className: 'owc-pet-home', 'data-pet-home': true },
-
+              {
+                className: 'owc-pet-home' + (waterPrompt ? ' owc-water-due' : ''),
+                'data-pet-home': true,
+                'data-water-event': waterPrompt ? waterState.eventId : undefined,
+              },
+              waterHero(),
               h(
                 'div',
-                {
-                  className: 'owc-pet-water-card' + (waterPrompt ? ' owc-water-due' : ''),
-                  'data-water-event': waterPrompt ? waterState.eventId : undefined,
-                },
+                { className: 'owc-detail-primary-actions' },
                 h(
-                  'p',
-                  { className: 'owc-water-status', 'data-water-status': true },
-                  waterPrompt
-                    ? t('waterDue')
-                    : waterState.phase === 'quiet'
-                      ? t('petQuietActive')
-                      : waterSummary(),
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-primary owc-water-record',
+                    disabled: !waterCanRecord || waterBusy,
+                    onClick: recordWater,
+                  },
+                  t('petRecord'),
                 ),
-                h(
-                  'div',
-                  { className: 'owc-pet-water-row' },
+                waterPrompt &&
                   h(
                     'button',
                     {
                       type: 'button',
-                      className: 'owc-primary',
-                      disabled: !waterCanRecord || waterBusy,
-                      onClick: recordWater,
+                      className: 'owc-text',
+                      disabled: waterBusy,
+                      onClick: () => waterAction({ type: 'snooze', eventId: waterState.eventId }),
                     },
-                    t('petRecord'),
+                    t('waterSnooze'),
                   ),
-                  h(
-                    'span',
-                    { 'data-water-count': true },
-                    t('waterCount') + ': ' + waterState.count,
-                  ),
-                ),
               ),
               h(
                 'div',
-                { className: 'owc-pet-quiet-row' },
-                [30, 60].map((minutes) =>
+                { className: 'owc-detail-secondary' },
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'owc-text',
+                    disabled: !water.enabled || busy || waterBusy || waterError || !waterReady,
+                    onClick: () => waterAction({ type: water.paused ? 'resume' : 'pause' }),
+                  },
+                  t(water.paused ? 'waterResume' : 'waterPause'),
+                ),
+                waterState.phase === 'quiet' &&
                   h(
                     'button',
                     {
                       type: 'button',
-                      key: minutes,
-                      disabled: !waterCanQuiet || waterBusy,
-                      onClick: () => waterAction({ type: 'quiet', minutes }),
+                      className: 'owc-text',
+                      disabled: waterBusy,
+                      onClick: () => waterAction({ type: 'end-quiet' }),
                     },
-                    t(minutes === 30 ? 'petQuiet30' : 'petQuiet60'),
+                    t('waterQuietEnd'),
                   ),
-                ),
               ),
               h(
-                'div',
-                { className: 'owc-pet-quiet-status' },
-                waterPrompt
-                  ? h(
+                'details',
+                { className: 'owc-detail-more' },
+                h('summary', null, t('waterQuiet')),
+                h(
+                  'div',
+                  { className: 'owc-detail-options' },
+                  [30, 60].map((minutes) =>
+                    h(
                       'button',
                       {
                         type: 'button',
-                        disabled: waterBusy,
-                        onClick: () => waterAction({ type: 'snooze', eventId: waterState.eventId }),
+                        key: minutes,
+                        disabled: !waterCanQuiet || waterBusy,
+                        onClick: (event) => {
+                          const menu = event.currentTarget.closest('details');
+                          menu.open = false;
+                          menu.querySelector('summary')?.focus();
+                          void waterAction({ type: 'quiet', minutes });
+                        },
                       },
-                      t('waterSnooze'),
-                    )
-                  : water.shift?.paused
-                    ? t('petPausedHint')
-                    : waterState.phase === 'quiet'
-                      ? h(
-                          React.Fragment,
-                          null,
-                          t('waterQuiet') +
-                            ' · ' +
-                            formatDuration(waterState.quietRemaining / 1000),
-                          h(
-                            'button',
-                            {
-                              type: 'button',
-                              disabled: waterBusy,
-                              onClick: () => waterAction({ type: 'end-quiet' }),
-                            },
-                            t('waterQuietEnd'),
-                          ),
-                        )
-                      : t('petQuietHint'),
-              ),
-              h(
-                'div',
-                { className: 'owc-pet-feedback' },
-                waterNotice
-                  ? t(waterNotice.key)
-                  : waterError
-                    ? t('waterUnavailable')
-                    : t('petHomeHint'),
+                      t(minutes === 30 ? 'petQuiet30' : 'petQuiet60'),
+                    ),
+                  ),
+                ),
+                h('p', { className: 'owc-hint' }, t('petQuietHint')),
               ),
+              waterError &&
+                h('p', { className: 'owc-error', role: 'alert' }, t('waterUnavailable')),
               waterError &&
                 h(
                   'button',
@@ -2956,26 +4114,6 @@ window.__ModuleLoader__.load({
                   },
                   t('waterRetry'),
                 ),
-              h(
-                'div',
-                { className: 'owc-pet-home-links' },
-                h('button', { type: 'button', onClick: openWaterEditor }, t('petWaterSettings')),
-                h(
-                  'button',
-                  {
-                    type: 'button',
-                    disabled:
-                      !water.enabled ||
-                      busy ||
-                      waterBusy ||
-                      waterError ||
-                      !waterContext ||
-                      water.shift?.id !== waterContext.id,
-                    onClick: () => waterAction({ type: water.shift?.paused ? 'resume' : 'pause' }),
-                  },
-                  t(water.shift?.paused ? 'waterResume' : 'waterPause'),
-                ),
-              ),
             );
           const contextMenu = () =>
             ui.menu &&
@@ -3030,6 +4168,8 @@ window.__ModuleLoader__.load({
                 [
                   ['income', 'petCountdownCard'],
                   ['home', 'petWaterCard'],
+                  ['water-countdown', 'waterCountdown'],
+                  ['smoking', 'smokingCountdown'],
                   ['earnings', 'petEarningsCard'],
                   ['appearance', 'petAppearance'],
                   ['schedule', 'petWorkSettings'],
@@ -3040,14 +4180,34 @@ window.__ModuleLoader__.load({
                       key: screen,
                       type: 'button',
                       role: 'menuitem',
+                      'data-pet-menu-screen': screen,
                       tabIndex: -1,
-                      disabled: busy || waterBusy,
+                      disabled:
+                        requestBusy.current ||
+                        waterBusy ||
+                        (!LOCAL_SCREENS.includes(screen) &&
+                          (hostBusy || !data || (!data.configured && screen !== 'schedule'))),
                       onClick: (event) => navigateScreen(screen, event),
                     },
                     t(label),
                   ),
                 ),
 
+                (!data || error || state?.error) &&
+                  h(
+                    'button',
+                    {
+                      type: 'button',
+                      role: 'menuitem',
+                      tabIndex: -1,
+                      disabled: hostBusy || !sessionId,
+                      onClick: () => {
+                        closePetMenu();
+                        void reload(true);
+                      },
+                    },
+                    t('retry'),
+                  ),
                 h('hr', null),
                 h(
                   'button',
@@ -3065,15 +4225,23 @@ window.__ModuleLoader__.load({
               ),
             );
 
+          if (!ready) return null;
           if (petMode)
             return h(
               'section',
               {
                 ref: box,
                 className: 'owc-v2 owc-pet-shell',
-                'data-version': '1.1.0',
+                'data-version': '1.1.2',
                 'data-pet-model': stageModel,
-                'data-status': safeState.status,
+                'data-status':
+                  error || state?.error
+                    ? 'error'
+                    : data?.configured && safeState
+                      ? safeState.status
+                      : data
+                        ? 'setup'
+                        : 'loading',
                 'aria-label': t('companionLabel'),
                 style: {
                   '--owc-alpha': String(view.opacity),
@@ -3099,8 +4267,7 @@ window.__ModuleLoader__.load({
                   else if (ui.pending) dispatchUI({ type: 'stay' });
                   else if (editing || waterEditing) navigateScreen(ui.back);
                   else if (petShowing) closePetPanel();
-                  else if (waterPrompt)
-                    void waterAction({ type: 'snooze', eventId: waterState.eventId });
+                  else if (autoWaterPrompt) dismissWaterPopup();
                 },
               },
               h('style', null, STYLE),
@@ -3113,10 +4280,13 @@ window.__ModuleLoader__.load({
                   {
                     type: 'button',
                     className: 'owc-pet-handle',
-                    'aria-label': t('petOpen'),
-                    'aria-expanded': !!petShowing,
+                    'aria-label': t('petGreet'),
                     title: t('companionName') + ' · ' + t('petHint'),
-                    onClick: togglePetPanel,
+                    onClick: interactWithPet,
+                    onPointerEnter: (event) => {
+                      if (event.pointerType === 'mouse' && !dragState.current)
+                        petMotion.current?.play('look');
+                    },
                     onKeyDown: gripKeys,
                   },
                   petArtwork(
@@ -3126,23 +4296,74 @@ window.__ModuleLoader__.load({
                     waterNotice?.token,
                     stageModel,
                     PET_SPRITES,
+                    true,
                   ),
                 ),
                 h(
-                  'button',
+                  'div',
                   {
-                    type: 'button',
-                    className: 'owc-pet-clock',
-                    onClick: togglePetPanel,
-                    'aria-label': t('petClock'),
+                    className: 'owc-pet-timers',
+                    role: 'group',
+                    'aria-label': t('petCountdownGroup'),
                   },
-                  iconSvg('alarm', 12),
-                  h('span', { className: 'owc-pet-clock-label' }, t(safeState.status)),
-                  ['done', 'rest'].includes(safeState.status) ? null : h('strong', null, duration),
+                  h(
+                    'div',
+                    {
+                      className: 'owc-pet-clock',
+                      role: data?.configured && safeState ? 'timer' : 'status',
+                      'aria-label': t('petClock'),
+                      title:
+                        error || state?.error
+                          ? t('petRetryHint')
+                          : !sessionId
+                            ? t('noSession')
+                            : undefined,
+                    },
+                    iconSvg('alarm', 12),
+                    h(
+                      'span',
+                      { className: 'owc-pet-clock-label', title: t(petClockStatus) },
+                      t(petClockStatus),
+                    ),
+                    data?.configured &&
+                      safeState &&
+                      !error &&
+                      sessionId &&
+                      !['done', 'rest'].includes(safeState.status)
+                      ? h('strong', null, duration)
+                      : null,
+                  ),
+                  h(
+                    'div',
+                    { className: 'owc-pet-timer-pair' },
+                    timerRow(
+                      'water',
+                      waterCountdownText(),
+                      waterState.phase === 'due',
+                      t('waterCountdown') + ' · ' + waterSummary(),
+                    ),
+                    timerRow(
+                      'smoking',
+                      smokingCountdownText(),
+                      smokingState.phase === 'due',
+                      t('smokingCountdown') +
+                        ' · ' +
+                        (smokingUnavailable
+                          ? t('timerUnavailable')
+                          : t(
+                              {
+                                idle: 'timerIdle',
+                                running: 'timerRunning',
+                                paused: 'timerPaused',
+                                due: 'timerDue',
+                              }[smokingState.phase],
+                            )),
+                    ),
+                  ),
                 ),
               ),
               waterPrompt &&
-                petShowing &&
+                !autoWaterPrompt &&
                 ui.screen !== 'home' &&
                 h(
                   'button',
@@ -3151,7 +4372,9 @@ window.__ModuleLoader__.load({
                     className: 'owc-pet-water-alert owc-water-due',
                     'data-water-event': waterState.eventId,
                     'aria-label': t('petWaterAlert'),
-                    onClick: (event) => navigateScreen('home', event),
+                    title: t('petWaterAlert'),
+                    disabled: busy || waterBusy || !!ui.pending,
+                    onClick: openWaterPopup,
                     style: {
                       left: waterAlertLayout.left,
                       top: waterAlertLayout.top,
@@ -3160,7 +4383,8 @@ window.__ModuleLoader__.load({
                     },
                   },
                   iconSvg('water', 13),
-                  t('petWaterBadge'),
+                  h('span', { className: 'owc-pet-water-label' }, t('petWaterBadge')),
+                  iconSvg('chevronUp', 10),
                 ),
               contextMenu(),
               !petShowing &&
@@ -3185,8 +4409,8 @@ window.__ModuleLoader__.load({
                   'div',
                   {
                     ref: petPanel,
-                    className: 'owc-pet-panel owc-pet-workspace',
-                    'data-pet-panel': petShowing ? 'open' : 'bubble',
+                    className: 'owc-pet-panel owc-pet-workspace owc-detail-page',
+                    'data-pet-panel': petShowing ? 'open' : 'reminder',
                     'data-pet-screen': ui.screen || 'reminder',
                     'data-side': floatingPanel.side,
                     role: 'region',
@@ -3211,10 +4435,10 @@ window.__ModuleLoader__.load({
                           {
                             type: 'button',
                             className: 'owc-icon',
-                            'aria-label': t('waterSnooze'),
+                            'aria-label': t('petDismissReminder'),
+                            title: t('petDismissReminder'),
                             disabled: waterBusy,
-                            onClick: () =>
-                              waterAction({ type: 'snooze', eventId: waterState.eventId }),
+                            onClick: dismissWaterPopup,
                           },
                           iconSvg('close', 14),
                         ),
@@ -3237,9 +4461,13 @@ window.__ModuleLoader__.load({
                                   ? editor()
                                   : petDetails
                                     ? panelBody('clock')
-                                    : ui.screen === 'earnings'
-                                      ? panelBody('earnings')
-                                      : petHome(),
+                                    : ui.screen === 'water-countdown'
+                                      ? waterCountdownCard()
+                                      : ui.screen === 'smoking'
+                                        ? smokingCountdownCard()
+                                        : ui.screen === 'earnings'
+                                          ? panelBody('earnings')
+                                          : petHome(),
                             notices(),
                           )
                         : waterReminder(),
@@ -3253,13 +4481,14 @@ window.__ModuleLoader__.load({
             {
               ref: box,
               className:
-                'owc-v2' +
+                'owc-v2 owc-classic' +
+                (!collapsed ? ' owc-detail-page' : '') +
                 (collapsed ? ' owc-compact' : '') +
                 (collapsed && waterQuickOpen ? ' owc-quick' : '') +
                 (editing || waterEditing ? ' owc-editing' : ''),
               'aria-label': t('title'),
-              'data-version': '1.1.0',
-              'data-status': safeState?.status || 'setup',
+              'data-version': '1.1.2',
+              'data-status': classicClock.phase,
               style: cardStyle,
               onPointerDown: dragDown,
               onPointerMove: dragMove,
@@ -3278,8 +4507,8 @@ window.__ModuleLoader__.load({
                   return;
                 event.preventDefault();
                 if (ui.pending) dispatchUI({ type: 'stay' });
-                else if (editing || waterEditing) navigateScreen(ui.back);
-                else if (waterQuickOpen) closeWaterQuick();
+                else if (ui.screen)
+                  navigateScreen(PET_EDITOR_SCREENS.includes(ui.screen) ? ui.back : null);
                 else setPreference({ mini: true });
               },
             },
@@ -3301,33 +4530,28 @@ window.__ModuleLoader__.load({
                   waterPrompt ? t('waterDue') : waterNotice ? t(waterNotice.key) : '',
                 ),
               ),
-              collapsed
-                ? h(
-                    React.Fragment,
-                    null,
-                    strip(),
-                    waterQuickOpen && waterOverview(true),
-                    !waterQuickOpen &&
-                      waterNotice &&
-                      (!view.companion || companion.announce) &&
-                      h('p', { className: 'owc-mini-feedback' }, t(waterNotice.key)),
-                  )
-                : h(
-                    React.Fragment,
-                    null,
-                    panelHead(),
-                    !editing && !waterEditing && companionCard(),
-                    ui.pending
-                      ? draftGuard()
-                      : waterEditing
-                        ? waterSettings()
-                        : editing
-                          ? editor()
-                          : panelBody(),
-                    notices(),
-                    !editing && !waterEditing && waterOverview(),
-                  ),
-              !collapsed && waterReminder(),
+              !collapsed && classicHeader(),
+              ui.pending
+                ? draftGuard()
+                : waterEditing
+                  ? waterSettings()
+                  : editing
+                    ? editor()
+                    : ui.screen === 'water-countdown'
+                      ? waterCountdownCard()
+                      : ui.screen === 'smoking'
+                        ? smokingCountdownCard()
+                        : ui.screen === 'home'
+                          ? petHome()
+                          : ui.screen === 'earnings'
+                            ? panelBody('earnings')
+                            : ui.screen === 'income'
+                              ? panelBody('clock')
+                              : collapsed
+                                ? classicMini()
+                                : classicOverview(),
+              notices(ui.screen !== null),
+              ui.screen === null && waterReminder(),
             ),
           );
         }