akari-video 0.1.95 → 0.1.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "0.1.95",
+  "version": "0.1.97",
   "description": "AKARI Video launcher CLI — start an AI-edited video project from any directory: scaffold, connection check, then hand over to Claude Code (or opencode). AKARI Video を opencode や Claude Code で、どのディレクトリからでも始めるための `akari` ランチャー CLI。接続確認（doctor）→ 未セットアップならプロジェクト雛形を作成 → AI エージェントを起動する。外部 npm 依存ゼロ（Node.js 組み込みモジュールのみ）。",
   "type": "module",
   "bin": {

package/vendor/packages/akari-launcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "0.1.95",
+  "version": "0.1.97",
   "description": "AKARI Video launcher CLI — start an AI-edited video project from any directory: scaffold, connection check, then hand over to Claude Code (or opencode). AKARI Video を opencode や Claude Code で、どのディレクトリからでも始めるための `akari` ランチャー CLI。接続確認（doctor）→ 未セットアップならプロジェクト雛形を作成 → AI エージェントを起動する。外部 npm 依存ゼロ（Node.js 組み込みモジュールのみ）。 [akari-video npm vendor: bin/akari.mjs is reference-only. These CLI entrypoints are not included in the akari-video npm package. Use `akari doctor --json` and run the path reported in `render_cut.path`. Full installations provide it in a monorepo checkout, ~/.akari/app, /Applications/AKARI Video.app/Contents/Resources/packages, or %LOCALAPPDATA%\\Programs\\@akari-videoshell\\resources\\packages.]",
   "type": "module",
   "files": [

package/vendor/packages/asset-resolver/src/resolve.mjs

@@ -116,7 +116,7 @@ export async function resolve(
   const hasFiles = Array.isArray(item.files) && item.files.length > 0;
   if (price > 0) {
     const { ids: entitlements } = await fetchEntitlements({ env, fetchImpl });
-    if (!entitlements.has(item.id)) {
+    if (!entitlements.has(item.id) && !entitlements.has(item.product_id)) {
       throw new AssetResolverError(
         `未購入の素材です（¥${price.toLocaleString()}）。ストアで購入してから再度お試しください: ${item.id}`,
         'locked',
@@ -208,25 +208,29 @@ async function resolvePaidZip(item, { env, fetchImpl, project, reference, home,
   const tempAssetDir = path.join(tempRoot, item.category, item.id);
 
   try {
-    const zipPath = path.join(tempRoot, `${item.id}.zip`);
-    await downloadPaidZip(item.id, credentials, zipPath, { env, fetchImpl });
+    const productId = item.product_id ?? item.id;
+    const zipPath = path.join(tempRoot, `${productId}.zip`);
+    await downloadPaidZip(productId, credentials, zipPath, { env, fetchImpl });
 
     const extractedRoot = path.join(tempRoot, 'extracted');
     extractZip(zipPath, extractedRoot);
-    const { packageDir, payloadFiles } = await verifyPaidZipContents(extractedRoot, item.id);
+    const { packageDir, payloadFiles } = await verifyPaidZipContents(extractedRoot, productId);
 
-    // ストア入稿の実形は pack 形状（zip ルートに PACK.json / docs/ を持ち、素材本体は
-    // assets/<category>/<id>/ 配下）。契約 v0 のフラット形状（zip 直下に meta.json / 本体）も
+    // パックは assets/<category>/<id>/ と assets/<id>/ の両配置を受け付ける。
+    // 契約 v0 のフラット形状（zip 直下に meta.json / 本体）も
     // 引き続き受け付ける。どちらの形でも、ライブラリへ入るのは素材ディレクトリの中身だけ
     // （PACK.json / docs はライブラリに混ぜない — 全量が必要なら `akari store download` が zip を渡す）。
-    const nestedPrefix = `assets/${item.category}/${item.id}/`;
-    const nestedFiles = payloadFiles
-      .filter((relPath) => relPath.startsWith(nestedPrefix))
-      .map((relPath) => relPath.slice(nestedPrefix.length));
-    const payloadRoot = nestedFiles.length > 0
-      ? path.join(packageDir, 'assets', item.category, item.id)
-      : packageDir;
-    const assetFiles = nestedFiles.length > 0 ? nestedFiles : payloadFiles;
+    const prefixes = [`assets/${item.category}/${item.id}/`, `assets/${item.id}/`];
+    const nestedPrefix = prefixes.find(prefix => payloadFiles.some(file => file.startsWith(prefix)));
+    const nestedFiles = nestedPrefix
+      ? payloadFiles.filter(file => file.startsWith(nestedPrefix)).map(file => file.slice(nestedPrefix.length))
+      : [];
+    // A shared product zip may contain many assets. Never copy a sibling into this item's directory.
+    if (item.product_id && item.product_id !== item.id && !nestedPrefix) {
+      throw new AssetResolverError(`パック内に対象素材がありません: ${item.id}`, 'integrity');
+    }
+    const payloadRoot = nestedPrefix ? path.join(packageDir, nestedPrefix) : packageDir;
+    const assetFiles = nestedPrefix ? nestedFiles : payloadFiles;
 
     // 有料素材は meta.json 必須（契約検証を必ず通す）。形の取り違えを「meta.json の無い素材」と
     // 誤認して検証スキップのまま通した前歴（#25）があるため fail-closed に倒す

package/vendor/packages/asset-resolver/src/state.mjs

@@ -89,7 +89,8 @@ export async function composeState({ env = process.env, fetchImpl = fetch } = {}
     const price = item.price ?? 0;
     let state;
     if (installed.has(key)) state = 'cached';
-    else if (price > 0 && !entitlementsResult.ids.has(item.id)) state = 'locked';
+    else if (price > 0 && !entitlementsResult.ids.has(item.id)
+      && !entitlementsResult.ids.has(item.product_id)) state = 'locked';
     else state = 'available';
     return { ...item, state, ...sourceFields(item, catalogKeys.has(key) || item.source === 'installed') };
   });

package/vendor/packages/asset-resolver/test/resolve-paid-zip.test.mjs

@@ -13,6 +13,7 @@ import path from 'node:path';
 import { Readable } from 'node:stream';
 import test from 'node:test';
 import { AssetResolverError, resolve as resolveAsset } from '../src/resolve.mjs';
+import { composeState } from '../src/state.mjs';
 import { setupFixtureEnv } from './helpers.mjs';
 
 const MINI_PNG = Buffer.from(
@@ -38,7 +39,7 @@ function paidMetaBuffer(id, category) {
     provenance: { origin: 'asset-resolver test fixture', generator: null },
     author: 'test',
     license: { spdx: 'LicenseRef-fixture', scope: 'paid-license-required', attribution_required: false, ai_training_allowed: false },
-    price: 2980,
+    price: category === 'overlay' ? null : 2980,
     version: 1,
   };
   return Buffer.from(`${JSON.stringify(meta, null, 2)}\n`);
@@ -54,24 +55,26 @@ function paidMetaBuffer(id, category) {
  * （有料経路の meta.json 必須化テスト用）。`extraChecksumLine` は checksums.txt に任意の 1 行を
  * 追記する（zip-slip 防御テスト用）。
  */
-function buildPaidZip(id, category, { corrupt, layout = 'flat', withoutMeta = false, extraChecksumLine } = {}) {
+function buildPaidZip(id, category, { corrupt, layout = 'flat', withoutMeta = false, extraChecksumLine,
+  productId = id, siblingId } = {}) {
   const stage = mkdtempSync(path.join(tmpdir(), 'paid-zip-fixture-'));
-  const rootName = `${id}-v1`;
+  const rootName = `${productId}-v1`;
   const rootDir = path.join(stage, rootName);
   mkdirSync(rootDir, { recursive: true });
 
   const payload = {
     'meta.json': paidMetaBuffer(id, category),
-    'fragment.html': Buffer.from(
-      `<div class="${id}-stub"><canvas></canvas><div data-akari-3d-fallback>fixture</div>`
-      + '<script type="application/json" data-akari-3d-scene>{"model":"model.glb"}</script></div>\n',
-    ),
-    'model.glb': Buffer.from('glTF-fixture-not-a-real-binary'),
+    'fragment.html': Buffer.from(category === 'overlay'
+      ? `<div class="${id}-stub"><span data-mirror="text">fixture</span></div>\n`
+      : `<div class="${id}-stub"><canvas></canvas><div data-akari-3d-fallback>fixture</div>`
+        + '<script type="application/json" data-akari-3d-scene>{"model":"model.glb"}</script></div>\n'),
+    ...(category === 'scene3d' ? { 'model.glb': Buffer.from('glTF-fixture-not-a-real-binary') } : {}),
     'preview.png': MINI_PNG,
   };
   if (withoutMeta) delete payload['meta.json'];
 
-  const payloadPrefix = layout === 'pack' ? `assets/${category}/${id}/` : '';
+  const payloadPrefix = layout === 'pack' ? `assets/${category}/${id}/`
+    : layout === 'telop-pack' ? `assets/${id}/` : '';
   const allFiles = {
     'README.md': Buffer.from('# fixture\n'),
     'LICENSE.md': Buffer.from('fixture license\n'),
@@ -83,6 +86,11 @@ function buildPaidZip(id, category, { corrupt, layout = 'flat', withoutMeta = fa
   for (const [name, buffer] of Object.entries(payload)) {
     allFiles[`${payloadPrefix}${name}`] = buffer;
   }
+  if (siblingId) {
+    allFiles[`assets/${siblingId}/meta.json`] = paidMetaBuffer(siblingId, category);
+    allFiles[`assets/${siblingId}/fragment.html`] = Buffer.from('<div data-mirror="text">sibling</div>');
+    allFiles[`assets/${siblingId}/preview.png`] = MINI_PNG;
+  }
   for (const [name, buffer] of Object.entries(allFiles)) {
     const filePath = path.join(rootDir, name);
     mkdirSync(path.dirname(filePath), { recursive: true });
@@ -120,7 +128,7 @@ function fetchImplFor(id, { entitled, zipPath }) {
   };
 }
 
-function addPaidCatalogItem(catalog, catalogPath, id, category, price) {
+function addPaidCatalogItem(catalog, catalogPath, id, category, price, productId) {
   const withPaidItem = structuredClone(catalog);
   withPaidItem.items.push({
     id,
@@ -129,6 +137,7 @@ function addPaidCatalogItem(catalog, catalogPath, id, category, price) {
     tags: ['fixture', 'paid'],
     license: { spdx: 'LicenseRef-fixture' },
     price,
+    ...(productId ? { product_id: productId } : {}),
     version: 1,
     preview: '',
     provenance: {},
@@ -263,6 +272,76 @@ test('resolvePaidZip: pack 形状（assets/<category>/<id>/ 配下）は素材
   assert.equal(meta.id, 'mini-paid-pack');
 });
 
+test('テロップパック: product_id の権利で全素材が available、未購入は locked、対象 1 件だけを配置', async () => {
+  const { env, home, catalog, catalogPath } = setupFixtureEnv();
+  const productId = 'fixture-telop-pack';
+  const first = 'telop-fixture-gold';
+  const second = 'telop-fixture-blue';
+  writeCredentials(home);
+  addPaidCatalogItem(catalog, catalogPath, first, 'overlay', 1980, productId);
+  const withFirst = JSON.parse(readFileSync(catalogPath, 'utf8'));
+  addPaidCatalogItem(withFirst, catalogPath, second, 'overlay', 1980, productId);
+  const zipPath = buildPaidZip(first, 'overlay', { layout: 'telop-pack', productId, siblingId: second });
+
+  const lockedFetch = fetchImplFor(productId, { entitled: false, zipPath: null });
+  const locked = await composeState({ env, fetchImpl: lockedFetch });
+  assert.deepEqual([first, second].map(id => locked.items.find(item => item.id === id)?.state), ['locked', 'locked']);
+  await assert.rejects(() => resolveAsset(first, { env, fetchImpl: lockedFetch }),
+    error => error instanceof AssetResolverError && error.code === 'locked');
+
+  // The store expands Lifetime access into product entitlements in this API response.
+  const entitledFetch = fetchImplFor(productId, { entitled: true, zipPath });
+  const available = await composeState({ env, fetchImpl: entitledFetch });
+  assert.deepEqual([first, second].map(id => available.items.find(item => item.id === id)?.state), ['available', 'available']);
+  const result = await resolveAsset(first, { env, fetchImpl: entitledFetch });
+  assert.equal(result.dir, path.join(home, 'assets', 'overlay', first));
+  assert.ok(existsSync(path.join(result.dir, 'meta.json')));
+  assert.ok(existsSync(path.join(result.dir, 'fragment.html')));
+  assert.equal(existsSync(path.join(result.dir, 'assets')), false);
+  assert.equal(existsSync(path.join(home, 'assets', 'overlay', second)), false);
+});
+
+test('Lifetime パスの展開済み entitlements でパック全件が available、1 件だけ resolve できる', async () => {
+  const { env, home, catalog, catalogPath } = setupFixtureEnv();
+  const productId = 'telop-rich-pack-01';
+  const ids = Array.from({ length: 21 }, (_, index) => `telop-pass-${index + 1}`);
+  const [first, second] = ids;
+  writeCredentials(home);
+  let withPaidItems = catalog;
+  for (const id of ids) {
+    addPaidCatalogItem(withPaidItems, catalogPath, id, 'overlay', 1980, productId);
+    withPaidItems = JSON.parse(readFileSync(catalogPath, 'utf8'));
+  }
+  const zipPath = buildPaidZip(first, 'overlay', { layout: 'telop-pack', productId, siblingId: second });
+  // worker/lib/entitlement.mjs はパスを active + pass_eligible な商品の行へ展開する。
+  const entitlements = [
+    { product_id: productId, kind: 'asset-pack', current_version: 1 },
+    { product_id: 'fixture-other-product', kind: 'asset-pack', current_version: 2 },
+  ];
+  const downloads = [];
+  const fetchImpl = async (url, options = {}) => {
+    assert.equal(options.headers?.authorization, 'Bearer akst_test');
+    if (String(url).endsWith('/v1/entitlements')) {
+      return { ok: true, status: 200, json: async () => ({ entitlements }) };
+    }
+    downloads.push(String(url));
+    assert.ok(String(url).endsWith(`/v1/download/${productId}`));
+    return { ok: true, status: 200, body: Readable.toWeb(createReadStream(zipPath)) };
+  };
+  const state = await composeState({ env, fetchImpl });
+  assert.deepEqual(ids.map(id => state.items.find(item => item.id === id)?.state),
+    Array(ids.length).fill('available'));
+  assert.deepEqual(state.entitledProducts, [
+    { id: productId, kind: 'asset-pack', currentVersion: 1 },
+    { id: 'fixture-other-product', kind: 'asset-pack', currentVersion: 2 },
+  ]);
+  const result = await resolveAsset(second, { env, fetchImpl });
+  assert.deepEqual(downloads, [`https://example.invalid/api/store/v1/download/${productId}`]);
+  assert.equal(result.dir, path.join(home, 'assets', 'overlay', second));
+  assert.equal(JSON.parse(readFileSync(path.join(result.dir, 'meta.json'))).id, second);
+  assert.equal(existsSync(path.join(home, 'assets', 'overlay', first)), false);
+});
+
 test('resolvePaidZip: meta.json の無い有料 zip は fail-closed（無警告スキップを許さない — #25）', async () => {
   const { env, home, catalog, catalogPath } = setupFixtureEnv();
   writeCredentials(home);

package/vendor/packages/edit-store/lib/caption-display.js

@@ -47,7 +47,8 @@ const CAPTION_STYLE_KEYS = new Set([
     'color', 'size_px', 'font_weight', 'line_height', 'stroke', 'background', 'zone', 'layout',
     'font_family', 'weight', 'italic', 'underline', 'strikethrough', 'list', 'opacity', 'letter_spacing_em', 'align',
     'vertical_align', 'vertical', 'text_transform', 'max_width_pct', 'wrap_width_pct', 'max_characters', 'text_anchor',
-    'position', 'scale', 'rotate', 'shadow', 'glow', 'animation', 'reference_height_px'
+    'position', 'scale', 'rotate', 'shadow', 'glow', 'animation', 'reference_height_px',
+    'stroke_inner', 'fill_gradient', 'extrude', 'karaoke'
 ]);
 const CAPTION_STROKE_KEYS = new Set(['method', 'color', 'width_px']);
 const CAPTION_BACKGROUND_KEYS = new Set([
@@ -578,6 +579,17 @@ function validateCaptionTextStyle(value, label = 'text_style') {
     rejectStyleUnknown(value, CAPTION_STYLE_KEYS, label);
     if (Object.prototype.hasOwnProperty.call(value, 'color'))
         validateHexColor(value.color, `${label}.color`);
+    if (Object.prototype.hasOwnProperty.call(value, 'karaoke')) {
+        if (!isRecord(value.karaoke))
+            fail('INVALID_TEXT_STYLE', `${label}.karaoke must be an object`);
+        rejectStyleUnknown(value.karaoke, new Set(['done_color', 'fill', 'start_index']), `${label}.karaoke`);
+        if (Object.prototype.hasOwnProperty.call(value.karaoke, 'done_color'))
+            validateHexColor(value.karaoke.done_color, `${label}.karaoke.done_color`);
+        if (Object.prototype.hasOwnProperty.call(value.karaoke, 'fill') && !['char', 'word', 'smooth'].includes(value.karaoke.fill))
+            fail('INVALID_TEXT_STYLE', `${label}.karaoke.fill must be char, word or smooth`);
+        if (Object.prototype.hasOwnProperty.call(value.karaoke, 'start_index') && (!Number.isInteger(value.karaoke.start_index) || value.karaoke.start_index < 0))
+            fail('INVALID_TEXT_STYLE', `${label}.karaoke.start_index must be a non-negative integer`);
+    }
     if (Object.prototype.hasOwnProperty.call(value, 'size_px') && !finitePositive(value.size_px)) {
         fail('INVALID_TEXT_STYLE', `${label}.size_px must be a positive finite number`);
     }
@@ -603,6 +615,43 @@ function validateCaptionTextStyle(value, label = 'text_style') {
     validateTextStyleV0(value, label);
     if (Object.prototype.hasOwnProperty.call(value, 'stroke'))
         validateCaptionStroke(value.stroke, `${label}.stroke`);
+    if (Object.prototype.hasOwnProperty.call(value, 'stroke_inner')) {
+        const inner = value.stroke_inner;
+        if (!isRecord(inner))
+            fail('INVALID_TEXT_STYLE', `${label}.stroke_inner must be an object`);
+        rejectStyleUnknown(inner, new Set(['color', 'width_px']), `${label}.stroke_inner`);
+        if (inner.color !== undefined)
+            validateHexColor(inner.color, `${label}.stroke_inner.color`);
+        if (inner.width_px !== undefined && !finiteNonNegative(inner.width_px)) {
+            fail('INVALID_TEXT_STYLE', `${label}.stroke_inner.width_px must be non-negative`);
+        }
+    }
+    if (Object.prototype.hasOwnProperty.call(value, 'fill_gradient')) {
+        const gradient = value.fill_gradient;
+        if (!isRecord(gradient))
+            fail('INVALID_TEXT_STYLE', `${label}.fill_gradient must be an object`);
+        rejectStyleUnknown(gradient, new Set(['colors', 'angle_deg']), `${label}.fill_gradient`);
+        if (!Array.isArray(gradient.colors) || gradient.colors.length < 2 || gradient.colors.length > 3) {
+            fail('INVALID_TEXT_STYLE', `${label}.fill_gradient.colors must contain 2 or 3 colors`);
+        }
+        gradient.colors.forEach((color, index) => validateHexColor(color, `${label}.fill_gradient.colors[${index}]`));
+        if (!finiteNumber(gradient.angle_deg))
+            fail('INVALID_TEXT_STYLE', `${label}.fill_gradient.angle_deg must be finite`);
+    }
+    if (Object.prototype.hasOwnProperty.call(value, 'extrude')) {
+        const extrude = value.extrude;
+        if (!isRecord(extrude))
+            fail('INVALID_TEXT_STYLE', `${label}.extrude must be an object`);
+        rejectStyleUnknown(extrude, new Set(['depth_px', 'color', 'color_end', 'angle_deg']), `${label}.extrude`);
+        if (!Number.isInteger(extrude.depth_px) || extrude.depth_px < 1 || extrude.depth_px > 32) {
+            fail('INVALID_TEXT_STYLE', `${label}.extrude.depth_px must be within [1, 32]`);
+        }
+        validateHexColor(extrude.color, `${label}.extrude.color`);
+        if (extrude.color_end !== undefined)
+            validateHexColor(extrude.color_end, `${label}.extrude.color_end`);
+        if (!finiteNumber(extrude.angle_deg))
+            fail('INVALID_TEXT_STYLE', `${label}.extrude.angle_deg must be finite`);
+    }
     if (Object.prototype.hasOwnProperty.call(value, 'background'))
         validateCaptionBackground(value.background, `${label}.background`);
     if (Object.prototype.hasOwnProperty.call(value, 'zone') && !CAPTION_ZONES.has(value.zone)) {
@@ -1384,7 +1433,7 @@ function mergeCaptionDisplayStyles(base, override) {
     const left = isRecord(base) ? base : {};
     const right = isRecord(override) ? override : {};
     const merged = { ...left, ...right };
-    for (const key of ['stroke', 'background', 'layout']) {
+    for (const key of ['stroke', 'stroke_inner', 'fill_gradient', 'extrude', 'background', 'layout', 'karaoke']) {
         if (isRecord(left[key]) || isRecord(right[key]))
             merged[key] = { ...(isRecord(left[key]) ? left[key] : {}), ...(isRecord(right[key]) ? right[key] : {}) };
     }
@@ -1414,6 +1463,13 @@ function normalizeCaptionLineTextStyle(value) {
     const animationLoop = normalizeCaptionAnimationSlot(value.animation?.loop);
     const animationOut = normalizeCaptionAnimationSlot(value.animation?.out);
     return {
+        ...(isRecord(value.karaoke) ? { karaoke: {
+                ...(typeof value.karaoke.done_color === 'string' ? { done_color: value.karaoke.done_color } : {}),
+                ...(value.karaoke.fill === 'char' || value.karaoke.fill === 'word' || value.karaoke.fill === 'smooth'
+                    ? { fill: value.karaoke.fill } : {}),
+                ...(Number.isInteger(value.karaoke.start_index) && value.karaoke.start_index >= 0
+                    ? { start_index: value.karaoke.start_index } : {})
+            } } : {}),
         ...(typeof value.color === 'string' ? { color: value.color } : {}),
         ...(finiteNumber(value.size_px) ? { size_px: value.size_px } : {}),
         ...(finiteNumber(value.scale) && value.scale >= 0.4 && value.scale <= 3 ? { scale: value.scale } : {}),
@@ -1472,6 +1528,18 @@ function normalizeCaptionLineTextStyle(value) {
                 ...(typeof value.stroke.color === 'string' ? { color: value.stroke.color } : {}),
                 ...(finiteNumber(value.stroke.width_px) ? { width_px: value.stroke.width_px } : {})
             } } : {}),
+        ...(isRecord(value.stroke_inner) ? { stroke_inner: {
+                ...(typeof value.stroke_inner.color === 'string' ? { color: value.stroke_inner.color } : {}),
+                ...(finiteNumber(value.stroke_inner.width_px) ? { width_px: value.stroke_inner.width_px } : {})
+            } } : {}),
+        ...(isRecord(value.fill_gradient) ? { fill_gradient: {
+                colors: value.fill_gradient.colors, angle_deg: value.fill_gradient.angle_deg
+            } } : {}),
+        ...(isRecord(value.extrude) ? { extrude: {
+                depth_px: value.extrude.depth_px, color: value.extrude.color,
+                ...(value.extrude.color_end !== undefined ? { color_end: value.extrude.color_end } : {}),
+                angle_deg: value.extrude.angle_deg
+            } } : {}),
         ...(isRecord(value.background) ? { background: {
                 ...(typeof value.background.color === 'string' ? { color: value.background.color } : {}),
                 ...(finiteNumber(value.background.opacity) ? { opacity: value.background.opacity } : {}),
@@ -1494,7 +1562,7 @@ function mergeCaptionLineTextStyles(base, override) {
     const left = normalizeCaptionLineTextStyle(base);
     const right = normalizeCaptionLineTextStyle(override);
     const merged = { ...left, ...right };
-    for (const key of ['stroke', 'background', 'shadow', 'glow', 'position', 'animation']) {
+    for (const key of ['stroke', 'stroke_inner', 'fill_gradient', 'extrude', 'background', 'shadow', 'glow', 'position', 'animation', 'karaoke']) {
         if (isRecord(left[key]) || isRecord(right[key])) {
             merged[key] = { ...(isRecord(left[key]) ? left[key] : {}), ...(isRecord(right[key]) ? right[key] : {}) };
             if (Object.keys(merged[key]).length === 0)
@@ -1644,6 +1712,8 @@ function resolveCaptionLineStyleVarsAtScale(style, scale) {
     }
     if (typeof style.color === 'string')
         vars['--caption-color'] = style.color;
+    if (isRecord(style.karaoke) && typeof style.karaoke.done_color === 'string')
+        vars['--caption-highlight-color'] = style.karaoke.done_color;
     if (finiteNumber(style.size_px))
         vars['--caption-font-size'] = `${px(style.size_px)}px`;
     if (isRecord(style.stroke) && (typeof style.stroke.color === 'string' || finiteNumber(style.stroke.width_px))) {
@@ -1651,6 +1721,17 @@ function resolveCaptionLineStyleVarsAtScale(style, scale) {
         const color = typeof style.stroke.color === 'string' ? style.stroke.color : 'rgba(0,0,0,.9)';
         vars['--caption-stroke'] = `${width * 2}px ${color}`;
     }
+    if (isRecord(style.stroke_inner) && !isRecord(style.stroke))
+        vars['--caption-stroke'] = '0 transparent';
+    if (isRecord(style.fill_gradient) && Array.isArray(style.fill_gradient.colors)
+        && style.fill_gradient.colors.length >= 2 && style.fill_gradient.colors.length <= 3
+        && style.fill_gradient.colors.every((color) => typeof color === 'string' && HEX_COLOR.test(color))
+        && finiteNumber(style.fill_gradient.angle_deg)) {
+        vars['--caption-fill-gradient'] = `linear-gradient(${style.fill_gradient.angle_deg}deg, ${style.fill_gradient.colors.join(', ')})`;
+        vars['--caption-fill-clip'] = 'text';
+        vars['--caption-fill-color'] = 'transparent';
+        vars['--caption-fill-filter'] = captionGradientFilterValue(style, scale);
+    }
     if (isRecord(style.background) && (typeof style.background.color === 'string' || finiteNumber(style.background.opacity))) {
         const name = style.background.mode === 'block'
             ? '--plate-block-bg' : extendedBackground ? '--plate-ext-bg' : '--plate-bg';
@@ -1710,7 +1791,7 @@ function resolveCaptionLineStyleVarsAtScale(style, scale) {
         vars['--plate-pad-y'] = `${px(style.background.padding_px)}px`;
         vars['--plate-pad-x'] = `${px(style.background.padding_px)}px`;
     }
-    const textShadow = captionTextShadowValue(style.shadow, style.glow, scale);
+    const textShadow = captionRichTextShadowValue(style, scale);
     if (textShadow !== null)
         vars['--caption-text-shadow'] = textShadow;
     Object.assign(vars, captionZoneVars(style.zone));
@@ -1770,7 +1851,8 @@ function resolveCaptionStyleForOutput(style, output) {
     const vars = resolveCaptionLineStyleVarsAtScale(style, scale);
     Object.assign(vars, captionVerticalHeightVars(style, output));
     vars['--caption-paint-order'] = 'stroke fill';
-    if (!isRecord(style.shadow) && !isRecord(style.glow))
+    if (!isRecord(style.shadow) && !isRecord(style.glow)
+        && !isRecord(style.stroke_inner) && !isRecord(style.extrude))
         vars['--caption-text-shadow'] = 'none';
     if (isRecord(style.stroke)) {
         const color = typeof style.stroke.color === 'string' ? style.stroke.color : 'rgba(0,0,0,.85)';
@@ -1778,6 +1860,8 @@ function resolveCaptionStyleForOutput(style, output) {
         vars['--caption-webkit-text-stroke'] = `${formatCssNumber(width * 2)}px ${color}`;
         vars['--caption-paint-order'] = 'stroke fill';
     }
+    if (isRecord(style.stroke_inner) && !isRecord(style.stroke))
+        vars['--caption-webkit-text-stroke'] = '0 transparent';
     if (isRecord(style.background) && finiteNonNegative(style.background.radius_px)) {
         vars['--plate-block-radius'] = `${formatCssNumber(style.background.radius_px * scale)}px`;
     }
@@ -1878,6 +1962,102 @@ function captionTextShadowValue(shadow, glow, scale = 1) {
     }
     return parts.length > 0 ? parts.join(', ') : null;
 }
+function captionRichTextShadowValue(style, scale) {
+    const parts = [];
+    if (isRecord(style.stroke_inner) && finiteNonNegative(style.stroke_inner.width_px)
+        && style.stroke_inner.width_px > 0) {
+        const radius = scaleCaptionPx(style.stroke_inner.width_px, scale);
+        const color = typeof style.stroke_inner.color === 'string' && HEX_COLOR.test(style.stroke_inner.color)
+            ? style.stroke_inner.color : '#ffffff';
+        for (let index = 0; index < 16; index++) {
+            const angle = 2 * Math.PI * index / 16;
+            parts.push(`${formatCssNumber(Math.cos(angle) * radius)}px ${formatCssNumber(Math.sin(angle) * radius)}px 0 ${color}`);
+        }
+    }
+    if (isRecord(style.extrude) && Number.isInteger(style.extrude.depth_px)
+        && style.extrude.depth_px >= 1 && style.extrude.depth_px <= 32
+        && typeof style.extrude.color === 'string' && HEX_COLOR.test(style.extrude.color)
+        && finiteNumber(style.extrude.angle_deg)) {
+        const depth = Math.ceil(scaleCaptionPx(style.extrude.depth_px, scale));
+        const angle = style.extrude.angle_deg * Math.PI / 180;
+        for (let layer = 1; layer <= depth; layer++) {
+            const distance = Math.min(layer, scaleCaptionPx(style.extrude.depth_px, scale));
+            const color = typeof style.extrude.color_end === 'string' && HEX_COLOR.test(style.extrude.color_end)
+                ? interpolateCaptionHex(style.extrude.color, style.extrude.color_end, layer / depth)
+                : style.extrude.color;
+            parts.push(`${formatCssNumber(Math.sin(angle) * distance)}px ${formatCssNumber(-Math.cos(angle) * distance)}px 0 ${color}`);
+        }
+    }
+    const original = captionTextShadowValue(style.shadow, style.glow, scale);
+    if (original)
+        parts.push(original);
+    return parts.length ? parts.join(', ') : null;
+}
+function captionGradientFilterValue(style, scale) {
+    const parts = [];
+    const grow = (radius, color) => {
+        let remaining = radius;
+        let power = 1;
+        while (remaining > 0.0001) {
+            const step = Math.min(power, remaining);
+            for (const [x, y] of [[step, 0], [0, step], [-step, 0], [0, -step]]) {
+                parts.push(`drop-shadow(${formatCssNumber(x)}px ${formatCssNumber(y)}px 0 ${color})`);
+            }
+            remaining -= step;
+            power *= 2;
+        }
+    };
+    const stroke = isRecord(style.stroke) ? style.stroke : null;
+    const inner = isRecord(style.stroke_inner) ? style.stroke_inner : null;
+    const outerRadius = stroke && finiteNonNegative(stroke.width_px) ? scaleCaptionPx(stroke.width_px, scale) : 0;
+    const innerRadius = inner && finiteNonNegative(inner.width_px) ? scaleCaptionPx(inner.width_px, scale) : 0;
+    if (innerRadius > 0)
+        grow(innerRadius, typeof inner?.color === 'string' && HEX_COLOR.test(inner.color)
+            ? inner.color : '#ffffff');
+    if (outerRadius > 0)
+        grow(Math.max(0, outerRadius - innerRadius), typeof stroke?.color === 'string' && HEX_COLOR.test(stroke.color) ? stroke.color : '#000000');
+    if (isRecord(style.extrude) && Number.isInteger(style.extrude.depth_px)
+        && style.extrude.depth_px >= 1 && style.extrude.depth_px <= 32
+        && typeof style.extrude.color === 'string' && HEX_COLOR.test(style.extrude.color)
+        && finiteNumber(style.extrude.angle_deg)) {
+        const depth = Math.ceil(scaleCaptionPx(style.extrude.depth_px, scale));
+        const angle = style.extrude.angle_deg * Math.PI / 180;
+        for (let layer = 1; layer <= depth; layer++) {
+            const color = typeof style.extrude.color_end === 'string' && HEX_COLOR.test(style.extrude.color_end)
+                ? interpolateCaptionHex(style.extrude.color, style.extrude.color_end, layer / depth)
+                : style.extrude.color;
+            parts.push(`drop-shadow(${formatCssNumber(Math.sin(angle))}px ${formatCssNumber(-Math.cos(angle))}px 0 ${color})`);
+        }
+    }
+    if (isRecord(style.shadow) && typeof style.shadow.color === 'string' && HEX_COLOR.test(style.shadow.color)) {
+        const angle = (finiteNumber(style.shadow.angle_deg) ? style.shadow.angle_deg : 90) * Math.PI / 180;
+        const distance = scaleCaptionPx(finiteNonNegative(style.shadow.distance_px) ? style.shadow.distance_px : 0, scale);
+        const blur = scaleCaptionPx(finiteNonNegative(style.shadow.blur_px) ? style.shadow.blur_px : 0, scale);
+        parts.push(`drop-shadow(${formatCssNumber(Math.cos(angle) * distance)}px ${formatCssNumber(Math.sin(angle) * distance)}px ${formatCssNumber(blur)}px ${colorWithOpacity(style.shadow.color, style.shadow.opacity)})`);
+    }
+    if (isRecord(style.glow) && typeof style.glow.color === 'string' && HEX_COLOR.test(style.glow.color)) {
+        const spread = scaleCaptionPx(finiteNonNegative(style.glow.spread) ? style.glow.spread : 40, scale);
+        const alpha = Math.min(1, (finiteNonNegative(style.glow.density) ? style.glow.density : 50) / 60);
+        const x = scaleCaptionPx(finiteNumber(style.glow.offset_x) ? style.glow.offset_x : 0, scale);
+        const y = scaleCaptionPx(finiteNumber(style.glow.offset_y) ? style.glow.offset_y : 0, scale);
+        parts.push(`drop-shadow(${formatCssNumber(x)}px ${formatCssNumber(y)}px ${formatCssNumber(spread)}px ${colorWithOpacity(style.glow.color, alpha)})`);
+        parts.push(`drop-shadow(${formatCssNumber(x)}px ${formatCssNumber(y)}px ${formatCssNumber(spread * 2)}px ${colorWithOpacity(style.glow.color, Number((alpha * 0.7).toFixed(4)))})`);
+    }
+    return parts.join(' ') || 'none';
+}
+function interpolateCaptionHex(start, end, fraction) {
+    const rgba = (value) => {
+        const hex = value.slice(1);
+        const full = hex.length === 3 ? hex.split('').map(digit => digit + digit).join('') : hex;
+        return [0, 2, 4, 6].map(index => index === 6 && full.length === 6
+            ? 255 : parseInt(full.slice(index, index + 2), 16));
+    };
+    const from = rgba(start);
+    const to = rgba(end);
+    const channels = start.length === 9 || end.length === 9 ? 4 : 3;
+    return '#' + from.slice(0, channels).map((value, index) => Math.round(value + ((to[index] ?? value) - value) * fraction)
+        .toString(16).padStart(2, '0')).join('');
+}
 function colorWithOpacity(color, explicitOpacity) {
     const raw = color.slice(1);
     const expanded = raw.length === 3

package/vendor/packages/edit-store/lib/caption-store.d.ts

@@ -49,6 +49,11 @@ export interface CaptionLayout {
     maxLines: 1;
 }
 export interface CaptionTextStyle {
+    karaoke?: {
+        doneColor?: string;
+        fill?: 'char' | 'word' | 'smooth';
+        startIndex?: number;
+    };
     color?: string;
     sizePx?: number;
     /** zone 方式の px 系フィールドの基準出力高さ（issue #40 §2）。integer ≥ 1。layout と排他。 */
@@ -80,6 +85,20 @@ export interface CaptionTextStyle {
         color?: string;
         widthPx?: number;
     };
+    strokeInner?: {
+        color?: string;
+        widthPx?: number;
+    };
+    fillGradient?: {
+        colors: string[];
+        angleDeg: number;
+    };
+    extrude?: {
+        depthPx: number;
+        color: string;
+        colorEnd?: string;
+        angleDeg: number;
+    };
     background?: {
         color?: string;
         opacity?: number;
@@ -96,6 +115,7 @@ export interface CaptionTextStyle {
     layout?: CaptionLayout;
 }
 export interface CaptionTextStylePatch {
+    karaoke?: CaptionTextStyle['karaoke'] | null;
     color?: string | null;
     sizePx?: number | null;
     wrapWidthPct?: number | null;
@@ -110,6 +130,20 @@ export interface CaptionTextStylePatch {
         color?: string | null;
         widthPx?: number | null;
     };
+    strokeInner?: {
+        color?: string;
+        widthPx?: number;
+    } | null;
+    fillGradient?: {
+        colors: string[];
+        angleDeg: number;
+    } | null;
+    extrude?: {
+        depthPx: number;
+        color: string;
+        colorEnd?: string;
+        angleDeg: number;
+    } | null;
     background?: {
         color?: string | null;
         opacity?: number | null;