@lincyaw/workbench 0.2.0-rc.8 → 0.2.0-rc.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -4
- package/src/MediaClipEditor.tsx +4 -3
- package/src/StepProductionEditor.tsx +13 -4
- package/src/approvals.tsx +6 -1
- package/src/audio-recording.ts +27 -5
- package/src/authoring-client.ts +10 -10
- package/src/authoring-draft-fragment.ts +3 -1
- package/src/authoring-window.ts +100 -0
- package/src/body-draft-actions.ts +60 -0
- package/src/caption-timing-drafts.ts +18 -1
- package/src/component-property-drafts.ts +5 -5
- package/src/components.tsx +22 -31
- package/src/context.tsx +5 -3
- package/src/diagnostics.ts +1 -1
- package/src/document-draft-store.ts +45 -18
- package/src/document-drafts.ts +28 -19
- package/src/document-editing.ts +484 -0
- package/src/document-editor/BlockNoteSurface.tsx +25 -9
- package/src/document-editor/ComponentMaterials.tsx +3 -9
- package/src/document-editor/ComponentPropertiesDialog.tsx +4 -4
- package/src/document-editor/DocumentBlockPreview.tsx +4 -2
- package/src/document-editor/DocumentComments.tsx +85 -14
- package/src/document-editor/DocumentEditor.tsx +44 -7
- package/src/document-editor/DocumentStepNarration.tsx +33 -25
- package/src/document-editor/NarrationEditor.tsx +54 -20
- package/src/document-editor/NewCommentDrafts.tsx +114 -31
- package/src/document-editor/PlaceComment.tsx +228 -0
- package/src/document-editor/comment-draft-actions.ts +40 -20
- package/src/document-editor/comment-draft-inspection.ts +2 -2
- package/src/document-editor/comment-drafts.ts +73 -25
- package/src/document-editor/comments.ts +30 -10
- package/src/document-editor/component-label.ts +11 -0
- package/src/document-editor/file-input.ts +2 -2
- package/src/document-editor/focus.ts +0 -2
- package/src/document-editor/insertion-place.ts +60 -0
- package/src/document-editor/messages.ts +3 -3
- package/src/document-editor/narration-schema.tsx +12 -6
- package/src/document-editor/narration.ts +19 -3
- package/src/document-editor/page-body.ts +60 -0
- package/src/document-editor/projection.ts +2 -2
- package/src/document-editor/rich-text.ts +3 -2
- package/src/document-editor/selection.ts +13 -0
- package/src/document-editor/style.css +12 -1
- package/src/document-editor/table-identities.ts +2 -1
- package/src/document-production.ts +491 -0
- package/src/document-session.ts +202 -56
- package/src/document-timing-drafts.ts +22 -2
- package/src/history.ts +5 -5
- package/src/index.ts +6 -5
- package/src/jobs.ts +1 -1
- package/src/media-drafts.ts +43 -1
- package/src/messages.ts +31 -14
- package/src/panels/DocumentView.tsx +71 -28
- package/src/panels/DocumentVoiceDialog.tsx +25 -9
- package/src/panels/DocumentVoiceField.tsx +1 -1
- package/src/panels/ExportPanel.tsx +1 -6
- package/src/panels/HistoryPanel.tsx +32 -2
- package/src/panels/PageDeleteDialog.tsx +4 -4
- package/src/panels/PageRenameDialog.tsx +1 -1
- package/src/panels/PreviewPanel.tsx +1 -4
- package/src/panels/ProductionCaptionSize.tsx +20 -0
- package/src/panels/ProductionCaptionTiming.tsx +12 -9
- package/src/panels/ProductionMediaClips.tsx +23 -7
- package/src/panels/ProductionPanel.tsx +8 -4
- package/src/panels/ProductionRecording.tsx +86 -9
- package/src/panels/ProductionRecordingRange.tsx +21 -19
- package/src/panels/ProductionTimeline.tsx +6 -1
- package/src/panels/ProductionTranscription.tsx +5 -4
- package/src/panels/SourceDocumentPanel.tsx +16 -36
- package/src/panels/TranscriptionAdoption.tsx +40 -34
- package/src/panels/VoiceCloneDialog.tsx +2 -1
- package/src/panels/VoiceoverDialog.tsx +1 -1
- package/src/places.ts +1 -36
- package/src/preview-playback.ts +1 -1
- package/src/production-draft-actions.ts +37 -0
- package/src/production-messages.ts +6 -0
- package/src/production-playback.ts +1 -1
- package/src/production-voice-playback.ts +3 -2
- package/src/sha256.ts +9 -0
- package/src/styles.css +21 -43
- package/src/transcription-drafts.ts +124 -0
- package/src/use-recording-adoption.ts +2 -2
- package/src/voice-drafts.ts +32 -8
- package/src/voiceover-jobs.ts +1 -1
- package/src/workbench-state.ts +157 -0
- package/src/workbench.ts +258 -951
- package/src/workspace-client.ts +21 -11
- package/src/assistant-mascot.ts +0 -62
- package/src/mascot-preference.ts +0 -37
- package/src/panels/ChangeTrail.tsx +0 -79
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { useEffect, useId, useRef, useState } from 'react'
|
|
2
|
-
import { recordingSourceRange } from '@lincyaw/kernel'
|
|
3
|
-
import type { DocumentRecordingAdoption, ProductionAssetInspection
|
|
2
|
+
import { randomUUID, recordingSourceRange } from '@lincyaw/kernel'
|
|
3
|
+
import type { DocumentRecordingAdoption, ProductionAssetInspection } from '@lincyaw/kernel'
|
|
4
4
|
import { PmButton, PmInput, PmNotice } from '../components.tsx'
|
|
5
5
|
import { useWorkbench, useWorkbenchState } from '../context.tsx'
|
|
6
6
|
import { AUDIO_RECORDING_MESSAGES } from '../audio-recording-messages.ts'
|
|
7
7
|
import { MEDIA_MESSAGES, mediaFailure } from '../media-messages.ts'
|
|
8
8
|
import { mediaTime, mediaTimeValue } from '../media-time.ts'
|
|
9
9
|
import { PRODUCTION_MESSAGES } from '../production-messages.ts'
|
|
10
|
-
|
|
11
|
-
type RecordingSource = Extract<VoiceSource, { type: 'recording' }>
|
|
12
|
-
interface RangeDraft { version: string, voice: RecordingSource, range?: TimeRange, startText?: string, endText?: string }
|
|
10
|
+
import type { RecordingRangeDraft as RangeDraft } from '../document-production.ts'
|
|
13
11
|
const same = (a: unknown, b: unknown) => JSON.stringify(a) === JSON.stringify(b)
|
|
14
12
|
|
|
15
13
|
/** Video-only pending input; the existing recording transaction and source actor own every write. */
|
|
@@ -21,7 +19,7 @@ export function ProductionRecordingRange({ identity, sectionId, stepId, active,
|
|
|
21
19
|
const document = source?.identity === identity ? source.content : undefined
|
|
22
20
|
const effective = document?.production.stepOverrides[stepId]?.voiceSource ?? document?.production.sectionOverrides?.[sectionId]?.voiceSource ?? document?.production.defaults.voiceSource
|
|
23
21
|
const voice = effective?.type === 'recording' ? effective : undefined, key = JSON.stringify([stepId, voice?.assetId])
|
|
24
|
-
const drafts =
|
|
22
|
+
const drafts = workbench.production.recordingRangeDrafts(identity), mounted = useRef(true), request = useRef<AbortController>()
|
|
25
23
|
const [inspection, setInspection] = useState<{ version: string, value: ProductionAssetInspection }>(), [loading, setLoading] = useState(false)
|
|
26
24
|
const [busy, setBusy] = useState(false), [failure, setFailure] = useState<string>(), [reload, setReload] = useState(0), [, render] = useState(0)
|
|
27
25
|
const rangeErrorId = useId()
|
|
@@ -34,7 +32,7 @@ export function ProductionRecordingRange({ identity, sectionId, stepId, active,
|
|
|
34
32
|
const latest = useRef({ key, active, disabled, onChanged }); latest.current = { key, active, disabled, onChanged }
|
|
35
33
|
const current = () => mounted.current && workbench.getState().authoring?.identity === identity
|
|
36
34
|
const inspected = inspection && inspection.version === source?.version && inspection.value.assetId === voice?.assetId ? inspection.value : undefined
|
|
37
|
-
const draft = drafts.
|
|
35
|
+
const draft = drafts.get(key) ?? (voice ? { version: source?.version ?? '', voice } : undefined)
|
|
38
36
|
const range = draft?.range ?? (draft && inspected ? recordingSourceRange(draft.voice, inspected.durationMs) : undefined)
|
|
39
37
|
const start = draft ? mediaTimeValue(draft.startText, range?.startMs ?? draft.voice.sourceRange?.startMs ?? 0) : undefined
|
|
40
38
|
const end = draft ? mediaTimeValue(draft.endText, range?.endMs ?? draft.voice.sourceRange?.endMs ?? 0) : undefined
|
|
@@ -48,22 +46,26 @@ export function ProductionRecordingRange({ identity, sectionId, stepId, active,
|
|
|
48
46
|
const saved = step && (actual!.content!.production.stepOverrides[step.id]?.voiceSource ?? actual!.content!.production.sectionOverrides?.[step.sectionId]?.voiceSource ?? actual!.content!.production.defaults.voiceSource)
|
|
49
47
|
if (!value || !actual?.version || saved?.type !== 'recording' || saved.assetId !== value.request.assetId || !same(saved.sourceRange, value.request.sourceRange)
|
|
50
48
|
|| actual.content?.assets[saved.assetId]?.fingerprint !== `sha256:${value.request.sha256}`) return false
|
|
51
|
-
const pending = drafts.
|
|
52
|
-
if (pending === value.draft)
|
|
53
|
-
else if (pending?.version === value.draft.version && same(pending.voice, value.draft.voice))
|
|
54
|
-
if (current()) { setFailure(undefined); render(value => value + 1) }
|
|
49
|
+
const pending = drafts.get(value.key)
|
|
50
|
+
if (pending === value.draft) workbench.production.setRecordingRangeDraft(identity, value.key, undefined)
|
|
51
|
+
else if (pending?.version === value.draft.version && same(pending.voice, value.draft.voice)) workbench.production.setRecordingRangeDraft(identity, value.key, { ...pending, version: actual.version, voice: structuredClone(saved) })
|
|
52
|
+
if (current()) { workbench.refreshAuthoringClientControls(); setFailure(undefined); render(value => value + 1) }
|
|
55
53
|
if (latest.current.key === value.key && latest.current.active && !latest.current.disabled && reported.current !== value.request.id) {
|
|
56
54
|
reported.current = value.request.id; latest.current.onChanged()
|
|
57
55
|
}
|
|
58
56
|
return true
|
|
59
57
|
}
|
|
58
|
+
useEffect(() => workbench.registerNavigationGuard(() => current() && (composing.current || Boolean(request.current))), [workbench, identity])
|
|
59
|
+
useEffect(() => workbench.production.registerDraftView({ identity, kind: 'recording-range', has: target => current() && target === latest.current.key,
|
|
60
|
+
blocked: () => composing.current || Boolean(request.current), clear: () => { setFailure(undefined); render(value => value + 1) } }), [workbench, identity])
|
|
61
|
+
useEffect(() => { workbench.refreshAuthoringClientControls() }, [workbench, busy, key, active])
|
|
60
62
|
useEffect(() => () => { mounted.current = false; request.current?.abort() }, [])
|
|
61
63
|
useEffect(() => { request.current?.abort(); request.current = undefined; setBusy(false); setFailure(undefined) }, [key, active])
|
|
62
64
|
useEffect(() => {
|
|
63
65
|
const version = source?.version, assetId = voice?.assetId, controller = new AbortController()
|
|
64
66
|
if (!active || !version || !assetId || disabled) { setLoading(false); return }
|
|
65
67
|
setLoading(true)
|
|
66
|
-
void workbench.
|
|
68
|
+
void workbench.production.inspectAudio(assetId, { identity, version }, controller.signal).then(answer => {
|
|
67
69
|
if (!controller.signal.aborted && current() && latest.current.key === key) setInspection({ version: answer.version, value: answer.inspection })
|
|
68
70
|
}, error => { if (!controller.signal.aborted && current() && latest.current.key === key) setFailure(failureText(error)) })
|
|
69
71
|
.finally(() => { if (!controller.signal.aborted && current() && latest.current.key === key) setLoading(false) })
|
|
@@ -72,7 +74,7 @@ export function ProductionRecordingRange({ identity, sectionId, stepId, active,
|
|
|
72
74
|
useEffect(() => { settle() }, [source?.version, source?.content, source?.loading, source?.dirty, source?.saving, source?.composing, source?.restored, source?.error, active, disabled, key])
|
|
73
75
|
const edit = (patch: Partial<RangeDraft>) => {
|
|
74
76
|
if (!draft) return
|
|
75
|
-
|
|
77
|
+
workbench.production.setRecordingRangeDraft(identity, key, { ...draft, ...range ? { range: { ...range } } : {}, ...patch }); workbench.refreshAuthoringClientControls(); setFailure(undefined); render(value => value + 1)
|
|
76
78
|
}
|
|
77
79
|
const apply = async () => {
|
|
78
80
|
if (!voice || !draft || !inspected || !valid || !changed || busy || disabled || !active || composing.current || !current()) return
|
|
@@ -81,11 +83,11 @@ export function ProductionRecordingRange({ identity, sectionId, stepId, active,
|
|
|
81
83
|
const controller = new AbortController(), proposed = { startMs: start!, endMs: end! }
|
|
82
84
|
const previous = sent.current?.request
|
|
83
85
|
const change: DocumentRecordingAdoption = previous && previous.source.version === source.version && previous.stepId === stepId && previous.assetId === voice.assetId && previous.sha256 === inspected.sha256 && same(previous.sourceRange, proposed)
|
|
84
|
-
? previous : { id:
|
|
85
|
-
const stored = drafts.
|
|
86
|
-
|
|
86
|
+
? previous : { id: randomUUID(), source: { documentId: source.content.id, version: source.version, fingerprint: source.fingerprint }, stepId, assetId: voice.assetId, sha256: inspected.sha256, sourceRange: proposed }
|
|
87
|
+
const stored = drafts.get(key) ?? draft
|
|
88
|
+
workbench.production.setRecordingRangeDraft(identity, key, stored); sent.current = { key, draft: stored, request: change }; request.current = controller
|
|
87
89
|
setBusy(true); setFailure(undefined)
|
|
88
|
-
try { await workbench.
|
|
90
|
+
try { await workbench.production.adoptRecording(change, { identity, version: source.version }, controller.signal); if (current()) settle() }
|
|
89
91
|
catch (error) { if (current() && request.current === controller && !settle() && !controller.signal.aborted) setFailure(failureText(error)) }
|
|
90
92
|
finally { if (request.current === controller) { request.current = undefined; if (current()) setBusy(false) } }
|
|
91
93
|
}
|
|
@@ -95,7 +97,7 @@ export function ProductionRecordingRange({ identity, sectionId, stepId, active,
|
|
|
95
97
|
const trimmed = Boolean(canonicalRange && inspected && (canonicalRange.startMs > 0 || canonicalRange.endMs < inspected.durationMs))
|
|
96
98
|
const hasCaptions = document?.steps[stepId]?.narrationIds.some(id => document.narrations[id]?.content.some(node => node.type !== 'cue' && (node.type === 'text' ? node.text : node.display).trim()))
|
|
97
99
|
return <section className="pm-ui-media-clip-editor" aria-label={r.trim} onFocusCapture={() => { if (!disabled) void workbench.pausePlayback() }}
|
|
98
|
-
onCompositionStart={() => { composing.current = true }} onCompositionEnd={() => { composing.current = false }}
|
|
100
|
+
onCompositionStart={() => { composing.current = true; workbench.refreshAuthoringClientControls() }} onCompositionEnd={() => { composing.current = false; workbench.refreshAuthoringClientControls() }}
|
|
99
101
|
onKeyDown={event => { event.stopPropagation(); if (event.key === 'Enter' && event.target instanceof HTMLInputElement && !event.nativeEvent.isComposing && !composing.current) { event.preventDefault(); void apply() } }}>
|
|
100
102
|
<strong>{r.trim}</strong>
|
|
101
103
|
<span>{document?.assets[voice.assetId]?.title || r.title}</span>
|
|
@@ -113,6 +115,6 @@ export function ProductionRecordingRange({ identity, sectionId, stepId, active,
|
|
|
113
115
|
{review && <PmNotice tone="warn">{t.review}<PmButton small disabled={disabled || !inspected || busy} onClick={() => edit({ version: source!.version!, voice: structuredClone(voice) })}>{t.check}</PmButton></PmNotice>}
|
|
114
116
|
{trimmed && hasCaptions && <PmNotice tone="warn">{r.captionReview}</PmNotice>}
|
|
115
117
|
{failure && <PmNotice tone="danger">{failure}<PmButton small disabled={disabled || busy} onClick={() => { setInspection(undefined); setFailure(undefined); setReload(value => value + 1) }}>{t.retry}</PmButton></PmNotice>}
|
|
116
|
-
{drafts.
|
|
118
|
+
{drafts.has(key) && <span className="pm-ui-field__hint" role="status">{t.pending}</span>}
|
|
117
119
|
</section>
|
|
118
120
|
}
|
|
@@ -36,6 +36,10 @@ export function ProductionTimeline({ plan, sectionId, stepId, active, current, s
|
|
|
36
36
|
}, [workbench, directory, plan, sectionId, active, current])
|
|
37
37
|
const document = source?.content, section = document?.sections[sectionId]
|
|
38
38
|
const page = current ? plan?.pages.find(page => page.sectionId === sectionId) : undefined
|
|
39
|
+
// The current plan lists every page of the lecture; a page of the document it lacks is left out of the lecture.
|
|
40
|
+
const excluded = Boolean(current && plan && section && !page)
|
|
41
|
+
// On a page of the lecture, a step it leaves out is missing from the page's steps.
|
|
42
|
+
const stepLeftOut = Boolean(page && !page.steps.some(step => step.stepId === stepId))
|
|
39
43
|
const start = page?.startMs, end = page?.endMs, duration = start !== undefined && end !== undefined ? Math.max(0, end - start) : undefined
|
|
40
44
|
const position = plan && current && playback && sameProductionBinding(playback.binding, plan.binding) && playback.position?.sectionId === sectionId && start !== undefined ? Math.max(0, playback.position.timeMs - start) : undefined
|
|
41
45
|
const tracks: TimelineTrack[] = page && plan ? plan.tracks.map(track => ({ id: track.kind, label: p.tracks[track.kind], segments: track.segments.filter(segment => segment.sectionId === sectionId).map(segment => {
|
|
@@ -49,9 +53,10 @@ export function ProductionTimeline({ plan, sectionId, stepId, active, current, s
|
|
|
49
53
|
statusLabel: [status, track.kind === 'caption' && p.alignmentStatus[segment.alignment ?? 'none'], segment.audio && (wave === false ? p.waveformUnavailable : wave === undefined ? p.waveformLoading : undefined)].filter(Boolean).join(' · '),
|
|
50
54
|
waveform: wave ? wave.peaks : undefined,
|
|
51
55
|
}
|
|
52
|
-
}) })) : [{ id: 'visual', label: p.tracks.visual, segments: section?.stepOrder.map((id, index) => ({ id, stepId: id, label: document?.steps[id]?.title ?? p.stepNumber(index), timing: 'unknown' as const })) ?? [] }, { id: 'voice', label: p.tracks.voice, segments: [] }, { id: 'caption', label: p.tracks.caption, segments: [] }]
|
|
56
|
+
}) })) : [{ id: 'visual', label: p.tracks.visual, segments: excluded ? [] : section?.stepOrder.map((id, index) => ({ id, stepId: id, label: document?.steps[id]?.title ?? p.stepNumber(index), timing: 'unknown' as const })) ?? [] }, { id: 'voice', label: p.tracks.voice, segments: [] }, { id: 'caption', label: p.tracks.caption, segments: [] }]
|
|
53
57
|
const captionChoices = current ? plan?.tracks.find(track => track.kind === 'caption')?.segments.filter(segment => segment.stepId === stepId && (segment.alignment === 'words' || segment.alignment === 'manual') && segment.timing === 'confirmed').map(segment => segment.id) ?? [] : []
|
|
54
58
|
return <PmTimeline variant="editor" label={p.timeline} tracks={tracks} labels={p.timelineLabels} durationMs={duration} durationStatus={page?.timing ?? 'unknown'} currentTimeMs={position} selectedStepId={stepId} showSteps={false}
|
|
59
|
+
excluded={excluded ? { status: p.notInLecture, notice: p.notInLectureHint } : undefined} notice={stepLeftOut ? p.notInLectureStep : undefined}
|
|
55
60
|
segmentPicker={{ track: 'caption', ids: captionChoices, label: p.captionSegment, placeholder: p.chooseCaptionSegment }}
|
|
56
61
|
zoom={zoom} onZoomChange={setZoom} disabled={disabled} loading={loading} seeking={seeking} seekDisabled={!seekEnabled || start === undefined}
|
|
57
62
|
onSelectStep={onSelectStep} onSelectSegment={(track, selected) => {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react'
|
|
2
2
|
import type { DocumentTranscriptionRequest, TeachingDocument, TranscriptionCapabilities, TranscriptionListAnswer, TranscriptionRevision, TranscriptionTask } from '@lincyaw/kernel'
|
|
3
|
+
import { randomUUID } from '@lincyaw/kernel'
|
|
3
4
|
import { PmBadge, PmButton, PmCard, PmDialog, PmField, PmIconButton, PmNotice, PmSelect } from '../components.tsx'
|
|
4
5
|
import { useWorkbench, useWorkbenchState } from '../context.tsx'
|
|
5
6
|
import { documentTranscriptionSession } from '../transcription-session.ts'
|
|
@@ -81,7 +82,7 @@ export function ProductionTranscription({ identity, directory, document, section
|
|
|
81
82
|
const controller = new AbortController(); importRequest.current = controller; setImporting(true); setFailure(undefined)
|
|
82
83
|
pendingFile.current = value
|
|
83
84
|
try {
|
|
84
|
-
const answer = await workbench.
|
|
85
|
+
const answer = await workbench.production.ensureAudio(value, { identity, version: now.version }, controller.signal)
|
|
85
86
|
if (current() && !controller.signal.aborted) { setAssetId(answer.inspection.assetId); pendingFile.current = undefined }
|
|
86
87
|
} catch (error) { if (current() && !controller.signal.aborted) setFailure(transcriptionFailure(error, locale)) }
|
|
87
88
|
finally { if (importRequest.current === controller) { importRequest.current = undefined; if (current()) setImporting(false) } }
|
|
@@ -92,10 +93,10 @@ export function ProductionTranscription({ identity, directory, document, section
|
|
|
92
93
|
const controller = new AbortController(); inspectionRequest.current = controller; setInspecting(true)
|
|
93
94
|
setFailure(undefined)
|
|
94
95
|
try {
|
|
95
|
-
const expected = { identity, version: now.version }, audio = await workbench.
|
|
96
|
+
const expected = { identity, version: now.version }, audio = await workbench.production.inspectAudio(assetId, expected, controller.signal)
|
|
96
97
|
if (!current() || controller.signal.aborted) return
|
|
97
|
-
const request: DocumentTranscriptionRequest = { intent: `transcription_${
|
|
98
|
-
await session.start(request, () => workbench.
|
|
98
|
+
const request: DocumentTranscriptionRequest = { intent: `transcription_${randomUUID()}`, source: { documentId: now.content.id, version: now.version, fingerprint: now.fingerprint }, assetId, audioSha256: audio.inspection.sha256, engine, lang: now.content.metadata.lang, confirmed: true }
|
|
99
|
+
await session.start(request, () => workbench.production.startTranscription(request, expected))
|
|
99
100
|
} catch (error) { if (current() && !controller.signal.aborted) setFailure(transcriptionFailure(error, locale)) }
|
|
100
101
|
finally { if (inspectionRequest.current === controller) { inspectionRequest.current = undefined; if (current()) setInspecting(false) } }
|
|
101
102
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { useEffect, useRef
|
|
1
|
+
import { useEffect, useRef } from 'react'
|
|
2
2
|
import { hasRole } from '@lincyaw/kernel'
|
|
3
|
-
import { PmButton, PmNotice,
|
|
3
|
+
import { PmButton, PmNotice, PmSkeleton } from '../components.tsx'
|
|
4
4
|
import { useMessages, useWorkbench, useWorkbenchState } from '../context.tsx'
|
|
5
5
|
import { DocumentEditor } from '../document-editor/DocumentEditor.tsx'
|
|
6
6
|
import { DOCUMENT_EDITOR_MESSAGES } from '../document-editor/messages.ts'
|
|
@@ -9,11 +9,10 @@ import { DocumentBlockPreview } from '../document-editor/DocumentBlockPreview.ts
|
|
|
9
9
|
import { nativeEditingCursor } from '../document-editor/selection.ts'
|
|
10
10
|
import { hasBlockPreview } from '../document-editor/projection.ts'
|
|
11
11
|
import type { NativeDocumentEditor } from '../document-editor/schema.tsx'
|
|
12
|
-
import { isAgentChanging } from '../workbench.ts'
|
|
13
|
-
import { EditorChangeTrail } from './ChangeTrail.tsx'
|
|
12
|
+
import { isAgentChanging } from '../workbench-state.ts'
|
|
14
13
|
|
|
15
14
|
/** Source editing is available before the first successful runtime compilation. */
|
|
16
|
-
export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore }: { commentsPortal?: HTMLElement | null, onCommentDraftRestore?(): void }) {
|
|
15
|
+
export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore, onOpenComments }: { commentsPortal?: HTMLElement | null, onCommentDraftRestore?(): void, onOpenComments?(): void }) {
|
|
17
16
|
const workbench = useWorkbench(), t = useMessages()
|
|
18
17
|
const source = useWorkbenchState(state => state.authoring)
|
|
19
18
|
const sourceAcknowledged = () => {
|
|
@@ -26,23 +25,16 @@ export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore }: {
|
|
|
26
25
|
const navigation = useWorkbenchState(state => state.documentNavigation)
|
|
27
26
|
const readOnly = useWorkbenchState(state => state.mode !== 'editing' || workbench.client.capabilities?.readOnly === true || Boolean(state.authoring?.member && !hasRole(state.authoring.member, 'editor')) || Boolean(state.authoring?.loading) || isAgentChanging(state))
|
|
28
27
|
const container = useRef<HTMLElement>(null)
|
|
29
|
-
const sheet = useRef<HTMLDivElement>(null)
|
|
30
28
|
const consumedNavigation = useRef<string>()
|
|
31
29
|
const bodyEditor = useRef<NativeDocumentEditor>()
|
|
32
30
|
const editingPosition = useRef<{ nativeBlockId: string, sectionId: string, position: number, editor: NativeDocumentEditor, identity: string, reset: number | undefined }>()
|
|
33
31
|
const cancelReading = useRef<() => void>()
|
|
34
|
-
const [selectedDraft, setSelectedDraft] = useState('')
|
|
35
|
-
const drafts = source?.recoveryDrafts ?? []
|
|
36
|
-
const draftKey = (value: { id: string, revision: number, token: string }) => JSON.stringify([value.id, value.revision, value.token])
|
|
37
|
-
const draft = drafts.find(value => draftKey(value) === selectedDraft)
|
|
38
|
-
useEffect(() => { setSelectedDraft('') }, [source?.identity])
|
|
39
|
-
const recoveryDisabled = readOnly || source?.saving || source?.composing || source?.recovering
|
|
40
32
|
useEffect(() => {
|
|
41
33
|
const element = container.current
|
|
42
|
-
if (element && source?.identity && source.content) return workbench.
|
|
34
|
+
if (element && source?.identity && source.content) return workbench.editing.attachViewport(element, source.identity)
|
|
43
35
|
}, [workbench, source?.identity, Boolean(source?.content)])
|
|
44
36
|
// The editor applies `readOnly` while committing, so it is editable by the time this runs.
|
|
45
|
-
useEffect(() => { if (!readOnly) workbench.
|
|
37
|
+
useEffect(() => { if (!readOnly) workbench.editing.editorEditable() }, [workbench, readOnly])
|
|
46
38
|
useEffect(() => {
|
|
47
39
|
if (!navigation) return
|
|
48
40
|
const request = JSON.stringify([source?.identity, navigation.request])
|
|
@@ -71,7 +63,7 @@ export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore }: {
|
|
|
71
63
|
const viewport = measure(), state = workbench.getState()
|
|
72
64
|
if (gesture.generation !== state.documentPositionToken || !sameGeometry(gesture.viewport, viewport) || gesture.viewport.top !== viewport.top) return
|
|
73
65
|
if (!state.authoring?.loading && !isAgentChanging(state)) {
|
|
74
|
-
const field = workbench.
|
|
66
|
+
const field = workbench.editing.focusedField(), root = field?.editor.prosemirrorView.dom.getRootNode()
|
|
75
67
|
if (field && root instanceof ShadowRoot && element.contains(root.host)) {
|
|
76
68
|
try {
|
|
77
69
|
const point = field.editor.prosemirrorView.coordsAtPos(field.editor.prosemirrorState.selection.head), bounds = element.getBoundingClientRect()
|
|
@@ -115,17 +107,17 @@ export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore }: {
|
|
|
115
107
|
const scroll = (event: Event) => {
|
|
116
108
|
const viewport = measure(), previous = baseline
|
|
117
109
|
baseline = viewport
|
|
118
|
-
if (workbench.
|
|
110
|
+
if (workbench.editing.consumeReturnScroll(element)) { cancel(); return }
|
|
119
111
|
// Native scroll chaining from an iframe has no parent wheel event.
|
|
120
112
|
if (!event.isTrusted) return
|
|
121
113
|
if (!sameGeometry(previous, viewport)) { cancel(); return }
|
|
122
114
|
if (viewport.top === previous.top) return
|
|
123
|
-
workbench.
|
|
115
|
+
workbench.editing.interact()
|
|
124
116
|
queue(viewport)
|
|
125
117
|
}
|
|
126
118
|
const interact = (event: Event) => {
|
|
127
119
|
if (!event.isTrusted) return
|
|
128
|
-
workbench.
|
|
120
|
+
workbench.editing.interact()
|
|
129
121
|
baseline = measure()
|
|
130
122
|
queue(baseline)
|
|
131
123
|
}
|
|
@@ -136,7 +128,7 @@ export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore }: {
|
|
|
136
128
|
if (['Home', 'End'].includes(event.key) && target instanceof HTMLElement && target.isContentEditable && !event.ctrlKey && !event.metaKey) return
|
|
137
129
|
interact(event)
|
|
138
130
|
}
|
|
139
|
-
const pointer = () => { cancel(); workbench.
|
|
131
|
+
const pointer = () => { cancel(); workbench.editing.interact() }
|
|
140
132
|
element.addEventListener('scroll', scroll, { passive: true })
|
|
141
133
|
element.addEventListener('wheel', interact, { passive: true })
|
|
142
134
|
element.addEventListener('touchmove', interact, { passive: true })
|
|
@@ -156,29 +148,17 @@ export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore }: {
|
|
|
156
148
|
const error = source?.error === 'document-version-changed' || source?.error === 'document-identity-changed' ? messages.conflict
|
|
157
149
|
: source?.error ? messages.saveFailure : undefined
|
|
158
150
|
return <section ref={container} className="pmw-source-document" aria-label={t.documentEditor} aria-busy={source?.loading || undefined}>
|
|
159
|
-
{Boolean(positionFailure || source?.storageFailure || source?.
|
|
151
|
+
{Boolean(positionFailure || source?.storageFailure || source?.restored || error) && <div className="pmw-source-document__notices">
|
|
160
152
|
{positionFailure && <PmNotice tone="warn">{t.documentPositionRemoved}</PmNotice>}
|
|
161
|
-
{
|
|
162
|
-
{Boolean(drafts.length || source?.recoveryChanged) && <PmNotice tone="accent"><div className="pmw-source-document__recovery">
|
|
163
|
-
<span>{source?.recoveryChanged ? t.documentDraftChanged : t.documentDraftFound}</span>
|
|
164
|
-
<PmSelect label={t.documentDraftSelect} value={draft ? selectedDraft : ''} disabled={Boolean(recoveryDisabled)} onChange={event => setSelectedDraft(event.currentTarget.value)}>
|
|
165
|
-
<option value="">{t.documentDraftChoose}</option>
|
|
166
|
-
{drafts.map((value, index) => <option key={draftKey(value)} value={draftKey(value)}>{t.documentDraftOption(index + 1, new Intl.DateTimeFormat(locale, { month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' }).format(value.updatedAt), value.source)}</option>)}
|
|
167
|
-
</PmSelect>
|
|
168
|
-
<div className="pmw-source-document__recovery-actions">
|
|
169
|
-
<PmButton small variant="primary" disabled={!draft || Boolean(recoveryDisabled)} onClick={() => { if (draft && source?.identity) void workbench.recoverDocumentDraft(draft, source.identity) }}>{t.documentDraftRestore}</PmButton>
|
|
170
|
-
<PmButton small disabled={!draft || Boolean(recoveryDisabled)} onClick={() => { if (draft && source?.identity) workbench.forgetDocumentDraft(draft, source.identity) }}>{t.narrationDiscard}</PmButton>
|
|
171
|
-
</div>
|
|
172
|
-
</div></PmNotice>}
|
|
153
|
+
{source?.storageFailure && <PmNotice tone="warn">{t.narrationRecoveryUnavailable}</PmNotice>}
|
|
173
154
|
{source?.restored && !error && <PmNotice tone="accent"><span>{messages.restored}</span><span className="pmw-notice__actions"><PmButton small onClick={() => void workbench.retryDocument()}>{t.retry}</PmButton><PmButton small onClick={() => void workbench.discardDocument()}>{t.narrationDiscard}</PmButton></span></PmNotice>}
|
|
174
155
|
{error && <PmNotice tone="danger"><span>{error}</span><span className="pmw-notice__actions"><PmButton small onClick={() => void workbench.retryDocument()}>{t.retry}</PmButton>{source?.dirty && <PmButton small onClick={() => void workbench.discardDocument()}>{t.narrationDiscard}</PmButton>}</span></PmNotice>}
|
|
175
156
|
</div>}
|
|
176
157
|
{source?.issues.length ? <div className="pmw-source-document__diagnostics"><PmNotice tone="warn"><details><summary>{messages.diagnostics(source.issues.length)}</summary><ul>{source.issues.map((issue, index) => <li key={`${issue.path}:${index}`}><code>{issue.path}</code> {issue.message}</li>)}</ul></details></PmNotice></div> : null}
|
|
177
158
|
{!source?.content || !source.identity ? source?.loading
|
|
178
159
|
? <div className="pmw-source-document__sheet pmw-source-document__sheet--loading"><PmSkeleton label={messages.loading} /></div>
|
|
179
|
-
: <PmNotice tone="warn"><span>{messages.unavailable}</span><span className="pmw-notice__actions"><PmButton small onClick={() => void workbench.retryDocument()}>{t.retry}</PmButton></span></PmNotice> : <div
|
|
180
|
-
<
|
|
181
|
-
<DocumentEditor acknowledged={sourceAcknowledged()} getDocumentAcknowledged={sourceAcknowledged} onCommentDraftRestore={onCommentDraftRestore} commentDrafts={workbench.documentCommentDrafts(source.identity)} identity={source.identity} document={source.content} version={source.version} member={source.member} getDocument={() => workbench.getDocument(source.identity)}
|
|
160
|
+
: <PmNotice tone="warn"><span>{messages.unavailable}</span><span className="pmw-notice__actions"><PmButton small onClick={() => void workbench.retryDocument()}>{t.retry}</PmButton></span></PmNotice> : <div className="pmw-source-document__sheet">
|
|
161
|
+
<DocumentEditor acknowledged={sourceAcknowledged()} getDocumentAcknowledged={sourceAcknowledged} onCommentDraftRestore={onCommentDraftRestore} onOpenComments={onOpenComments} commentDrafts={workbench.documentCommentDrafts(source.identity)} identity={source.identity} document={source.content} version={source.version} member={source.member} getDocument={() => workbench.getDocument(source.identity)}
|
|
182
162
|
getDocumentVersion={() => { const current = workbench.getState().authoring; return current && current.identity === source.identity && current.reset === source.reset ? current.version : undefined }} reset={source.reset} locale={locale} readOnly={readOnly}
|
|
183
163
|
uploadImage={(file, signal) => workbench.importDocumentImage(file, source.identity!, signal)}
|
|
184
164
|
getPositionToken={() => workbench.getState().documentPositionToken}
|
|
@@ -200,7 +180,7 @@ export function SourceDocumentPanel({ commentsPortal, onCommentDraftRestore }: {
|
|
|
200
180
|
commentsPortal={commentsPortal} onChange={document => workbench.recordDocument(document)} onReady={(editor, commands) => {
|
|
201
181
|
bodyEditor.current = editor
|
|
202
182
|
editingPosition.current = undefined
|
|
203
|
-
workbench.
|
|
183
|
+
workbench.editing.attachEditor(editor, commands, { identity: source.identity!, reset: source.reset })
|
|
204
184
|
}}
|
|
205
185
|
onEditingPosition={(position, editor) => {
|
|
206
186
|
const state = workbench.getState(), current = state.authoring
|
|
@@ -1,30 +1,19 @@
|
|
|
1
1
|
import { useEffect, useMemo, useRef, useState } from 'react'
|
|
2
|
-
import { prepareTranscriptionAdoption } from '@lincyaw/kernel'
|
|
2
|
+
import { prepareTranscriptionAdoption, randomUUID } from '@lincyaw/kernel'
|
|
3
3
|
import type { CanonicalSource, NarrationNode, TeachingDocument, TranscriptionRevision, TranscriptionAdoptionDraft, TranscriptionAdoptionPart, TranscriptionAdoptionPlan } from '@lincyaw/kernel'
|
|
4
4
|
import { PmBadge, PmButton, PmDialog, PmField, PmNotice, PmSelect, PmTextarea } from '../components.tsx'
|
|
5
5
|
import { useWorkbench, useWorkbenchState } from '../context.tsx'
|
|
6
6
|
import { NarrationEditor } from '../document-editor/NarrationEditor.tsx'
|
|
7
|
-
import { narrationToNative } from '../document-editor/narration.ts'
|
|
7
|
+
import { narrationToNative, nativeToNarration } from '../document-editor/narration.ts'
|
|
8
8
|
import type { NativeNarrationEditor } from '../document-editor/narration-schema.tsx'
|
|
9
9
|
import { TRANSCRIPTION_MESSAGES } from '../transcription-messages.ts'
|
|
10
|
+
import { transcriptionCorrectionKey } from '../transcription-drafts.ts'
|
|
11
|
+
import type { TranscriptionCorrection as Draft } from '../transcription-drafts.ts'
|
|
10
12
|
|
|
11
13
|
interface Props { identity: string, candidate: TranscriptionRevision, document: TeachingDocument, sectionId: string, stepId: string, disabled: boolean }
|
|
12
|
-
interface Draft { id: string, revision: number, nodes?: NarrationNode[], discarded: string[], shared: 'fork' | 'edit-shared', baseVersion?: string, applied?: boolean }
|
|
13
14
|
const ordered = (value: unknown): unknown => Array.isArray(value) ? value.map(ordered) : value && typeof value === 'object' ? Object.fromEntries(Object.keys(value).sort().map(key => [key, ordered((value as Record<string, unknown>)[key])])) : value
|
|
14
15
|
const same = (a: unknown, b: unknown) => JSON.stringify(ordered(a)) === JSON.stringify(ordered(b))
|
|
15
16
|
const displayed = (nodes: readonly NarrationNode[]) => nodes.map(node => node.type === 'text' ? node.text : node.type === 'pronunciation' ? node.display : '').join('')
|
|
16
|
-
function restore(key: string): { draft: Draft, failed: boolean } {
|
|
17
|
-
const fallback = () => ({ draft: { id: crypto.randomUUID(), revision: 0, discarded: [], shared: 'fork' as const }, failed: false })
|
|
18
|
-
try {
|
|
19
|
-
const raw = localStorage.getItem(key)
|
|
20
|
-
if (!raw) return fallback()
|
|
21
|
-
const value = JSON.parse(raw)
|
|
22
|
-
if (!value || typeof value.id !== 'string' || !Number.isSafeInteger(value.revision) || value.revision < 0 || !Array.isArray(value.discarded) || !value.discarded.every((key: unknown) => typeof key === 'string') || !['fork', 'edit-shared'].includes(value.shared)
|
|
23
|
-
|| value.baseVersion !== undefined && typeof value.baseVersion !== 'string' || value.applied !== undefined && typeof value.applied !== 'boolean'
|
|
24
|
-
|| value.nodes !== undefined && (!Array.isArray(value.nodes) || !value.nodes.every((node: NarrationNode) => node && (node.type === 'text' && typeof node.text === 'string' || node.type === 'pronunciation' && typeof node.display === 'string' && typeof node.spoken === 'string' || node.type === 'cue' && typeof node.id === 'string' && typeof node.action === 'string')))) throw new Error('invalid-draft')
|
|
25
|
-
return { draft: value, failed: false }
|
|
26
|
-
} catch { return { ...fallback(), failed: true } }
|
|
27
|
-
}
|
|
28
17
|
|
|
29
18
|
export function TranscriptionAdoption(props: Props) {
|
|
30
19
|
const locale = useWorkbenchState(state => state.locale), t = TRANSCRIPTION_MESSAGES[locale]
|
|
@@ -41,11 +30,27 @@ export function TranscriptionAdoption(props: Props) {
|
|
|
41
30
|
|
|
42
31
|
function AdoptionTarget({ identity, candidate, document, sectionId, stepId, disabled, narrationId, segments }: Props & { narrationId?: string, segments: string[] }) {
|
|
43
32
|
const workbench = useWorkbench(), locale = useWorkbenchState(state => state.locale), t = TRANSCRIPTION_MESSAGES[locale], source = useWorkbenchState(state => state.authoring)
|
|
44
|
-
const
|
|
45
|
-
const
|
|
33
|
+
const correctionTarget = useMemo(() => ({ identity, candidate: { id: candidate.transcriptionId, revision: candidate.revision }, stepId, narrationId, segmentIds: segments }), [identity, candidate.transcriptionId, candidate.revision, stepId, narrationId, JSON.stringify(segments)])
|
|
34
|
+
const correctionKey = transcriptionCorrectionKey(correctionTarget), key = `presmium.transcription-draft.v1:${correctionKey}`
|
|
35
|
+
const [restored] = useState(() => workbench.production.transcriptionCorrection(correctionTarget)), [draft, setDraft] = useState(restored.draft), latest = useRef(draft)
|
|
46
36
|
const [storageFailed, setStorageFailed] = useState(restored.failed), [composing, setComposing] = useState(false)
|
|
47
37
|
const [plan, setPlan] = useState<TranscriptionAdoptionPlan>(), [reviewing, setReviewing] = useState(false), [applying, setApplying] = useState(false), [open, setOpen] = useState(false), [failure, setFailure] = useState<string>(), [status, setStatus] = useState<string>()
|
|
48
|
-
const editor = useRef<NativeNarrationEditor>(), generation = useRef(0)
|
|
38
|
+
const editor = useRef<NativeNarrationEditor>(), generation = useRef(0), interaction = useRef({ composing: false, pending: false }), unavailable = useRef(false)
|
|
39
|
+
unavailable.current = disabled || reviewing || applying || open
|
|
40
|
+
useEffect(() => workbench.production.registerDraftView({ identity, kind: 'transcription', has: target => target === correctionKey,
|
|
41
|
+
blocked: () => interaction.current.composing || interaction.current.pending || unavailable.current,
|
|
42
|
+
clear: () => {
|
|
43
|
+
generation.current++
|
|
44
|
+
const value = workbench.production.transcriptionCorrection(correctionTarget)
|
|
45
|
+
latest.current = value.draft; setDraft(value.draft); setStorageFailed(value.failed)
|
|
46
|
+
setPlan(undefined); setOpen(false); setFailure(undefined); setStatus(undefined)
|
|
47
|
+
} }), [workbench, identity, correctionKey])
|
|
48
|
+
useEffect(() => { workbench.refreshAuthoringClientControls() }, [workbench, disabled, reviewing, applying, open])
|
|
49
|
+
const busy = (value: boolean) => { interaction.current.pending = value; workbench.refreshAuthoringClientControls() }
|
|
50
|
+
const composition = (value: boolean) => {
|
|
51
|
+
if (interaction.current.composing === value) return
|
|
52
|
+
interaction.current.composing = value; setComposing(value); workbench.refreshAuthoringClientControls()
|
|
53
|
+
}
|
|
49
54
|
useEffect(() => () => { generation.current++ }, [])
|
|
50
55
|
const binding: CanonicalSource = { documentId: document.id, version: source?.version ?? '', fingerprint: source?.fingerprint ?? '' }
|
|
51
56
|
const references = narrationId ? Object.values(document.steps).filter(step => step.narrationIds.includes(narrationId)).map(step => step.id) : []
|
|
@@ -76,46 +81,47 @@ function AdoptionTarget({ identity, candidate, document, sectionId, stepId, disa
|
|
|
76
81
|
generation.current++
|
|
77
82
|
const next = { ...latest.current, ...patch, revision: latest.current.revision + 1, applied: false }
|
|
78
83
|
latest.current = next; setDraft(next); setPlan(undefined); setFailure(undefined); setStatus(undefined)
|
|
79
|
-
|
|
84
|
+
setStorageFailed(!workbench.production.keepTranscriptionCorrection(correctionTarget, next))
|
|
80
85
|
}
|
|
81
86
|
const pause = () => { workbench.stopAuditions(); void workbench.pausePlayback().catch(() => {}) }
|
|
82
87
|
const preview = async () => {
|
|
83
88
|
const now = workbench.getState().authoring
|
|
84
89
|
if (disabled || reviewing || applying || composing || !sourceReady || !now?.version || !now.fingerprint || parsed.invalid) return
|
|
85
90
|
pause()
|
|
86
|
-
if (latest.current.baseVersion && latest.current.baseVersion !== now.version) change({ id:
|
|
91
|
+
if (latest.current.baseVersion && latest.current.baseVersion !== now.version) change({ id: randomUUID(), baseVersion: now.version })
|
|
87
92
|
else if (!latest.current.baseVersion) change({ baseVersion: now.version })
|
|
88
93
|
const value = latest.current, request = ++generation.current, normalized = content()
|
|
89
94
|
const retainsOriginal = references.length > 1 && value.shared === 'fork'
|
|
90
95
|
const removeCueTimings = atoms.filter(atom => value.discarded.includes(atom.key) && atom.node.type === 'cue' && !retainsOriginal && Object.hasOwn(document.production.cueTimings ?? {}, atom.node.id)).map(atom => (atom.node as Extract<NarrationNode, { type: 'cue' }>).id)
|
|
91
96
|
const sent: TranscriptionAdoptionDraft = { id: value.id, source: { documentId: document.id, version: now.version, fingerprint: now.fingerprint }, candidate: { id: candidate.transcriptionId, revision: candidate.revision }, draftRevision: value.revision, targets: [{ ...target, content: normalized.parts, discardAtoms: value.discarded.filter(key => atoms.some(atom => atom.key === key)) }], ...removeCueTimings.length ? { removeCueTimings } : {} }
|
|
92
|
-
setReviewing(true); setFailure(undefined)
|
|
97
|
+
busy(true); setReviewing(true); setFailure(undefined)
|
|
93
98
|
try {
|
|
94
|
-
const answer = await workbench.
|
|
99
|
+
const answer = await workbench.production.planTranscription(sent, { identity, version: now.version })
|
|
95
100
|
if (request !== generation.current || latest.current.revision !== sent.draftRevision) return
|
|
96
101
|
setPlan(answer); setOpen(true)
|
|
97
102
|
} catch { if (request === generation.current) setFailure(t.previewFailed) }
|
|
98
|
-
finally { setReviewing(false) }
|
|
103
|
+
finally { busy(false); setReviewing(false) }
|
|
99
104
|
}
|
|
100
105
|
const apply = async () => {
|
|
101
106
|
if (!plan?.planId || !planCurrent || plan.conflicts.length || plan.draftRevision !== latest.current.revision || composing || applying || !sourceReady) return
|
|
102
|
-
const sent = plan, planId = plan.planId
|
|
103
|
-
setApplying(true); setFailure(undefined)
|
|
107
|
+
const sent = plan, planId = plan.planId, expected = latest.current, request = ++generation.current
|
|
108
|
+
busy(true); setApplying(true); setFailure(undefined)
|
|
104
109
|
try {
|
|
105
|
-
const answer = await workbench.
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
110
|
+
const answer = await workbench.production.adoptTranscription({ planId, source: sent.source, candidate: sent.candidate, draftRevision: sent.draftRevision }, { identity, version: sent.source.version })
|
|
111
|
+
const next: Draft = { ...expected, id: randomUUID(), revision: 0, discarded: [], baseVersion: answer.version, applied: true }
|
|
112
|
+
const completed = workbench.production.completeTranscriptionCorrection(correctionTarget, expected, next)
|
|
113
|
+
if (request !== generation.current) return
|
|
114
|
+
if (completed) { latest.current = next; setDraft(next) }
|
|
115
|
+
setStorageFailed(!completed)
|
|
111
116
|
setPlan(undefined); setOpen(false); setStatus(t.adopted)
|
|
112
117
|
} catch { setFailure(t.applyFailed) }
|
|
113
|
-
finally { setApplying(false) }
|
|
118
|
+
finally { busy(false); setApplying(false) }
|
|
114
119
|
}
|
|
115
120
|
if (!displayed(nodes).trim() && !atoms.length) return <span>{t.empty}</span>
|
|
116
121
|
return <>
|
|
117
|
-
<PmField label={t.text} group><NarrationEditor identity={key}
|
|
118
|
-
|
|
122
|
+
<PmField label={t.text} group><NarrationEditor identity={key} fieldId={original?.outputNarrationId ?? draft.id} content={nodes} getContent={() => latest.current.nodes ?? nodes} locale={locale} advanced={false} readOnly={disabled || applying}
|
|
123
|
+
toNative={value => narrationToNative(original?.outputNarrationId ?? draft.id, value)} fromNative={nativeToNarration}
|
|
124
|
+
onReady={value => { editor.current = value }} onComposition={composition} onFocus={pause} onChange={value => {
|
|
119
125
|
const used = new Set<string>()
|
|
120
126
|
for (const node of value) { const atom = atoms.find(atom => !used.has(atom.key) && same(atom.node, node)); if (atom) used.add(atom.key) }
|
|
121
127
|
change({ nodes: value, discarded: latest.current.discarded.filter(key => !used.has(key)) })
|
|
@@ -40,9 +40,10 @@ function RecordingSlot({ label, hint, value, disabled, onChange }: { label: stri
|
|
|
40
40
|
const capturing = ['requesting', 'recording', 'stopping'].includes(state.phase)
|
|
41
41
|
const start = () => {
|
|
42
42
|
setFailure(undefined)
|
|
43
|
-
void recording.start(async
|
|
43
|
+
void recording.start(async signal => {
|
|
44
44
|
workbench.stopAuditions()
|
|
45
45
|
await workbench.pausePlayback()
|
|
46
|
+
signal.throwIfAborted()
|
|
46
47
|
return workbench.registerAudioCapture(() => recording.stop())
|
|
47
48
|
})
|
|
48
49
|
}
|
|
@@ -8,7 +8,7 @@ import type { DocumentVoiceScope } from '../document-voices.ts'
|
|
|
8
8
|
import { VOICE_MESSAGES, voiceFailure } from '../voice-messages.ts'
|
|
9
9
|
import { prepareVoiceSnapshot, runtimeVoiceScope, voiceSnapshotCurrent } from '../voice-snapshot.ts'
|
|
10
10
|
import type { VoiceSnapshot } from '../voice-snapshot.ts'
|
|
11
|
-
import { isAgentChanging } from '../workbench.ts'
|
|
11
|
+
import { isAgentChanging } from '../workbench-state.ts'
|
|
12
12
|
import { VoiceScopeField } from './VoiceScopeField.tsx'
|
|
13
13
|
|
|
14
14
|
interface CheckedVoice { snapshot: VoiceSnapshot, document: TeachingDocument }
|
package/src/places.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { irBlocks } from '@lincyaw/kernel'
|
|
2
|
-
import type { IRDocument, PreviewAnchor, ReviewChange, SourcePos
|
|
2
|
+
import type { IRDocument, PreviewAnchor, ReviewChange, SourcePos } from '@lincyaw/kernel'
|
|
3
3
|
|
|
4
4
|
const CHANGED_PLACES = 100
|
|
5
5
|
|
|
@@ -65,38 +65,3 @@ export function changedPlaces(doc: IRDocument, changes: readonly ReviewChange[])
|
|
|
65
65
|
}
|
|
66
66
|
return [...places.values()].slice(0, CHANGED_PLACES)
|
|
67
67
|
}
|
|
68
|
-
|
|
69
|
-
/**
|
|
70
|
-
* The places that differ between two versions of a document: each block whose content changed or that is new (with
|
|
71
|
-
* its page), each page whose title changed or that is new, and the block of each step whose narration or settings
|
|
72
|
-
* changed, at most CHANGED_PLACES.
|
|
73
|
-
*/
|
|
74
|
-
export function changedBlocks(before: TeachingDocument, after: TeachingDocument): PreviewAnchor[] {
|
|
75
|
-
const places: PreviewAnchor[] = []
|
|
76
|
-
const visit = (section: string, ids: readonly string[]) => {
|
|
77
|
-
for (const id of ids) {
|
|
78
|
-
const block = after.blocks[id]
|
|
79
|
-
if (!block) continue
|
|
80
|
-
if (JSON.stringify(block) !== JSON.stringify(before.blocks[id])) places.push({ section, block: id })
|
|
81
|
-
if ('children' in block && Array.isArray(block.children)) visit(section, block.children as string[])
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
for (const id of after.sectionOrder) {
|
|
85
|
-
const section = after.sections[id]
|
|
86
|
-
if (!section) continue
|
|
87
|
-
if (before.sections[id]?.title !== section.title) places.push({ section: id })
|
|
88
|
-
visit(id, section.children)
|
|
89
|
-
}
|
|
90
|
-
// A changed step, or a changed narration of it, shows at the block the step plays (else at its page).
|
|
91
|
-
const seen = new Set(places.map(place => `${place.section}\0${place.block ?? ''}`))
|
|
92
|
-
for (const step of Object.values(after.steps)) {
|
|
93
|
-
const narrated = step.narrationIds.some(id => JSON.stringify(after.narrations[id]) !== JSON.stringify(before.narrations[id]))
|
|
94
|
-
if (!narrated && JSON.stringify(step) === JSON.stringify(before.steps[step.id])) continue
|
|
95
|
-
// the component the step plays, where its narration shows, else any block it shows
|
|
96
|
-
const block = step.visuals.find(visual => after.blocks[visual.blockId]?.type === 'component')?.blockId ?? step.visuals.find(visual => visual.visible)?.blockId ?? step.visuals[0]?.blockId
|
|
97
|
-
const place = { section: step.sectionId, ...block ? { block } : {} }
|
|
98
|
-
const key = `${place.section}\0${place.block ?? ''}`
|
|
99
|
-
if (!seen.has(key)) { seen.add(key); places.push(place) }
|
|
100
|
-
}
|
|
101
|
-
return places.slice(0, CHANGED_PLACES)
|
|
102
|
-
}
|
package/src/preview-playback.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { PreviewReport } from '@lincyaw/kernel'
|
|
2
|
-
import type { PreviewSink } from './workbench.ts'
|
|
2
|
+
import type { PreviewSink } from './workbench-state.ts'
|
|
3
3
|
|
|
4
4
|
interface PlaybackContext { document?: string, scope: number, sinks: ReadonlySet<PreviewSink> }
|
|
5
5
|
interface PendingPause {
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { AuthoringClientAction, AuthoringClientActionResult } from '@lincyaw/kernel'
|
|
2
|
+
import { authoringDraftFragment, draftContentHash } from './authoring-draft-fragment.ts'
|
|
3
|
+
import type { DocumentProduction } from './document-production.ts'
|
|
4
|
+
|
|
5
|
+
/** Explicit reads use the native pending values; discard never submits production changes. */
|
|
6
|
+
export async function executeProductionDraftAction(owner: DocumentProduction, action: Extract<AuthoringClientAction, { type: `production-drafts.${string}` }>, signal: AbortSignal, owned: () => void, fits: (value: AuthoringClientActionResult) => boolean): Promise<AuthoringClientActionResult> {
|
|
7
|
+
const snapshot = owner.productionDraftSnapshot()
|
|
8
|
+
const guard = () => { signal.throwIfAborted(); owned(); snapshot.guard() }
|
|
9
|
+
const values = await Promise.all(snapshot.candidates.map(async candidate => ({ candidate, metadata: { ...candidate.metadata, draft: await draftContentHash(JSON.stringify([snapshot.stamp, candidate.key])) } })))
|
|
10
|
+
guard()
|
|
11
|
+
if (action.type === 'production-drafts.inspect') {
|
|
12
|
+
const token = await draftContentHash(JSON.stringify([snapshot.coverage, values.map(value => value.metadata)]))
|
|
13
|
+
guard()
|
|
14
|
+
if (action.cursor && action.cursor.token !== token) throw new Error('client-production-drafts-changed')
|
|
15
|
+
const start = action.cursor ? values.findIndex(value => value.metadata.draft === action.cursor!.after) + 1 : 0
|
|
16
|
+
if (action.cursor && !start) throw new Error('client-production-drafts-changed')
|
|
17
|
+
const result: Extract<AuthoringClientActionResult, { type: 'production-drafts.inspect' }> = { type: action.type, family: 'production', coverage: snapshot.coverage, token, drafts: [] }
|
|
18
|
+
for (const value of values.slice(start, start + (action.limit ?? 10))) {
|
|
19
|
+
const next = { ...result, drafts: [...result.drafts, value.metadata], ...start + result.drafts.length + 1 < values.length ? { next: { after: value.metadata.draft, token } } : {} }
|
|
20
|
+
if (!fits(next)) break
|
|
21
|
+
result.drafts.push(value.metadata)
|
|
22
|
+
}
|
|
23
|
+
if (start < values.length && !result.drafts.length) throw new Error('client-production-metadata-too-large')
|
|
24
|
+
if (start + result.drafts.length < values.length) result.next = { after: result.drafts.at(-1)!.draft, token }
|
|
25
|
+
if (!fits(result)) throw new Error('client-production-metadata-too-large')
|
|
26
|
+
guard(); return result
|
|
27
|
+
}
|
|
28
|
+
const selected = values.filter(value => value.metadata.draft === action.draft)
|
|
29
|
+
if (selected.length !== 1) throw new Error('client-production-drafts-changed')
|
|
30
|
+
const candidate = selected[0]!.candidate
|
|
31
|
+
if (action.type === 'production-drafts.read') return authoringDraftFragment({ text: JSON.stringify({ kind: candidate.metadata.kind, stepId: candidate.metadata.stepId, ...candidate.metadata.field ? { field: candidate.metadata.field } : {}, value: candidate.value }),
|
|
32
|
+
base: { type: action.type, family: 'production', draft: action.draft, format: 'presmium-production-draft-json-v1' }, offset: action.offset, maxChars: action.maxChars }, guard, fits)
|
|
33
|
+
const result: AuthoringClientActionResult = { type: action.type, family: 'production', draft: action.draft, discarded: true }
|
|
34
|
+
if (!fits(result)) throw new Error('client-production-result-too-large')
|
|
35
|
+
guard(); candidate.discard(); signal.throwIfAborted(); owned()
|
|
36
|
+
return result
|
|
37
|
+
}
|
|
@@ -57,6 +57,9 @@ const zh = {
|
|
|
57
57
|
alignmentStatus: { manual: '手动时间', words: '词时码', proportional: '比例估时', none: '未对齐' },
|
|
58
58
|
segmentStatus: { recorded: '原音频', cached: '已有配音', silent: '静音', missing: '配音待生成', blocked: '暂不可用' },
|
|
59
59
|
waveformLoading: '正在加载波形…', waveformUnavailable: '波形不可用', stepNumber: (index: number) => `步骤 ${index + 1}`,
|
|
60
|
+
notInLecture: '不在讲授中', notInLectureHint: '这一页的内容都限定在其他形态,又没有讲稿与音频,讲授视频中没有这一页。',
|
|
61
|
+
notInLectureStep: '这一步不在讲授中:它的内容都限定在其他形态,又没有讲稿与音频。',
|
|
62
|
+
captionSize: '字幕大小', captionSizeHint: '整个文稿的字幕:放映中显示的与导出视频中烧录的都按这个大小。',
|
|
60
63
|
timelineLabels: { position: '位置', seconds: '秒', seek: '播放头位置', zoomIn: '放大时间线', zoomOut: '缩小时间线', fit: '适配本页', estimated: '估计时长', unknown: '时长未知', loading: '正在加载时间线…', empty: '当前页暂无时间线片段', seekHint: '选择步骤,或用时间尺、方向键和精确时间定位;定位会先暂停播放。', invalidPosition: '请输入本页时长范围内的秒数。' },
|
|
61
64
|
failures: {
|
|
62
65
|
'production-source-changed': '文稿已更新,旧播放请求已停止。请重新准备当前版本。',
|
|
@@ -129,6 +132,9 @@ export const PRODUCTION_MESSAGES: Record<Locale, typeof zh> = {
|
|
|
129
132
|
alignmentStatus: { manual: 'Manual timing', words: 'Word timing', proportional: 'Proportional timing', none: 'Unaligned' },
|
|
130
133
|
segmentStatus: { recorded: 'Original audio', cached: 'Voiceover cached', silent: 'Silent', missing: 'Voiceover needed', blocked: 'Unavailable' },
|
|
131
134
|
waveformLoading: 'Loading waveform…', waveformUnavailable: 'Waveform unavailable', stepNumber: index => `Step ${index + 1}`,
|
|
135
|
+
notInLecture: 'Not in the lecture', notInLectureHint: 'Everything on this page is limited to other forms and it has no script or audio, so the lecture video leaves it out.',
|
|
136
|
+
notInLectureStep: 'This step is not in the lecture: everything on it is limited to other forms and it has no script or audio.',
|
|
137
|
+
captionSize: 'Caption size', captionSizeHint: 'For the whole document: captions shown in the presentation and burned into an exported video use this size.',
|
|
132
138
|
timelineLabels: { position: 'Position', seconds: 'seconds', seek: 'Playhead position', zoomIn: 'Zoom In Timeline', zoomOut: 'Zoom Out Timeline', fit: 'Fit Page', estimated: 'Estimated duration', unknown: 'Unknown duration', loading: 'Loading the timeline…', empty: 'This page has no timeline segments', seekHint: 'Select a step, or use the ruler, arrow keys, or an exact time to seek. Seeking pauses playback first.', invalidPosition: 'Enter a time in seconds within this page’s duration.' },
|
|
133
139
|
failures: {
|
|
134
140
|
'production-source-changed': 'The document changed and the old playback request stopped. Prepare the current version.',
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { PreviewReport, ProductionBinding, ProductionPlaybackCommand, ProductionPlaybackState } from '@lincyaw/kernel'
|
|
2
2
|
import { sameProductionBinding } from '@lincyaw/kernel'
|
|
3
|
-
import type { PreviewSink } from './workbench.ts'
|
|
3
|
+
import type { PreviewSink } from './workbench-state.ts'
|
|
4
4
|
|
|
5
5
|
interface Context {
|
|
6
6
|
document?: string
|