feat: save and restore window position

Makefile

@@ -64,8 +64,10 @@ release: lint
 	@xattr -cr "build/bin/Daily Timer.app" 2>/dev/null || true
 	@rm -rf dist && mkdir -p dist
 	cd build/bin && zip -r "../../dist/Daily-Timer-$(VERSION)-macos-arm64.zip" "Daily Timer.app"
+	@shasum -a 256 "build/bin/Daily Timer.app/Contents/MacOS/daily-timer" | awk '{print $$1}' > "dist/Daily-Timer-$(VERSION)-macos-arm64.sha256"
 	@echo "Release package: dist/Daily-Timer-$(VERSION)-macos-arm64.zip"
-	@ls -lh dist/*.zip
+	@echo "Checksum: $$(cat dist/Daily-Timer-$(VERSION)-macos-arm64.sha256)"
+	@ls -lh dist/*
 
 # Release for both architectures
 release-all: lint
@@ -89,7 +91,7 @@ release-upload:
 		-d '{"tag_name": "$(VERSION)", "name": "$(VERSION)", "body": "Release $(VERSION)"}' \
 		| jq -r '.id'); \
 	echo "Created release ID: $$RELEASE_ID"; \
-	for file in dist/*.zip; do \
+	for file in dist/*; do \
 		filename=$$(basename "$$file"); \
 		echo "Uploading $$filename..."; \
 		curl -s -X POST \

README.md

@@ -15,6 +15,7 @@
 - 💾 **Экспорт** - экспорт данных в JSON или CSV
 - 🔊 **Звуковые уведомления** - настраиваемые звуковые оповещения
 - 🌐 **Локализация** - русский и английский интерфейс
+- 🔄 **Автообновление** - проверка и установка обновлений из приложения
 
 ## Скриншоты
 
@@ -36,6 +37,24 @@ _(Скоро)_
 3. Переместить `Daily Timer.app` в `/Applications/`
 4. Убрать атрибут карантина (см. ниже)
 
+### Автообновление
+
+Приложение поддерживает автоматическое обновление:
+
+1. Открыть **Настройки** → секция "Обновления"
+2. Нажать **Проверить сейчас**
+3. Если доступно обновление → **Скачать и установить**
+4. После установки нажать **Перезапустить**
+
+Приложение автоматически:
+
+- Скачивает новую версию
+- Устанавливает в `/Applications/`
+- Снимает карантин (`xattr -cr`)
+- Перезапускается
+
+**Обнаружение пересборок**: Если версия та же, но бинарник изменился (пересборка) - приложение также предложит обновление.
+
 ### Установка Wails CLI
 
 ```bash
@@ -86,8 +105,9 @@ xattr -cr "Daily Timer.app"
 2. Таймер показывает текущего спикера с обратным отсчётом
 3. Нажать **Следующий** для перехода (или ⌘N)
 4. Нажать **Пропустить** чтобы переместить спикера в конец очереди
-5. Использовать **Пауза/Продолжить** для прерываний
+5. **Клик по спикеру** в списке - быстро переключиться на него (для done-спикеров таймер продолжится)
-6. Нажать **Стоп** для досрочного завершения
+6. Использовать **Пауза/Продолжить** для прерываний
+7. Нажать **Стоп** для досрочного завершения
 
 ### Горячие клавиши
 
@@ -172,6 +192,7 @@ GITEA_TOKEN=<token> make release-publish
 - [ ] Шаблоны команд
 - [ ] Облачная синхронизация
 - [ ] Поддержка Windows/Linux
+- [x] Автообновление приложения
 
 ## Лицензия
 

frontend/src/App.svelte

@@ -7,7 +7,7 @@
   import History from './components/History.svelte'
   import Setup from './components/Setup.svelte'
   import { EventsOn, EventsOff, WindowSetSize, ScreenGetAll } from '../wailsjs/runtime/runtime'
-  import { GetParticipants, StartMeeting, GetSettings, SkipSpeaker, RemoveFromQueue } from '../wailsjs/go/app/App'
+  import { GetParticipants, StartMeeting, GetSettings, SkipSpeaker, RemoveFromQueue, SwitchToSpeaker } from '../wailsjs/go/app/App'
   import { t, initLocale } from './lib/i18n'
 
   let currentView = 'main'
@@ -35,6 +35,27 @@
     EventsOn('timer:meeting_warning', handleMeetingWarning)
     EventsOn('timer:meeting_ended', handleMeetingEnded)
     EventsOn('timer:speaker_changed', handleSpeakerChanged)
+    
+    // Warm up AudioContext on first user interaction
+    const warmUpAudio = async () => {
+      const ctx = getAudioContext()
+      if (ctx.state === 'suspended') {
+        await ctx.resume()
+      }
+      // Play silent sound to fully unlock audio
+      const oscillator = ctx.createOscillator()
+      const gainNode = ctx.createGain()
+      oscillator.connect(gainNode)
+      gainNode.connect(ctx.destination)
+      gainNode.gain.value = 0 // Silent
+      oscillator.start()
+      oscillator.stop(ctx.currentTime + 0.001)
+      // Remove listener after first interaction
+      document.removeEventListener('click', warmUpAudio)
+      document.removeEventListener('keydown', warmUpAudio)
+    }
+    document.addEventListener('click', warmUpAudio)
+    document.addEventListener('keydown', warmUpAudio)
   })
 
   async function loadSettings() {
@@ -80,17 +101,17 @@
     timerState = state
   }
 
-  function handleWarning(state) {
+  async function handleWarning(state) {
     timerState = state
     if (settings?.soundEnabled) {
-      playSound('warning')
+      await playSound('warning')
     }
   }
 
-  function handleTimeUp(state) {
+  async function handleTimeUp(state) {
     timerState = state
     if (settings?.soundEnabled) {
-      playSound('timeup')
+      await playSound('timeup')
     }
   }
 
@@ -98,11 +119,11 @@
     timerState = state
   }
 
-  function handleMeetingEnded(state) {
+  async function handleMeetingEnded(state) {
     timerState = state
     meetingActive = false
     if (settings?.soundEnabled) {
-      playSound('meeting_end')
+      await playSound('meeting_end')
     }
   }
 
@@ -141,24 +162,27 @@
     }
   }
 
-  function playSound(name) {
+  async function playSound(name) {
+    // Ensure AudioContext is running (may be suspended after inactivity)
+    const ctx = getAudioContext()
+    if (ctx.state === 'suspended') {
+      await ctx.resume()
+    }
+    
     switch (name) {
       case 'warning':
-        // Two short warning beeps
         playBeep(880, 0.15)
         setTimeout(() => playBeep(880, 0.15), 200)
         break
       case 'timeup':
-        // Descending tone sequence
         playBeep(1200, 0.2)
         setTimeout(() => playBeep(900, 0.2), 250)
         setTimeout(() => playBeep(600, 0.3), 500)
         break
       case 'meeting_end':
-        // Final chime - three notes
+        playBeep(523, 0.2)
-        playBeep(523, 0.2)  // C5
+        setTimeout(() => playBeep(659, 0.2), 200)
-        setTimeout(() => playBeep(659, 0.2), 200)  // E5
+        setTimeout(() => playBeep(784, 0.4), 400)
-        setTimeout(() => playBeep(784, 0.4), 400)  // G5
         break
     }
   }
@@ -168,16 +192,30 @@
     currentView = 'main'
   }
 
-  function handleSettingsLoaded(s) {
+  function handleSettingsLoaded(event) {
-    settings = s
+    settings = event.detail
   }
 
   async function handleSkipFromList(event) {
     const { speakerId } = event.detail
     try {
-      await RemoveFromQueue(speakerId)
+      // If this is the current speaker, use SkipSpeaker, otherwise RemoveFromQueue
+      if (timerState?.currentSpeakerId === speakerId) {
+        await SkipSpeaker()
+      } else {
+        await RemoveFromQueue(speakerId)
+      }
     } catch (e) {
-      console.error('Failed to remove speaker from queue:', e)
+      console.error('Failed to skip speaker:', e)
+    }
+  }
+
+  async function handleSwitchSpeaker(event) {
+    const { speakerId } = event.detail
+    try {
+      await SwitchToSpeaker(speakerId)
+    } catch (e) {
+      console.error('Failed to switch to speaker:', e)
     }
   }
 
@@ -242,12 +280,12 @@
     </button>
   </nav>
 
-  <div class="content">
+  <div class="content" class:no-nav={meetingActive}>
     {#if currentView === 'main'}
       {#if meetingActive && timerState}
         <div class="timer-view">
           <Timer {timerState} />
-          <ParticipantList {timerState} on:skip={handleSkipFromList} />
+          <ParticipantList {timerState} on:skip={handleSkipFromList} on:switch={handleSwitchSpeaker} />
           <Controls {timerState} on:stop={() => meetingActive = false} />
         </div>
       {:else if participants.length > 0}
@@ -309,6 +347,11 @@
   }
 
   .nav {
+    position: fixed;
+    top: 32px;
+    left: 0;
+    right: 0;
+    z-index: 100;
     display: flex;
     gap: 4px;
     padding: 8px 12px;
@@ -335,6 +378,7 @@
     font-size: 13px;
     transition: all 0.2s;
     white-space: nowrap;
+    outline: none;
   }
 
   .nav button:hover {
@@ -348,10 +392,17 @@
   }
 
   .content {
-    flex: 1;
+    position: fixed;
-    overflow: auto;
+    top: 84px; /* 32px titlebar + 52px nav height */
+    bottom: 0;
+    left: 0;
+    right: 0;
+    overflow-y: auto;
     padding: 12px;
