@thunderkiller/video-clipper 1.8.0 → 1.10.0

package/dist/app/web/lib/services/publishing/uploadService.js

@@ -1,5 +1,6 @@
 import { promises as fs } from 'fs';
-import { createArtifactId, getPublishDraft, saveUploadArtifacts, } from '../../../lib/services/artifacts/artifactStore.js';
+import { createArtifactId, saveUploadArtifacts, } from '../../../lib/services/artifacts/artifactStore.js';
+import { loadAndRefreshPublishDraft } from '../../../lib/services/publishing/draftService.js';
 import { getAuthorizedYouTubeAuthState } from '../../../lib/services/youtube/uploadAuth.js';
 import { UploadArtifactSchema, } from '../../../types/publish.js';
 import { log } from '../../../../../lib/utils/logger.js';
@@ -7,13 +8,20 @@ const YOUTUBE_UPLOAD_URL = 'https://www.googleapis.com/upload/youtube/v3/videos?
 const YOUTUBE_THUMBNAILS_URL = 'https://www.googleapis.com/upload/youtube/v3/thumbnails/set';
 const YOUTUBE_PLAYLIST_ITEMS_URL = 'https://www.googleapis.com/youtube/v3/playlistItems?part=snippet';
 export async function uploadDraftClips(input, cfg, requestId, callbacks) {
-    const done = log.fnCalled('uploadDraftClips', { analysisId: input.analysisId }, requestId);
-    const draft = await getPublishDraft(cfg.OUTPUT_DIR, input.analysisId);
+    const done = log.fnCalled('uploadDraftClips', requestId, { analysisId: input.analysisId });
+    const draft = await loadAndRefreshPublishDraft(input.analysisId, cfg, requestId);
     if (!draft) {
-        log.warn(`${requestId ?? 'no-request-id'} [publish-upload] [draft] | analysisId=${input.analysisId} status=missing`);
+        log.warn('uploadDraftClips', '[draft] draft missing', requestId, {
+            analysisId: input.analysisId,
+            status: 'missing',
+        });
         throw new Error('Save a publish draft before uploading clips.');
     }
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [draft] | analysisId=${draft.analysisId} totalItems=${draft.items.length} titleLength=${draft.title.length}`);
+    log.info('uploadDraftClips', '[draft]', requestId, {
+        analysisId: draft.analysisId,
+        totalItems: draft.items.length,
+        titleLength: draft.title.length,
+    });
     const auth = await getAuthorizedYouTubeAuthState(requestId);
     const selectedItems = draft.items.filter((item) => {
         if (input.clipArtifactIds?.length) {
@@ -22,10 +30,19 @@ export async function uploadDraftClips(input, cfg, requestId, callbacks) {
         return item.selected;
     });
     if (selectedItems.length === 0) {
-        log.warn(`${requestId ?? 'no-request-id'} [publish-upload] [selection] | analysisId=${input.analysisId} selected=0 requestedClips=${input.clipArtifactIds?.length ?? 0}`);
+        log.warn('uploadDraftClips', '[selection] no clips selected', requestId, {
+            analysisId: input.analysisId,
+            selected: 0,
+            requestedClips: input.clipArtifactIds?.length ?? 0,
+        });
         throw new Error('Select at least one prepared clip before uploading.');
     }
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [selection] | analysisId=${input.analysisId} selected=${selectedItems.length} authMode=${auth.authMode} channelId=${auth.channel.channelId}`);
+    log.info('uploadDraftClips', '[selection]', requestId, {
+        analysisId: input.analysisId,
+        selected: selectedItems.length,
+        authMode: auth.authMode,
+        channelId: auth.channel.channelId,
+    });
     const uploads = [];
     for (const item of selectedItems) {
         callbacks?.onUploadStarted?.(item);
@@ -41,28 +58,45 @@ export async function uploadDraftClips(input, cfg, requestId, callbacks) {
     const saved = await saveUploadArtifacts(uploads, cfg.OUTPUT_DIR);
     const uploaded = uploads.filter((u) => u.status === 'uploaded').length;
     const failed = uploads.length - uploaded;
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [persisted] | analysisId=${input.analysisId} uploaded=${uploaded} failed=${failed} savedArtifacts=${saved.length}`);
+    log.info('uploadDraftClips', '[persisted]', requestId, {
+        analysisId: input.analysisId,
+        uploaded,
+        failed,
+        savedArtifacts: saved.length,
+    });
     done({ uploaded, total: uploads.length });
     return saved;
 }
 async function uploadSingleClip(item, analysisId, videoId, auth, requestId) {
-    const done = log.fnCalled('uploadSingleClip', { clip: item.filename }, requestId);
+    const done = log.fnCalled('uploadSingleClip', requestId, { clip: item.filename });
     const createdAt = new Date().toISOString();
     const startedAt = Date.now();
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [clip-start] | clipArtifactId=${item.clipArtifactId} file=${item.filename} privacy=${item.privacyStatus} titleLength=${item.title.length}`);
+    log.info('uploadSingleClip', '[clip-start]', requestId, {
+        clipArtifactId: item.clipArtifactId,
+        file: item.filename,
+        privacy: item.privacyStatus,
+        titleLength: item.title.length,
+    });
     try {
         const uploaded = await uploadToYouTube(item, auth.accessToken, requestId);
         // Non-fatal post-upload steps: thumbnail + playlist
         if (item.thumbnailPath) {
             await uploadThumbnail(uploaded.videoId, item.thumbnailPath, auth.accessToken, requestId).catch((err) => {
                 const msg = err instanceof Error ? err.message : String(err);
-                log.warn(`${requestId ?? 'no-request-id'} [publish-upload] [thumbnail-failed] | clipArtifactId=${item.clipArtifactId} error=${msg}`);
+                log.warn('uploadSingleClip', '[thumbnail-failed]', requestId, {
+                    clipArtifactId: item.clipArtifactId,
+                    error: msg,
+                });
             });
         }
         if (item.playlistId) {
             await insertIntoPlaylist(uploaded.videoId, item.playlistId, auth.accessToken, requestId).catch((err) => {
                 const msg = err instanceof Error ? err.message : String(err);
-                log.warn(`${requestId ?? 'no-request-id'} [publish-upload] [playlist-insert-failed] | clipArtifactId=${item.clipArtifactId} playlistId=${item.playlistId} error=${msg}`);
+                log.warn('uploadSingleClip', '[playlist-insert-failed]', requestId, {
+                    clipArtifactId: item.clipArtifactId,
+                    playlistId: item.playlistId,
+                    error: msg,
+                });
             });
         }
         const artifact = UploadArtifactSchema.parse({
@@ -78,13 +112,22 @@ async function uploadSingleClip(item, analysisId, videoId, auth, requestId) {
             createdAt,
             updatedAt: new Date().toISOString(),
         });
-        log.info(`${requestId ?? 'no-request-id'} [publish-upload] [clip-success] | clipArtifactId=${item.clipArtifactId} youtubeVideoId=${uploaded.videoId} elapsedMs=${Date.now() - startedAt}`);
+        log.info('uploadSingleClip', '[clip-success]', requestId, {
+            clipArtifactId: item.clipArtifactId,
+            youtubeVideoId: uploaded.videoId,
+            elapsedMs: Date.now() - startedAt,
+        });
         done({ status: 'uploaded' });
         return artifact;
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        log.warn(`${requestId ?? 'no-request-id'} [publish-upload] [clip-failed] | clipArtifactId=${item.clipArtifactId} file=${item.filename} elapsedMs=${Date.now() - startedAt} error=${sanitizeLogValue(message)}`);
+        log.warn('uploadSingleClip', '[clip-failed]', requestId, {
+            clipArtifactId: item.clipArtifactId,
+            file: item.filename,
+            elapsedMs: Date.now() - startedAt,
+            error: sanitizeLogValue(message),
+        });
         const artifact = UploadArtifactSchema.parse({
             id: createArtifactId(`upload-${videoId}`),
             analysisId,
@@ -102,11 +145,37 @@ async function uploadSingleClip(item, analysisId, videoId, auth, requestId) {
     }
 }
 async function uploadToYouTube(item, accessToken, requestId) {
-    const file = await fs.readFile(item.path);
+    const file = await fs.readFile(item.editedPath ?? item.path);
     const boundary = `video-clipper-${Date.now()}`;
     const description = item.isShort && !item.description.includes('#Shorts')
         ? `${item.description}\n\n#Shorts`.trim()
         : item.description;
+    const scheduleMs = item.scheduledAt ? Date.parse(item.scheduledAt) : NaN;
+    const hasFutureSchedule = Number.isFinite(scheduleMs) && scheduleMs > Date.now() + 60_000;
+    if (item.scheduledAt && !hasFutureSchedule) {
+        log.warn('uploadToYouTube', '[schedule-stale]', requestId, {
+            clipArtifactId: item.clipArtifactId,
+            scheduledAt: item.scheduledAt,
+        });
+    }
+    if (hasFutureSchedule && item.privacyStatus !== 'private') {
+        log.info('uploadToYouTube', '[schedule-coerce]', requestId, {
+            clipArtifactId: item.clipArtifactId,
+            from: item.privacyStatus,
+            publishAt: item.scheduledAt,
+        });
+    }
+    const status = {
+        privacyStatus: hasFutureSchedule ? 'private' : item.privacyStatus,
+        selfDeclaredMadeForKids: item.selfDeclaredMadeForKids,
+        embeddable: item.embeddable,
+        license: item.license,
+        publicStatsViewable: item.publicStatsViewable,
+        containsSyntheticMedia: item.containsSyntheticMedia,
+    };
+    if (hasFutureSchedule) {
+        status.publishAt = item.scheduledAt;
+    }
     const metadata = {
         snippet: {
             title: item.title,
@@ -114,14 +183,7 @@ async function uploadToYouTube(item, accessToken, requestId) {
             tags: item.tags,
             categoryId: item.categoryId,
         },
-        status: {
-            privacyStatus: item.privacyStatus,
-            selfDeclaredMadeForKids: item.selfDeclaredMadeForKids,
-            embeddable: item.embeddable,
-            license: item.license,
-            publicStatsViewable: item.publicStatsViewable,
-            containsSyntheticMedia: item.containsSyntheticMedia,
-        },
+        status,
     };
     const metadataPart = Buffer.from(JSON.stringify(metadata), 'utf-8');
     const delimiter = Buffer.from(`--${boundary}\r\n`, 'utf-8');
@@ -136,7 +198,12 @@ async function uploadToYouTube(item, accessToken, requestId) {
         file,
         closeDelimiter,
     ]);
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [youtube-request] | clipArtifactId=${item.clipArtifactId} fileBytes=${file.length} bodyBytes=${body.length} privacy=${item.privacyStatus}`);
+    log.info('uploadToYouTube', '[youtube-request]', requestId, {
+        clipArtifactId: item.clipArtifactId,
+        fileBytes: file.length,
+        bodyBytes: body.length,
+        privacy: item.privacyStatus,
+    });
     const res = await fetch(YOUTUBE_UPLOAD_URL, {
         method: 'POST',
         headers: {
@@ -148,10 +215,19 @@ async function uploadToYouTube(item, accessToken, requestId) {
     });
     const rawText = await res.text();
     const raw = tryParseJson(rawText);
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [youtube-response] | clipArtifactId=${item.clipArtifactId} status=${res.status} ok=${res.ok}`);
     if (!res.ok || !raw?.id) {
+        log.warn('uploadToYouTube', '[youtube-failed]', requestId, {
+            clipArtifactId: item.clipArtifactId,
+            status: res.status,
+            error: sanitizeLogValue(raw?.error?.message || rawText),
+        });
         throw new Error(raw?.error?.message || summarizeResponseText(rawText) || 'YouTube upload failed.');
     }
+    log.info('uploadToYouTube', '[youtube-response]', requestId, {
+        clipArtifactId: item.clipArtifactId,
+        status: res.status,
+        ok: res.ok,
+    });
     return {
         videoId: raw.id,
         youtubeUrl: `https://www.youtube.com/watch?v=${raw.id}`,
@@ -161,7 +237,11 @@ async function uploadThumbnail(youtubeVideoId, thumbnailPath, accessToken, reque
     const file = await fs.readFile(thumbnailPath);
     const ext = thumbnailPath.split('.').pop()?.toLowerCase() ?? 'jpeg';
     const mimeType = ext === 'png' ? 'image/png' : ext === 'webp' ? 'image/webp' : 'image/jpeg';
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [thumbnail-upload] | youtubeVideoId=${youtubeVideoId} bytes=${file.length} mime=${mimeType}`);
+    log.info('uploadThumbnail', '[thumbnail-upload]', requestId, {
+        youtubeVideoId,
+        bytes: file.length,
+        mime: mimeType,
+    });
     const res = await fetch(`${YOUTUBE_THUMBNAILS_URL}?videoId=${encodeURIComponent(youtubeVideoId)}&uploadType=media`, {
         method: 'POST',
         headers: {
@@ -178,7 +258,7 @@ async function uploadThumbnail(youtubeVideoId, thumbnailPath, accessToken, reque
     }
 }
 async function insertIntoPlaylist(youtubeVideoId, playlistId, accessToken, requestId) {
-    log.info(`${requestId ?? 'no-request-id'} [publish-upload] [playlist-insert] | youtubeVideoId=${youtubeVideoId} playlistId=${playlistId}`);
+    log.info('insertIntoPlaylist', '[playlist-insert]', requestId, { youtubeVideoId, playlistId });
     const body = JSON.stringify({
         snippet: {
             playlistId,

package/dist/app/web/lib/services/publishing/uploadService.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadService.js","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/publishing/uploadService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"uploadService.js","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/publishing/uploadService.ts"],"names":[],"mappings":"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"}

package/dist/app/web/lib/services/publishing/uploadStreamEvents.d.ts

@@ -1,4 +1,5 @@
-export type UploadStreamEventName = 'upload_started' | 'upload_finished' | 'upload_failed' | 'upload_complete' | 'error';
+import type { UploadStreamEventName } from '../../../types/upload.js';
+export type { UploadStreamEventName };
 export declare function serializeUploadSSE(eventName: UploadStreamEventName, data: unknown): string;
 export declare function logEmittedUploadEvent(requestId: string, eventName: UploadStreamEventName, data: unknown): void;
 //# sourceMappingURL=uploadStreamEvents.d.ts.map

package/dist/app/web/lib/services/publishing/uploadStreamEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadStreamEvents.d.ts","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/publishing/uploadStreamEvents.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,qBAAqB,GAC7B,gBAAgB,GAChB,iBAAiB,GACjB,eAAe,GACf,iBAAiB,GACjB,OAAO,CAAC;AAEZ,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CAE1F;AAED,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,qBAAqB,EAChC,IAAI,EAAE,OAAO,GACZ,IAAI,CAGN"}
+{"version":3,"file":"uploadStreamEvents.d.ts","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/publishing/uploadStreamEvents.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEtE,YAAY,EAAE,qBAAqB,EAAE,CAAC;AAEtC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CAE1F;AAED,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,qBAAqB,EAChC,IAAI,EAAE,OAAO,GACZ,IAAI,CAON"}

package/dist/app/web/lib/services/publishing/uploadStreamEvents.js

@@ -4,7 +4,7 @@ export function serializeUploadSSE(eventName, data) {
 }
 export function logEmittedUploadEvent(requestId, eventName, data) {
     const meta = summarizeUploadEvent(eventName, data);
-    log.info(`${requestId} [upload-stream] [emit] | ${eventName}${formatEventMeta(meta)}`);
+    log.info('logEmittedUploadEvent', `[upload-stream] [emit] | ${eventName}${formatEventMeta(meta)}`, requestId);
 }
 function summarizeUploadEvent(eventName, data) {
     const record = asRecord(data) ?? {};

package/dist/app/web/lib/services/publishing/uploadStreamEvents.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadStreamEvents.js","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/publishing/uploadStreamEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAS3C,MAAM,UAAU,kBAAkB,CAAC,SAAgC,EAAE,IAAa;IAChF,OAAO,UAAU,SAAS,WAAW,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,SAAiB,EACjB,SAAgC,EAChC,IAAa;IAEb,MAAM,IAAI,GAAG,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnD,GAAG,CAAC,IAAI,CAAC,GAAG,SAAS,6BAA6B,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzF,CAAC;AAED,SAAS,oBAAoB,CAC3B,SAAgC,EAChC,IAAa;IAEb,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEpC,IAAI,SAAS,KAAK,gBAAgB,EAAE,CAAC;QACnC,OAAO;YACL,cAAc,EAAE,MAAM,CAAC,cAAc;SACtC,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,iBAAiB,IAAI,SAAS,KAAK,eAAe,EAAE,CAAC;QACrE,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7C,OAAO;YACL,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,MAAM;SACtB,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACrC,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAE,KAAiC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjG,CAAC;AAED,SAAS,eAAe,CAAC,IAA6B;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAEhF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClF,CAAC"}
+{"version":3,"file":"uploadStreamEvents.js","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/publishing/uploadStreamEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAM3C,MAAM,UAAU,kBAAkB,CAAC,SAAgC,EAAE,IAAa;IAChF,OAAO,UAAU,SAAS,WAAW,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,SAAiB,EACjB,SAAgC,EAChC,IAAa;IAEb,MAAM,IAAI,GAAG,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnD,GAAG,CAAC,IAAI,CACN,uBAAuB,EACvB,4BAA4B,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,EAAE,EAC/D,SAAS,CACV,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,SAAgC,EAChC,IAAa;IAEb,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEpC,IAAI,SAAS,KAAK,gBAAgB,EAAE,CAAC;QACnC,OAAO;YACL,cAAc,EAAE,MAAM,CAAC,cAAc;SACtC,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,iBAAiB,IAAI,SAAS,KAAK,eAAe,EAAE,CAAC;QACrE,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7C,OAAO;YACL,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,iBAAiB,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,MAAM;SACtB,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACrC,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAE,KAAiC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjG,CAAC;AAED,SAAS,eAAe,CAAC,IAA6B;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAEhF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClF,CAAC"}

package/dist/app/web/lib/services/subtitles/subtitlePlanService.d.ts

@@ -0,0 +1,5 @@
+import type { Config } from '../../../../../lib/types/config.js';
+import { type PlannedSubtitleLine, type PlanSubtitlesRequest, type PlanSubtitlesResult } from '../../../types/subtitlePlan.js';
+export declare function planSubtitles(req: PlanSubtitlesRequest, cfg: Config, requestId?: string): Promise<PlanSubtitlesResult>;
+export declare function normalizeWordTimings(line: PlannedSubtitleLine): PlannedSubtitleLine;
+//# sourceMappingURL=subtitlePlanService.d.ts.map

package/dist/app/web/lib/services/subtitles/subtitlePlanService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subtitlePlanService.d.ts","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/subtitles/subtitlePlanService.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACzB,MAAM,gCAAgC,CAAC;AAexC,wBAAsB,aAAa,CACjC,GAAG,EAAE,oBAAoB,EACzB,GAAG,EAAE,MAAM,EACX,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,mBAAmB,CAAC,CA+E9B;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,mBAAmB,GAAG,mBAAmB,CAqCnF"}

package/dist/app/web/lib/services/subtitles/subtitlePlanService.js

@@ -0,0 +1,113 @@
+import { generateText, tool } from 'ai';
+import { getModel } from '../../../../../lib/utils/modelFactory.js';
+import { log } from '../../../../../lib/utils/logger.js';
+import { PlanSubtitlesResultSchema, } from '../../../types/subtitlePlan.js';
+const DEFAULT_SUBTITLE_PLAN_SYSTEM_PROMPT = `You are an expert subtitle editor. You receive a list of subtitle lines from auto-captions, each with startSec, endSec, text, and per-word timings.
+
+Return a corrected version that:
+1. Regroups text into readable lines (≤ ~7 words or ~42 chars, no mid-clause splits, no orphan words).
+2. Fixes spacing, punctuation, capitalization, and removes artifacts like [Music], >>, --.
+3. Corrects obvious misspellings, especially proper nouns. Never invent facts.
+4. Adjusts each line's startSec/endSec and per-word timings for readability. Words must be in order and non-overlapping within a line. Each word's endSec must be strictly greater than its startSec; do not collapse multiple words to the same instant.
+
+Constraints:
+- Total span (first startSec … last endSec) must stay within [0, durationSec].
+- Preserve the original meaning. Do not translate. Do not add lines not in the source.
+- Always populate the words array with one entry per word in text.`;
+export async function planSubtitles(req, cfg, requestId) {
+    const done = log.fnCalled('planSubtitles', requestId, { lines: req.subtitles.length });
+    const model = getModel(cfg.LLM_PROVIDER, cfg.LLM_MODEL, {
+        ZAI_API_KEY: cfg.ZAI_API_KEY,
+        OPENROUTER_API_KEY: cfg.OPENROUTER_API_KEY,
+        CUSTOM_OPENAI_BASE_URL: cfg.CUSTOM_OPENAI_BASE_URL,
+        CUSTOM_OPENAI_API_KEY: cfg.CUSTOM_OPENAI_API_KEY,
+    });
+    log.info('planSubtitles', `[subtitle-plan] model=${cfg.LLM_PROVIDER}/${cfg.LLM_MODEL} lines=${req.subtitles.length}`, requestId);
+    const effectiveSystemPrompt = cfg.SUBTITLE_PLAN_SYSTEM_PROMPT ?? DEFAULT_SUBTITLE_PLAN_SYSTEM_PROMPT;
+    const prompt = buildPlanPrompt(req);
+    const t0 = Date.now();
+    const result = await generateText({
+        model,
+        system: effectiveSystemPrompt,
+        prompt,
+        tools: {
+            register_planned_subtitles: tool({
+                description: 'Register the corrected subtitle lines',
+                inputSchema: PlanSubtitlesResultSchema,
+            }),
+        },
+        toolChoice: { type: 'tool', toolName: 'register_planned_subtitles' },
+        maxRetries: cfg.LLM_MAX_RETRIES,
+    });
+    log.info('planSubtitles', `[subtitle-plan] toolCalls=${result.toolCalls.length} finishReason=${result.finishReason} (${Date.now() - t0}ms)`, requestId);
+    log.info('planSubtitles', `[subtitle-plan] result: ${JSON.stringify(result)}`, requestId);
+    const toolCall = result.toolCalls.find((tc) => tc.toolName === 'register_planned_subtitles');
+    if (!toolCall) {
+        const names = result.toolCalls.map((tc) => tc.toolName).join(', ') || 'none';
+        log.error('planSubtitles', `[subtitle-plan] no register_planned_subtitles call — toolCalls=[${names}] finishReason=${result.finishReason}`, requestId);
+        throw new Error('No subtitles registered: model did not call register_planned_subtitles');
+    }
+    const planned = PlanSubtitlesResultSchema.parse(toolCall.input);
+    let redistributedLines = 0;
+    const normalizedLines = planned.lines.map((line) => {
+        const next = normalizeWordTimings(line);
+        if (next !== line)
+            redistributedLines++;
+        return next;
+    });
+    if (redistributedLines > 0) {
+        log.info('planSubtitles', `[subtitle-plan] redistributed timings on ${redistributedLines}/${planned.lines.length} lines`, requestId);
+    }
+    const normalized = { ...planned, lines: normalizedLines };
+    log.info('planSubtitles', `[subtitle-plan] ✓ ${normalized.lines.length} lines returned`, requestId);
+    done({ lines: normalized.lines.length });
+    return normalized;
+}
+export function normalizeWordTimings(line) {
+    const n = line.words.length;
+    if (n === 0)
+        return line;
+    const clamped = line.words.map((w) => {
+        const startSec = Math.min(Math.max(w.startSec, line.startSec), line.endSec);
+        const endSec = Math.min(Math.max(w.endSec, startSec), line.endSec);
+        return { text: w.text, startSec, endSec };
+    });
+    let needsRedistribute = false;
+    for (let i = 0; i < n; i++) {
+        if (clamped[i].endSec <= clamped[i].startSec) {
+            needsRedistribute = true;
+            break;
+        }
+        if (i > 0 && clamped[i].startSec < clamped[i - 1].endSec) {
+            needsRedistribute = true;
+            break;
+        }
+    }
+    if (!needsRedistribute) {
+        const unchanged = clamped.every((w, i) => w.startSec === line.words[i].startSec && w.endSec === line.words[i].endSec);
+        return unchanged ? line : { ...line, words: clamped };
+    }
+    const span = Math.max(line.endSec - line.startSec, 0);
+    const step = span / n;
+    const words = clamped.map((w, i) => ({
+        text: w.text,
+        startSec: line.startSec + i * step,
+        endSec: line.startSec + (i + 1) * step,
+    }));
+    return { ...line, words };
+}
+function buildPlanPrompt(req) {
+    const lines = req.subtitles.map((s) => ({
+        startSec: s.startSec,
+        endSec: s.endSec,
+        text: s.text,
+        words: s.words,
+    }));
+    return `Clip duration: ${req.durationSec.toFixed(2)}s
+
+Current subtitle lines (${lines.length} total):
+${JSON.stringify(lines, null, 2)}
+
+Return corrected subtitles via register_planned_subtitles.`;
+}
+//# sourceMappingURL=subtitlePlanService.js.map

package/dist/app/web/lib/services/subtitles/subtitlePlanService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subtitlePlanService.js","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/subtitles/subtitlePlanService.ts"],"names":[],"mappings":"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"}

package/dist/app/web/lib/services/youtube/catalogFactory.d.ts

@@ -1,3 +1,3 @@
-import type { YouTubeCatalogService } from '../../../../../lib/services/video/source/youtube/catalog.js';
+import type { YouTubeCatalogService } from '../../../../../lib/types/youtube.js';
 export declare function createYouTubeCatalogService(): YouTubeCatalogService;
 //# sourceMappingURL=catalogFactory.d.ts.map

package/dist/app/web/lib/services/youtube/catalogFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalogFactory.d.ts","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/youtube/catalogFactory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAE3F,wBAAgB,2BAA2B,IAAI,qBAAqB,CAQnE"}
+{"version":3,"file":"catalogFactory.d.ts","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/youtube/catalogFactory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnE,wBAAgB,2BAA2B,IAAI,qBAAqB,CAQnE"}

package/dist/app/web/lib/services/youtube/uploadAuth.d.ts

@@ -1,9 +1,4 @@
-import { type SaveYouTubeManualAuthRequest, type YouTubeAuthState, type YouTubeAuthStatus } from '../../../types/publish.js';
-export interface OAuthCookieState {
-    state: string;
-    codeVerifier: string;
-    returnTo: string;
-}
+import { type SaveYouTubeManualAuthRequest, type YouTubeAuthState, type YouTubeAuthStatus, type OAuthCookieState } from '../../../types/publish.js';
 export declare function getYouTubeAuthStatus(): Promise<YouTubeAuthStatus>;
 export declare function saveManualYouTubeAuth(input: SaveYouTubeManualAuthRequest): Promise<YouTubeAuthStatus>;
 export declare function disconnectYouTubeAuth(): Promise<void>;

package/dist/app/web/lib/services/youtube/uploadAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadAuth.d.ts","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/youtube/uploadAuth.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,4BAA4B,EACjC,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEvB,MAAM,2BAA2B,CAAC;AAkBnC,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAiBvE;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,iBAAiB,CAAC,CAgB5B;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3D;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAmBjF;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAmD5B;AAED,wBAAsB,6BAA6B,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAajG;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAM3C"}
+{"version":3,"file":"uploadAuth.d.ts","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/youtube/uploadAuth.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,4BAA4B,EACjC,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEtB,KAAK,gBAAgB,EACtB,MAAM,2BAA2B,CAAC;AAkBnC,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAiBvE;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,4BAA4B,GAClC,OAAO,CAAC,iBAAiB,CAAC,CAgB5B;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3D;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAmBjF;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,gBAAgB,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAmD5B;AAED,wBAAsB,6BAA6B,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkBjG;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAM3C"}

package/dist/app/web/lib/services/youtube/uploadAuth.js

@@ -98,10 +98,17 @@ export async function completeYouTubeOAuthCallback(code, oauth) {
 export async function getAuthorizedYouTubeAuthState(requestId) {
     const auth = await loadYouTubeAuthState();
     if (!auth) {
-        log.warn(`${requestId ?? 'no-request-id'} [youtube-auth] [state] | status=missing`);
+        log.warn('getAuthorizedYouTubeAuthState', 'no auth state found', requestId, {
+            status: 'missing',
+        });
         throw new Error('Connect a YouTube account before publishing clips.');
     }
-    log.info(`${requestId ?? 'no-request-id'} [youtube-auth] [state] | status=loaded authMode=${auth.authMode} channelId=${auth.channel.channelId} hasRefreshToken=${Boolean(auth.refreshToken)}`);
+    log.info('getAuthorizedYouTubeAuthState', 'auth state loaded', requestId, {
+        status: 'loaded',
+        authMode: auth.authMode,
+        channelId: auth.channel.channelId,
+        hasRefreshToken: Boolean(auth.refreshToken),
+    });
     return ensureFreshAccessToken(auth, requestId);
 }
 export function isOAuthConfigured() {
@@ -111,18 +118,34 @@ export function isOAuthConfigured() {
 }
 async function ensureFreshAccessToken(auth, requestId) {
     if (!isExpiredOrMissing(auth.expiryDate)) {
-        log.info(`${requestId ?? 'no-request-id'} [youtube-auth] [token] | action=reuse authMode=${auth.authMode} expiresAt=${auth.expiryDate ?? 'none'}`);
+        log.info('ensureFreshAccessToken', 'reusing token', requestId, {
+            action: 'reuse',
+            authMode: auth.authMode,
+            expiresAt: auth.expiryDate ?? 'none',
+        });
         return auth;
     }
     const credentials = resolveOAuthClientCredentials(auth);
     if (!auth.refreshToken || !credentials) {
-        log.warn(`${requestId ?? 'no-request-id'} [youtube-auth] [token] | action=refresh-skipped hasRefreshToken=${Boolean(auth.refreshToken)} hasCredentials=${Boolean(credentials)}`);
+        log.warn('ensureFreshAccessToken', 'refresh skipped', requestId, {
+            action: 'refresh-skipped',
+            hasRefreshToken: Boolean(auth.refreshToken),
+            hasCredentials: Boolean(credentials),
+        });
         return auth;
     }
-    log.info(`${requestId ?? 'no-request-id'} [youtube-auth] [token] | action=refresh-start authMode=${auth.authMode} channelId=${auth.channel.channelId}`);
+    log.info('ensureFreshAccessToken', 'refreshing token', requestId, {
+        action: 'refresh-start',
+        authMode: auth.authMode,
+        channelId: auth.channel.channelId,
+    });
     const refreshed = await refreshAccessToken(auth, credentials, requestId);
     await saveYouTubeAuthState(refreshed);
-    log.info(`${requestId ?? 'no-request-id'} [youtube-auth] [token] | action=refresh-success authMode=${refreshed.authMode} expiresAt=${refreshed.expiryDate ?? 'none'}`);
+    log.info('ensureFreshAccessToken', 'token refreshed', requestId, {
+        action: 'refresh-success',
+        authMode: refreshed.authMode,
+        expiresAt: refreshed.expiryDate ?? 'none',
+    });
     return refreshed;
 }
 async function refreshAccessToken(auth, credentials, requestId) {
@@ -139,7 +162,11 @@ async function refreshAccessToken(auth, credentials, requestId) {
     });
     const raw = (await res.json());
     if (!res.ok || !raw.access_token) {
-        log.warn(`${requestId ?? 'no-request-id'} [youtube-auth] [token] | action=refresh-failed status=${res.status} error=${sanitizeLogValue(raw.error_description || raw.error || 'unknown')}`);
+        log.warn('refreshAccessToken', 'token refresh failed', requestId, {
+            action: 'refresh-failed',
+            status: res.status,
+            error: sanitizeLogValue(raw.error_description || raw.error || 'unknown'),
+        });
         throw new Error(raw.error_description || raw.error || 'Failed to refresh YouTube access token.');
     }
     return YouTubeAuthStateSchema.parse({

package/dist/app/web/lib/services/youtube/uploadAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadAuth.js","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/youtube/uploadAuth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"uploadAuth.js","sourceRoot":"","sources":["../../../../../../src/app/web/lib/services/youtube/uploadAuth.ts"],"names":[],"mappings":"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"}