diff --git a/.forgejo/workflows/portable.yml b/.forgejo/workflows/portable.yml index 60672da..11de405 100644 --- a/.forgejo/workflows/portable.yml +++ b/.forgejo/workflows/portable.yml @@ -39,30 +39,67 @@ jobs: run: | node scripts/ci/sync-version.mjs --check --tag "$env:GITHUB_REF_NAME" + - name: 로컬 런타임 선행 게시 확인 + id: feed + run: | + $releaseVersion = node -p "require('./release/product-version.json').version" + $published = 'false' + $base = 'https://git.chanpaca.net/api/packages/yunchan/generic/d3ro-voice' + function Read-PublishedIndex($url) { + try { return Invoke-RestMethod $url } + catch { + if ($_.Exception.Response.StatusCode.value__ -eq 404) { return $null } + throw + } + } + $portable = Read-PublishedIndex "$base/portable-$releaseVersion/portable.json" + $runtime = Read-PublishedIndex "$base/runtime-$releaseVersion/runtime.json" + if ($portable -or $runtime) { + if ($portable.version -ne $releaseVersion -or $runtime.version -ne $releaseVersion) { + throw 'Partial immutable publication. Resume with preserved local artifacts; do not rebuild.' + } + $portableLatest = Read-PublishedIndex "$base/portable-latest/portable.json" + $runtimeLatest = Read-PublishedIndex "$base/runtime-latest/runtime.json" + if (-not $portableLatest -or -not $runtimeLatest -or + [version]$portableLatest.version -lt [version]$releaseVersion -or + [version]$runtimeLatest.version -lt [version]$releaseVersion) { + throw 'Latest aliases incomplete. Resume the local publisher with preserved artifacts.' + } + $published = 'true' + } + "published=$published" >> $env:GITHUB_OUTPUT + - name: 의존성 설치 + if: steps.feed.outputs.published != 'true' run: npm ci - name: STT 사이드카 빌드 + if: steps.feed.outputs.published != 'true' run: | npm run sidecar:setup --workspace=@d3ro/desktop npm run sidecar:build --workspace=@d3ro/desktop node scripts/ci/verify-sidecar-bundle.mjs - name: 데스크톱 번들 빌드 + if: steps.feed.outputs.published != 'true' run: npm run build --workspace=@d3ro/desktop - name: 데스크톱 렌더러 번들 검증 + if: steps.feed.outputs.published != 'true' run: node scripts/ci/verify-desktop-renderer-bundles.mjs - name: 휴대용 ZIP + Scoop 매니페스트 생성 + if: steps.feed.outputs.published != 'true' run: node scripts/ci/build-portable.mjs - name: Forgejo portable 채널 게시 + if: steps.feed.outputs.published != 'true' env: FORGEJO_TOKEN: "${{ secrets.FORGEJO_TOKEN }}" run: node scripts/ci/publish-portable-release.mjs - name: 게시 요약 출력 + if: steps.feed.outputs.published != 'true' # Forgejo Actions 러너는 actions/upload-artifact@v4 의 GHES 스토리지 프로토콜을 지원하지 않으므로(GAP-REL-11), # 실제 배포 산출물은 앞 단계에서 Forgejo Generic Package Registry 에 이미 게시됐고 여기서는 해시 요약을 남긴다. run: | @@ -85,4 +122,4 @@ jobs: Write-Host $summaryText if ($env:GITHUB_STEP_SUMMARY) { Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value $summaryText -Encoding utf8 - } \ No newline at end of file + } diff --git a/CHANGELOG.md b/CHANGELOG.md index 1da58a1..1f92eac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Additional Whisper model management UI - Plugin system for custom pipelines +## [1.16.0] - 2026-11-01 + +### Added +- Import existing audio or video recordings into a meeting, retaining timestamped transcripts and playable audio for minutes generation. + +### Fixed +- Cancel meeting imports when the account changes, preventing transcripts from being saved to another account. +- Deliver the updated local speech engine with CPU thread limits and faster terminal UIA handling. Existing engines upgrade before use. + +### Changed +- Release the required speech engine before publishing the desktop update, and verify the packaged engine starts successfully. + ## [1.15.4] - 2026-10-31 > Published from an annotated tag. Installer and update metadata are served by the diff --git a/apps/desktop/src/main/ipc/file-transcription-handlers.ts b/apps/desktop/src/main/ipc/file-transcription-handlers.ts index 21a72b2..df85d68 100644 --- a/apps/desktop/src/main/ipc/file-transcription-handlers.ts +++ b/apps/desktop/src/main/ipc/file-transcription-handlers.ts @@ -7,6 +7,7 @@ import { ErrorCode, ipcSuccess, ipcError } from '@d3ro/core/errors' import { getFileTranscriptionService } from '../services/FileTranscriptionService' import { getLogger } from '../services/LoggerService' import type { FileTranscriptionStartParams } from '@d3ro/core/types' +import { SUPPORTED_MEDIA_EXTENSIONS } from '../services/file-transcription/media-formats' const logger = getLogger('file-transcription-handlers') @@ -33,10 +34,7 @@ export function registerFileTranscriptionHandlers(): void { filters: [ { name: 'Audio/Video', - extensions: [ - 'mp3', 'wav', 'm4a', 'ogg', 'flac', 'wma', 'aac', - 'mp4', 'mkv', 'webm', 'avi', 'mov', - ], + extensions: [...SUPPORTED_MEDIA_EXTENSIONS], }, ], } diff --git a/apps/desktop/src/main/ipc/meeting-mode-handlers.ts b/apps/desktop/src/main/ipc/meeting-mode-handlers.ts index 62c62f0..af36401 100644 --- a/apps/desktop/src/main/ipc/meeting-mode-handlers.ts +++ b/apps/desktop/src/main/ipc/meeting-mode-handlers.ts @@ -1,11 +1,12 @@ // src/main/ipc/meeting-mode-handlers.ts // Phase 14 / 14.5: Meeting Mode IPC 핸들러 -import { ipcMain } from 'electron' +import { dialog, ipcMain } from 'electron' import { IPC_CHANNELS } from '@d3ro/core/ipc-channels' import { ErrorCode, ipcSuccess, ipcError, D3ROError } from '@d3ro/core/errors' import { getMeetingModeService } from '../services/MeetingModeService' import { getLogger } from '../services/LoggerService' +import { SUPPORTED_MEDIA_EXTENSIONS } from '../services/file-transcription/media-formats' import { LiveSegmentEditor, normalizeSegmentText } from '../services/meeting/live-segment-edits' import { MEETING_CHAT_GET_HISTORY_CHANNEL, @@ -15,6 +16,7 @@ import type { LiveSegmentEditResult } from '../services/meeting/live-segment-edi import type { CaptionSegment, MeetingSessionDetail, + MeetingImportParams, MeetingAddMemoParams, MeetingGetSessionsParams, MeetingGetSessionParams, @@ -102,6 +104,34 @@ export function registerMeetingModeHandlers(): void { } }) + ipcMain.handle(ch.IMPORT_RECORDING, async (_event, params: MeetingImportParams) => { + try { + let filePath = params.filePath + if (!filePath) { + const { getMainWindow } = await import('../windows/WindowManager') + const mainWindow = getMainWindow() + const options = { + properties: ['openFile'] as ('openFile')[], + filters: [{ name: 'Audio/Video', extensions: [...SUPPORTED_MEDIA_EXTENSIONS] }], + } + const selected = mainWindow + ? await dialog.showOpenDialog(mainWindow, options) + : await dialog.showOpenDialog(options) + if (selected.canceled || selected.filePaths.length === 0) { + return ipcError(ErrorCode.FileTranscriptionCancelled, 'File selection cancelled') + } + filePath = selected.filePaths[0] + } + return ipcSuccess(await getMeetingModeService().importRecording(filePath, params.language)) + } catch (err) { + logger.error(`importRecording 실패: ${err instanceof Error ? err.message : String(err)}`) + return ipcError( + err instanceof D3ROError ? err.code : ErrorCode.MeetingProcessingFailed, + err instanceof Error ? err.message : String(err), + ) + } + }) + ipcMain.handle('meetingMode:forceReset', async () => { try { await getMeetingModeService().forceReset() diff --git a/apps/desktop/src/main/services/FileTranscriptionService.ts b/apps/desktop/src/main/services/FileTranscriptionService.ts index 5370853..d5ec26a 100644 --- a/apps/desktop/src/main/services/FileTranscriptionService.ts +++ b/apps/desktop/src/main/services/FileTranscriptionService.ts @@ -35,6 +35,7 @@ import type { } from '@d3ro/core/types' import { collapseRepeatedSegments, collapseRepeats, isDegenerateTranscript } from './file-transcription/repetition' +import { SUPPORTED_MEDIA_EXTENSION_SET } from './file-transcription/media-formats' const logger = getLogger('FileTranscriptionService') @@ -44,11 +45,6 @@ const CHUNK_DURATION_SEC = 30 const MAX_FILE_SIZE_BYTES = 2 * 1024 * 1024 * 1024 /** initialPrompt 컨텍스트 윈도우 (자) */ const CONTEXT_WINDOW_SIZE = 300 -/** 지원 확장자 */ -const SUPPORTED_EXTENSIONS = new Set([ - '.mp3', '.wav', '.m4a', '.ogg', '.flac', '.wma', '.aac', - '.mp4', '.mkv', '.webm', '.avi', '.mov', -]) /** 기본 ffmpeg 위치 포트: 로컬 사본 조회 + 런타임 feed 다운로드 */ const defaultFfmpegLocator: FfmpegLocator = { @@ -94,14 +90,18 @@ class FileTranscriptionService extends EventEmitter { } } - async startTranscription(filePath: string, language?: string): Promise { + async startTranscription( + filePath: string, + language?: string, + options: { saveToHistory?: boolean; onConverted?: (wavPath: string) => Promise } = {}, + ): Promise { if (this._state !== 'idle') { throw new D3ROError(ErrorCode.FileTranscriptionChunkFailed, 'Transcription already in progress') } // 파일 검증 const ext = path.extname(filePath).toLowerCase() - if (!SUPPORTED_EXTENSIONS.has(ext)) { + if (!SUPPORTED_MEDIA_EXTENSION_SET.has(ext)) { throw new D3ROError(ErrorCode.FileTranscriptionInvalidFormat, `Unsupported format: ${ext}`) } @@ -152,6 +152,8 @@ class FileTranscriptionService extends EventEmitter { const wavPath = path.join(job.tempDir, 'audio.wav') await this._convertToWav(job, ffmpegPath, filePath, wavPath) throwIfCancelled() + await options.onConverted?.(wavPath) + throwIfCancelled() // 오디오 길이 확인 const totalDurationSec = await this._probeDuration(job, ffmpegPath, wavPath) @@ -234,31 +236,32 @@ class FileTranscriptionService extends EventEmitter { processingTimeMs, } - // 히스토리에 저장 - try { - const wordCount = fullText.split(/\s+/).filter((w) => w.length > 0).length - getHistoryService().create({ - originalText: fullText, - polishedText: null, - focusedApp: null, - focusedAppName: null, - focusedAppWindowTitle: null, - mode: 'file-transcription', - status: 'completed', - errorCode: null, - audioLocalPath: filePath, - duration: totalDurationSec, - detectedLanguage: null, - micDevice: null, - wordCount, - sttModel: configGet('sttModelId') as string | null, - llmModel: null, - sttLatencyMs: processingTimeMs, - llmLatencyMs: null, - appVersion: app.getVersion(), - }) - } catch (err) { - logger.warn('Failed to save file transcription to history:', err) + if (options.saveToHistory !== false) { + try { + const wordCount = fullText.split(/\s+/).filter((w) => w.length > 0).length + getHistoryService().create({ + originalText: fullText, + polishedText: null, + focusedApp: null, + focusedAppName: null, + focusedAppWindowTitle: null, + mode: 'file-transcription', + status: 'completed', + errorCode: null, + audioLocalPath: filePath, + duration: totalDurationSec, + detectedLanguage: null, + micDevice: null, + wordCount, + sttModel: configGet('sttModelId') as string | null, + llmModel: null, + sttLatencyMs: processingTimeMs, + llmLatencyMs: null, + appVersion: app.getVersion(), + }) + } catch (err) { + logger.warn('Failed to save file transcription to history:', err) + } } this._setJobState(job, 'completed') diff --git a/apps/desktop/src/main/services/MeetingModeService.ts b/apps/desktop/src/main/services/MeetingModeService.ts index a503c45..3d6888e 100644 --- a/apps/desktop/src/main/services/MeetingModeService.ts +++ b/apps/desktop/src/main/services/MeetingModeService.ts @@ -56,6 +56,8 @@ import { parseTranscriptLines, } from '@d3ro/core/meeting-transcript' import { markdownToDocx } from '@d3ro/core/utils/markdown-to-docx' +import { getFileTranscriptionService } from './FileTranscriptionService' +import { buildImportedMeetingTranscript } from './meeting/imported-recording' import type { MeetingModeState, MeetingMemo, @@ -122,6 +124,8 @@ let isShowingMeetingSaveDialog = false class MeetingModeService extends EventEmitter { private _state: MeetingModeState = 'idle' + private _importInFlight = false + private _accountRevision = 0 /** * 진행 중인 녹음. 녹음 한 건의 세그먼트·메모·오디오·구독은 이 객체가 단독으로 소유한다. * 후처리가 끝날 때까지 남아 있어 getStateInfo 가 세션 id 를 계속 보고한다(실시간 편집 반영용). @@ -158,6 +162,7 @@ class MeetingModeService extends EventEmitter { this.on('error', () => { /* default sink */ }) // 계정 DB 가 바뀔 때마다(로그인·로그아웃) 그 DB 에 남은 중단된 녹음을 정리한다. this._unsubscribeScope = onAccountScopeChanged(() => { + this._accountRevision += 1 try { this.recoverInterruptedSessions() } catch (err) { @@ -245,6 +250,69 @@ class MeetingModeService extends EventEmitter { this._sendStateToRenderer() } + async importRecording(filePath: string, language?: string): Promise { + if (this._state !== 'idle' || this._importInFlight) { + throw new D3ROError(ErrorCode.MeetingAlreadyRecording, '다른 회의 녹음 또는 파일 가져오기가 진행 중입니다') + } + this._importInFlight = true + const accountRevision = this._accountRevision + const assertImportAccount = (): void => { + if (accountRevision !== this._accountRevision) { + throw new D3ROError(ErrorCode.FileTranscriptionCancelled, 'Account changed during meeting import') + } + } + const sessionId = crypto.randomUUID() + const audioPath = meetingAudioFilePathSync(sessionId) + let completed = false + try { + const transcription = await getFileTranscriptionService().startTranscription( + filePath, + language, + { + saveToHistory: false, + onConverted: async (wavPath) => { + assertImportAccount() + fs.mkdirSync(pathDirname(audioPath), { recursive: true }) + await fs.promises.copyFile(wavPath, audioPath) + assertImportAccount() + }, + }, + ) + assertImportAccount() + const imported = buildImportedMeetingTranscript(transcription) + if (!imported.rawTranscript) { + throw new D3ROError(ErrorCode.MeetingProcessingFailed, '파일에서 인식된 발화가 없습니다') + } + + const endedAt = Date.now() + const startedAt = Math.max(0, endedAt - imported.durationMs) + getDatabase().insert(meetingSessions).values({ + id: sessionId, + title: imported.title, + status: 'completed', + startedAt, + endedAt, + durationMs: imported.durationMs, + rawTranscript: imported.rawTranscript, + sttModel: configGet('sttModelId') as string | undefined, + sttLatencyMs: transcription.processingTimeMs, + createdAt: endedAt, + updatedAt: endedAt, + }).run() + getCloudSyncService().pushOne('meetings', sessionId) + getCloudSyncService().pushOne('meeting_audio', sessionId) + completed = true + + const detail = this._loadSessionDetail(sessionId) + if (!detail) throw new D3ROError(ErrorCode.MeetingSessionNotFound, '가져온 회의를 다시 읽지 못했습니다') + this.emit('session-completed', detail) + return detail + } finally { + this._importInFlight = false + if (!completed) await fs.promises.rm(audioPath, { force: true }).catch(() => undefined) + } + } + // ── 녹음 시작 ── async startRecording(options?: { force?: boolean }): Promise { @@ -252,7 +320,7 @@ class MeetingModeService extends EventEmitter { await this.forceReset() } - if (this._state !== 'idle') { + if (this._state !== 'idle' || this._importInFlight) { throw new D3ROError( ErrorCode.MeetingAlreadyRecording, `회의 모드가 이미 실행 중입니다 (${this._state}). 이전 회의를 종료하거나 강제 초기화 후 다시 시도해주세요.`, diff --git a/apps/desktop/src/main/services/file-transcription/media-formats.ts b/apps/desktop/src/main/services/file-transcription/media-formats.ts new file mode 100644 index 0000000..1bf2c39 --- /dev/null +++ b/apps/desktop/src/main/services/file-transcription/media-formats.ts @@ -0,0 +1,8 @@ +export const SUPPORTED_MEDIA_EXTENSIONS = [ + 'mp3', 'wav', 'm4a', 'ogg', 'flac', 'wma', 'aac', + 'mp4', 'mkv', 'webm', 'avi', 'mov', +] as const + +export const SUPPORTED_MEDIA_EXTENSION_SET: ReadonlySet = new Set( + SUPPORTED_MEDIA_EXTENSIONS.map((extension) => `.${extension}`), +) diff --git a/apps/desktop/src/main/services/meeting/imported-recording.ts b/apps/desktop/src/main/services/meeting/imported-recording.ts new file mode 100644 index 0000000..f1dc6f8 --- /dev/null +++ b/apps/desktop/src/main/services/meeting/imported-recording.ts @@ -0,0 +1,28 @@ +import type { FileTranscriptionResult } from '@d3ro/core/types' +import { formatTranscriptLines } from '@d3ro/core/meeting-transcript' + +export interface ImportedMeetingTranscript { + title: string + rawTranscript: string + durationMs: number +} + +export function buildImportedMeetingTranscript( + result: Pick, +): ImportedMeetingTranscript { + const title = result.fileName.replace(/\.[^.]+$/, '').trim().slice(0, 160) || result.fileName.slice(0, 160) + const lines = result.segments.length > 0 + ? result.segments.map((segment) => ({ + timestampMs: Math.max(0, Math.round(segment.start * 1000)), + timed: true, + speaker: null, + text: segment.text.trim(), + })).filter((segment) => segment.text.length > 0) + : [{ timestampMs: 0, timed: false, speaker: null, text: result.fullText.trim() }] + + return { + title, + rawTranscript: formatTranscriptLines(lines), + durationMs: Math.max(0, Math.round(result.totalDurationSec * 1000)), + } +} diff --git a/apps/desktop/src/main/services/runtime/runtime-index.ts b/apps/desktop/src/main/services/runtime/runtime-index.ts index 1c6fd46..8e55f48 100644 --- a/apps/desktop/src/main/services/runtime/runtime-index.ts +++ b/apps/desktop/src/main/services/runtime/runtime-index.ts @@ -20,12 +20,13 @@ export function isRuntimeComponent(value: unknown): value is RuntimeComponent { } /** - * 이 앱이 요구하는 런타임 최소 버전. 사이드카 API 가 바뀔 때만 올린다. + * 이 앱이 요구하는 런타임 최소 버전. 필수 API 또는 입력 안전성 수정이 있을 때 올린다. * 1.5.0 — UIA 브리지(`/uia/focus`). 1.7.0 — 보조 모델 자리(`/load` slot, `/transcribe` model_id). + * 1.16.0 — CPU 스레드 예산과 터미널/xterm UIA 고속 경로. * ffmpeg 는 CLI 가 안정적이라 확인하지 않는다. */ export const RUNTIME_MIN_VERSION: Readonly> = { - sidecar: '1.7.0', + sidecar: '1.16.0', ffmpeg: null, } diff --git a/apps/desktop/src/preload/index.ts b/apps/desktop/src/preload/index.ts index 4c4dfe6..fa796ad 100644 --- a/apps/desktop/src/preload/index.ts +++ b/apps/desktop/src/preload/index.ts @@ -158,6 +158,7 @@ import type { TemplateFieldCompletedEvent, TemplateSessionCompletedEvent, MeetingStartResult, + MeetingImportParams, MeetingMemo, MeetingAddMemoParams, MeetingModeStateInfo, @@ -763,6 +764,8 @@ const electronAPI = { meetingMode: { startRecording: (params?: { force?: boolean }) => invoke(IPC_CHANNELS.MEETING_MODE.START_RECORDING, params), + importRecording: (params: MeetingImportParams) => + invoke(IPC_CHANNELS.MEETING_MODE.IMPORT_RECORDING, params), forceReset: () => invoke('meetingMode:forceReset'), stopRecording: () => diff --git a/apps/desktop/src/renderer/pages/MeetingModePage.tsx b/apps/desktop/src/renderer/pages/MeetingModePage.tsx index 69f7d2a..c846cf5 100644 --- a/apps/desktop/src/renderer/pages/MeetingModePage.tsx +++ b/apps/desktop/src/renderer/pages/MeetingModePage.tsx @@ -11,8 +11,10 @@ import { AudioVisualizerBar, Led, PhysicalButton, TactileBadge } from '@d3ro/ui/ import { d3roFontMono, d3roFontSans, d3roPalette, d3roRadius, typoSx } from '@d3ro/ui/theme' import { useI18n } from '@d3ro/i18n' import type { TranslationKey } from '@d3ro/i18n' +import { ErrorCode } from '@d3ro/core/errors' import type { CaptionSegment, + FileTranscriptionProgress, MeetingMemo, MeetingModeStateInfo, MeetingProcessingProgress, @@ -71,6 +73,8 @@ export function MeetingModePage(): React.ReactElement { // 사전 점검 및 기동 상태 const [isStarting, setIsStarting] = useState(false) + const [isImporting, setIsImporting] = useState(false) + const [importProgress, setImportProgress] = useState(null) const [errorInfo, setErrorInfo] = useState(null) /** 조회한 값만 보인다 — 조회 전이면 null */ const [sttProvider, setSttProvider] = useState(null) @@ -234,6 +238,40 @@ export function MeetingModePage(): React.ReactElement { }, [view]) // ── 핸들러 ── + useEffect( + () => window.electronAPI.fileTranscription.onProgress((value) => { + if (isImporting) setImportProgress(value) + }), + [isImporting], + ) + + const handleImportRecording = useCallback(async () => { + if (isImporting || isStarting) return + setIsImporting(true) + setImportProgress(null) + try { + const resp = await window.electronAPI.meetingMode.importRecording({}) + if (resp.success) { + setDetail(resp.data) + setView('detail') + } else if (resp.error.code !== ErrorCode.FileTranscriptionCancelled) { + notify({ message: t('meetings.importFailed', { message: resp.error.message }), severity: 'error' }) + } + } catch (err) { + notify({ + message: t('meetings.importFailed', { message: err instanceof Error ? err.message : String(err) }), + severity: 'error', + }) + } finally { + setIsImporting(false) + setImportProgress(null) + } + }, [isImporting, isStarting, notify, setView, t]) + + const handleCancelImport = useCallback(() => { + void window.electronAPI.fileTranscription.cancel() + }, []) + const handleStartRecording = useCallback(async (force = false) => { setIsStarting(true) setErrorInfo(null) @@ -419,6 +457,10 @@ export function MeetingModePage(): React.ReactElement { onQueryChange={setListQuery} isStarting={isStarting} onStartMeeting={() => void handleStartRecording(false)} + isImporting={isImporting} + importProgress={importProgress} + onImportMeeting={() => void handleImportRecording()} + onCancelImport={handleCancelImport} onOpen={(id) => void handleViewDetail(id)} progress={progress} micLabel={micDeviceName === null ? null : micDeviceName || t('meetings.defaultMic')} diff --git a/apps/desktop/src/renderer/pages/meeting/MeetingListView.tsx b/apps/desktop/src/renderer/pages/meeting/MeetingListView.tsx index 061ad73..4b8d7d5 100644 --- a/apps/desktop/src/renderer/pages/meeting/MeetingListView.tsx +++ b/apps/desktop/src/renderer/pages/meeting/MeetingListView.tsx @@ -24,7 +24,7 @@ import { MoreHorizontal, Pencil, Plus, Trash2, Users } from 'lucide-react' import { PhysicalButton, TactileBadge } from '@d3ro/ui/components/ds' import { d3roFocusRing, d3roPalette, d3roRadius, d3roShadow, d3roTransition, typoSx } from '@d3ro/ui/theme' import { useI18n } from '@d3ro/i18n' -import type { MeetingProcessingProgress, MeetingSessionSummary } from '@d3ro/core/types' +import type { FileTranscriptionProgress, MeetingProcessingProgress, MeetingSessionSummary } from '@d3ro/core/types' import { ConfirmDialog, EmptyStateCard, PageHeader, SearchInput, useNotify } from '../../components/shared' import { clearNotepad, defaultNotepadStorage } from '../../components/meeting/meeting-notepad-storage' import { meetingStatusLabelKey, meetingStatusTone, shouldShowStatusBadge } from '../../components/meeting/meeting-format' @@ -39,6 +39,10 @@ interface MeetingListViewProps { onQueryChange: (query: string) => void isStarting: boolean onStartMeeting: () => void + isImporting: boolean + importProgress: FileTranscriptionProgress | null + onImportMeeting: () => void + onCancelImport: () => void onOpen: (sessionId: string) => void /** 후처리 진행률(저장 중인 회의 줄에 막대로) */ progress: MeetingProcessingProgress | null @@ -56,6 +60,10 @@ export function MeetingListView({ onQueryChange, isStarting, onStartMeeting, + isImporting, + importProgress, + onImportMeeting, + onCancelImport, onOpen, progress, micLabel, @@ -199,15 +207,20 @@ export function MeetingListView({ } // ── 렌더 ── - const startButton = ( - : } - > - {isStarting ? t('meetings.starting') : t('meeting.newMeeting')} - + const actions = ( + + + {isImporting ? t('meetings.importing') : t('meetings.import')} + + : } + > + {isStarting ? t('meetings.starting') : t('meeting.newMeeting')} + + ) const isEmpty = loadState === 'ready' && total === 0 && sessions.length === 0 @@ -224,9 +237,22 @@ export function MeetingListView({ title={t('nav.meeting')} count={total > 0 ? t('meeting.sessions', { count: total }) : undefined} description={description || undefined} - action={loadState === 'ready' && !isEmpty ? startButton : undefined} + action={loadState === 'ready' && !isEmpty ? actions : undefined} /> + {isImporting && ( + + + + {t('meetings.importing')} + {importProgress ? ` ${importProgress.currentChunk}/${importProgress.totalChunks} · ${importProgress.percent}%` : ''} + + + {t('common.cancel')} + + + )} + {loadState === 'loading' ? ( @@ -246,7 +272,7 @@ export function MeetingListView({ message={t('meetings.empty.title')} description={t('meetings.empty.description')} icon={} - action={startButton} + action={actions} /> ) : ( <> diff --git a/apps/desktop/tests/integration/meeting-import-media.test.ts b/apps/desktop/tests/integration/meeting-import-media.test.ts new file mode 100644 index 0000000..5f33555 --- /dev/null +++ b/apps/desktop/tests/integration/meeting-import-media.test.ts @@ -0,0 +1,47 @@ +import { execFile } from 'child_process' +import fs from 'fs' +import os from 'os' +import path from 'path' +import { promisify } from 'util' +import { afterEach, describe, expect, it, vi } from 'vitest' +import { getMeetingModeService } from '../../src/main/services/MeetingModeService' +import { getSTTManager } from '../../src/main/services/stt/STTManager' +import { getLicenseService } from '../../src/main/services/LicenseService' +import { getFfmpegPath } from '../../src/main/utils/paths' +import { localAudioPath } from '../../src/main/services/sync/audio-sync' +import { useRedHarness } from '../red/harness' + +const execFileAsync = promisify(execFile) +useRedHarness() + +const sources = new Set() +afterEach(() => { + for (const source of sources) fs.rmSync(source, { force: true }) + sources.clear() +}) + +describe.each(['mp3', 'm4a'])('실제 %s 녹음 파일 가져오기', (extension) => { + it('ffmpeg 변환 후 회의와 재생용 WAV를 만든다', async () => { + const source = path.join(os.tmpdir(), `d3ro-meeting-media-${process.pid}-${Date.now()}.${extension}`) + sources.add(source) + await execFileAsync(getFfmpegPath(), [ + '-f', 'lavfi', '-i', 'sine=frequency=440:duration=1', '-y', source, + ]) + vi.spyOn(getLicenseService(), 'canUse').mockReturnValue({ allowed: true, reason: 'ok' }) + vi.spyOn(getSTTManager(), 'transcribe').mockResolvedValue({ + text: `${extension} 회의 발언`, + segments: [{ text: `${extension} 회의 발언`, start: 0, end: 1, confidence: 1 }], + }) + + const detail = await getMeetingModeService().importRecording(source, 'ko') + + expect(detail.rawTranscript).toBe(`[00:00] ${extension} 회의 발언`) + expect(detail.durationMs).toBeGreaterThan(0) + const audioPath = localAudioPath('meeting', detail.id) + expect(audioPath).not.toBeNull() + const wav = fs.readFileSync(audioPath!) + expect(wav.subarray(0, 4).toString('ascii')).toBe('RIFF') + expect(wav.subarray(8, 12).toString('ascii')).toBe('WAVE') + getMeetingModeService().deleteSession(detail.id) + }, 30_000) +}) diff --git a/apps/desktop/tests/main/services/runtime-provisioner-redteam-r1-8.test.ts b/apps/desktop/tests/main/services/runtime-provisioner-redteam-r1-8.test.ts index 7136c11..e7e736c 100644 --- a/apps/desktop/tests/main/services/runtime-provisioner-redteam-r1-8.test.ts +++ b/apps/desktop/tests/main/services/runtime-provisioner-redteam-r1-8.test.ts @@ -338,12 +338,12 @@ describe('RuntimeProvisioner', () => { const markerPath = (): string => join(workDir, 'runtime', 'sidecar', '.runtime-version') it('설치 후 마커를 쓰고, 다음 ensure 는 내려받지 않는다', async () => { - const feed = feedFor(sidecarTar('1.9.0'), '1.9.0') + const feed = feedFor(sidecarTar('1.16.0'), '1.16.0') const p = provisioner(feed.fetchImpl) const path = await p.ensure('sidecar') expect(path).toBe(p.binaryPath('sidecar')) - expect(readFileSync(markerPath(), 'utf8')).toBe('1.9.0') + expect(readFileSync(markerPath(), 'utf8')).toBe('1.16.0') feed.calls.length = 0 await p.ensure('sidecar') @@ -351,7 +351,7 @@ describe('RuntimeProvisioner', () => { }) it('force 면 설치돼 있어도 다시 받아 손상된 트리를 복구한다', async () => { - const feed = feedFor(sidecarTar('1.9.0'), '1.9.0') + const feed = feedFor(sidecarTar('1.16.0'), '1.16.0') const p = provisioner(feed.fetchImpl) await p.ensure('sidecar') @@ -365,7 +365,7 @@ describe('RuntimeProvisioner', () => { }) it('추출 중 항목 오류가 나면 실패하고 버전 마커를 남기지 않는다', async () => { - const feed = feedFor(brokenSidecarTar(), '1.9.0') + const feed = feedFor(brokenSidecarTar(), '1.16.0') const p = provisioner(feed.fetchImpl) await expect(p.ensure('sidecar')).rejects.toThrow() @@ -382,7 +382,7 @@ describe('RuntimeProvisioner', () => { }) it('다운로드가 끝나면 임시 폴더를 남기지 않는다', async () => { - const feed = feedFor(sidecarTar('1.9.0'), '1.9.0') + const feed = feedFor(sidecarTar('1.16.0'), '1.16.0') await provisioner(feed.fetchImpl).ensure('sidecar') expect(existsSync(join(workDir, 'runtime', '.download-sidecar'))).toBe(false) expect(existsSync(join(workDir, 'runtime', 'sidecar.staging'))).toBe(false) diff --git a/apps/desktop/tests/red/meeting-import.usecase.test.ts b/apps/desktop/tests/red/meeting-import.usecase.test.ts new file mode 100644 index 0000000..8b249ae --- /dev/null +++ b/apps/desktop/tests/red/meeting-import.usecase.test.ts @@ -0,0 +1,100 @@ +import fs from 'fs' +import os from 'os' +import path from 'path' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import type { FileTranscriptionResult } from '@d3ro/core/types' +import { ErrorCode } from '@d3ro/core/errors' +import { getMeetingModeService } from '../../src/main/services/MeetingModeService' +import { getFileTranscriptionService } from '../../src/main/services/FileTranscriptionService' +import { getHistoryService } from '../../src/main/services/HistoryService' +import { localAudioPath } from '../../src/main/services/sync/audio-sync' +import { emitAccountScopeChanged, LOCAL_SCOPE_ID } from '../../src/main/services/account-scope' +import { useRedHarness } from './harness' + +useRedHarness() + +function transcription(filePath: string, fullText = '가져온 회의 전사'): FileTranscriptionResult { + return { + jobId: 'job-1', + filePath, + fileName: path.basename(filePath), + fullText, + segments: [{ text: fullText, start: 0, end: 3, confidence: 1 }], + totalDurationSec: 3, + processingTimeMs: 25, + } +} + +describe('기존 녹음 파일을 회의로 가져오기', () => { + let sourcePath: string + + beforeEach(() => { + sourcePath = path.join(os.tmpdir(), `d3ro-meeting-import-${Date.now()}.mp3`) + fs.writeFileSync(sourcePath, 'normalized-audio') + }) + + afterEach(() => { + emitAccountScopeChanged(LOCAL_SCOPE_ID) + fs.rmSync(sourcePath, { force: true }) + }) + + it('일반 기록 중복 없이 회의·타임스탬프 전사·재생용 WAV를 저장한다', async () => { + const historyCreate = vi.spyOn(getHistoryService(), 'create') + const transcribe = vi.spyOn(getFileTranscriptionService(), 'startTranscription') + .mockImplementation(async (filePath, _language, options) => { + await options?.onConverted?.(filePath) + return transcription(filePath) + }) + + const detail = await getMeetingModeService().importRecording(sourcePath, 'ko') + + expect(detail.title).toBe(path.basename(sourcePath, '.mp3')) + expect(detail.status).toBe('completed') + expect(detail.rawTranscript).toBe('[00:00] 가져온 회의 전사') + expect(detail.durationMs).toBe(3_000) + expect(transcribe).toHaveBeenCalledWith(sourcePath, 'ko', { + saveToHistory: false, + onConverted: expect.any(Function), + }) + expect(historyCreate).not.toHaveBeenCalled() + const storedAudio = localAudioPath('meeting', detail.id) + expect(storedAudio).not.toBeNull() + expect(fs.readFileSync(storedAudio!, 'utf8')).toBe('normalized-audio') + expect(getMeetingModeService().getSessions(1, 20).total).toBe(1) + }) + + it('빈 전사는 완료된 회의나 오디오로 남기지 않는다', async () => { + vi.spyOn(getFileTranscriptionService(), 'startTranscription') + .mockImplementation(async (filePath, _language, options) => { + await options?.onConverted?.(filePath) + return transcription(filePath, '') + }) + + await expect(getMeetingModeService().importRecording(sourcePath)).rejects.toThrow('발화가 없습니다') + expect(getMeetingModeService().getSessions(1, 20).total).toBe(0) + }) + + it.each(['before-copy', 'after-copy', 'round-trip'] as const)( + '가져오기 중 계정이 바뀌면 저장하지 않고 임시 오디오를 정리한다 (%s)', + async (timing) => { + const copy = vi.spyOn(fs.promises, 'copyFile') + vi.spyOn(getFileTranscriptionService(), 'startTranscription') + .mockImplementation(async (filePath, _language, options) => { + if (timing === 'before-copy') emitAccountScopeChanged('other-account') + await options?.onConverted?.(filePath) + if (timing !== 'before-copy') emitAccountScopeChanged('other-account') + if (timing === 'round-trip') emitAccountScopeChanged(LOCAL_SCOPE_ID) + return transcription(filePath) + }) + + await expect(getMeetingModeService().importRecording(sourcePath)).rejects.toMatchObject({ + code: ErrorCode.FileTranscriptionCancelled, + }) + expect(getMeetingModeService().getSessions(1, 20).total).toBe(0) + for (const [, destination] of copy.mock.calls) { + expect(fs.existsSync(destination)).toBe(false) + } + if (timing === 'before-copy') expect(copy).not.toHaveBeenCalled() + }, + ) +}) diff --git a/apps/desktop/tests/unit/meeting-imported-recording.test.ts b/apps/desktop/tests/unit/meeting-imported-recording.test.ts new file mode 100644 index 0000000..ab92e07 --- /dev/null +++ b/apps/desktop/tests/unit/meeting-imported-recording.test.ts @@ -0,0 +1,31 @@ +import { describe, expect, it } from 'vitest' +import { buildImportedMeetingTranscript } from '../../src/main/services/meeting/imported-recording' + +describe('가져온 녹음의 회의 전사 변환', () => { + it('파일 이름을 회의 제목으로 쓰고 STT 구간을 상대 시각 전사로 바꾼다', () => { + expect(buildImportedMeetingTranscript({ + fileName: '주간 제품 회의.mp4', + fullText: '첫 발언 두 번째 발언', + totalDurationSec: 65.4, + segments: [ + { text: ' 첫 발언 ', start: 1.25, end: 4, confidence: 0.9 }, + { text: '두 번째 발언', start: 61, end: 65, confidence: 0.8 }, + ], + })).toEqual({ + title: '주간 제품 회의', + rawTranscript: '[00:01] 첫 발언\n[01:01] 두 번째 발언', + durationMs: 65_400, + }) + }) + + it('구간 정보가 없으면 원문을 보존한다', () => { + const result = buildImportedMeetingTranscript({ + fileName: 'memo.wav', + fullText: ' 전사 원문 ', + totalDurationSec: 3, + segments: [], + }) + expect(result.rawTranscript).toBe('전사 원문') + expect(result.durationMs).toBe(3_000) + }) +}) diff --git a/apps/desktop/vitest.config.ts b/apps/desktop/vitest.config.ts index debc16c..488d99f 100644 --- a/apps/desktop/vitest.config.ts +++ b/apps/desktop/vitest.config.ts @@ -18,6 +18,9 @@ export default defineConfig(({ mode }) => ({ exclude: ['tests/e2e/**'], setupFiles: ['tests/setup.ts'], testTimeout: 10000, + // Keep the local desktop usable and avoid import-hook starvation on busy, high-core PCs. + maxWorkers: 4, + minWorkers: 1, coverage: { provider: 'v8', include: ['src/main/services/**'], diff --git a/apps/mobile-rn/__tests__/meeting-creation-screen.test.tsx b/apps/mobile-rn/__tests__/meeting-creation-screen.test.tsx index fc3fcc7..be5cade 100644 --- a/apps/mobile-rn/__tests__/meeting-creation-screen.test.tsx +++ b/apps/mobile-rn/__tests__/meeting-creation-screen.test.tsx @@ -354,4 +354,41 @@ describe('meeting metadata creation screen', () => { expect(mockLoadTemplateLibrary).toHaveBeenCalledTimes(1) await act(() => renderer!.unmount()) }) + + test('creates a meeting and routes an existing recording into the shared import pipeline', async () => { + const navigation = { + getParent: () => null, + navigate: mockNavigate, + } + let renderer: ReactTestRenderer + await act(async () => { + renderer = create() + }) + await flush() + + await act(async () => { + renderer!.root.findByProps({ testID: 'meetings-import' }).props.onPress() + }) + await flush() + await act(async () => { + renderer!.root.findByProps({ testID: 'meeting-title-input' }).props.onChangeText('Imported meeting') + }) + await act(async () => { + renderer!.root.findByProps({ testID: 'meeting-editor-save' }).props.onPress() + await Promise.resolve() + }) + await flush() + + expect(mockNavigate).toHaveBeenCalledWith('Main', { + screen: 'Record', + params: { + meetingId: CREATED_MEETING_ID, + meetingTitle: 'Launch review', + meetingLanguage: 'en', + importRequest: expect.any(Number), + }, + }) + expect(mockNavigate).not.toHaveBeenCalledWith('MeetingDetail', expect.anything()) + await act(() => renderer!.unmount()) + }) }) diff --git a/apps/mobile-rn/__tests__/onboarding-fresh-route.test.tsx b/apps/mobile-rn/__tests__/onboarding-fresh-route.test.tsx new file mode 100644 index 0000000..9e115a1 --- /dev/null +++ b/apps/mobile-rn/__tests__/onboarding-fresh-route.test.tsx @@ -0,0 +1,78 @@ +import React from 'react' +import { act, create, type ReactTestRenderer } from 'react-test-renderer' + +const mockCompleteOnboarding = jest.fn() +const mockUpdatePreferences = jest.fn() + +jest.mock('react-native-safe-area-context', () => ({ + useSafeAreaInsets: () => ({ top: 0, bottom: 0, left: 0, right: 0 }), +})) +jest.mock('@d3ro/i18n', () => ({ + useI18n: () => ({ + locale: 'en', + setLocale: jest.fn(), + t: (key: string) => key, + }), +})) +jest.mock('../src/lib/auth-context', () => ({ + useAuth: () => ({ user: null }), +})) +jest.mock('../src/lib/preferences-context', () => { + const { getMobileThemePalette } = jest.requireActual( + '../src/theme/mobile-theme', + ) + return { + useMobilePreferences: () => ({ + preferences: { themeMode: 'dark' }, + palette: getMobileThemePalette('dark'), + syncStatus: 'local', + errorCode: null, + updatePreferences: mockUpdatePreferences, + completeOnboarding: mockCompleteOnboarding, + }), + } +}) + +import OnboardingScreen from '../src/screens/OnboardingScreen' + +async function press(renderer: ReactTestRenderer, testID: string): Promise { + await act(async () => { + renderer.root.findByProps({ testID }).props.onPress() + await Promise.resolve() + }) +} + +describe('fresh onboarding auth route preparation', () => { + beforeEach(() => { + jest.clearAllMocks() + mockUpdatePreferences.mockResolvedValue({ localSaved: true, serverSynced: false }) + mockCompleteOnboarding.mockResolvedValue({ localSaved: true, serverSynced: false }) + }) + + test('prepares the new-account route before persistence starts', async () => { + const events: string[] = [] + mockCompleteOnboarding.mockImplementation(async () => { + events.push('persist') + return { localSaved: true, serverSynced: false } + }) + let renderer: ReactTestRenderer | undefined + await act(async () => { + renderer = create( + false, goBack: jest.fn() } as never} + route={{ params: undefined } as never} + onFreshFinish={(audience) => events.push(`route:${audience}`)} + />, + ) + }) + if (renderer === undefined) throw new Error('Onboarding did not render') + + await press(renderer, 'onboarding-audience-new') + for (let step = 0; step < 4; step += 1) { + await press(renderer, 'onboarding-next') + } + await press(renderer, 'onboarding-complete') + + expect(events).toEqual(['route:new', 'persist']) + }) +}) diff --git a/apps/mobile-rn/__tests__/record-screen-redteam-r2-27.test.tsx b/apps/mobile-rn/__tests__/record-screen-redteam-r2-27.test.tsx index fb60be0..cb8dfbc 100644 --- a/apps/mobile-rn/__tests__/record-screen-redteam-r2-27.test.tsx +++ b/apps/mobile-rn/__tests__/record-screen-redteam-r2-27.test.tsx @@ -284,4 +284,31 @@ describe('RecordScreen meeting durability (redteam r2-27)', () => { expect(mockPickAudioFile).toHaveBeenCalledTimes(1) }) + + test('routes a meeting import request through the durable meeting pipeline', async () => { + mockPickAudioFile.mockResolvedValue(validInput()) + mockEnqueueAudioProcessing.mockResolvedValue({ id: 'item' }) + mockProcessQueuedAudioNow.mockResolvedValue(meetingResult()) + const renderer = await render({ + meetingId: MEETING_ID, + meetingLanguage: 'ko', + importRequest: 1700000000000, + }, jest.fn()) + + await act(async () => { + await Promise.resolve() + await Promise.resolve() + await Promise.resolve() + }) + + expect(mockPickAudioFile).toHaveBeenCalledTimes(1) + expect(mockEnqueueAudioProcessing).toHaveBeenCalledWith(expect.objectContaining({ + fileName: 'capture.wav', + }), { + userId: USER_ID, + languageCode: 'ko', + meetingId: MEETING_ID, + }) + expect(has(renderer, 'record-view-meeting')).toBe(true) + }) }) diff --git a/apps/mobile-rn/jest.config.js b/apps/mobile-rn/jest.config.js index 5c09ef9..9b95ec0 100644 --- a/apps/mobile-rn/jest.config.js +++ b/apps/mobile-rn/jest.config.js @@ -1,5 +1,7 @@ module.exports = { preset: '@react-native/jest-preset', + // Bound parallel transforms on busy developer PCs; preserve the default test timeout. + maxWorkers: 4, transformIgnorePatterns: [ 'node_modules/(?!((jest-)?react-native(-.*)?|@react-native(-community)?|@react-native-documents|@react-navigation)/)', ], diff --git a/apps/mobile-rn/src/screens/MeetingsScreen.tsx b/apps/mobile-rn/src/screens/MeetingsScreen.tsx index 3f0ac0a..c0e4b72 100644 --- a/apps/mobile-rn/src/screens/MeetingsScreen.tsx +++ b/apps/mobile-rn/src/screens/MeetingsScreen.tsx @@ -39,6 +39,7 @@ interface MeetingsScreenProps { type EditorMode = | { kind: 'create' } + | { kind: 'import' } | { kind: 'edit'; meeting: Meeting } | null @@ -205,8 +206,8 @@ export default function MeetingsScreen({ } } - const openCreate = (): void => { - setEditor({ kind: 'create' }) + const openCreate = (kind: 'create' | 'import' = 'create'): void => { + setEditor({ kind }) setEditorTitle('') setEditorAttendees('') setEditorLanguage('ko') @@ -222,7 +223,7 @@ export default function MeetingsScreen({ void loadCreationTemplates() } - openCreateRef.current = openCreate + openCreateRef.current = () => openCreate('create') useEffect(() => { const request = route?.params?.createRequest @@ -252,11 +253,12 @@ export default function MeetingsScreen({ const saveEditor = async (): Promise => { if (user === null || editor === null || editorBusyRef.current) return + const mode = editor editorBusyRef.current = true setEditorBusy(true) setEditorError(null) try { - if (editor.kind === 'create') { + if (mode.kind === 'create' || mode.kind === 'import') { if (editorCreationKey === null) { throw new MeetingServiceError('validation', 'Meeting creation key is unavailable') } @@ -274,9 +276,22 @@ export default function MeetingsScreen({ setMeetings((current) => mergeMeetings([created], current)) setTotal((current) => current + 1) setEditor(null) - openDetail(created) + if (mode.kind === 'import') { + const target = navigation.getParent() ?? navigation + target.navigate('Main', { + screen: 'Record', + params: { + meetingId: created.id, + meetingTitle: created.title ?? undefined, + meetingLanguage: created.language ?? undefined, + importRequest: Date.now(), + }, + }) + } else { + openDetail(created) + } } else { - const updated = await updateMeetingTitleRevisionSafe(editor.meeting, editorTitle) + const updated = await updateMeetingTitleRevisionSafe(mode.meeting, editorTitle) setMeetings((current) => current.map((meeting) => ( meeting.id === updated.id ? updated : meeting ))) @@ -330,11 +345,19 @@ export default function MeetingsScreen({ subtitle={t('mobile.meetings.count', { count: total })} showBack={false} rightContent={( - + + openCreate('import')} + testID="meetings-import" + /> + openCreate('create')} + testID="meetings-create" + /> + )} testID="meetings-header" /> @@ -481,7 +504,9 @@ export default function MeetingsScreen({ {editor?.kind === 'create' ? t('mobile.meetings.createTitle') - : t('mobile.meetings.editTitle')} + : editor?.kind === 'import' + ? t('mobile.meetings.importTitle') + : t('mobile.meetings.editTitle')} - {editor?.kind === 'create' && ( + {(editor?.kind === 'create' || editor?.kind === 'import') && ( @@ -619,7 +644,9 @@ export default function MeetingsScreen({ )} - {t('mobile.meetings.createNotice')} + {editor.kind === 'import' + ? t('mobile.meetings.importNotice') + : t('mobile.meetings.createNotice')} )} @@ -649,7 +676,7 @@ export default function MeetingsScreen({ disabled={ editorBusy || editorTitle.trim().length === 0 - || (editor?.kind === 'create' && ( + || ((editor?.kind === 'create' || editor?.kind === 'import') && ( editorTemplatesLoading || editorCreationKey === null )) @@ -740,6 +767,7 @@ function createStyles(palette: Palette): ReturnType { gap: 14, }, headerCopy: { flex: 1, gap: 4 }, + headerActions: { flexDirection: 'row', gap: 8, flexShrink: 0 }, searchWrap: { paddingHorizontal: 20, paddingBottom: 12 }, searchInput: { minHeight: 48, diff --git a/apps/mobile-rn/src/screens/OnboardingScreen.tsx b/apps/mobile-rn/src/screens/OnboardingScreen.tsx index aea988b..60cc47c 100644 --- a/apps/mobile-rn/src/screens/OnboardingScreen.tsx +++ b/apps/mobile-rn/src/screens/OnboardingScreen.tsx @@ -146,6 +146,7 @@ export default function OnboardingScreen({ async function finish(outcome: 'completed' | 'skipped'): Promise { if (saving) return const selectedAudience = audience ?? 'existing' + onFreshFinish?.(selectedAudience) setSaving(true) setLocalSaveFailed(false) const result = await completeOnboarding(outcome) @@ -154,7 +155,6 @@ export default function OnboardingScreen({ setSaving(false) return } - onFreshFinish?.(selectedAudience) const exit = resolveOnboardingExit(true, user !== null, isReplay, navigation.canGoBack()) // Authenticated fresh completion changes the root navigator branch. The // parent observes needsOnboarding true -> false and resets to Main after diff --git a/docs/evidence/2026-11-01-completion.md b/docs/evidence/2026-11-01-completion.md new file mode 100644 index 0000000..9cfa926 --- /dev/null +++ b/docs/evidence/2026-11-01-completion.md @@ -0,0 +1,53 @@ +# 2026-11-01 recovery, verification and release evidence + +All dates below are KST. This report separates source tests, physical-device evidence and publication; one does not establish the others. + +## Recovered scope and initial state + +- Checkout: `D:\workspace\D3ROVoice`, sole registered worktree, branch `main`. +- Initial local, Forgejo `chanpaca/main`, GitLab `origin/main`: `5a8c5cd7927a65b9289a954cff280d0d0ddf3f67` (v1.15.4). Both servers advertise `main` as their default. Remote refs were fetched without altering the checkout. +- Initial dirty set: 33 tracked modifications and six new files. Meeting recording import (desktop/mobile, shared IPC/types/locales), fresh-onboarding routing, Android signer parsing, tests and maps were all retained. Original file copies, SHA-256 manifest and binary patch are under `test-results/recovery-2026-11-01/initial-*`. +- No initial commits dated November 1. October 30 typing-race work and October 31 terminal/modifier/suggestion fixes were already committed through v1.15.4; they were not treated as new uncommitted work. +- Today's earlier mobile evidence: `.2` first-run gate passed; later `.3` first-run auth and retry failed. The later artifacts must not inherit the earlier PASS. +- Local session-file inventory is retained in `session-inventory.json` and `recent-resumed-sessions.json`. The root Codex session is `01a18a1c-4d07-7e31-90ca-70e542c03286`; the latest local Claude log was October 28, and `memory/handoff-latest.md` was an August 19 historical handoff. A worker cannot query the coordinator-only Switchboard session inventory, so the local inventory is not asserted to enumerate every coordinator session. +- Historical remote branch `origin/seoro/project-overview-report`, `9cd965d434acc399a661ce697f2e8ce2300c537c` (April 13): one unique commit, 316 main-only commits at recovery. Its hidden titlebar/32px safe area/thin scrollbar/cloud i18n patch predates the current hiddenInset/custom Windows shell, OverlayScrollbars and translated cloud settings. Retained unmerged; blindly merging it would restore obsolete shell behavior. No additional local branch or worktree requires integration. + +## Implemented and recovered work + +- Desktop media picker → existing ffmpeg/STT pipeline → meeting transcript and normalized WAV, without duplicate plain history. Progress/cancel and existing minutes-generation entry points are wired. Mobile meeting creation routes to the durable meeting import pipeline. +- Added import account-generation guards before and after WAV copy and after transcription. Before-copy, after-copy and A→B→A switches previously saved results; all now reject and remove their generated audio. +- Retained the onboarding route-before-persistence fix and Build Tools 37 signer parser, including their tests. +- Restored reproducible typing A/B after the fix became HEAD: default baseline `f49acf01057cc100b9caeace6eada26cf7bf4b54`, optional `--baseline`, explicit commit/hash evidence. No checkout switching is used. +- Found public runtime feed still at 1.10.0 despite newer CPU-budget/UIA source. Sidecar minimum is now 1.16.0. The runtime-inclusive release rebuilds and smoke-tests the actual executable, publishes runtime/portable indexes before the installer, and avoids dirtying the tracked Scoop manifest after tagging. CI skips already-published runtime/portable versions. +- Read-only release review found that rebuilding on resume could destroy bytes already partially uploaded, and checking only immutable indexes missed unfinished latest aliases. Added a pre-upload checkpoint with source tag commit and SHA-256 fingerprints. Resume reuses verified bytes through the idempotent publishers; absent/mismatched checkpoints preserve output and fail closed. CI checks both immutable indexes and latest aliases, and no longer treats network errors as an unpublished version. + +## Verification + +Evidence root: `test-results/recovery-2026-11-01/` (already ignored by the repository; no ignore changes were made). + +| Check | Result and scope | +|---|---| +| Initial `npm run verify:all` | PASS: desktop 2,768 tests, core 572, API client 30, mobile 87 suites / 599; workspace/mobile typecheck and lint; zero design-token violations. | +| Intermediate full runs | Preserved five failures in `verify-all-final.log`: three positive runtime fixtures still advertised 1.9.0 after the minimum was raised; two voice-test import hooks timed out under concurrent load. Updated only positive runtime fixtures and bounded desktop workers to four. `verify-all-bounded.log` then passed desktop/core/API and lint/typecheck but retained three mobile 5 s timeouts. Bounded mobile workers to four as well, without increasing any timeout. [Jest worker configuration](https://jestjs.io/docs/30.0/configuration#maxworkers-number--string). | +| Final scope checks | Desktop **2,771/2,771**, core **572/572**, API client **30/30**, workspace/mobile typecheck and lint PASS in `verify-all-bounded.log`. Mobile **87 suites / 599 tests PASS**, 6.126 s in `mobile-bounded.log`. Design tokens **0 violations** in `design-final.log`. These are composed scope passes; the intermediate full-command failures remain retained. | +| Account-switch RED → GREEN | Three unwanted-persistence failures reproduced, then all five meeting-import use cases pass. Logs `meeting-account-red.log`, `meeting-account-green.log`. | +| Real MP3 / M4A integration | 2/2 PASS using actual ffmpeg conversion, SQLite and WAV headers; STT response is a test double. `meeting-media.log`. | +| Typing source A/B | Pre-fix 2 PASS / 15 FAIL; current 17 PASS / 0 FAIL. All three next-Hangul-word corruption cases fail before and preserve text after; unchanged-input control passes in both. `test-results/typing-load/race-proof-2026-11-01T10-22-36-247Z/report.json`. Three services are overlaid; dependencies/tests are current. Not native keyboard/IME/load proof. | +| Python sidecar suite | 27/27 PASS, including CPU headroom, missing-model fail-closed behavior and cancellation. `sidecar-tests.log`. | +| Runtime feed and publication policy | **44/44 PASS** including five checkpoint cases: same bytes, altered bytes, missing files, source mismatch, path escape, runtime/portable parts. Old 1.10.0 feed rejected and 1.16.0 accepted. `publish-final.log`. Runtime install/provisioner 26/26 PASS. | +| Release metadata / secrets | 18 negative cases PASS; source credential scan PASS. `release-metadata.log`, `secret-scan.log`. | +| Packaged local engine | Separate-process startup/health PASS. Existing local CUDA large-v3-turbo transcribed an offline synthesized 8.498 s sentence exactly; HTTP 200, reported processing 625 ms. `sidecar-smoke-before.log`, `local-stt-runtime.json`. No cloud inference was used. This was a warm loaded model, not cold-load overlap. | +| Android artifact | Build Tools 37 verifier and its self-test PASS. Current `.3` APK: `com.d3ro.voice`, `1.15.4-e2e.20261101.3`, code `2026110103`, 147158575 bytes, SHA-256 `937d2a0b3fb6b810516f07e91dd97ffe99d34c5885a72f21805a51e8a408027f`; installed Fold6 identity matches. `android-artifact.json`. | +| Fold6 current runtime | Existing app brought forward without clearing data. Meetings → Recording opens `meeting-editor-modal` with title/attendees/language/template fields; rendered screenshot and UI hierarchy retained. No meeting was saved and no inference was requested. A later list-restoration assertion failed because the expected list was no longer visible; it is not counted as a navigation PASS. | +| Isolated Android first-run auth | Created a new empty API 34 AVD `D3RORecovery20261101`, explicitly targeted `emulator-5580`, installed exact `.3` APK. Initial run failed while Android's **System UI isn't responding** dialog covered the app; XML and log retained. After choosing Wait, actual onboarding rendered; canonical fresh-auth flow **PASS, 37 s**, including persistent Login after restart. This is emulator evidence, not a new Fold6 first-run pass. Maestro also logged local heartbeat file-lock errors; those were not treated as an app diagnosis. | + +## Open gates and preserved failures + +- Windows native GUI helper returned `Computer Use native pipe is unavailable` / OS error 2 after the prescribed retry and reconnect. Actual high-CPU typing, model-load overlap, native Korean IME and desktop picker-to-minutes verification remain open. Electron was not launched from an agent subshell and the user's installed app/data were not replaced. +- Latest `.3` **Fold6** first-run tests and retry both fail at `onboarding-screen` visibility; black screenshots remain in `apps/mobile-rn/.maestro-output/fold6-20261101-mtg13/`. Cause is not established by those images. Earlier `.2` 4/4 PASS in `fold6-20261101-fix1/` remains historical evidence. Personal-device data was never cleared or uninstalled in this recovery. The new isolated test AVD alone used canonical `clearState` flows; it contains no personal data. +- `release:mobile:config` fails `mobile_release_config_invalid:firebase_expected_project_id_missing`, also after loading root `.env`. No production APK/AAB/Play release is claimed. External OAuth, Play purchase/restore, production SSV and file-to-minutes tests remain open. No paid tests or promotional messages were sent. +- Physical-device import evidence covers the current installed local test build. The planned desktop 1.16.0 release does not imply mobile 1.16.0 was installed or published. + +## Release and final state + +Release execution, public hashes/signature, final commit/remotes and the final clean-state check are appended after the release finishes. Until then this section is pending, not deployment proof. diff --git a/docs/map/00-index.md b/docs/map/00-index.md index 7d96dce..62b2bdf 100644 --- a/docs/map/00-index.md +++ b/docs/map/00-index.md @@ -2,7 +2,13 @@ > Status: ACTIVE > Last full audit: 2026-09-13 -> Last update: 2026-10-31 — **데스크톱 테스트 녹색 기준선 복구 및 제안 파이프라인 구조화.** 기본 `npm test`는 오프라인 단위·서비스 테스트 2,764개가 전부 통과하고, `test:all`은 2,788개 통과·10개 환경 의존 테스트 skip·0 실패다. `test:unit`·`test:service`·`test:integration`·`test:eval`을 하나의 Vitest 설정으로 분리하고, 제안 첫 후보 준비·stale 검증·후속 후보 게시 책임을 분리했다 (`GAP-QA-03`, `02` §3, `04` 입력 인텔리전스). +> Last update: 2026-11-01 — 미완료 작업 복구·1.16.0 배포 준비. 회의 import 계정 전환 경합을 재현·수정했고, 입력 A/B는 이전 2/17 → 현재 17/17이다. 공개 엔진 1.10.0에서 빠진 CPU/UIA 수정을 1.16.0 최소 엔진과 선행 게시로 연결한다. 모바일 최신 `.3` APK의 첫 실행 실패와 `.2`의 과거 4/4 PASS를 구분했다. 상세 증거: [completion report](../evidence/2026-11-01-completion.md). +> +> Previous update: 2026-11-01 — **기존 녹음 파일을 회의로 가져오기(`MTG-13`).** 데스크톱은 기존 ffmpeg 파일 전사를 재사용해 타임스탬프 전사와 재생용 WAV를 회의에 저장하고 일반 기록 중복을 피하며, 모바일은 회의 생성 후 기존 durable meeting import queue로 연결한다. 데스크톱 2,768개·모바일 599개·core 572개 테스트와 실제 MP3/M4A 변환 2개가 GREEN이다. 실제 Electron GUI와 인증 모바일 기기 E2E는 남아 있어 두 표면 모두 `[~]`다 (`04`, `06`, `11` GAP-MTG-03). +> +> Previous update: 2026-11-01 — **모바일 신규 사용자 온볼드 라우팅 및 Build Tools 37 APK 검증 복구.** 인증 목적지를 온볼드 persistence 전에 준비하도록 바꾸고 Fold6에서 fresh auth/signup/invite/small-screen 4/4를 검증했다. 모바일 Jest 87 suites/597 tests·lint·typecheck와 Build Tools 37 APK artifact verifier가 GREEN이다 (`06`, `02` §8, `11` O-001). +> +> Previous update: 2026-10-31 — **데스크톱 테스트 녹색 기준선 복구 및 제안 파이프라인 구조화.** 기본 `npm test`는 오프라인 단위·서비스 테스트 2,764개가 전부 통과하고, `test:all`은 2,788개 통과·10개 환경 의존 테스트 skip·0 실패다. `test:unit`·`test:service`·`test:integration`·`test:eval`을 하나의 Vitest 설정으로 분리하고, 제안 첫 후보 준비·stale 검증·후속 후보 게시 책임을 분리했다 (`GAP-QA-03`, `02` §3, `04` 입력 인텔리전스). > > Previous update: 2026-10-31 — **v1.15.2 릴리스 + `Ctrl+Alt+Enter` 제안 수락 불발 근본 해결 + 터미널·xterm.js 한글 씹힘 및 UIA·LLM 캐시 최적화(`INPUT-04`, `INPUT-06`, `INPUT-19`, `GAP-INPUT-08`, `GAP-INPUT-11`).** (1) **`Ctrl+Alt+Enter` 제안 수락 근본 해결:** ① `classifyKeyStroke`가 수정자 VK(`0x10..0x12`, `0x5b..0x5c`, `0xa0..0xa5`)보다 수정자 플래그를 먼저 검사해 `Ctrl`/`Alt`를 누르는 순간 `'shortcut'`(`key=shortcut+C+A`)으로 분류되어 `TerminalKeystrokeTracker` 버퍼가 `prefixLen=0`으로 초기화되고 `Enter`를 누르기 전에 제안 창이 닫히던 버그 수정, ② `ChordStateMachine.keyUp`에서 `Ctrl` 또는 `RightAlt`를 먼저 놓았을 때 `command`(`Ctrl+RightAlt`)만 해제하고 `break`/`return`으로 빠져나가 `suggestion-accept`(`Ctrl+Alt+Enter`)가 `_isDown`에 영구 고착되어 이후 입력이 auto-repeat으로 무시되던 버그 수정, ③ `KeyBindingService`에 `UiohookKey.NumpadEnter` 매핑 및 OS `globalShortcut` 캡처 25ms 폴백 트리거 추가, ④ `"생성 중..."` 또는 첫 후보 스트리밍 중 `Ctrl+Alt+Enter`를 누르면 무시하지 않고 첫 후보 완성(최대 2.5s) 즉시 수락(`_waitForFirstCandidate`)하도록 개선, ⑤ 터미널(`terminalMode` / `isTerminalApp`) 수락 시 클립보드 `Ctrl+V` 경합 대신 `KEYEVENTF_UNICODE` 직접 주입 및 백그라운드 채우기 루프 즉시 중단. (2) **UIA·Ollama 최적화:** 비타이핑 키 및 짧은 입력에서 780ms 중복 `_settleTimer` 스냅샷을 취소하고, `TypoCorrectionService.propose`가 이미 검사 완료된 구간(`_isRegionChecked`)에 대해 336토큰 오타 LLM 호출을 중복 실행해 제안 KV 캐시를 밀어내던 문제를 제거했다. (3) 직전 `v1.15.1`: 터미널 `WM_IME_CONTROL` 키다운 호출 제거 및 `uia_bridge.py` `xterm-helper-textarea` 고속 경로 적용. > diff --git a/docs/map/02-infrastructure.md b/docs/map/02-infrastructure.md index 57a2870..893dbb6 100644 --- a/docs/map/02-infrastructure.md +++ b/docs/map/02-infrastructure.md @@ -1,7 +1,7 @@ # 02 — Repository & Infrastructure Map > Surface: whole repo -> Last updated: 2026-10-31 — desktop Vitest green baseline and unit/service/integration/eval tiers (GAP-QA-03) +> Last updated: 2026-11-01 — 1.16.0 runtime-first release, meeting import verification and current mobile artifact reconciliation > Source of truth for: layout, workspaces, build/test commands, CI/CD, Docker, deploy, scripts, resources --- @@ -68,6 +68,10 @@ Note: root `package.json` declares npm workspaces `apps/desktop`, `apps/web`, `a --- +## Runtime-inclusive desktop release (2026-11-01) + +When required sidecar changes ship, run `node --env-file-if-exists=.env scripts/ci/release-desktop.mjs minor --with-runtime` on clean main. It preserves the normal version/tag/signature/installer gates, rebuilds the sidecar, runs `verify-sidecar-bundle.mjs --smoke` on a separate loopback port, builds portable/runtime artifacts, and publishes their immutable manifests before pushing the tag and publishing the desktop update. `--release-artifacts-only` keeps generated Scoop metadata in the release directory. Before the first upload, `release-artifacts.json` records the tag commit and file hashes. Resume with `--resume --with-runtime`: verify and reuse those bytes, then rerun the idempotent publishers to recover missing files and latest aliases. Existing output without a valid checkpoint is preserved and requires investigation, never silently rebuilt. Forgejo portable CI skips only completed immutable and latest indexes; partial publication fails closed. Desktop Vitest and mobile Jest use at most four workers; timeouts remain unchanged. Sidecar minimum is 1.16.0; ffmpeg has no new minimum. [Evidence](../evidence/2026-11-01-completion.md). + ## 3. Root scripts (`package.json`) ```bash @@ -216,6 +220,7 @@ Full detail: [`09-supabase-backend.md`](./09-supabase-backend.md). - **CI (`scripts/ci/`, 33 files):** build/version/release (`build-all`, `sync-version`, `generate-checksums`, `verify-release-metadata`, `create-release-tag`, `extract-release-notes`), security (`check-no-hardcoded-secrets`), mobile release gates (`verify-mobile-release-boundary/-config/-build-config`, `verify-android-artifact/-app-links`, `verify-play-store-assets`, `prepare-whisper-model`, `create-mobile-release-evidence`, `prepare-mobile-release-publication`, emulator/CSPRNG gates), keys (`create-desktop-license-keypair`, `create-release-evidence-key`, etc.), publish (`publish-forgejo-release` canonical, `publish-gitlab-release` mirror; the legacy `sync-and-publish-forgejo-release`/`upload-asset-to-forgejo-release` scripts were deleted 2026-09-26, Wave 3, cd9d199), env/tooling (`bootstrap-linux-toolchain.sh`, `audit-nas-stt-config.ps1`, mobile local E2E scripts). - **Deploy/release:** `deploy-nas.ps1/.sh`, `nas-control.sh`, `publish-gh.ps1`, `gen-keystore.js` (`deploy-site-to-nas.js` deleted 2026-09-26, Wave 3, cd9d199 — site deploy is Cloudflare Pages only). +- **Android artifact verification (2026-11-01):** `verify-android-artifact.mjs` parses both legacy `Signer #1` and Build Tools 37 `V2/V3.x Signer` certificate output. Self-test and the actual universal E2E APK verification pass with Build Tools `37.0.0`. - **GCP/Google OAuth automation + inspection (~70 `*.mjs`):** `auto-configure-oauth`, `automate-google-oauth`, `setup-consent`, `create-*-client`, `check-*`, `inspect-*` — mostly one-off/browser-driven console automation. - **AdMob console automation:** `admob-probe.mjs` (read-only login/app/ad-unit probe), `admob-login.mjs` + `run-admob-login.bat` (one interactive headful Chrome login into a persistent profile), `admob-automate.mjs` (dry-run by default; `--apply` creates/verifies banner+rewarded units and reports Play-store link). Uses `playwright` with `channel: 'chrome'` and the gitignored `.chrome-playwright-profile`. - **E2E / verification:** `e2e-desktop-*.js`, `real-app-multi-tab-e2e.js`, `test-and-capture-all-10-ad-services.js`, `verify-live-production-d3ro.js`. diff --git a/docs/map/04-desktop-app.md b/docs/map/04-desktop-app.md index a0114c6..95c35b8 100644 --- a/docs/map/04-desktop-app.md +++ b/docs/map/04-desktop-app.md @@ -67,7 +67,7 @@ Singleton + `EventEmitter` pattern (`getXService()` accessors). | Service | Purpose | |---|---| | `CaptionService` | Live captions from system/loopback audio; caption overlay (events segment, state-changed, session-saved, error) | -| `FileTranscriptionService` | Audio/video file → ffmpeg → 30s chunks → STT merge (events progress, complete, error, state-changed) | +| `FileTranscriptionService` | Audio/video file → ffmpeg → 30s chunks → STT merge (events progress, complete, error, state-changed). Shared media-format SSOT is `file-transcription/media-formats.ts`; meeting import can skip duplicate history persistence and retain the normalized WAV | | `MeetingSummaryService` | Post-caption LLM summary | | `DictationTemplateService` | Field-by-field voice form filling | | `VoiceConversationService` | STT→LLM→TTS loop, 10-turn memory. Local conversations are single-flight and pass their request signal through to local LLM chat, so a voice cancel aborts its own active request rather than only changing UI/watchdog state. | @@ -77,7 +77,7 @@ Singleton + `EventEmitter` pattern (`getXService()` accessors). ### Phase 12–15 | Service | Purpose | |---|---| -| `MeetingModeService` | Meeting recording: live transcript, timestamp memos, doc generation/export, diarization | +| `MeetingModeService` | Meeting recording and existing-media import: live/file transcript, normalized meeting audio, timestamp memos, doc generation/export, diarization. `meeting/imported-recording.ts` maps file-transcription segments to the canonical meeting transcript. Account revision checks before/after WAV copy and after transcription reject even A→B→A changes; unsuccessful imports remove only their own generated audio | | `MeetingDocTemplateService` | Meeting-doc templates (built-ins + CRUD) | ### Input intelligence (2026-09-21; Local Flow Intelligence extension 2026-09-22) @@ -142,7 +142,7 @@ Registry: `src/main/ipc/index.ts` calls 31 `registerXHandlers()` in fixed order. | `license-handlers` | LICENSE | | `llm-handlers` | LLM + `llm:premium:*` + ONLINE_AUTH | | `meeting-doc-template-handlers` | MEETING_DOC_TEMPLATE | -| `meeting-mode-handlers` | MEETING_MODE + MEETING_CHAT | +| `meeting-mode-handlers` | MEETING_MODE + MEETING_CHAT; `meetingMode:importRecording` opens the shared media picker and returns the completed meeting detail | | `meeting-summary-handlers` | MEETING_SUMMARY | | `memo-handlers` | MEMO | | `rag-handlers` | RAG | @@ -201,7 +201,7 @@ Routing is state-based in `renderer/navigation/app-navigation.tsx` (`AppRoute`, | `CommandsPage` | commands | Custom instructions + voice keyword rules + LLM chains + dictation templates | | `VoiceConversationPage` | conversation | Duplex voice assistant (local pipeline vs OpenAI Realtime) | | `KnowledgeBasePage` | knowledge | Local RAG: add/index docs, semantic query, reindex/remove | -| `MeetingModePage` | meetings | Meeting studio: live transcript, memos, doc generation/export, diarization | +| `MeetingModePage` | meetings | Meeting studio: live or imported-media transcript with progress/cancel, linked audio, memos, minutes/doc generation/export, diarization | Modals/components: `SettingsModal` (tabs General/Audio/STT/LLM/Input/License/Cloud/About), `LicenseModal`, `LicenseTab`, `CloudSyncSection`, `InputInsightsPanel` (consent + suggestion policy + weekly insights + learned phrases), `InputConsentPanel` (receipt + current-app exclusion recommendation), `InputInsightsView` (flow, friction and app-quality summaries), `OnboardingModal`, `UpgradePromptModal`, `ProBadge`, `TemplateSection`, `FileDropZone`, `OllamaGuideModal`, `CodexOAuthGuideModal`, `TitleBar`, `StatusBar`, meeting components (9), voice-conversation, payment (`CheckoutModal`, `checkout-flow.ts`), support (`SupportModal`), ads (`AdBanner`, `RewardedQuotaModal`), shared cards. @@ -271,3 +271,5 @@ DB schema (`src/main/db/schema.ts`, drizzle SQLite): `history`, `dictionary`, `s | Update policy SSOT | `release/update-policy.json` + `src/main/update-policy.ts` | | Path/loopback resolution | `src/main/utils/paths.ts`, `src/main/utils/loopback.ts` | | Sidecar source / packaging | `sidecar/main.py`, `scripts/setup-sidecar.mjs`, `scripts/build-sidecar.mjs`, `scripts/ci/verify-sidecar-bundle.mjs` | + +2026-11-01 verification: source A/B 2/17 before vs 17/17 current; real MP3/M4A conversion 2/2; account-switch regression 3/3 after reproducing all three failures; local packaged STT transcribed the synthetic 8.498 s fixture exactly. The required sidecar minimum is now 1.16.0 to deliver CPU budgeting and terminal UIA changes. Windows GUI/native helper remained unavailable; physical typing/model-load overlap is still unverified. [Recovery evidence](../evidence/2026-11-01-completion.md). diff --git a/docs/map/06-mobile-app.md b/docs/map/06-mobile-app.md index 12ce085..ae03e37 100644 --- a/docs/map/06-mobile-app.md +++ b/docs/map/06-mobile-app.md @@ -33,7 +33,7 @@ Provider stack: `GestureHandlerRootView → SafeAreaProvider → AuthProvider | `RecordScreen` | Recording + local-whisper/cloud transcription, import audio, share; entered from the hidden Record route/FAB | | `TalkScreen` | Voice/text AI chat: STT, LLM streaming, TTS; opened from More on the root stack | | `HistoryScreen` / `HistoryDetailScreen` | History list/detail: sync, search, filters, audio playback, edit/share/favorite/delete | -| `MeetingsScreen` / `MeetingDetailScreen` | Meeting workspaces: create/rename/delete, transcript, memos, documents, export, content report | +| `MeetingsScreen` / `MeetingDetailScreen` | Meeting workspaces: create/rename/delete, existing-audio import through the durable meeting queue, transcript, memos, documents/minutes, export, content report | | `MemosScreen` | Memos: list, tags, search, share | | `TemplatesScreen` | Dictation/meeting document templates CRUD | | `KnowledgeScreen` | Knowledge docs: create/import/index/merge/delete/search | @@ -92,7 +92,7 @@ Source of truth for status is `docs/v3/MOBILE_APP_COMPLETION_SSOT.md` sections 0 | Area | Status | |---|---| | Auth / account | `[~]` Implemented + Jest GREEN; external OAuth consent→callback and logout/delete/provider device E2E pending | -| Onboarding | `[x]` previous first-run device journey GREEN; this does not verify the new v4 shell on every viewport/theme | +| Onboarding | `[x]` current fresh auth/signup/invite and small-screen journeys GREEN on physical Fold6; this does not verify the new v4 shell on every viewport/theme | | v4 shell / theme / accessibility | `[x]` shell journey at 320dp dark and 411dp light; `[~]` broader design-system/a11y proof because TalkBack/font-scale/rotation remain | | Recording / transcription / Talk | `[x]` core path GREEN on API 34 (FGS, recovery, local Whisper, cloud fail-closed, TTS) | | Data portability | `[x]` export/restore + share E2E GREEN | @@ -117,10 +117,11 @@ The v4 shell also removed `DashScreen` and `WorksHubScreen`. Home replaces the d ## 6. Tests & evidence -- Jest: `npm --prefix apps/mobile-rn test` — current full tree **86 suites / 589 tests PASS** (2026-09-28). v4-focused coverage includes `navigation-shell.test.tsx`, `screen-header.test.tsx`, `theme-parity.test.ts`, `ui-native-theme.test.tsx`, `unified-search-service.test.ts`, and `unified-search-result-row.test.tsx`. +- Jest: `npm --prefix apps/mobile-rn test` — current full tree **87 suites / 599 tests PASS** (2026-11-01). Coverage includes `onboarding-fresh-route.test.tsx`, plus meeting-import creation routing and `record-screen-redteam-r2-27.test.tsx`, which proves `meetingId + importRequest` enters the durable meeting pipeline. The current `.3` Fold6 APK renders the MTG-13 entry/editor; device file selection→transcription→minutes E2E remains NOT_RUN. - Maestro E2E: `apps/mobile-rn/.maestro/` + evidence in `.maestro-output/`. +- Historical `.2` Fold6 physical-device gate (Android 16, `SM-F956N`): fresh auth **60 s PASS**, fresh signup **67 s PASS**, warm/cold invite **31 s PASS**, and small-screen signup **61 s PASS** on 2026-11-01. Fatal/Metro matches 0; evidence is `apps/mobile-rn/.maestro-output/fold6-20261101-fix1/`. Authenticated parity was not run because test credentials are absent. - v4 local runtime: `apps/mobile-rn/.maestro/navigation-shell-search-local.yaml`; 320dp dark **1/1 PASS, 88 s** at `scratch/design-audit/wave45/navigation-shell-search-320-dark-verified.xml`, and 411dp light **1/1 PASS, 100 s** at `scratch/design-audit/wave45/navigation-shell-search-411-light-verified.xml`. -- Runtime APK: `com.d3ro.voice`, versionName `1.9.0-e2e.20260928.2`, versionCode `202609282`, 147063583 bytes, SHA-256 `96EBA2A47E54033EB0DEFCE4E4D282F1D06F162A5F7DF9457E99609D98745D58`. This is a local E2E artifact, not a production-signed APK/AAB or Play release. +- Current runtime APK: `com.d3ro.voice`, `1.15.4-e2e.20261101.3` / `2026110103`, 147158575 bytes, SHA-256 `937d2a0b3fb6b810516f07e91dd97ffe99d34c5885a72f21805a51e8a408027f`. Build Tools 37 verifier PASS; installed identity matches. Import entry and metadata editor rendered on Fold6 without saving new data. Earlier `.3` fresh-auth + retry both FAILED at onboarding visibility (black screenshots); those failures are retained. No data reset was performed, so `.2` historical passes are not current first-run proof. Production configuration fails with `firebase_expected_project_id_missing`, including with root `.env`. [Evidence](../evidence/2026-11-01-completion.md). - Committed evidence summary: [`docs/evidence/wave45-mobile-shell-search-2026-09-28.md`](../evidence/wave45-mobile-shell-search-2026-09-28.md). - Android instrumentation: `apps/mobile-rn/android/app/src/androidTest` (CSPRNG + incoming share). -- Build verifiers: `scripts/ci/verify-android-artifact.mjs`, `verify-android-app-links.mjs`, `verify-mobile-build-config.mjs`, `verify-mobile-release-boundary.mjs`. +- Build verifiers: `scripts/ci/verify-android-artifact.mjs` (legacy + Build Tools 37 signer output), `verify-android-app-links.mjs`, `verify-mobile-build-config.mjs`, `verify-mobile-release-boundary.mjs`. diff --git a/docs/map/10-feature-catalog.md b/docs/map/10-feature-catalog.md index c5950b0..bde3fd6 100644 --- a/docs/map/10-feature-catalog.md +++ b/docs/map/10-feature-catalog.md @@ -88,6 +88,7 @@ Status quick-reference: `[x]` done+verified · `[~]` partial/unverified · `[ ]` | MTG-10 | Meeting list search/filter/sort | [~] | [ ] | [~] | [x] | Basic lists; advanced filters pending | | MTG-11 | Meeting AI chat over transcript | [x] | [ ] | [ ] | [x] | Desktop `MeetingChatPanel` + `MEETING_CHAT` | | MTG-12 | Content reporting for generated docs | [-] | [ ] | [x] | [x] | `content-report` Edge + generation receipts | +| MTG-13 | Existing audio/video import into a meeting | [~] | [ ] | [~] | [x] | **2026-11-01:** Desktop `meetingMode:importRecording` reuses `FileTranscriptionService` without duplicate history, saves canonical timestamped transcript + normalized WAV, then opens existing minutes generation. Mobile `MeetingsScreen` creates the workspace then routes `meetingId` + `importRequest` to the existing durable Record meeting pipeline. Desktop unit/service 2,771 and real MP3/M4A ffmpeg integration 2 PASS; mobile Jest 599 PASS. Fold6 `.3` import entry/editor rendered; Electron GUI and device file-to-minutes E2E remain, so `[~]` (`GAP-MTG-03`). | --- @@ -197,7 +198,7 @@ end-to-end behaviour has **not been verified by typing in a real app** (`11` GAP | SHELL-01 | Settings / preferences | [x] | [~] | [x] | [x] | **2026-09-28 개편:** 데스크톱 설정은 모달이 아니라 메인 창 전체 화면 라우트(`settings`) — 왼쪽 세로 탭 8개 + 본문 `components/settings/SettingsRows`(구획 h3 + 라벨·설명/컨트롤 행). 일반 탭에 키 바인딩 편집기(CAP-16). 이전 기록: Desktop tabbed modal; the General tab hosts the whole key-binding editor (CAP-16: global on/off switch + one `KeyBindingField` per action, grouped voice/window — `SettingsModal.tsx:239`), which is also the first settings entry point the `command` action ever had; web theme/i18n; mobile `SettingsScreen` | | SHELL-02 | Theme system (6 themes) | [x] | [x] | [x] | [-] | `theme.ts` SSOT | | SHELL-03 | i18n (12 locales) | [x] | [x] | [x] | [-] | `@d3ro/i18n`; **2026-10-30 (`GAP-I18N-01` `[x]`, `GAP-UX-07` `[x]`):** all 12 locales (`ko`, `en`, `ja`, `zh`, `zh-TW`, `es`, `fr`, `de`, `pt`, `ru`, `vi`, `th`) synchronized to 2,716 keys via `scripts/ci/sync-i18n-locales.mjs` and guarded by `i18n-locale-parity.test.ts` (15/15 PASS). | -| SHELL-04 | Onboarding / first-run | [x] | [ ] | [x] | [-] | Desktop model bootstrap (`onboarding.llmModelSize` aligned to 4.0GB `gemma4:e4b`, `GAP-UX-07` `[x]`); mobile audience/theme/locale | +| SHELL-04 | Onboarding / first-run | [x] | [ ] | [~] | [-] | Desktop model bootstrap (`onboarding.llmModelSize` aligned to 4.0GB `gemma4:e4b`, `GAP-UX-07` `[x]`); mobile audience/theme/locale. **2026-11-01:** 신규 사용자 목적지를 persistence 전에 준비하도록 수정하고 Fold6에서 `.2` fresh auth/signup/invite/small-screen 4/4 PASS (`fold6-20261101-fix1`); latest `.3` first-run auth and retry fail at onboarding visibility (`fold6-20261101-mtg13`). Existing personal data was preserved; fresh-state retest remains open. | | SHELL-05 | Accessibility / reduced motion | [~] | [~] | [~] | [-] | Desktop reduced-motion honored; mobile a11y rows pending | | SHELL-06 | System tray / background | [x] | [-] | [-] | [-] | Desktop tray | | SHELL-07 | Auto-launch on login | [x] | [-] | [-] | [-] | Desktop only | @@ -235,7 +236,7 @@ end-to-end behaviour has **not been verified by typing in a real app** (`11` GAP | INFRA-17 | 서명 없는 배포 채널 (portable + Scoop) | [x] | `scripts/ci/build-portable.mjs` (95MiB 7z 분할 볼륨 + Scoop 매니페스트), `scripts/ci/publish-portable-release.mjs`, `scripts/local/install-d3ro-voice.ps1`, `bucket/` 버킷, `.forgejo/workflows/portable.yml`; 7z 분할 볼륨(Scoop, 162MiB) + zip 분할 부품(수동 설치, 243MiB, 7-Zip 불필요); updater feed와 분리. 2026-09-18 `portable-1.3.1` 게시 + 실제 설치 검증. | | INFRA-18 | 로컬 런타임 온디맨드 설치 | [x] | `RuntimeProvisioner`(부품 다운로드 + SHA-256 검증 + tar 해제, `%APPDATA%/d3ro-voice/runtime`), `POST runtime:ensure` / `runtime:progress` IPC, 설정 > STT 상태/내려받기 UI. 설치본에서 엔진/ffmpeg를 분리해 189MB → 90.6MiB, 업데이트 피드 게시 복구. 검증은 전부 디스크에 기록된 파일 기준이며(부품 크기·해시 → 결합본 크기·해시), 부품 다운로드는 최대 3회 재시도한다. 2026-09-18 실제 feed 통합 검증(엔진 94.4MiB/18초, ffmpeg 21.7MiB/5초). | | INFRA-19 | 네이티브 ABI + updater 설정 게이트 | [x] | `scripts/ci/verify-native-abi.mjs`(패키징된 `better_sqlite3.node`가 Electron ABI인지 호스트 Node 로드 거부로 판별) + `scripts/ci/fix-native-abi.mjs`(로컬 잠금 우회용 주입). GitLab/Forgejo/GitHub 패키징 단계에 검증 삽입. 2026-09-18: Node ABI 모듈로 앱이 시작 즉시 죽은 사고 + 누락으로 자동 업데이트가 죽은 사고를 함께 방지(). | -| INFRA-20 | Desktop typing race and load verification | [~] | `scripts/verification/typing-race-proof.mjs` retains three-service HEAD/current A/B reports (1/17 vs 17/17 on 2026-10-30, with current dependencies/tests in both). `typing-fixture` provides an isolated WinForms scan-code/IME/CPU-load matrix; `typing-runtime/build.ps1` builds an interactive launcher that checks the installed app is closed before opening the actual product bundle with a separate profile. Automatic correction defaults off; protocol/startup registration is blocked; product version and bundle hash identify the tested build. Compilation passed, but interactive execution and model-load evidence remain pending. Procedure: `scripts/verification/README.md`; see GAP-INPUT-11 and `02-infrastructure.md` §3. | +| INFRA-20 | Desktop typing race and load verification | [~] | `typing-race-proof.mjs` accepts `--baseline` and defaults to pre-fix `f49acf0`, preserving three-service overlays and hashes. 2026-11-01: baseline 2/17 vs current 17/17; three whole-word loss cases fail before/pass after. CPU/physical-key/model-load overlap remains pending: native GUI helper unavailable. Sidecar minimum 1.16.0 delivers the CPU/UIA source changes; runtime-first release includes native startup/health smoke. See [evidence](../evidence/2026-11-01-completion.md), GAP-INPUT-11. | --- diff --git a/docs/map/11-gap-backlog.md b/docs/map/11-gap-backlog.md index 6b1f097..8369fad 100644 --- a/docs/map/11-gap-backlog.md +++ b/docs/map/11-gap-backlog.md @@ -63,6 +63,7 @@ Legend: `[ ]` open · `[~]` in progress · `[!]` blocked externally · `[x]` res | GAP-MEM-02 | Dictionary | No dictionary import/export on any surface. | catalog MEM-07 | `[x]` 2026-09-13: desktop `dictionary:import/export` (JSON/CSV), web serialize/parse + download/upload, mobile via `data-portability`; 8 new unit tests. | | GAP-MTG-01 | Meetings | Audio seek ↔ transcript timestamp sync missing. | `apps/mobile-rn/src/features/meetings/meetings-service.ts`, `MeetingDetailScreen.tsx`, `apps/web/src/components/meetings/{meeting-audio-player,live-transcript-list}.tsx`, `apps/mobile-rn/__tests__/meetings.test.ts` | `[x]` 2026-10-30: 모바일(`MeetingDetailScreen.tsx`)과 웹(`meeting-audio-player.tsx` ↔ `live-transcript-list.tsx`) 및 데스크톱(`TranscriptTab.tsx` / `EditableSegment.tsx`)에 `[MM:SS]` 구간 타임스탬프 파싱·오디오 시크 이동 및 재생 위치별 활성 전사 세그먼트 하이라이트를 구현했다 (`__tests__/meetings.test.ts` 통과). | | GAP-MTG-02 | Meetings | Speaker diarization only partially done on desktop; absent web/mobile. | `docs/phases/phase-15.5-speaker-diarization.md`, SSOT H-014 | Finish desktop pyannote path; expose speaker labels cross-surface. | +| GAP-MTG-03 | Meetings | Existing recordings could become plain transcription history, but not a meeting with linked audio and minutes. | desktop `MeetingModeService`, `meeting/imported-recording.ts`, `meeting-mode-handlers.ts`; mobile `MeetingsScreen` → `RecordScreen`; MTG-13 | `[~]` 2026-11-01: desktop/mobile import flows and canonical transcript/audio persistence implemented; full offline suites, lint/typecheck/build and real MP3/M4A integration PASS. Remaining: run Electron picker→transcript→minutes GUI and authenticated Android picker→upload→transcript→minutes on Fold6. | | GAP-INFRA-01 | Build | `apps/mobile-rn` is outside npm workspaces, so root `typecheck`/`test`/`lint` skip it. `typecheck:mobile`/`lint:mobile`/`test:mobile`/`verify:all` root scripts added 2026-09-13 (`package.json`), but membership/CI integration is still open. | `package.json`, `.forgejo/workflows/ci.yml`, `.gitlab-ci.yml` | `[x]` 2026-10-30: React Native Metro/Gradle 네이티브 오토링킹 격리를 위해 `apps/mobile-rn`은 독립 `node_modules`로 유지하고, 루트 `verify:all` 및 `.forgejo/workflows/ci.yml`·`.gitlab-ci.yml`의 `mobile-quality` 잡이 모바일 `lint`·`typecheck`·`test:ci`를 필수 게이트로 실행하도록 정본화했다. | | GAP-MOB-01 | Legacy | `apps/mobile` Expo skeleton duplicated auth/data code and got version-sync edits. | SSOT G-002 | `[x]` 2026-09-13: deleted `apps/mobile`, removed from `sync-version.mjs` and `package-lock.json`; `version:check` GREEN. | | GAP-INFRA-02 | CI | GitLab admin NAS deploy job is disabled; admin deploy is manual/GHCR. | `.gitlab-ci.yml`, `docs/deployment/nas-deploy-runbook.md` | `[x]` 2026-10-30: 임시 CI DinD 데몬만 바꾸던 구 잡 대신 `docker-compose.nas.yml` 기반의 정본 배포·헬스체크·롤백 절차를 `docs/deployment/nas-deploy-runbook.md`로 문서화하고 `.gitlab-ci.yml` 및 `02-infrastructure.md`에 연결했다. | @@ -131,7 +132,7 @@ These are the mobile SSOT rows still `[ ]` / `[~]`. Do not duplicate the full te |---|---|---| | G (governance) | G-002, G-006, G-007, G-008, G-009, G-010, G-011 | Type/error/identity consolidation, legacy bundle separation, credential rotation | | A (auth/account) | A-001..A-013, A-018; A-014..A-017 `[~]` | Session restore, signup, deep links, OAuth, profile, provider E2E | -| O (onboarding/a11y) | O-001..O-007, O-009, O-011; O-008/O-010/O-012 `[~]` | Onboarding branches, permissions, tutorial; app-wide theme coverage, TalkBack/font-scale/rotation; full-app ko/en audit | +| O (onboarding/a11y) | O-002..O-007, O-009, O-011; O-001 `[~]`, O-008/O-010/O-012 `[~]` | O-001 2026-11-01: `.2` Fold6 fresh auth/signup/small-screen PASS; latest `.3` fresh-auth/retry FAILED (onboarding visibility), 회귀 테스트 추가(`apps/mobile-rn/.maestro-output/fold6-20261101-fix1/`). Remaining: permissions, tutorial; app-wide theme coverage, TalkBack/font-scale/rotation; full-app ko/en audit | | D (data/sync/offline) | D-001..D-014 | Schema/RLS, devices, cross-surface read/write, offline queue, conflict policy | | R (record/transcribe) | R-001..R-009, R-011..R-015, R-017..R-020; R-016 `[x]` | Permissions, recorder, FGS, upload queue, job state, sharing | | H (history/meetings) | H-001..H-005, H-007..H-010, H-012..H-015; H-006/H-011/H-016 `[x]` | Pagination, filters, detail, meeting timeline/docs/diarization/cross-app | @@ -249,3 +250,13 @@ Actionable checklist for the work started this session. Fields to fill are blank |---|---|---|---| | CONSTRAINT-INPUT-01 | 입력 레메트리는 **키 내용을 저장하지 않는다.** 카운터(키 입력·클릭·스크롤)와 마우스 이동 거리, 그리고 **사용자가 명시적으로 동의한 경우에만** 읽은 텍스트(학습 DB)만 남긴다. 키코드→문자 복원은 시도하지 않는다. | ActivityWatch `aw-watcher-input` 이 같은 이유로 같은 선택을 한다 — 전역 키 내용 수집은 보안·프라이버시 파급이 크고, 신뢰를 잃으면 기능 자체가 사라진다(README 원문: "This does not track which keys you press … This is not a keylogger, and never will be"). 게다가 키코드 복원은 한/일 IME 에서 원리적으로 불가능하다(조합 결과가 텍스트다). | 수집은 옵트인(`inputTelemetryEnabled`/`inputLearnTypedText` 기본 false), 비밀번호 필드는 `IsPassword` 로 fail-closed 차단, 앱별 제외, 30일 보존 후 자동 삭제, "수집된 데이터 삭제" 버튼(동의 철회 시 즉시 삭제 + 학습 플래그 해제), 전송 없음(로컬 SQLite 전용). | | CONSTRAINT-I18N-01 | `packages/core/src/keybinding.ts` 는 i18n 키를 평범한 `string` 으로 노출한다. 렌더러가 `asTranslationKey()`(`apps/desktop/src/renderer/components/keybinding/translation-key.ts:7`)로 경계에서 캐스팅하므로, 존재하지 않는 키를 넘겨도 컴파일러가 잡지 못한다. | core 가 로케일 패키지에 의존하지 않게 하려는 의도적 설계다. 검토한 대안 둘 다 성립하지 않는다 — (A) 키 필드를 리터럴 유니온으로 좁히는 방식은 `KEY_CATALOG` 가 `letterEntries()` 같은 함수 생성부를 포함해 불가능하고, (B) core 가 `@d3ro/i18n` 의 타입 가드를 쓰는 방식은 의존 방향을 core → i18n 으로 역전시켜 `03-shared-packages.md` §6 의 전제를 깬다. 2026-09-21 결정: 현행 유지. | `packages/core/__tests__/keybinding-i18n.test.ts` (14 케이스). core 가 참조하는 키가 12개 로케일 전부에 있는지, 값이 빈 문자열이 아닌지, core 가 렌더러 전용 `keybinding.ui.*` 를 참조하지 않는지 검사한다. 거부 사유 키는 하드코딩 목록이 아니라 실제 `validateBinding` 경로를 태워 수집하므로 새 사유가 생기면 자동으로 커버된다. | + +## 2026-11-01 recovery gates + +- `[x]` Meeting import account isolation: before-copy, after-copy and A→B→A all reproduced unwanted persistence, then passed after revision guards; generated audio removed on rejection. Test: `meeting-import.usecase.test.ts`. +- `[~]` GAP-INPUT-11: current deterministic A/B 17/17 (pre-fix 2/17), Python 27/27 and packaged engine startup/health pass. Runtime feed was still 1.10.0; minimum 1.16.0 and runtime-first deployment now require CPU/UIA fixes. Windows native helper is unavailable, so actual high-load typing/model-load overlap remains open. +- `[~]` GAP-MTG-03: real ffmpeg MP3/M4A 2/2 and Fold6 `.3` entry/editor rendering pass. Desktop file picker→minutes and mobile file→transcript→minutes remain unverified; no paid inference was run. +- `[!]` Mobile production release: `release:mobile:config` fails `firebase_expected_project_id_missing`, also with root `.env`. No production APK/AAB/Play publication. Latest `.3` first-run failures are retained, historical `.2` PASS is not promoted to current proof. Next: configured production credentials and isolated fresh-state device test that preserves personal data. +- `[~]` Historical remote `origin/seoro/project-overview-report` (`9cd965d`, 2026-04-13) remains unmerged: its titlebar/scrollbar/cloud settings changes are superseded by the September shell and current i18n. It is not today's work; preserve the branch rather than reverting current shell behavior. + +Evidence and inventory: [2026-11-01 completion](../evidence/2026-11-01-completion.md). diff --git a/docs/v3/MOBILE_APP_COMPLETION_SSOT.md b/docs/v3/MOBILE_APP_COMPLETION_SSOT.md index de868ed..f3cf6a3 100644 --- a/docs/v3/MOBILE_APP_COMPLETION_SSOT.md +++ b/docs/v3/MOBILE_APP_COMPLETION_SSOT.md @@ -94,17 +94,17 @@ | 묶음 | 현재 판정 | 확인된 증거 / 남은 게이트 | |---|---|---| -| Auth·계정 | 구현·자동화 GREEN, 외부 OAuth·privacy purge 기기 E2E 대기 | auth/signup/invite 경계는 최신 exact APK `.11`에서 PASS. Keychain 세션, 중앙 `purgeAllAccountLocalData`, cold no-session·SIGNED_OUT·refresh session loss·A→B 전환·실패 재시도 경계는 전체 모바일 57 suites/353 tests에 포함돼 GREEN. 실제 token-expiry 강제 로그아웃·logout/delete/provider 연결/해제 기기 E2E와 Google/GitHub/Apple 동의→callback은 남음 | -| 온보딩 | 기존 구현·기기 journey GREEN | 신규/기존 분기, skip/replay, 계정별 preference merge, 알림·마이크 권한 상태 구현. production preference `0→skip→1`, Android PID 유지, 5.8초 내 Main, navigation warning 0을 실측. 이 과거 증거를 2026-09-28 v4 셸의 전 테마·viewport 증거로 재사용하지 않는다 | -| v4 셸·테마·접근성 | 셸 `[x]`, 디자인 시스템·접근성 `[~]` | visible Home/Records/Meetings/More 4탭, hidden Record route, 세 동작 FAB, Home/More, 새/전환된 v4 흐름의 `ScreenHeader`, ui-native dark/light 의미 토큰과 48dp control을 구현했다. 전체 Jest 86 suites/589 tests, 320dp dark 1/1 PASS(88초), 411dp light 1/1 PASS(100초). 기존 stack 화면 전부의 헤더 전환을 뜻하지 않으며 실제 TalkBack/font-scale/rotation은 남음 | +| Auth·계정 | 구현·자동화 GREEN, 외부 OAuth·privacy purge 기기 E2E 대기 | auth/signup/invite 경계는 2026-11-01 Fold6 `1.15.4-e2e.20261101.2`에서 PASS. Keychain 세션, 중앙 `purgeAllAccountLocalData`, cold no-session·SIGNED_OUT·refresh session loss·A→B 전환·실패 재시도 경계는 Jest GREEN. 실제 token-expiry 강제 로그아웃·logout/delete/provider 연결/해제 기기 E2E와 Google/GitHub/Apple 동의→callback은 남음 | +| 온보딩 | 현재 구현·Fold6 journey GREEN | 신규 사용자 목적지를 persistence 전에 준비하도록 수정한 뒤 fresh auth/signup/invite/small-screen 4/4 PASS. 이 증거를 v4 셸의 전 테마·viewport 또는 로그아웃 완료 증거로 재사용하지 않는다 | +| v4 셸·테마·접근성 | 셸 `[x]`, 디자인 시스템·접근성 `[~]` | visible Home/Records/Meetings/More 4탭, hidden Record route, 세 동작 FAB, Home/More, 새/전환된 v4 흐름의 `ScreenHeader`, ui-native dark/light 의미 토큰과 48dp control을 구현했다. 전체 Jest 87 suites/599 tests, 320dp dark 1/1 PASS(88초), 411dp light 1/1 PASS(100초). 기존 stack 화면 전부의 헤더 전환을 뜻하지 않으며 실제 TalkBack/font-scale/rotation은 남음 | | 녹음·전사·Talk | 핵심 경로 GREEN | API 34 microphone FGS, 지속 알림, pause/resume/discard, 실제 통화 audio-focus, 프로세스 kill 후 WAV 복구, 파일 import, cloud STT fail-closed, on-device Whisper, Claude SSE, Android TTS를 통합 APK에서 확인. STT provider 호출 전 원자 quota reservation·실패 환불은 20-way 동시성으로 검증. Android `ACTION_SEND` 수신은 허용 MIME·크기·provider 예외·MP4 AAC 추출을 fail-closed로 구현했고 API 34 instrumentation 4/4(CSPRNG 1 + share 3)와 별도 UID 외부 ContentProvider APK→`ACTION_SEND`→Record→durable queue→cancel cleanup E2E가 GREEN | | 데이터 portability | 구현·공유 E2E GREEN | 00021 atomic export/restore, 손상/타 사용자/충돌 rollback, legacy import를 local integration으로 확인. `portable_exports`→FileProvider `shared_exports` 경계와 PDF Print/DOCX chooser·30초 cleanup을 실제 기기에서 확인 | -| History·회의 | 실제 데이터·회의 생성 계약 GREEN | Supabase history pagination/search/favorite/CAS, Web↔mobile history E2E, meetings/memos/documents RLS/CAS, meeting recording lifecycle 구현. 00025의 제목·참석자·4개 언어·소유 템플릿 원자 생성은 2계정 43 assertions와 competing-payload PT409로 검증. speaker/audio timestamp와 최종 교차 앱 E2E는 남음 | +| History·회의 | 실제 데이터·회의 생성 계약 GREEN, 녹음 파일→회의 `[~]` | Supabase history pagination/search/favorite/CAS, Web↔mobile history E2E, meetings/memos/documents RLS/CAS, meeting recording lifecycle 구현. 00025의 제목·참석자·4개 언어·소유 템플릿 원자 생성은 2계정 43 assertions와 competing-payload PT409로 검증. H-017 기존 파일 회의 import는 생성 라우팅·durable meeting pipeline Jest가 GREEN이지만 실제 파일의 Fold6 전사·회의록 E2E는 NOT_RUN. speaker/audio timestamp와 최종 교차 앱 E2E도 남음 | | 기록+회의 통합 검색 | `[~]` source/full Jest + 320dp dark·411dp light runtime GREEN | 사용자 범위 history title/original/polished/summary와 meetings title/raw/edited transcript를 병렬 검색해 최신순으로 합치고 각 상세로 이동한다. 두 viewport/theme에서 두 source→detail을 실측했다. 다만 별도 `transcripts` 구간은 검색하지 않고, 모바일 raw-text 과전송·실행 요청 미취소, FTS/index·대규모 성능 미검증이 남음 | | Teams·Push | 팀 GREEN, 외부 Push 대기 | production 17 assertions와 local 36 assertions로 원자 팀/초대/RLS/role/device token 계약 확인. durable push outbox 00015~00020과 logout device `1→0` 확인. 실제 FCM 수신은 Firebase/FCM 자격 증명·cron 배포가 필요 | | Billing·Ads | test 광고와 production AdMob identity/SSV 준비, store·실제 지급 E2E RED | Google Play restore는 실제 store list→모든 token 서버 검증→entitlement snapshot 일치 후에만 성공. Google 공식 test adaptive banner와 rewarded `AdActivity` 완주를 실측했다. production app `ca-app-pub-1039714767792854~6427959892`, banner `/9840591290`, rewarded `/2255790918`, `50 cloud_ai_tokens`, SSV URL, Edge v13, durable receipt 원장은 SSOT에 반영했다. 그러나 live는 `검토 필요`, `광고 게재 제한`, store 미연결, 결제 프로필 미완료다 | | Admin | 서버·Web·모바일 E2E와 production DB·Edge 배포 GREEN | .NET 21/21, 00023 관리 integration 25 assertions, Edge/JWT 47 assertions와 TLS Chromium E2E GREEN. 모바일 API 34에서 ordinary/manager/admin/super_admin 및 stale 강등을 55 assertions로 실측: Free test 광고, Pro 광고 미요청, 관리자 메뉴/API 차단, 구독 수정, 역할 경계·변경, 삭제 확인·취소, stale JWT 403와 민감 state purge가 모두 PASS. fixture 잔존 0. production 00023 및 admin Edge 4개 배포 후 익명 GET은 모두 `401 authentication_required` + `Cache-Control: no-store`로 재검증 | -| 품질·배포 | current local source/runtime gate GREEN, production 배포 RED | 2026-09-28 현재 tree 전체 Jest 86 suites/589 tests GREEN. 로컬 E2E APK는 `com.d3ro.voice`, `1.9.0-e2e.20260928.2`/`202609282`, 147063583 B, SHA-256 `96EBA2A47E54033EB0DEFCE4E4D282F1D06F162A5F7DF9457E99609D98745D58`이며 두 canonical Maestro 보고서가 GREEN이다. 이것은 production-signed artifact가 아니므로 Firebase·CI secret 주입·AAB·Play track·Fold6 Play 설치 게이트는 그대로 RED다 | +| 품질·배포 | source GREEN; current first-run unverified; production RED | 2026-11-01: Jest 87 suites/599 tests, lint/typecheck GREEN. 현재 Fold6 APK `.3` / `2026110103`, 147158575 B, SHA-256 `937d2a0b3fb6b810516f07e91dd97ffe99d34c5885a72f21805a51e8a408027f`는 artifact verifier GREEN이며 import 버튼·폼이 표시된다. `.2`의 4/4 PASS와 달리 `.3` 첫 실행 시험 2회는 실패했고 재초기화 없이 보존했다. production config는 `firebase_expected_project_id_missing`; AAB/Play 미배포. | **v4 제거 범위:** `DashScreen`과 `WorksHubScreen`을 삭제했다. Home과 1급 탭/More가 기존 목적지를 보존하며 사용자 콘텐츠는 삭제하지 않았다. WorksHub 전용 로컬 도구 검색·고정은 복잡도 축소를 위해 의도적으로 종료했고, 비활성 `works-hub-pins.v1` AsyncStorage 키는 업그레이드 설치에 남을 수 있다. @@ -162,7 +162,7 @@ ### O — 온보딩·튜토리얼·테마·접근성 -- [ ] O-001 첫 실행 welcome과 기존 사용자/신규 사용자 분기 +- [~] O-001 첫 실행 welcome과 기존 사용자/신규 사용자 분기 — 2026-11-01 `.2` Fold6 fresh auth/signup/small-screen PASS; 이후 `.3` fresh-auth와 retry는 onboarding visibility 실패. 현재 첫 실행 재검증이 남아 있다. 신규 사용자 목적지 준비 순서 회귀 테스트와 증거는 `apps/mobile-rn/__tests__/onboarding-fresh-route.test.tsx`, `apps/mobile-rn/.maestro-output/fold6-20261101-fix1/` - [ ] O-002 로그인 전 개인정보·클라우드 처리·녹음 권한 설명 - [ ] O-003 마이크 권한 요청/거부/다시 묻지 않음/설정 이동 - [ ] O-004 알림 권한은 가치 설명 뒤 요청하고 거부 시 기능 저하 안내 @@ -235,6 +235,7 @@ - [ ] H-014 화자 구분 상태·화자명 편집·미지원 fallback - [ ] H-015 Web↔모바일 동일 회의 교차 편집 E2E - [x] H-016 홈 기록+회의 통합 검색 — 2026-10-30: `unified-search-service.ts` + `UnifiedSearchScreen.tsx`에 `AbortSignal`/검색 세대 토큰 취소, transcript segment 매칭, 필요한 컬럼/스니펫만 가져오는 경량 프로젝션을 구현해 `GAP-UX-05` 해소 (`__tests__/unified-search-service.test.ts` 통과) +- [~] H-017 기존 녹음 파일을 회의로 가져와 전사·회의록 생성 — 2026-11-01: `MeetingsScreen`의 녹음 파일 동작이 회의 메타데이터를 원자 생성한 뒤 `RecordScreen`의 `meetingId + importRequest`로 연결된다. 파일 검증·업로드·전사·회의 완료는 기존 durable queue와 `mobile_complete_meeting_processing`을 재사용한다. 생성 라우팅과 durable meeting import Jest는 GREEN이나 Fold6에서 실제 파일 선택→전사→회의록 생성은 미실행이다. | ### F — 데스크톱/Web 전체 기능의 모바일 화면 @@ -315,7 +316,7 @@ - [~] Q-010 Android debug·release APK clean build — universal debug와 non-debuggable E2E 양 ABI clean build GREEN, production signed release APK/AAB는 외부 secret gate - [~] Q-011 JS bundle이 포함된 release APK의 offline cold start — embedded bundle non-debuggable E2E APK cold start GREEN, production signed release artifact는 대기 - [ ] Q-012 에뮬레이터 API 35+ 생성·부팅·초기화 script -- [ ] Q-013 fresh install→onboarding→signup/login→logout E2E +- [~] Q-013 fresh install→onboarding→signup/login→logout E2E — 2026-11-01 Fold6에서 fresh install→onboarding→signup/login boundary와 cold restart는 PASS. 실제 계정 로그인·로그아웃은 credentials 부재로 NOT_RUN이므로 전체 완료는 아님 - [ ] Q-014 OAuth provider redirect→callback→session→Main E2E - [x] Q-015 녹음 권한→실제 오디오 fixture 주입/녹음→전사 결과 E2E - [x] Q-016 파일 picker→fixture 선택→upload→전사→상세→공유 E2E @@ -368,8 +369,9 @@ | Mobile lint | `npm --prefix apps/mobile-rn run lint` | GREEN, warning/error 0 (`--max-warnings=0`) | `apps/mobile-rn/.eslintrc.js`, `package.json` | 2026-08-21 | | Mobile typecheck | `npm --prefix apps/mobile-rn run typecheck` | GREEN | `apps/mobile-rn/tsconfig.json` | 2026-08-21 | | Historical mobile unit | `npm --prefix apps/mobile-rn test` | 당시 전체 통합 tree 57 suites / 353 tests GREEN; 현재 tree 수치가 아님 | `apps/mobile-rn/__tests__` | 2026-08-24 | -| Current mobile unit | `npm --prefix apps/mobile-rn test` | 전체 tree **86 suites / 589 tests PASS**. navigation shell/header/theme와 unified-search service/result-row 계약을 포함 | `apps/mobile-rn/__tests__`, `docs/evidence/wave45-mobile-shell-search-2026-09-28.md` | 2026-09-28 | -| Wave 4/5 local runtime APK | output metadata + file size/SHA-256 + installed/runtime identity 확인 | `com.d3ro.voice`, versionName `1.9.0-e2e.20260928.2`, versionCode `202609282`, 147063583 B, SHA-256 `96EBA2A47E54033EB0DEFCE4E4D282F1D06F162A5F7DF9457E99609D98745D58`. 로컬 E2E artifact이며 production-signed APK/AAB가 아니다 | `apps/mobile-rn/android/app/build/outputs/apk/e2e/{app-e2e.apk,output-metadata.json}`, `docs/evidence/wave45-mobile-shell-search-2026-09-28.md` | 2026-09-28 | +| Current mobile unit | `npm --prefix apps/mobile-rn test` | 전체 tree **87 suites / 599 tests PASS**. 온볼딩 목적지 순서와 H-017 회의 생성→녹음 파일 import→durable meeting pipeline 회귀를 고정하고 lint/typecheck도 GREEN | `apps/mobile-rn/__tests__/{onboarding-fresh-route.test.tsx,meeting-creation-screen.test.tsx,record-screen-redteam-r2-27.test.tsx}` | 2026-11-01 | +| Current local runtime APK | metadata + SHA-256 + installed identity + Build Tools 37 verifier | `.3` / `2026110103`, 147158575 B, SHA-256 `937d2a0b3fb6b810516f07e91dd97ffe99d34c5885a72f21805a51e8a408027f`; local E2E artifact, production 아님. import entry/editor 실기 표시 확인; 저장·전사·회의록은 미검증 | `test-results/recovery-2026-11-01/android-artifact.json`, `mobile-import.xml`, `mobile-import.png` | 2026-11-01 | +| Historical `.2` Fold6 first-run gate | bundled E2E APK fresh install + canonical auth/signup/invite + `840x1490` signup | **4/4 PASS**: auth 60초, signup 67초, invite 31초, small-screen signup 61초. 신규 사용자가 SignUp으로 진입하고 cold restart 후 Login이 유지된다. fatal/Metro matches 0. 계정 필요 authenticated parity는 credentials 부재로 NOT_RUN | `apps/mobile-rn/.maestro-output/fold6-20261101-fix1/`, `apps/mobile-rn/.maestro/{fresh-install-auth,fresh-install-signup,small-screen-signup}.junit.xml` | 2026-11-01 | | Mobile v4 320dp dark runtime | `apps/mobile-rn/.maestro/navigation-shell-search-local.yaml` | **1/1 PASS, 0 failure, 88초**: visible 4 tabs, FAB open/back close, Home unified search, record+meeting results→both details, Records/Meetings/More navigation | `scratch/design-audit/wave45/navigation-shell-search-320-dark-verified.xml`, `docs/evidence/wave45-mobile-shell-search-2026-09-28.md` | 2026-09-28 | | Mobile v4 411dp light runtime | same journey on 411dp light | **1/1 PASS, 0 failure, 100초**. 두 보고서는 shell/viewport/theme runtime proof이며 TalkBack/font-scale/rotation 또는 production release proof가 아니다 | `scratch/design-audit/wave45/navigation-shell-search-411-light-verified.xml`, `docs/evidence/wave45-mobile-shell-search-2026-09-28.md` | 2026-09-28 | | Supabase local | migration-up + shadow replay 00001~00028 및 domain integration | 기존 domain integration에 더해 AdMob receipt 원장의 unknown/ineligible/cooldown replay, account-delete unlink, ACL, 교차 사용자·동시 요청을 검증했다. mobile-platform 85/85, reward race 2회 연속, SSV Deno 6/6, db lint error 0, shadow diff empty, fixture cleanup 0 | `server/supabase/migrations/20260821000028_ad_reward_receipt_replay_protection.sql`, `server/supabase/tests`, `server/supabase/functions/_shared/admob-ssv.test.ts` | 2026-08-24 | @@ -414,3 +416,5 @@ - 결제·광고 보상은 서버 검증 전에 entitlement/토큰을 바꾸는 경로가 0건인지 검사한다. - 에뮬레이터를 초기화한 clean install과 기존 사용자 upgrade install을 모두 검증한다. - 실제 설치 APK의 version/signature/hash와 화면에 표시된 버전을 대조한다. + +2026-11-01 recovery: later `.3` first-run failures are preserved in `apps/mobile-rn/.maestro-output/fold6-20261101-mtg13/`. Source regression tests pass, but the current APK has no fresh-state PASS. This run did not reset app data, log out the user, or run paid STT/LLM/Play operations. [Completion evidence](../evidence/2026-11-01-completion.md). diff --git a/packages/core/src/ipc-channels.ts b/packages/core/src/ipc-channels.ts index 3e8a68c..e99f380 100644 --- a/packages/core/src/ipc-channels.ts +++ b/packages/core/src/ipc-channels.ts @@ -360,6 +360,7 @@ export const IPC_CHANNELS = { // ── Phase 14: Meeting Mode ── MEETING_MODE: { START_RECORDING: 'meetingMode:startRecording', + IMPORT_RECORDING: 'meetingMode:importRecording', STOP_RECORDING: 'meetingMode:stopRecording', ADD_MEMO: 'meetingMode:addMemo', GET_STATE: 'meetingMode:getState', diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index d85678b..03129a1 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -1261,6 +1261,11 @@ export interface FileTranscriptionStartParams { language?: string } +export interface MeetingImportParams { + filePath?: string + language?: string +} + export interface FileTranscriptionProgress { jobId: string currentChunk: number diff --git a/packages/i18n/src/locales/de.json b/packages/i18n/src/locales/de.json index 6a44574..2564bae 100644 --- a/packages/i18n/src/locales/de.json +++ b/packages/i18n/src/locales/de.json @@ -419,6 +419,9 @@ "nav.meeting": "Meeting", "meeting.title": "Meeting-Modus", "meeting.newMeeting": "Neues Meeting", + "meetings.import": "Aufnahme importieren", + "meetings.importing": "Aufnahme wird transkribiert", + "meetings.importFailed": "Aufnahme konnte nicht importiert werden: {{message}}", "meeting.stopRecording": "Aufnahme beenden", "meeting.recording": "Aufnahme läuft", "meeting.processing": "Protokoll wird erstellt...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "Aufnahme", + "mobile.meetings.importTitle": "Meeting aus Aufnahme erstellen", + "mobile.meetings.importNotice": "WAV, MP3, M4A, AAC, OGG, FLAC oder WebM auswählen. Das Transkript wird in diesem Meeting gespeichert und kann als Protokoll erstellt werden.", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/en.json b/packages/i18n/src/locales/en.json index fb792f1..2860811 100644 --- a/packages/i18n/src/locales/en.json +++ b/packages/i18n/src/locales/en.json @@ -419,6 +419,9 @@ "nav.meeting": "Meeting", "meeting.title": "Meeting Mode", "meeting.newMeeting": "New Meeting", + "meetings.import": "Import recording", + "meetings.importing": "Transcribing recording", + "meetings.importFailed": "Could not import recording: {{message}}", "meeting.stopRecording": "Stop Recording", "meeting.recording": "Recording", "meeting.processing": "Generating minutes...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "Recording", + "mobile.meetings.importTitle": "Create meeting from recording", + "mobile.meetings.importNotice": "Choose a WAV, MP3, M4A, AAC, OGG, FLAC, or WebM file. Its transcript is saved to this meeting, ready for minutes generation.", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/es.json b/packages/i18n/src/locales/es.json index db86f10..b902065 100644 --- a/packages/i18n/src/locales/es.json +++ b/packages/i18n/src/locales/es.json @@ -419,6 +419,9 @@ "nav.meeting": "Reunión", "meeting.title": "Modo Reunión", "meeting.newMeeting": "Nueva Reunión", + "meetings.import": "Importar grabación", + "meetings.importing": "Transcribiendo grabación", + "meetings.importFailed": "No se pudo importar la grabación: {{message}}", "meeting.stopRecording": "Detener Grabación", "meeting.recording": "Grabando", "meeting.processing": "Generando actas...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "Grabación", + "mobile.meetings.importTitle": "Crear reunión desde grabación", + "mobile.meetings.importNotice": "Elige WAV, MP3, M4A, AAC, OGG, FLAC o WebM. La transcripción se guarda en esta reunión para generar el acta.", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/fr.json b/packages/i18n/src/locales/fr.json index 5657107..dc8c080 100644 --- a/packages/i18n/src/locales/fr.json +++ b/packages/i18n/src/locales/fr.json @@ -419,6 +419,9 @@ "nav.meeting": "Réunion", "meeting.title": "Mode Réunion", "meeting.newMeeting": "Nouvelle Réunion", + "meetings.import": "Importer un enregistrement", + "meetings.importing": "Transcription de l’enregistrement", + "meetings.importFailed": "Impossible d’importer l’enregistrement : {{message}}", "meeting.stopRecording": "Arrêter l'enregistrement", "meeting.recording": "Enregistrement en cours", "meeting.processing": "Génération du compte-rendu...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "Enregistrement", + "mobile.meetings.importTitle": "Créer une réunion depuis un enregistrement", + "mobile.meetings.importNotice": "Choisissez WAV, MP3, M4A, AAC, OGG, FLAC ou WebM. La transcription est enregistrée dans cette réunion pour générer le compte rendu.", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/ja.json b/packages/i18n/src/locales/ja.json index cbe8196..d412cb5 100644 --- a/packages/i18n/src/locales/ja.json +++ b/packages/i18n/src/locales/ja.json @@ -419,6 +419,9 @@ "nav.meeting": "ミーティング", "meeting.title": "ミーティングモード", "meeting.newMeeting": "新規ミーティング", + "meetings.import": "録音ファイルを取り込む", + "meetings.importing": "録音ファイルを文字起こし中", + "meetings.importFailed": "録音ファイルを取り込めませんでした: {{message}}", "meeting.stopRecording": "録音停止", "meeting.recording": "録音中", "meeting.processing": "議事録を生成中...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "録音ファイル", + "mobile.meetings.importTitle": "録音ファイルからミーティングを作成", + "mobile.meetings.importNotice": "WAV、MP3、M4A、AAC、OGG、FLAC、WebMに対応。文字起こしをこのミーティングに保存し、議事録を作成できます。", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/ko.json b/packages/i18n/src/locales/ko.json index 0e3312f..c6fc36d 100644 --- a/packages/i18n/src/locales/ko.json +++ b/packages/i18n/src/locales/ko.json @@ -419,6 +419,9 @@ "nav.meeting": "회의", "meeting.title": "회의 모드", "meeting.newMeeting": "새 회의", + "meetings.import": "녹음 파일 가져오기", + "meetings.importing": "녹음 파일을 전사하는 중", + "meetings.importFailed": "녹음 파일을 가져오지 못했습니다: {{message}}", "meeting.stopRecording": "녹음 종료", "meeting.recording": "녹음 중", "meeting.processing": "회의록 생성 중...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "회의 제목 검색", "mobile.meetings.create": "새 회의", "mobile.meetings.createTitle": "회의 공간 만들기", + "mobile.meetings.import": "녹음 파일", + "mobile.meetings.importTitle": "녹음 파일로 회의 만들기", + "mobile.meetings.importNotice": "WAV, MP3, M4A, AAC, OGG, FLAC, WebM 파일을 선택하면 전사가 이 회의에 저장됩니다. 완료 후 회의록 문서를 생성할 수 있습니다.", "mobile.meetings.createNotice": "동기화되는 회의 공간을 생성합니다. 오디오 녹음은 REC 화면과 연결된 뒤 시작해야 합니다.", "mobile.meetings.editTitle": "회의 제목 편집", "mobile.meetings.titleLabel": "회의 제목", diff --git a/packages/i18n/src/locales/pt.json b/packages/i18n/src/locales/pt.json index e529778..d7d8dfe 100644 --- a/packages/i18n/src/locales/pt.json +++ b/packages/i18n/src/locales/pt.json @@ -419,6 +419,9 @@ "nav.meeting": "Reunião", "meeting.title": "Modo Reunião", "meeting.newMeeting": "Nova Reunião", + "meetings.import": "Importar gravação", + "meetings.importing": "Transcrevendo gravação", + "meetings.importFailed": "Não foi possível importar a gravação: {{message}}", "meeting.stopRecording": "Parar Gravação", "meeting.recording": "Gravando", "meeting.processing": "Gerando ata...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "Gravação", + "mobile.meetings.importTitle": "Criar reunião a partir de gravação", + "mobile.meetings.importNotice": "Escolha WAV, MP3, M4A, AAC, OGG, FLAC ou WebM. A transcrição fica nesta reunião, pronta para gerar a ata.", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/ru.json b/packages/i18n/src/locales/ru.json index 54840dc..8340b91 100644 --- a/packages/i18n/src/locales/ru.json +++ b/packages/i18n/src/locales/ru.json @@ -419,6 +419,9 @@ "nav.meeting": "Совещание", "meeting.title": "Режим совещания", "meeting.newMeeting": "Новое совещание", + "meetings.import": "Импортировать запись", + "meetings.importing": "Транскрибация записи", + "meetings.importFailed": "Не удалось импортировать запись: {{message}}", "meeting.stopRecording": "Остановить запись", "meeting.recording": "Запись", "meeting.processing": "Создание протокола...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "Запись", + "mobile.meetings.importTitle": "Создать совещание из записи", + "mobile.meetings.importNotice": "Выберите WAV, MP3, M4A, AAC, OGG, FLAC или WebM. Транскрипт сохранится в совещании для создания протокола.", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/th.json b/packages/i18n/src/locales/th.json index 84f606b..2423c6b 100644 --- a/packages/i18n/src/locales/th.json +++ b/packages/i18n/src/locales/th.json @@ -419,6 +419,9 @@ "nav.meeting": "การประชุม", "meeting.title": "โหมดการประชุม", "meeting.newMeeting": "การประชุมใหม่", + "meetings.import": "นำเข้าไฟล์บันทึกเสียง", + "meetings.importing": "กำลังถอดเสียงไฟล์บันทึก", + "meetings.importFailed": "ไม่สามารถนำเข้าไฟล์บันทึกเสียง: {{message}}", "meeting.stopRecording": "หยุดบันทึก", "meeting.recording": "กำลังบันทึก", "meeting.processing": "กำลังสร้างรายงานการประชุม...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "ไฟล์บันทึกเสียง", + "mobile.meetings.importTitle": "สร้างการประชุมจากไฟล์บันทึกเสียง", + "mobile.meetings.importNotice": "เลือก WAV, MP3, M4A, AAC, OGG, FLAC หรือ WebM ระบบจะบันทึกการถอดเสียงไว้ในการประชุมนี้เพื่อสร้างรายงานการประชุม", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/vi.json b/packages/i18n/src/locales/vi.json index 84709c9..cfd315b 100644 --- a/packages/i18n/src/locales/vi.json +++ b/packages/i18n/src/locales/vi.json @@ -419,6 +419,9 @@ "nav.meeting": "Cuộc họp", "meeting.title": "Chế độ Cuộc họp", "meeting.newMeeting": "Cuộc họp mới", + "meetings.import": "Nhập tệp ghi âm", + "meetings.importing": "Đang phiên âm tệp ghi âm", + "meetings.importFailed": "Không thể nhập tệp ghi âm: {{message}}", "meeting.stopRecording": "Dừng ghi âm", "meeting.recording": "Đang ghi âm", "meeting.processing": "Đang tạo biên bản...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "Tệp ghi âm", + "mobile.meetings.importTitle": "Tạo cuộc họp từ tệp ghi âm", + "mobile.meetings.importNotice": "Chọn WAV, MP3, M4A, AAC, OGG, FLAC hoặc WebM. Bản phiên âm được lưu vào cuộc họp này để tạo biên bản.", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/zh-TW.json b/packages/i18n/src/locales/zh-TW.json index 8328783..3e4e71c 100644 --- a/packages/i18n/src/locales/zh-TW.json +++ b/packages/i18n/src/locales/zh-TW.json @@ -419,6 +419,9 @@ "nav.meeting": "會議", "meeting.title": "會議模式", "meeting.newMeeting": "新增會議", + "meetings.import": "匯入錄音檔", + "meetings.importing": "正在轉錄錄音檔", + "meetings.importFailed": "無法匯入錄音檔:{{message}}", "meeting.stopRecording": "停止錄音", "meeting.recording": "錄音中", "meeting.processing": "正在產生會議記錄...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "錄音檔", + "mobile.meetings.importTitle": "從錄音檔建立會議", + "mobile.meetings.importNotice": "選擇 WAV、MP3、M4A、AAC、OGG、FLAC 或 WebM。轉錄會儲存到此會議,並可繼續產生會議紀錄。", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/packages/i18n/src/locales/zh.json b/packages/i18n/src/locales/zh.json index 63b10bb..0751fd4 100644 --- a/packages/i18n/src/locales/zh.json +++ b/packages/i18n/src/locales/zh.json @@ -419,6 +419,9 @@ "nav.meeting": "会议", "meeting.title": "会议模式", "meeting.newMeeting": "新建会议", + "meetings.import": "导入录音文件", + "meetings.importing": "正在转写录音文件", + "meetings.importFailed": "无法导入录音文件:{{message}}", "meeting.stopRecording": "停止录音", "meeting.recording": "录音中", "meeting.processing": "正在生成会议纪要...", @@ -1302,6 +1305,9 @@ "mobile.meetings.search": "Search meeting titles", "mobile.meetings.create": "New meeting", "mobile.meetings.createTitle": "Create meeting workspace", + "mobile.meetings.import": "录音文件", + "mobile.meetings.importTitle": "从录音文件创建会议", + "mobile.meetings.importNotice": "选择 WAV、MP3、M4A、AAC、OGG、FLAC 或 WebM。转写会保存到此会议,并可继续生成会议纪要。", "mobile.meetings.createNotice": "This creates a synchronized meeting workspace. Audio recording must be started after the REC flow is connected.", "mobile.meetings.editTitle": "Edit meeting title", "mobile.meetings.titleLabel": "Meeting title", diff --git a/scripts/ci/build-portable.mjs b/scripts/ci/build-portable.mjs index 89047e7..b2d49db 100644 --- a/scripts/ci/build-portable.mjs +++ b/scripts/ci/build-portable.mjs @@ -59,6 +59,10 @@ const ZIP_PART_SIZE = '90m' const MAX_ZIP_PART_BYTES = 95 * 1024 * 1024 const wantZip = process.argv.includes('--zip') +// 릴리스 태그 이후에는 추적 파일을 바꾸지 않는다. Scoop 산출물도 버전 폴더에 보존한다. +const scoopPath = process.argv.includes('--release-artifacts-only') + ? join(root, 'apps', 'desktop', 'release', version, 'd3ro-voice.scoop.json') + : join(root, 'bucket', 'd3ro-voice.json') const releaseDir = join(desktopDir, 'release', version) const appDir = join(releaseDir, 'win-unpacked') @@ -284,7 +288,7 @@ const scoopManifest = { } writeFileSync( - join(root, 'bucket', 'd3ro-voice.json'), + scoopPath, `${JSON.stringify(scoopManifest, null, 2)}\n`, 'utf8', ) @@ -445,8 +449,8 @@ console.log( ), ` zip : ${zipParts.length}개 부품 / 합계 ${(zipBytes.length / 1048576).toFixed(1)}MiB`, ` 인덱스 : ${join(releaseDir, 'portable.json')}`, - ` scoop : ${join(root, 'bucket', 'd3ro-voice.json')}`, + ` scoop : ${scoopPath}`, ` 런타임 : ${Object.keys(runtimeComponents).join(', ') || '(없음)'} (${runtimeIndex.platform}-${runtimeIndex.arch}) → ${join(RUNTIME_DIR, 'runtime.json')}`, ` 게시 : node scripts/ci/publish-portable-release.mjs`, ].join('\n'), -) \ No newline at end of file +) diff --git a/scripts/ci/lib/release-artifacts.mjs b/scripts/ci/lib/release-artifacts.mjs new file mode 100644 index 0000000..108471e --- /dev/null +++ b/scripts/ci/lib/release-artifacts.mjs @@ -0,0 +1,64 @@ +import { createHash } from 'node:crypto' +import { createReadStream } from 'node:fs' +import { readFile, readdir, rename, stat, writeFile } from 'node:fs/promises' +import { isAbsolute, join, relative, resolve, sep } from 'node:path' + +const CHECKPOINT = 'release-artifacts.json' + +function artifactPath(directory, name) { + const path = resolve(directory, name) + const rel = relative(resolve(directory), path) + if (!rel || isAbsolute(rel) || rel === '..' || rel.startsWith(`..${sep}`)) { + throw new Error(`Invalid release artifact path: ${name}`) + } + return path +} + +async function fingerprint(directory, name) { + const path = artifactPath(directory, name) + const info = await stat(path) + if (!info.isFile()) throw new Error(`Release artifact is not a file: ${name}`) + const hash = createHash('sha256') + for await (const chunk of createReadStream(path)) hash.update(chunk) + return { name, size: info.size, sha256: hash.digest('hex') } +} + +export async function saveReleaseArtifacts(directory, { version, tagCommit, withRuntime }) { + const names = await readdir(directory) + const installers = names.filter((name) => /-Setup-.*\.exe$/.test(name)) + if (installers.length !== 1) throw new Error('Expected exactly one release installer') + const files = [installers[0], `${installers[0]}.blockmap`, 'latest.yml'] + if (withRuntime) { + const portable = JSON.parse(await readFile(join(directory, 'portable.json'), 'utf8')) + const runtime = JSON.parse(await readFile(join(directory, 'runtime', 'runtime.json'), 'utf8')) + if (portable.version !== version || runtime.version !== version) throw new Error('Release index version mismatch') + files.push('portable.json', 'd3ro-voice.scoop.json', 'runtime/runtime.json') + for (const entry of [...portable.volumes, ...portable.zipParts]) files.push(entry.name) + for (const component of Object.values(runtime.components)) { + for (const part of component.parts) files.push(`runtime/${part.name}`) + } + } + const artifacts = [] + for (const name of new Set(files)) artifacts.push(await fingerprint(directory, name)) + const checkpoint = { version, tagCommit, withRuntime, artifacts } + const path = join(directory, CHECKPOINT) + await writeFile(`${path}.tmp`, `${JSON.stringify(checkpoint, null, 2)}\n`) + await rename(`${path}.tmp`, path) +} + +export async function verifyReleaseArtifacts(directory, expected) { + const checkpoint = JSON.parse(await readFile(join(directory, CHECKPOINT), 'utf8')) + for (const field of ['version', 'tagCommit', 'withRuntime']) { + if (checkpoint[field] !== expected[field]) throw new Error(`Release checkpoint ${field} mismatch`) + } + if (!Array.isArray(checkpoint.artifacts) || checkpoint.artifacts.length < 3) { + throw new Error('Release checkpoint has no complete artifact set') + } + for (const entry of checkpoint.artifacts) { + const actual = await fingerprint(directory, entry.name) + if (actual.size !== entry.size || actual.sha256 !== entry.sha256) { + throw new Error(`Release artifact changed: ${entry.name}`) + } + } + return checkpoint +} diff --git a/scripts/ci/lib/release-artifacts.test.mjs b/scripts/ci/lib/release-artifacts.test.mjs new file mode 100644 index 0000000..f1fcf8d --- /dev/null +++ b/scripts/ci/lib/release-artifacts.test.mjs @@ -0,0 +1,63 @@ +import assert from 'node:assert/strict' +import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import test from 'node:test' +import { saveReleaseArtifacts, verifyReleaseArtifacts } from './release-artifacts.mjs' + +const identity = { version: '1.16.0', tagCommit: 'a'.repeat(40), withRuntime: false } +async function fixture(t) { + const dir = await mkdtemp(join(tmpdir(), 'd3ro-release-checkpoint-')) + t.after(() => rm(dir, { recursive: true, force: true })) + for (const name of ['D3RO-Voice-Setup-1.16.0.exe', 'D3RO-Voice-Setup-1.16.0.exe.blockmap', 'latest.yml']) { + await writeFile(join(dir, name), `original ${name}`) + } + await saveReleaseArtifacts(dir, identity) + return dir +} + +test('reuses exact release bytes after a partial publication', async (t) => { + const dir = await fixture(t) + const verified = await verifyReleaseArtifacts(dir, identity) + assert.equal(verified.artifacts.length, 3) +}) + +test('rejects rebuilt bytes even when size is unchanged', async (t) => { + const dir = await fixture(t) + const path = join(dir, 'D3RO-Voice-Setup-1.16.0.exe') + const original = await readFile(path, 'utf8') + await writeFile(path, original.replace('original', 'modified')) + await assert.rejects(verifyReleaseArtifacts(dir, identity), /artifact changed/) +}) + +test('rejects missing artifacts and a different source commit', async (t) => { + const dir = await fixture(t) + await assert.rejects(verifyReleaseArtifacts(dir, { ...identity, tagCommit: 'b'.repeat(40) }), /tagCommit mismatch/) + await assert.rejects(verifyReleaseArtifacts(dir, { ...identity, withRuntime: true }), /withRuntime mismatch/) + await rm(join(dir, 'latest.yml')) + await assert.rejects(verifyReleaseArtifacts(dir, identity), /ENOENT/) +}) + +test('rejects paths outside the preserved release directory', async (t) => { + const dir = await fixture(t) + const path = join(dir, 'release-artifacts.json') + const checkpoint = JSON.parse(await readFile(path, 'utf8')) + checkpoint.artifacts[0].name = '../outside.exe' + await writeFile(path, JSON.stringify(checkpoint)) + await assert.rejects(verifyReleaseArtifacts(dir, identity), /Invalid release artifact path/) +}) + +test('preserves runtime and portable parts and rejects missing runtime bytes', async (t) => { + const dir = await fixture(t) + await mkdir(join(dir, 'runtime')) + await writeFile(join(dir, 'portable.json'), JSON.stringify({ version: identity.version, volumes: [{ name: 'portable.7z.001' }], zipParts: [{ name: 'portable.zip.001' }] })) + await writeFile(join(dir, 'runtime/runtime.json'), JSON.stringify({ version: identity.version, components: { sidecar: { parts: [{ name: 'sidecar.tar.gz.001' }] } } })) + for (const name of ['portable.7z.001', 'portable.zip.001', 'd3ro-voice.scoop.json', 'runtime/sidecar.tar.gz.001']) { + await writeFile(join(dir, name), name) + } + const expected = { ...identity, withRuntime: true } + await saveReleaseArtifacts(dir, expected) + assert.equal((await verifyReleaseArtifacts(dir, expected)).artifacts.length, 9) + await rm(join(dir, 'runtime/sidecar.tar.gz.001')) + await assert.rejects(verifyReleaseArtifacts(dir, expected), /ENOENT/) +}) diff --git a/scripts/ci/lib/runtime-feed-gate.test.mjs b/scripts/ci/lib/runtime-feed-gate.test.mjs index 50bb2f3..7deb4c4 100644 --- a/scripts/ci/lib/runtime-feed-gate.test.mjs +++ b/scripts/ci/lib/runtime-feed-gate.test.mjs @@ -53,6 +53,13 @@ test("parseRuntimeMinVersions reads the app's real RUNTIME_MIN_VERSION (drift gu assert.equal(parsed.ffmpeg, null); }); +test("the shipping app rejects the old feed without typing safety fixes", () => { + const source = readFileSync(fileURLToPath(new URL(`../../../${RUNTIME_MIN_VERSION_SOURCE}`, import.meta.url)), "utf8"); + const minVersions = parseRuntimeMinVersions(source); + assert.match(evaluateRuntimeFeed({ index: index({ version: "1.10.0" }), minVersions, target: WINDOWS_X64_TARGET }).join(" "), /below/); + assert.deepEqual(evaluateRuntimeFeed({ index: index({ version: "1.16.0" }), minVersions, target: WINDOWS_X64_TARGET }), []); +}); + test("parseRuntimeMinVersions fails loudly when the constant cannot be read", () => { assert.throws(() => parseRuntimeMinVersions("export const OTHER = {}"), /RUNTIME_MIN_VERSION not found/); assert.throws( diff --git a/scripts/ci/release-desktop.mjs b/scripts/ci/release-desktop.mjs index fd88860..1b9bd4e 100644 --- a/scripts/ci/release-desktop.mjs +++ b/scripts/ci/release-desktop.mjs @@ -5,6 +5,8 @@ // npm run release -- minor # 1.9.0 → 1.10.0 (feat) // npm run release -- 2.0.0 # 직접 지정 // npm run release -- minor --dry-run # 무엇을 할지만 출력 +// node --env-file-if-exists=.env scripts/ci/release-desktop.mjs minor --with-runtime +// — 새 사이드카/portable을 먼저 게시한 뒤 설치본을 게시한다. // npm run release -- --resume # 빌드/게시/푸시 중 실패했을 때 같은 버전으로 이어서 // // 단계 (실패하면 거기서 멈추고, --resume 으로 이어 간다): @@ -23,11 +25,13 @@ import { existsSync, readFileSync, writeFileSync } from 'node:fs' import { dirname, join } from 'node:path' import { fileURLToPath } from 'node:url' import { loadSigningKey, publicPemOf } from './lib/update-manifest-signature.mjs' +import { saveReleaseArtifacts, verifyReleaseArtifacts } from './lib/release-artifacts.mjs' const root = join(dirname(fileURLToPath(import.meta.url)), '..', '..') const args = process.argv.slice(2) const dryRun = args.includes('--dry-run') const resume = args.includes('--resume') +const withRuntime = args.includes('--with-runtime') const bumpArg = args.find((arg) => !arg.startsWith('--')) const CANONICAL_REMOTE = 'chanpaca' const MIRROR_REMOTES = ['origin'] @@ -81,6 +85,7 @@ if (resume) { if (dryRun) { info(notes ? `CHANGELOG 초안:\n${notes}` : 'CHANGELOG 섹션 있음') info('단계: 커밋·태그 → 빌드 → 푸시 → 게시(서명) → 공개 URL 검증') + if (withRuntime) info('런타임 포함: 사이드카 재빌드 → portable/runtime 게시 → 설치본 게시') info('dry-run — 아무것도 바꾸지 않았습니다.') process.exit(0) } @@ -105,7 +110,7 @@ if (resume) { runNpm(['run', 'version:check']) runNpm(['run', 'release:metadata']) runNpm(['run', 'typecheck']) - // 여기까지 실패하면 버전 파일만 바뀐 상태다 — git checkout -- . 로 되돌리고 다시 실행. + // 여기까지 실패하면 버전 파일이 바뀐 상태다. 변경과 실패 증거를 보존하고 원인을 복구한다. // ── 4. 커밋 + 태그 ── step(`커밋 + 태그 ${tag}`) @@ -116,18 +121,45 @@ if (resume) { const tag = `v${version}` const tagCommit = git(['rev-parse', `${tag}^{commit}`]) +const releaseDir = join(root, 'apps', 'desktop', 'release', version) +const artifactIdentity = { version, tagCommit, withRuntime } +const hasCheckpoint = existsSync(join(releaseDir, 'release-artifacts.json')) // 태그가 생긴 뒤의 실패는 --resume 으로 이어 간다. -const resumeHint = '\n고친 뒤 이어 가기: npm run release -- --resume' +const resumeHint = `\n고친 뒤 이어 가기: node --env-file-if-exists=.env scripts/ci/release-desktop.mjs --resume${withRuntime ? ' --with-runtime' : ''}` // 이미 게시가 끝난 버전을 다시 빌드하면 바이트가 달라 불변 경로와 충돌한다 — 푸시만 남은 경우다. -if (resume && (await feedHasVersion(version))) { +if (resume && !hasCheckpoint && !withRuntime && (await feedHasVersion(version))) { info(`피드에 ${version} 가 이미 있습니다 — 빌드·게시를 건너뜁니다.`) pushToRemotes(tag, tagCommit) } else { // ── 5. 빌드 ── - step('빌드') - runNode('scripts/ci/build-desktop-installer.mjs', [], {}, resumeHint) + if (resume && hasCheckpoint) { + step('보존 산출물 검증') + await verifyReleaseArtifacts(releaseDir, artifactIdentity) + info('태그·해시가 일치하는 원본 산출물을 재사용합니다.') + } else { + if (existsSync(releaseDir)) { + fail(`기존 산출물을 보존합니다: ${releaseDir}\n검증 가능한 release-artifacts.json이 없습니다. 원본 산출물을 조사·복구한 뒤 재개하세요.`) + } + step('빌드') + runNode('scripts/ci/build-desktop-installer.mjs', [], {}, resumeHint) + if (withRuntime) { + runNpm(['run', 'sidecar:build', '--workspace=@d3ro/desktop']) + runNode('scripts/ci/verify-sidecar-bundle.mjs', ['--smoke'], {}, resumeHint) + runNode('scripts/ci/build-portable.mjs', ['--release-artifacts-only'], {}, resumeHint) + } + // 첫 업로드 전에 원본 바이트와 태그를 기록한다. 재개 시 재빌드하지 않는다. + await saveReleaseArtifacts(releaseDir, artifactIdentity) + } + + // 런타임을 요구하는 앱을 먼저 게시하면 기존 사용자의 모델 로드가 막힌다. + // 기존 portable 게시기는 부품 해시를 검증하고 runtime 인덱스를 마지막에 게시한다. + if (withRuntime) { + step('런타임 선행 게시') + // 게시기는 동일 바이트를 건너뛰고 누락된 파일과 latest 별칭을 복구한다. + runNode('scripts/ci/publish-portable-release.mjs', [], {}, resumeHint) + } // ── 6. 푸시 ── // Forgejo Release 생성 API(POST /releases)는 원격에 태그가 아직 없으면 target_commitish 에 diff --git a/scripts/ci/verify-android-artifact.mjs b/scripts/ci/verify-android-artifact.mjs index ea3796c..387c7e1 100644 --- a/scripts/ci/verify-android-artifact.mjs +++ b/scripts/ci/verify-android-artifact.mjs @@ -64,6 +64,12 @@ function requireAllowedReleaseCertificate(value, label) { return normalized } +function parseApkSignerCertificate(signature) { + return signature.match( + /(?:Signer #\d+|V\d+(?:\.\d+)? Signer:)\s+certificate SHA-256 digest:\s*([0-9a-f:]+)/i, + )?.[1] +} + function stableStatValue(stat, key, fallbackKey) { if (key in stat) return stat[key] return BigInt(Math.trunc(Number(stat[fallbackKey]) * 1_000_000)) @@ -1078,6 +1084,18 @@ function runSigningPolicySelfTest() { if (requireAllowedReleaseCertificate(safe, 'self_test_safe') !== safe.replaceAll(':', '').toLowerCase()) { fail('self_test_safe_certificate_mismatch') } + for (const signerLine of [ + `Signer #1 certificate SHA-256 digest: ${safe}`, + `V2 Signer: certificate SHA-256 digest: ${safe}`, + `V3.1 Signer: certificate SHA-256 digest: ${safe}`, + ]) { + if (parseApkSignerCertificate(signerLine) !== safe) { + fail('self_test_apk_signer_format_mismatch') + } + } + if (parseApkSignerCertificate('Signer #1 certificate MD5 digest: 00') !== undefined) { + fail('self_test_apk_signer_unexpected_match') + } let compromisedRejected = false try { requireAllowedReleaseCertificate(COMPROMISED_SIGNER_SHA256, 'self_test') @@ -1467,8 +1485,7 @@ try { : options['expected-upload-cert-sha256'] ? normalizeCertificateSha256(options['expected-upload-cert-sha256'], 'expected_upload_certificate') : null - const actualCertificateText = signature - .match(/Signer #1 certificate SHA-256 digest:\s*([0-9a-f:]+)/i)?.[1] + const actualCertificateText = parseApkSignerCertificate(signature) if (!actualCertificateText) fail('signer_sha256_missing') const actualCertificate = mode === 'release' ? requireAllowedReleaseCertificate(actualCertificateText, 'release_signer_sha256') diff --git a/scripts/ci/verify-sidecar-bundle.mjs b/scripts/ci/verify-sidecar-bundle.mjs index b7f0865..612b05f 100644 --- a/scripts/ci/verify-sidecar-bundle.mjs +++ b/scripts/ci/verify-sidecar-bundle.mjs @@ -8,6 +8,9 @@ // 사용: node scripts/ci/verify-sidecar-bundle.mjs import { existsSync, statSync } from 'node:fs' +import { spawn } from 'node:child_process' +import { createServer } from 'node:net' +import { setTimeout as delay } from 'node:timers/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' @@ -55,3 +58,48 @@ if (problems.length > 0) { const sizeMb = statSync(exePath).size / (1024 * 1024) console.log(`STT 사이드카 번들 검증 통과: ${exePath} (${sizeMb.toFixed(1)} MB)`) + +// 별도 loopback 포트에서 방금 만든 실행 파일을 검사한다. 모델이나 사용자 프로필은 열지 않는다. +if (process.argv.includes('--smoke')) { + const reservation = createServer() + await new Promise((resolve, reject) => { + reservation.once('error', reject) + reservation.listen(0, '127.0.0.1', resolve) + }) + const address = reservation.address() + if (!address || typeof address === 'string') throw new Error('No smoke-test port') + await new Promise((resolve, reject) => reservation.close((error) => error ? reject(error) : resolve())) + const child = spawn(exePath, ['--host', '127.0.0.1', '--port', String(address.port)], { + windowsHide: true, + stdio: ['ignore', 'pipe', 'pipe'], + }) + let output = '' + let launchError + const capture = (chunk) => { output = (output + chunk.toString()).slice(-8000) } + child.stdout.on('data', capture) + child.stderr.on('data', capture) + child.on('error', (error) => { launchError = error }) + let healthy = false + try { + const deadline = Date.now() + 30000 + while (Date.now() < deadline && child.exitCode === null && !launchError) { + try { + const response = await fetch(`http://127.0.0.1:${address.port}/health`, { signal: AbortSignal.timeout(500) }) + const health = await response.json() + if (response.ok && health.status === 'no_model' && health.model_loaded === false) { + healthy = true + break + } + } catch { /* wait for this child to bind its port */ } + await delay(100) + } + if (!healthy) throw new Error(`Sidecar smoke failed: ${launchError?.message ?? output}`) + console.log(`STT 사이드카 실제 실행/health 검증 통과 (pid=${child.pid}, port=${address.port})`) + } finally { + if (child.pid && child.exitCode === null) { + const exited = new Promise((resolve) => child.once('exit', resolve)) + child.kill() + await exited + } + } +} diff --git a/scripts/verification/README.md b/scripts/verification/README.md index 97b715f..3883beb 100644 --- a/scripts/verification/README.md +++ b/scripts/verification/README.md @@ -2,7 +2,7 @@ These tools separate a proven service race from unverified claims about physical keys and real CPU/model load. -1. Run `node scripts/verification/typing-race-proof.mjs` from the checkout root. It overlays three HEAD services in memory while keeping current dependencies and tests. A successful comparison requires the old services to corrupt the next Hangul word in three independent timing cases, the current services to preserve it, and unchanged-input correction to work in both. The other 13 assertions cover UIA snapshot contracts. This is not a complete installed-release A/B. +1. Run `node scripts/verification/typing-race-proof.mjs` from the checkout root. It overlays three services from the pre-fix commit `f49acf01057cc100b9caeace6eada26cf7bf4b54` in memory while keeping current dependencies and tests. Override with `--baseline ` when investigating another baseline; the report records both commits and source hashes. A successful comparison requires the old services to corrupt the next Hangul word in three independent timing cases, the current services to preserve it, and unchanged-input correction to work in both. The other 13 assertions cover UIA snapshot contracts. This is not a complete installed-release A/B. 2. Build `typing-fixture/build.ps1` and `typing-runtime/build.ps1`. Quit the installed app and manually open the isolated runtime launcher as required by repository AGENTS.md. Do not run `run-desktop.bat` for this experiment; it kills unrelated Electron processes. Keep the test profile separate from the personal profile. The runtime receipt records the product bundle hash and product package version; the wrapper itself is not a released installer. 3. Run the fixture with correction off, then correction on, saving each JSON under a distinct name. Use default Hangul IME mode first. Require exact calibration text and native IME composition messages. Compare all three requested paces under idle and bounded CPU load. A missing/aborted case, mismatched text, partial SendInput return or absent IME evidence is not a pass. Report achieved pacing, accepted key events and CPU samples during the input window, not just the requested load. 4. Prove the correction path is active with Latin layout correction mode and a correction-enabled profile. A zero-loss Hangul run alone could simply mean the correction path never ran. Disable learned-text persistence throughout. diff --git a/scripts/verification/typing-race-proof.mjs b/scripts/verification/typing-race-proof.mjs index 9aa6629..0689b63 100644 --- a/scripts/verification/typing-race-proof.mjs +++ b/scripts/verification/typing-race-proof.mjs @@ -1,5 +1,5 @@ // Deterministic source A/B. No GUI, input injection, checkout mutation, or personal data. -// Run from this checkout: node scripts/verification/typing-race-proof.mjs +// Run from this checkout: node scripts/verification/typing-race-proof.mjs [--baseline ] import { execFileSync, spawnSync } from 'node:child_process' import { createHash } from 'node:crypto' import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs' @@ -28,9 +28,17 @@ mkdirSync(output, { recursive: true }) const sha256 = (text) => createHash('sha256').update(text).digest('hex') const normalized = (file) => path.resolve(file).replaceAll('\\', '/').toLowerCase() const head = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: root, encoding: 'utf8' }).trim() +const args = process.argv.slice(2) +if (args.length !== 0 && (args.length !== 2 || args[0] !== '--baseline')) { + throw new Error('Usage: typing-race-proof.mjs [--baseline ]') +} +// The fix is now committed: HEAD is no longer a broken baseline. +const baselineRef = args[1] ?? 'f49acf01057cc100b9caeace6eada26cf7bf4b54' +const baselineCommit = execFileSync('git', ['rev-parse', '--verify', '--end-of-options', `${baselineRef}^{commit}`], + { cwd: root, encoding: 'utf8' }).trim() const overrides = {} const evidence = sources.map((file) => { - const baseline = execFileSync('git', ['show', `${head}:${file}`], { cwd: root, encoding: 'utf8', maxBuffer: 4_000_000 }) + const baseline = execFileSync('git', ['show', `${baselineCommit}:${file}`], { cwd: root, encoding: 'utf8', maxBuffer: 4_000_000 }) const current = readFileSync(path.join(root, file), 'utf8') overrides[normalized(path.join(root, file))] = baseline return { file, baselineSha256: sha256(baseline), currentSha256: sha256(current) } @@ -38,14 +46,14 @@ const evidence = sources.map((file) => { const testEvidence = tests.map((file) => ({ file: `apps/desktop/${file}`, currentSha256: sha256(readFileSync(path.join(desktop, file), 'utf8')) })) -writeFileSync(path.join(output, 'head-source-overrides.json'), JSON.stringify(overrides)) +writeFileSync(path.join(output, 'baseline-source-overrides.json'), JSON.stringify(overrides)) const configPath = path.join(output, 'vitest.proof.config.mjs') writeFileSync(configPath, ` import { readFileSync } from 'node:fs'; const overrides = process.env.D3RO_RACE_BASELINE === '1' - ? JSON.parse(readFileSync(${JSON.stringify(path.join(output, 'head-source-overrides.json'))}, 'utf8')) : {}; + ? JSON.parse(readFileSync(${JSON.stringify(path.join(output, 'baseline-source-overrides.json'))}, 'utf8')) : {}; export default { - plugins: [{ name: 'read-only-head-source-overlay', enforce: 'pre', load(id) { + plugins: [{ name: 'read-only-baseline-source-overlay', enforce: 'pre', load(id) { return overrides[id.split('?')[0].replaceAll('\\\\', '/').toLowerCase()] ?? null; }}], test: { environment: 'node', globals: true, @@ -59,7 +67,7 @@ export default { `) const runs = [] for (const baseline of [true, false]) { - const label = baseline ? 'baseline-head' : 'current-fix' + const label = baseline ? 'baseline-source' : 'current-fix' const resultPath = path.join(output, `${label}.json`) const result = spawnSync(process.execPath, [vitest, 'run', ...tests, '--config', configPath, '--reporter=json', `--outputFile=${resultPath}`], { @@ -77,9 +85,9 @@ for (const baseline of [true, false]) { } const report = { capturedAt: new Date().toISOString(), kind: 'deterministic-source-ab-not-gui', - head, node: process.version, sources: evidence, tests: testEvidence, runs, + head, baselineCommit, node: process.version, sources: evidence, tests: testEvidence, runs, sourcesUnchangedDuringRun: [...evidence, ...testEvidence].every(({ file, currentSha256 }) => sha256(readFileSync(path.join(root, file), 'utf8')) === currentSha256), - baselineScope: 'Only the three listed services are loaded from HEAD; dependencies, test doubles and tests are current in both runs. This is not a full historical release test.', + baselineScope: 'Only the three listed services are loaded from baselineCommit; dependencies, test doubles and tests are current in both runs. This is not a full historical release test.', scope: 'Actual TypoCorrectionService + TextInsertService with an in-memory text sink, and actual InputTelemetryService with delayed UIA responses. Three text-preservation cases isolate timestamp, revision and native-tick guards; one unchanged-input control must still correct. The remaining 13 cases check snapshot invalidation/metadata/coalescing contracts, not 13 independent text-loss reproductions. Native keys, OS IME, model loading and CPU stress are not exercised.' } writeFileSync(path.join(output, 'report.json'), JSON.stringify(report, null, 2) + '\n')