-    padding-bottom: 64px;
+  }
+
+  .content.no-nav {
+    top: 32px; /* Only titlebar when nav is hidden */
   }
 
   .timer-view {

frontend/src/components/Controls.svelte

@@ -30,8 +30,33 @@
     await StopMeeting()
     dispatch('stop')
   }
+
+  function handleKeydown(e) {
+    // ⌘N - Next speaker
+    if (e.metaKey && e.key.toLowerCase() === 'n') {
+      e.preventDefault()
+      handleNext()
+    }
+    // ⌘S - Skip speaker  
+    if (e.metaKey && e.key.toLowerCase() === 's') {
+      e.preventDefault()
+      handleSkip()
+    }
+    // Space - Pause/Resume
+    if (e.code === 'Space' && !e.metaKey && !e.ctrlKey && !e.altKey) {
+      e.preventDefault()
+      handlePauseResume()
+    }
+    // ⌘Q - Stop meeting
+    if (e.metaKey && e.key.toLowerCase() === 'q') {
+      e.preventDefault()
+      handleStop()
+    }
+  }
 </script>
 
+<svelte:window on:keydown={handleKeydown} />
+
 <div class="controls">
   <button class="btn primary" on:click={handleNext}>
     {hasQueue ? $t('controls.next') : $t('controls.stop')}

frontend/src/components/History.svelte

@@ -205,7 +205,15 @@
                   <div class="participant-log" class:log-overtime={log.overtime} class:skipped={log.skipped}>
                     <span class="log-order">#{log.order}</span>
                     <span class="log-name">{log.participant?.name || 'Unknown'}</span>
-                    <span class="log-duration">{formatTime(log.duration)}</span>
+                    <span class="log-duration">
+                      <span class:overtime={log.duration > (log.participant?.timeLimit || 0)}>
+                        {formatTime(log.duration)}
+                      </span>
+                      {#if log.participant?.timeLimit}
+                        <span class="time-sep">/</span>
+                        <span class="time-limit">{formatTime(log.participant.timeLimit)}</span>
+                      {/if}
+                    </span>
                     {#if log.overtime}
                       <span class="overtime-icon">⚠️</span>
                     {/if}
@@ -463,6 +471,22 @@
   .log-duration {
     color: #9ca3af;
     font-family: 'SF Mono', 'Menlo', monospace;
+    white-space: nowrap;
+    display: inline-flex;
+    align-items: center;
+  }
+
+  .log-duration .overtime {
+    color: #ef4444;
+  }
+
+  .log-duration .time-sep {
+    color: #6b7280;
+    margin: 0 3px;
+  }
+
+  .log-duration .time-limit {
+    color: #6b7280;
   }
 
   .loading, .empty {

frontend/src/components/ParticipantList.svelte

@@ -1,31 +1,89 @@
 <script>
-  import { createEventDispatcher } from 'svelte'
+  import { createEventDispatcher, tick } from 'svelte'
   import { t } from '../lib/i18n'
 
   export let timerState
 
   const dispatch = createEventDispatcher()
 
+  let listEl
+  let lastSpeakingOrder = 0
+
   $: allSpeakers = timerState?.allSpeakers || []
   $: currentSpeakerId = timerState?.currentSpeakerId || 0
+  $: currentElapsed = timerState?.speakerElapsed || 0
+  $: speakingOrder = timerState?.speakingOrder || 0
+
+  // Auto-scroll when speaker changes
+  $: if (speakingOrder !== lastSpeakingOrder && speakingOrder > 0) {
+    lastSpeakingOrder = speakingOrder
+    scrollToCurrentSpeaker()
+  }
+
+  async function scrollToCurrentSpeaker() {
+    await tick() // Wait for DOM update
+    if (!listEl) return
+    
+    // Find the index of the current speaking participant
+    const speakingIndex = allSpeakers.findIndex(s => s.status === 'speaking')
+    if (speakingIndex < 0) return
+    
+    // Scroll to show previous speaker at top (or current if first)
+    const targetIndex = Math.max(0, speakingIndex - 1)
+    const items = listEl.querySelectorAll('li')
+    if (items[targetIndex]) {
+      items[targetIndex].scrollIntoView({ behavior: 'smooth', block: 'start' })
+    }
+  }
 
   function handleSkip(speakerId) {
     dispatch('skip', { speakerId })
   }
+
+  function handleSwitch(speakerId) {
+    dispatch('switch', { speakerId })
+  }
+
+  function formatTime(seconds) {
+    const mins = Math.floor(seconds / 60)
+    const secs = seconds % 60
+    return `${mins}:${secs.toString().padStart(2, '0')}`
+  }
 </script>
 
 <div class="participant-list">
   <h3>{$t('timer.participants')}</h3>
   
   {#if allSpeakers.length > 0}
-    <ul>
+    <ul bind:this={listEl}>
       {#each allSpeakers as speaker}
-        <li class="speaker-item {speaker.status}">
+        <!-- svelte-ignore a11y-click-events-have-key-events a11y-no-noninteractive-element-interactions -->
+        <li 
+          class="speaker-item {speaker.status}" 
+          class:clickable={speaker.status !== 'speaking'}
+          on:click={() => speaker.status !== 'speaking' && handleSwitch(speaker.id)}
+        >
           <span class="order">{speaker.order}</span>
           <span class="name">{speaker.name}</span>
-          <span class="time-limit">{Math.floor(speaker.timeLimit / 60)}:{(speaker.timeLimit % 60).toString().padStart(2, '0')}</span>
+          <span class="time-display">
-          {#if speaker.status === 'pending' || speaker.status === 'skipped'}
+            {#if speaker.status === 'done'}
-            <button class="skip-btn" on:click={() => handleSkip(speaker.id)} title="{$t('controls.skip')}">
+              <span class="time-spent" class:overtime={speaker.timeSpent > speaker.timeLimit}>
+                {formatTime(speaker.timeSpent)}
+              </span>
+              <span class="time-sep">/</span>
+              <span class="time-limit">{formatTime(speaker.timeLimit)}</span>
+            {:else if speaker.status === 'speaking'}
+              <span class="time-spent" class:overtime={currentElapsed > speaker.timeLimit}>
+                {formatTime(currentElapsed)}
+              </span>
+              <span class="time-sep">/</span>
+              <span class="time-limit">{formatTime(speaker.timeLimit)}</span>
+            {:else}
+              <span class="time-limit">{formatTime(speaker.timeLimit)}</span>
+            {/if}
+          </span>
+          {#if speaker.status === 'pending' || speaker.status === 'speaking'}
+            <button class="skip-btn" on:click|stopPropagation={() => handleSkip(speaker.id)} title="{$t('controls.skip')}">
               ⏭
             </button>
           {/if}
@@ -85,6 +143,18 @@
     background: #1b2636;
   }
 
+  .speaker-item.clickable {
+    cursor: pointer;
+  }
+
+  .speaker-item.clickable:hover {
+    background: #2d3f52;
+  }
+
+  .speaker-item.done.clickable:hover {
+    background: #2a4a6f;
+  }
+
   .speaker-item.skipped {
     background: repeating-linear-gradient(
       45deg,
@@ -129,13 +199,6 @@
     white-space: nowrap;
   }
 
-  .time-limit {
-    font-family: 'SF Mono', 'Menlo', monospace;
-    font-size: 12px;
-    color: #6b7280;
-    flex-shrink: 0;
-  }
-
   .skip-btn {
     margin-left: 8px;
     padding: 4px 8px;
@@ -163,4 +226,30 @@
     text-align: center;
     padding: 24px;
   }
+
+  .time-display {
+    display: inline-flex;
+    align-items: center;
+    font-family: 'SF Mono', 'Menlo', monospace;
+    font-size: 12px;
+    flex-shrink: 0;
+    white-space: nowrap;
+  }
+
+  .time-spent {
+    color: #4ade80;
+  }
+
+  .time-spent.overtime {
+    color: #ef4444;
+  }
+
+  .time-sep {
+    color: #6b7280;
+    margin: 0 3px;
+  }
+
+  .time-limit {
+    color: #6b7280;
+  }
 </style>

frontend/src/components/Settings.svelte

@@ -1,6 +1,6 @@
 <script>
   import { onMount, createEventDispatcher } from 'svelte'
-  import { GetSettings, UpdateSettings, GetMeeting, UpdateMeeting, GetVersion, CheckForUpdates, DownloadAndInstallUpdate, RestartApp } from '../../wailsjs/go/app/App'
+  import { GetSettings, UpdateSettings, GetMeeting, UpdateMeeting, GetVersion, CheckForUpdates, DownloadAndInstallUpdate, RestartApp, SelectCustomSound, GetCustomSoundPath, ClearCustomSound } from '../../wailsjs/go/app/App'
   import { WindowSetSize, ScreenGetAll, EventsOn, EventsOff } from '../../wailsjs/runtime/runtime'
   import { t, locale, setLocale } from '../lib/i18n'
 
@@ -16,6 +16,14 @@
   let windowFullHeight = true
   let audioContext = null
 
+  // Custom sounds state
+  let customSounds = {
+    warning: null,
+    timeup: null,
+    meeting_end: null
+  }
+  let audioElements = {}
+
   // Update state
   let currentVersion = 'dev'
   let updateInfo = null
@@ -51,11 +59,17 @@
       oscillator.stop(ctx.currentTime + duration)
     } catch (e) {
       console.error('Failed to play sound:', e)
-      alert('Sound error: ' + e.message)
     }
   }
 
   function testSound(name) {
+    // If custom sound exists, play it
+    if (customSounds[name]) {
+      playCustomSound(name)
+      return
+    }
+    
+    // Otherwise play default beep sounds
     switch (name) {
       case 'warning':
         playBeep(880, 0.15)
@@ -74,8 +88,63 @@
     }
   }
 
+  function playCustomSound(name) {
+    try {
+      if (!audioElements[name]) {
+        audioElements[name] = new Audio('file://' + customSounds[name])
+      }
+      audioElements[name].currentTime = 0
+      audioElements[name].play()
+    } catch (e) {
+      console.error('Failed to play custom sound:', e)
+    }
+  }
+
+  async function loadCustomSounds() {
+    const types = ['warning', 'timeup', 'meeting_end']
+    for (const type of types) {
+      try {
+        const path = await GetCustomSoundPath(type)
+        if (path) {
+          customSounds[type] = path
+          // Pre-create audio element
+          audioElements[type] = new Audio('file://' + path)
+        }
+      } catch (e) {
+        console.error(`Failed to get custom sound for ${type}:`, e)
+      }
+    }
+    customSounds = { ...customSounds } // Trigger reactivity
+  }
+
+  async function handleUploadSound(soundType) {
+    try {
+      const path = await SelectCustomSound(soundType)
+      if (path) {
+        customSounds[soundType] = path
+        // Recreate audio element with new file
+        audioElements[soundType] = new Audio('file://' + path)
+        customSounds = { ...customSounds }
+      }
+    } catch (e) {
+      console.error('Failed to upload sound:', e)
+    }
+  }
+
+  async function handleClearSound(soundType) {
+    try {
+      await ClearCustomSound(soundType)
+      customSounds[soundType] = null
+      delete audioElements[soundType]
+      customSounds = { ...customSounds }
+    } catch (e) {
+      console.error('Failed to clear sound:', e)
+    }
+  }
+
   onMount(async () => {
     await loadData()
+    await loadCustomSounds()
     
     // Load version and check for updates
     try {
@@ -94,9 +163,29 @@
       updateComplete = true
     })
 
+    // Warm up AudioContext on first user interaction (for sound tests)
+    const warmUpAudio = async () => {
+      const ctx = getAudioContext()
+      if (ctx.state === 'suspended') {
+        await ctx.resume()
+      }
+      // Play silent sound to fully unlock audio
+      const oscillator = ctx.createOscillator()
+      const gainNode = ctx.createGain()
+      oscillator.connect(gainNode)
+      gainNode.connect(ctx.destination)
+      gainNode.gain.value = 0 // Silent
+      oscillator.start()
+      oscillator.stop(ctx.currentTime + 0.001)
+      // Remove listener after first interaction
+      document.removeEventListener('click', warmUpAudio)
+    }
+    document.addEventListener('click', warmUpAudio)
+
     return () => {
       EventsOff('update:progress')
       EventsOff('update:complete')
+      document.removeEventListener('click', warmUpAudio)
     }
   })
 
@@ -247,10 +336,60 @@
         <label for="soundEnabled">{settings.soundEnabled ? $t('settings.soundEnabled') : $t('settings.soundDisabled')}</label>
       </div>
 
-      <div class="sound-test-buttons">
+      <div class="sound-items">
-        <button type="button" class="test-btn" on:click={() => testSound('warning')}>🔔 Test Warning</button>
+        <div class="sound-item">
-        <button type="button" class="test-btn" on:click={() => testSound('timeup')}>⏰ Test Time Up</button>
+          <div class="sound-info">
-        <button type="button" class="test-btn" on:click={() => testSound('meeting_end')}>🏁 Test Meeting End</button>
+            <span class="sound-label">🔔 {$t('settings.testWarning')}</span>
+            {#if customSounds.warning}
+              <span class="sound-status custom">{$t('settings.customSound')}</span>
+            {:else}
+              <span class="sound-status default">{$t('settings.defaultSound')}</span>
+            {/if}
+          </div>
+          <div class="sound-actions">
+            <button type="button" class="test-btn" on:click={() => testSound('warning')}>▶</button>
+            <button type="button" class="upload-btn" on:click={() => handleUploadSound('warning')}>📁</button>
+            {#if customSounds.warning}
+              <button type="button" class="clear-btn" on:click={() => handleClearSound('warning')}>✕</button>
+            {/if}
+          </div>
+        </div>
+
+        <div class="sound-item">
+          <div class="sound-info">
+            <span class="sound-label">⏰ {$t('settings.testTimeUp')}</span>
+            {#if customSounds.timeup}
+              <span class="sound-status custom">{$t('settings.customSound')}</span>
+            {:else}
+              <span class="sound-status default">{$t('settings.defaultSound')}</span>
+            {/if}
+          </div>
+          <div class="sound-actions">
+            <button type="button" class="test-btn" on:click={() => testSound('timeup')}>▶</button>
+            <button type="button" class="upload-btn" on:click={() => handleUploadSound('timeup')}>📁</button>
+            {#if customSounds.timeup}
+              <button type="button" class="clear-btn" on:click={() => handleClearSound('timeup')}>✕</button>
+            {/if}
+          </div>
+        </div>
+
+        <div class="sound-item">
+          <div class="sound-info">
+            <span class="sound-label">🏁 {$t('settings.testMeetingEnd')}</span>
+            {#if customSounds.meeting_end}
+              <span class="sound-status custom">{$t('settings.customSound')}</span>
+            {:else}
+              <span class="sound-status default">{$t('settings.defaultSound')}</span>
+            {/if}
+          </div>
+          <div class="sound-actions">
+            <button type="button" class="test-btn" on:click={() => testSound('meeting_end')}>▶</button>
+            <button type="button" class="upload-btn" on:click={() => handleUploadSound('meeting_end')}>📁</button>
+            {#if customSounds.meeting_end}
+              <button type="button" class="clear-btn" on:click={() => handleClearSound('meeting_end')}>✕</button>
+            {/if}
+          </div>
+        </div>
       </div>
     </section>
 
@@ -309,7 +448,11 @@
         </div>
       {:else if updateInfo?.available}
         <div class="update-status available">
-          {$t('updates.updateAvailable')}: <strong>{updateInfo.latestVersion}</strong>
+          {#if updateInfo.isRebuild}
+            {$t('updates.rebuildAvailable')}: <strong>{updateInfo.latestVersion}</strong>
+          {:else}
+            {$t('updates.updateAvailable')}: <strong>{updateInfo.latestVersion}</strong>
+          {/if}
         </div>
         <button class="update-btn primary" on:click={downloadAndInstall}>
           {$t('updates.downloadAndInstall')}
@@ -494,6 +637,84 @@
     transform: scale(0.97);
   }
 
+  /* Sound items */
+  .sound-items {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    margin-top: 12px;
+  }
+
+  .sound-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 12px;
+    background: #1b2636;
+    border: 1px solid #3d4f61;
+    border-radius: 8px;
+  }
+
+  .sound-info {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+
+  .sound-label {
+    font-size: 14px;
+    color: #e0e0e0;
+  }
+
+  .sound-status {
+    font-size: 11px;
+    padding: 2px 6px;
+    border-radius: 4px;
+  }
+
+  .sound-status.custom {
+    background: #2a4a3a;
+    color: #6ee7b7;
+  }
+
+  .sound-status.default {
+    background: #3d4f61;
+    color: #9ca3af;
+  }
+
+  .sound-actions {
+    display: flex;
+    gap: 6px;
+  }
+
+  .sound-actions button {
+    width: 32px;
+    height: 32px;
+    padding: 0;
+    border: 1px solid #3d4f61;
+    border-radius: 6px;
+    background: #2a3a4e;
+    color: #9ca3af;
+    font-size: 14px;
+    cursor: pointer;
+    transition: all 0.2s;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .sound-actions button:hover {
+    border-color: #4a90d9;
+    background: #3a4a5e;
+    color: #e0e0e0;
+  }
+
+  .sound-actions .clear-btn:hover {
+    border-color: #ef4444;
+    background: #4a2a2a;
+    color: #fca5a5;
+  }
+
   /* Updates section */
   .updates-section {
     border: 1px solid #3d4f61;

frontend/src/lib/i18n.js

@@ -94,6 +94,11 @@ export const translations = {
       sound: 'Звуковые уведомления',
       soundEnabled: 'Включены',
       soundDisabled: 'Выключены',
+      testWarning: 'Предупреждение',
+      testTimeUp: 'Время вышло',
+      testMeetingEnd: 'Конец собрания',
+      customSound: 'свой',
+      defaultSound: 'стандартный',
       warningTime: 'Предупреждение за',
       seconds: 'сек',
       defaultSpeakerTime: 'Время на спикера по умолчанию',
@@ -114,6 +119,7 @@ export const translations = {
       currentVersion: 'Текущая версия',
       checkingForUpdates: 'Проверка обновлений...',
       updateAvailable: 'Доступно обновление',
+      rebuildAvailable: 'Доступна пересборка',
       upToDate: 'У вас последняя версия',
       downloadAndInstall: 'Скачать и установить',
       downloading: 'Загрузка...',
@@ -261,6 +267,11 @@ export const translations = {
       sound: 'Sound Notifications',
       soundEnabled: 'Enabled',
       soundDisabled: 'Disabled',
+      testWarning: 'Warning',
+      testTimeUp: 'Time Up',
+      testMeetingEnd: 'Meeting End',
+      customSound: 'custom',
+      defaultSound: 'default',
       warningTime: 'Warning before',
       seconds: 'sec',
       defaultSpeakerTime: 'Default Speaker Time',
@@ -281,6 +292,7 @@ export const translations = {
       currentVersion: 'Current version',
       checkingForUpdates: 'Checking for updates...',
       updateAvailable: 'Update available',
+      rebuildAvailable: 'Rebuild available',
       upToDate: 'You have the latest version',
       downloadAndInstall: 'Download and install',
       downloading: 'Downloading...',

frontend/wailsjs/go/app/App.d.ts

@@ -7,6 +7,8 @@ export function AddParticipant(arg1:string,arg2:string,arg3:number):Promise<mode
 
 export function CheckForUpdates():Promise<updater.UpdateInfo>;
 
+export function ClearCustomSound(arg1:string):Promise<void>;
+
 export function DeleteAllSessions():Promise<void>;
 
 export function DeleteParticipant(arg1:number):Promise<void>;
@@ -19,6 +21,8 @@ export function ExportCSV(arg1:string,arg2:string):Promise<string>;
 
 export function ExportData(arg1:string,arg2:string):Promise<string>;
 
+export function GetCustomSoundPath(arg1:string):Promise<string>;
+
 export function GetMeeting():Promise<models.Meeting>;
 
 export function GetParticipants():Promise<Array<models.Participant>>;
@@ -49,12 +53,16 @@ export function RestartApp():Promise<void>;
 
 export function ResumeMeeting():Promise<void>;
 
+export function SelectCustomSound(arg1:string):Promise<string>;
+
 export function SkipSpeaker():Promise<void>;
 
 export function StartMeeting(arg1:Array<number>,arg2:Record<number, boolean>):Promise<void>;
 
 export function StopMeeting():Promise<void>;
 
+export function SwitchToSpeaker(arg1:number):Promise<void>;
+
 export function UpdateMeeting(arg1:string,arg2:number):Promise<void>;
 
 export function UpdateParticipant(arg1:number,arg2:string,arg3:string,arg4:number):Promise<void>;

frontend/wailsjs/go/app/App.js

@@ -10,6 +10,10 @@ export function CheckForUpdates() {
   return window['go']['app']['App']['CheckForUpdates']();
 }
 
+export function ClearCustomSound(arg1) {
+  return window['go']['app']['App']['ClearCustomSound'](arg1);
+}
+
 export function DeleteAllSessions() {
   return window['go']['app']['App']['DeleteAllSessions']();
 }
@@ -34,6 +38,10 @@ export function ExportData(arg1, arg2) {
   return window['go']['app']['App']['ExportData'](arg1, arg2);
 }
 
+export function GetCustomSoundPath(arg1) {
+  return window['go']['app']['App']['GetCustomSoundPath'](arg1);
+}
+
 export function GetMeeting() {
   return window['go']['app']['App']['GetMeeting']();
 }
@@ -94,6 +102,10 @@ export function ResumeMeeting() {
   return window['go']['app']['App']['ResumeMeeting']();
 }
 
+export function SelectCustomSound(arg1) {
+  return window['go']['app']['App']['SelectCustomSound'](arg1);
+}
+
 export function SkipSpeaker() {
   return window['go']['app']['App']['SkipSpeaker']();
 }
@@ -106,6 +118,10 @@ export function StopMeeting() {
   return window['go']['app']['App']['StopMeeting']();
 }
 
+export function SwitchToSpeaker(arg1) {
+  return window['go']['app']['App']['SwitchToSpeaker'](arg1);
+}
+
 export function UpdateMeeting(arg1, arg2) {
   return window['go']['app']['App']['UpdateMeeting'](arg1, arg2);
 }

frontend/wailsjs/go/models.ts

@@ -351,6 +351,7 @@ export namespace models {
 	    id: number;
 	    name: string;
 	    timeLimit: number;
+	    timeSpent: number;
 	    order: number;
 	    status: string;
 	
@@ -363,6 +364,7 @@ export namespace models {
 	        this.id = source["id"];
 	        this.name = source["name"];
 	        this.timeLimit = source["timeLimit"];
+	        this.timeSpent = source["timeSpent"];
 	        this.order = source["order"];
 	        this.status = source["status"];
 	    }
@@ -441,6 +443,7 @@ export namespace updater {
 	    releaseNotes: string;
 	    downloadURL: string;
 	    downloadSize: number;
+	    isRebuild: boolean;
 	
 	    static createFrom(source: any = {}) {
 	        return new UpdateInfo(source);
@@ -454,6 +457,7 @@ export namespace updater {
 	        this.releaseNotes = source["releaseNotes"];
 	        this.downloadURL = source["downloadURL"];
 	        this.downloadSize = source["downloadSize"];
+	        this.isRebuild = source["isRebuild"];
 	    }
 	}
 

internal/app/app.go

@@ -39,10 +39,19 @@ func (a *App) Startup(ctx context.Context) {
 }
 
 func (a *App) OnDomReady(ctx context.Context) {
+	// Restore saved window position
+	if settings, err := a.store.GetSettings(); err == nil && settings != nil {
+		if settings.WindowX >= 0 && settings.WindowY >= 0 {
+			runtime.WindowSetPosition(ctx, settings.WindowX, settings.WindowY)
+		}
+	}
 	runtime.WindowShow(ctx)
 }
 
 func (a *App) Shutdown(ctx context.Context) {
+	// Save window position before closing
+	a.saveWindowPosition()
+
 	if a.timer != nil {
 		a.timer.Close()
 	}
@@ -51,6 +60,25 @@ func (a *App) Shutdown(ctx context.Context) {
 	}
 }
 
+func (a *App) saveWindowPosition() {
+	if a.ctx == nil {
+		return
+	}
+	x, y := runtime.WindowGetPosition(a.ctx)
+	if x >= 0 && y >= 0 {
+		if settings, err := a.store.GetSettings(); err == nil && settings != nil {
+			settings.WindowX = x
+			settings.WindowY = y
+			_ = a.store.UpdateSettings(settings)
+		}
+	}
+}
+
+// SaveWindowPosition saves current window position (can be called from frontend)
+func (a *App) SaveWindowPosition() {
+	a.saveWindowPosition()
+}
+
 // Participants
 
 func (a *App) GetParticipants() ([]models.Participant, error) {
@@ -179,13 +207,37 @@ func (a *App) handleTimerEvents() {
 			a.saveSpeakerLog(event.State)
 			runtime.EventsEmit(a.ctx, "timer:speaker_changed", event.State)
 		case timer.EventMeetingEnded:
-			a.saveSpeakerLog(event.State)
+			a.finalizeSpeakerLogs(event.State)
 			a.endMeetingSession(event.State)
 			runtime.EventsEmit(a.ctx, "timer:meeting_ended", event.State)
 		}
 	}
 }
 
+func (a *App) finalizeSpeakerLogs(state models.TimerState) {
+	if a.session == nil {
+		return
+	}
+
+	// Only finalize existing logs, don't create new ones
+	for id, log := range a.currentLogs {
+		if log.EndedAt == nil {
+			now := time.Now()
+			log.EndedAt = &now
+			log.Duration = int(now.Sub(log.StartedAt).Seconds())
+
+			participants, _ := a.store.GetParticipants()
+			for _, p := range participants {
+				if p.ID == id {
+					log.Overtime = log.Duration > p.TimeLimit
+					break
+				}
+			}
+			_ = a.store.UpdateParticipantLog(log)
+		}
+	}
+}
+
 func (a *App) saveSpeakerLog(state models.TimerState) {
 	if a.session == nil {
 		return
@@ -247,6 +299,12 @@ func (a *App) RemoveFromQueue(speakerID uint) {
 	}
 }
 
+func (a *App) SwitchToSpeaker(speakerID uint) {
+	if a.timer != nil {
+		a.timer.SwitchToSpeaker(speakerID)
+	}
+}
+
 func (a *App) PauseMeeting() {
 	if a.timer != nil {
 		a.timer.Pause()
@@ -508,3 +566,105 @@ func (a *App) DownloadAndInstallUpdate() error {
 func (a *App) RestartApp() error {
 	return a.updater.RestartApp()
 }
+
+// Sound Management
+
+func (a *App) getSoundsDir() (string, error) {
+	configDir, err := os.UserConfigDir()
+	if err != nil {
+		return "", err
+	}
+	soundsDir := filepath.Join(configDir, "DailyTimer", "sounds")
+	if err := os.MkdirAll(soundsDir, 0755); err != nil {
+		return "", err
+	}
+	return soundsDir, nil
+}
+
+func (a *App) SelectCustomSound(soundType string) (string, error) {
+	// Validate sound type
+	validTypes := map[string]bool{"warning": true, "timeup": true, "meeting_end": true}
+	if !validTypes[soundType] {
+		return "", fmt.Errorf("invalid sound type: %s", soundType)
+	}
+
+	// Open file dialog
+	selection, err := runtime.OpenFileDialog(a.ctx, runtime.OpenDialogOptions{
+		Title: "Select Sound File",
+		Filters: []runtime.FileFilter{
+			{DisplayName: "Audio Files", Pattern: "*.mp3;*.wav;*.m4a;*.ogg"},
+		},
+	})
+	if err != nil {
+		return "", err
+	}
+	if selection == "" {
+		return "", nil // User cancelled
+	}
+
+	// Get sounds directory
+	soundsDir, err := a.getSoundsDir()
+	if err != nil {
+		return "", err
+	}
+
+	// Determine destination filename
+	ext := filepath.Ext(selection)
+	destPath := filepath.Join(soundsDir, soundType+ext)
+
+	// Copy file
+	src, err := os.Open(selection)
+	if err != nil {
+		return "", err
+	}
+	defer func() { _ = src.Close() }()
+
+	dst, err := os.Create(destPath)
+	if err != nil {
+		return "", err
+	}
+	defer func() { _ = dst.Close() }()
+
+	if _, err := dst.ReadFrom(src); err != nil {
+		return "", err
+	}
+
+	return destPath, nil
+}
+
+func (a *App) GetCustomSoundPath(soundType string) string {
+	soundsDir, err := a.getSoundsDir()
+	if err != nil {
+		return ""
+	}
+
+	// Check for common audio extensions
+	extensions := []string{".mp3", ".wav", ".m4a", ".ogg"}
+	for _, ext := range extensions {
+		path := filepath.Join(soundsDir, soundType+ext)
+		if _, err := os.Stat(path); err == nil {
+			return path
+		}
+	}
+
+	return ""
+}
+
+func (a *App) ClearCustomSound(soundType string) error {
+	soundsDir, err := a.getSoundsDir()
+	if err != nil {
+		return err
+	}
+
+	extensions := []string{".mp3", ".wav", ".m4a", ".ogg"}
+	for _, ext := range extensions {
+		path := filepath.Join(soundsDir, soundType+ext)
+		if _, err := os.Stat(path); err == nil {
+			if err := os.Remove(path); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}

internal/models/models.go

@@ -67,6 +67,8 @@ type Settings struct {
 	SoundMeetingEnd        string `json:"soundMeetingEnd" gorm:"default:meeting_end.mp3"`
 	WarningThreshold       int    `json:"warningThreshold" gorm:"default:30"` // seconds before time up
 	Theme                  string `json:"theme" gorm:"default:dark"`
-	WindowWidth            int    `json:"windowWidth" gorm:"default:800"`      // minimum 480
+	WindowWidth            int    `json:"windowWidth" gorm:"default:800"`       // minimum 480
 	WindowFullHeight       bool   `json:"windowFullHeight" gorm:"default:true"` // use full screen height
+	WindowX                int    `json:"windowX" gorm:"default:-1"`            // -1 = not set (center)
+	WindowY                int    `json:"windowY" gorm:"default:-1"`            // -1 = not set (center)
 }

internal/models/types.go

@@ -33,6 +33,7 @@ type SpeakerInfo struct {
 	ID        uint          `json:"id"`
 	Name      string        `json:"name"`
 	TimeLimit int           `json:"timeLimit"`
+	TimeSpent int           `json:"timeSpent"`
 	Order     int           `json:"order"`
 	Status    SpeakerStatus `json:"status"`
 }

internal/services/updater/updater.go

@@ -2,6 +2,8 @@ package updater
 
 import (
 	"archive/zip"
+	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -43,6 +45,7 @@ type UpdateInfo struct {
 	ReleaseNotes   string `json:"releaseNotes"`
 	DownloadURL    string `json:"downloadURL"`
 	DownloadSize   int64  `json:"downloadSize"`
+	IsRebuild      bool   `json:"isRebuild"`
 }
 
 type Updater struct {
@@ -89,16 +92,40 @@ func (u *Updater) CheckForUpdates() (*UpdateInfo, error) {
 
 	u.downloadURL = downloadAsset.BrowserDownloadURL
 
+	// Find checksum asset
+	var checksumAsset *Asset
+	for i := range release.Assets {
+		if strings.Contains(release.Assets[i].Name, "macos-arm64") && strings.HasSuffix(release.Assets[i].Name, ".sha256") {
+			checksumAsset = &release.Assets[i]
+			break
+		}
+	}
+
 	latestVersion := strings.TrimPrefix(release.TagName, "v")
 	currentVersion := strings.TrimPrefix(version.Version, "v")
 
+	isNewer := isNewerVersion(latestVersion, currentVersion)
+	isRebuild := false
+
+	// Check if same version but different checksum (rebuild)
+	if !isNewer && checksumAsset != nil {
+		remoteChecksum, err := u.downloadChecksum(checksumAsset.BrowserDownloadURL)
+		if err == nil {
+			localChecksum, err := u.calculateBinaryChecksum()
+			if err == nil && remoteChecksum != localChecksum {
+				isRebuild = true
+			}
+		}
+	}
+
 	info := &UpdateInfo{
-		Available:      isNewerVersion(latestVersion, currentVersion),
+		Available:      isNewer || isRebuild,
 		CurrentVersion: version.Version,
 		LatestVersion:  release.TagName,
 		ReleaseNotes:   release.Body,
 		DownloadURL:    downloadAsset.BrowserDownloadURL,
 		DownloadSize:   downloadAsset.Size,
+		IsRebuild:      isRebuild,
 	}
 
 	return info, nil
@@ -160,12 +187,27 @@ func (u *Updater) DownloadAndInstall(progressCallback func(float64)) error {
 func (u *Updater) RestartApp() error {
 	destPath := filepath.Join(InstallPath, AppName)
 
-	// Launch new app
+	// Use shell to launch new app after this process exits
-	cmd := exec.Command("open", destPath)
+	// The sleep ensures the current app has time to exit
+	script := fmt.Sprintf(`sleep 1 && open "%s"`, destPath)
+	cmd := exec.Command("sh", "-c", script)
+	cmd.Stdout = nil
+	cmd.Stderr = nil
+	cmd.Stdin = nil
+
+	// Detach the process so it continues after we exit
 	if err := cmd.Start(); err != nil {
 		return fmt.Errorf("failed to launch updated app: %w", err)
 	}
 
+	// Release the process so it doesn't become a zombie
+	go func() {
+		_ = cmd.Wait()
+	}()
+
+	// Give the shell time to start
+	time.Sleep(100 * time.Millisecond)
+
 	// Exit current app
 	os.Exit(0)
 	return nil
@@ -304,6 +346,54 @@ func (u *Updater) copyDir(src, dst string) error {
 	})
 }
 
+// downloadChecksum fetches the remote SHA256 checksum file
+func (u *Updater) downloadChecksum(url string) (string, error) {
+	client := &http.Client{Timeout: 10 * time.Second}
+	resp, err := client.Get(url)
+	if err != nil {
+		return "", err
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	if resp.StatusCode != http.StatusOK {
+		return "", fmt.Errorf("failed to download checksum: status %d", resp.StatusCode)
+	}
+
+	data, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	return strings.TrimSpace(string(data)), nil
+}
+
+// calculateBinaryChecksum calculates SHA256 of the current running binary
+func (u *Updater) calculateBinaryChecksum() (string, error) {
+	execPath, err := os.Executable()
+	if err != nil {
+		return "", err
+	}
+
+	// Resolve symlinks to get actual binary path
+	execPath, err = filepath.EvalSymlinks(execPath)
+	if err != nil {
+		return "", err
+	}
+
+	file, err := os.Open(execPath)
+	if err != nil {
+		return "", err
+	}
+	defer func() { _ = file.Close() }()
+
+	hasher := sha256.New()
+	if _, err := io.Copy(hasher, file); err != nil {
+		return "", err
+	}
+
+	return hex.EncodeToString(hasher.Sum(nil)), nil
+}
+
 // isNewerVersion compares semver-like versions (e.g., "0.1.0" vs "0.2.0")
 func isNewerVersion(latest, current string) bool {
 	if current == "dev" || current == "unknown" {

internal/timer/timer.go

@@ -106,24 +106,26 @@ func (t *Timer) Start() {
 	t.meetingWarned = false
 
 	if len(t.queue) > 0 {
-		t.startNextSpeaker(now)
+		t.startNextSpeaker(now, 0)
 	}
 	t.mu.Unlock()
 
 	go t.tick()
 }
 
-func (t *Timer) startNextSpeaker(now time.Time) {
+func (t *Timer) startNextSpeaker(now time.Time, offset time.Duration) {
 	if len(t.queue) == 0 {
 		return
 	}
 
-	// Mark previous speaker as done (only if they were speaking, not skipped)
+	// Mark previous speaker as done and save their time spent
 	if t.currentSpeakerID != 0 {
+		timeSpent := int(now.Sub(t.speakerStartTime).Seconds())
 		for i := range t.allSpeakers {
 			if t.allSpeakers[i].ID == t.currentSpeakerID {
 				if t.allSpeakers[i].Status == models.SpeakerStatusSpeaking {
 					t.allSpeakers[i].Status = models.SpeakerStatusDone
+					t.allSpeakers[i].TimeSpent = timeSpent
 				}
 				break
 			}
@@ -135,8 +137,8 @@ func (t *Timer) startNextSpeaker(now time.Time) {
 	t.currentSpeakerID = speaker.ID
 	t.currentSpeaker = speaker.Name
 	t.speakerLimit = time.Duration(speaker.TimeLimit) * time.Second
-	t.speakerStartTime = now
+	t.speakerStartTime = now.Add(-offset)
-	t.speakerElapsed = 0
+	t.speakerElapsed = offset
 	t.speakingOrder++
 	t.speakerWarned = false
 	t.speakerTimeUpEmitted = false
@@ -191,7 +193,7 @@ func (t *Timer) NextSpeaker() {
 
 	var eventType EventType
 	if len(t.queue) > 0 {
-		t.startNextSpeaker(now)
+		t.startNextSpeaker(now, 0)
 		eventType = EventSpeakerChanged
 	} else {
 		t.running = false
@@ -225,11 +227,14 @@ func (t *Timer) SkipSpeaker() {
 
 	now := time.Now()
 	if len(t.queue) > 1 {
-		t.startNextSpeaker(now)
+		t.startNextSpeaker(now, 0)
 		t.mu.Unlock()
 		t.emit(EventSpeakerChanged)
 	} else {
+		// Only skipped speaker left - they need to speak now
+		t.startNextSpeaker(now, 0)
 		t.mu.Unlock()
+		t.emit(EventSpeakerChanged)
 	}
 }
 
@@ -246,7 +251,16 @@ func (t *Timer) RemoveFromQueue(speakerID uint) {
 		return
 	}
 
-	// Remove from queue
+	// Find speaker info before removing
+	var speakerInfo models.QueuedSpeaker
+	for _, s := range t.queue {
+		if s.ID == speakerID {
+			speakerInfo = s
+			break
+		}
+	}
+
+	// Remove from current position in queue
 	for i, s := range t.queue {
 		if s.ID == speakerID {
 			t.queue = append(t.queue[:i], t.queue[i+1:]...)
@@ -254,11 +268,124 @@ func (t *Timer) RemoveFromQueue(speakerID uint) {
 		}
 	}
 
+	// Add to end of queue so they can speak later
+	if speakerInfo.ID != 0 {
+		t.queue = append(t.queue, speakerInfo)
+	}
+
 	// Mark as skipped in allSpeakers and move to end
 	t.updateSpeakerStatus(speakerID, models.SpeakerStatusSkipped)
 	t.moveSpeakerToEnd(speakerID)
 }
 
+// SwitchToSpeaker moves the specified speaker to front of queue and starts them
+// If speaker is already done, resumes their timer from accumulated time
+func (t *Timer) SwitchToSpeaker(speakerID uint) {
+	t.mu.Lock()
+
+	if !t.running {
+		t.mu.Unlock()
+		return
+	}
+
+	// First, find speaker in allSpeakers to get their info and status
+	var speakerInfo *models.SpeakerInfo
+	var speakerInfoIdx int
+	for i := range t.allSpeakers {
+		if t.allSpeakers[i].ID == speakerID {
+			speakerInfo = &t.allSpeakers[i]
+			speakerInfoIdx = i
+			break
+		}
+	}
+
+	if speakerInfo == nil {
+		t.mu.Unlock()
+		return
+	}
+
+	// Don't switch to currently speaking speaker
+	if speakerInfo.Status == models.SpeakerStatusSpeaking {
+		t.mu.Unlock()
+		return
+	}
+
+	// Calculate offset for resuming (0 for pending/skipped, timeSpent for done)
+	var offset time.Duration
+	if speakerInfo.Status == models.SpeakerStatusDone {
+		offset = time.Duration(speakerInfo.TimeSpent) * time.Second
+	}
+
+	// Save current speaker time
+	now := time.Now()
+	if t.currentSpeakerID != 0 {
+		timeSpent := int(now.Sub(t.speakerStartTime).Seconds())
+		for i := range t.allSpeakers {
+			if t.allSpeakers[i].ID == t.currentSpeakerID {
+				if t.allSpeakers[i].Status == models.SpeakerStatusSpeaking {
+					t.allSpeakers[i].Status = models.SpeakerStatusDone
+					t.allSpeakers[i].TimeSpent = timeSpent
+				}
+				break
+			}
+		}
+	}
+
+	// Find speaker in queue (pending/skipped) or create new entry (done)
+	foundIdx := -1
+	for i, s := range t.queue {
+		if s.ID == speakerID {
+			foundIdx = i
+			break
+		}
+	}
+
+	// Create QueuedSpeaker from SpeakerInfo
+	queuedSpeaker := models.QueuedSpeaker{
+		ID:        speakerInfo.ID,
+		Name:      speakerInfo.Name,
+		TimeLimit: speakerInfo.TimeLimit,
+		Order:     speakerInfo.Order,
+	}
+
+	if foundIdx >= 0 {
+		// Remove from current position in queue
+		t.queue = append(t.queue[:foundIdx], t.queue[foundIdx+1:]...)
+	}
+	// Insert at front of queue
+	t.queue = append([]models.QueuedSpeaker{queuedSpeaker}, t.queue...)
+
+	// Move the selected speaker in allSpeakers to position after last done/speaking
+	insertPos := 0
+	for i, s := range t.allSpeakers {
+		if s.Status == models.SpeakerStatusDone || s.Status == models.SpeakerStatusSpeaking {
+			insertPos = i + 1
+		}
+	}
+
+	if speakerInfoIdx >= 0 && speakerInfoIdx != insertPos {
+		// Save speaker info before removing
+		savedInfo := *speakerInfo
+		// Remove from current position
+		t.allSpeakers = append(t.allSpeakers[:speakerInfoIdx], t.allSpeakers[speakerInfoIdx+1:]...)
+		// Adjust insert position if needed
+		if speakerInfoIdx < insertPos {
+			insertPos--
+		}
+		// Insert at new position
+		t.allSpeakers = append(t.allSpeakers[:insertPos], append([]models.SpeakerInfo{savedInfo}, t.allSpeakers[insertPos:]...)...)
+		// Update order numbers
+		for i := range t.allSpeakers {
+			t.allSpeakers[i].Order = i + 1
+		}
+	}
+
+	// Start this speaker with offset (0 for new speakers, accumulated time for done)
+	t.startNextSpeaker(now, offset)
+	t.mu.Unlock()
+	t.emit(EventSpeakerChanged)
+}
+
 func (t *Timer) Pause() {
 	t.mu.Lock()
 
@@ -299,9 +426,17 @@ func (t *Timer) Stop() {
 		t.mu.Unlock()
 		return
 	}
-	// Mark current speaker as done before stopping
+	// Mark current speaker as done and save their time spent
 	if t.currentSpeakerID != 0 {
-		t.updateSpeakerStatus(t.currentSpeakerID, models.SpeakerStatusDone)
+		now := time.Now()
+		timeSpent := int(now.Sub(t.speakerStartTime).Seconds())
+		for i := range t.allSpeakers {
+			if t.allSpeakers[i].ID == t.currentSpeakerID {
+				t.allSpeakers[i].Status = models.SpeakerStatusDone
+				t.allSpeakers[i].TimeSpent = timeSpent
+				break
+			}
+		}
 	}
 	t.running = false
 	t.paused = false