akari-video 1.3.0-beta.2 → 1.3.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "1.3.0-beta.2",
+  "version": "1.3.0-beta.3",
   "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": "1.3.0-beta.2",
+  "version": "1.3.0-beta.3",
   "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/overlay-runtime/src/interaction.js

@@ -422,6 +422,8 @@ function elementBoxCompanions(style, parentStyle, width, height) {
   let selectedId = null;
   let selectedIds = [];
   let elementFocus = null;
+  // Inner selection belongs only to the currently selected telop, never to edit.json.
+  let telopInnerId = null;
   let elementGeometryCache = null;
   let elementNudge = null;
   let elementNudgeTimer = null;
@@ -1819,8 +1821,11 @@ function elementBoxCompanions(style, parentStyle, width, height) {
 
   function clearSelection() {
     const hadElementFocus = window.akari.capabilities?.elementSelection === true && Boolean(selectedElementFocus());
+    const hadTelopSelection = window.akari.capabilities?.elementSelection === true
+      && selectedOverlay && isTelopOverlay(selectedOverlay);
     flushElementNudge();
     elementFocus = null;
+    telopInnerId = null;
     if (activeRotate) cancelRotate();
     if (activeLine) finishLineEndpoint(true);
     flushNudge();
@@ -1839,7 +1844,7 @@ function elementBoxCompanions(style, parentStyle, width, height) {
     selectionFrame?.remove();
     selectionFrame = null;
     hideSnapGuides();
-    if (hadElementFocus) renderScopeBreadcrumb();
+    if (hadElementFocus || hadTelopSelection) renderScopeBreadcrumb();
   }
 
   function handleSelectedOverlayUnavailable(container) {
@@ -1879,24 +1884,41 @@ function elementBoxCompanions(style, parentStyle, width, height) {
         selectedOverlay.setAttribute('data-akari-interaction-selected', 'true');
         reconcileElementFocus();
       } else {
+        const keepTelopInner = selectedId === nextId && telopInnerId === nextId
+          && selectedIds.length === 1 && !groupSelection;
         clearSelection();
         selectedOverlay = container;
         selectedId = nextId;
         selectedIds = selectedId === null ? [] : [selectedId];
+        if (keepTelopInner) telopInnerId = nextId;
         selectedOverlay.setAttribute("data-akari-interaction-selected", "true");
       }
     }
 
     refreshSelectionFrame();
+    if (window.akari.capabilities?.elementSelection === true && isTelopOverlay(selectedOverlay)) renderScopeBreadcrumb();
     startSelectionTracking();
     return true;
   }
 
-  function canFocusElement(container) {
+  function elementSelectionEnabled(container) {
     if (window.akari.capabilities?.elementSelection !== true || !container || selectedIds.length > 1) return false;
     return window.akari.state?.summary?.overlays?.some(overlay => overlay.id === container.dataset.overlayId
       && overlay.elementSelection === true) === true;
   }
+  function canFocusElement(container) {
+    return elementSelectionEnabled(container)
+      && (!isTelopOverlay(container) || telopInnerId === selectedId && selectedId === container.dataset.overlayId);
+  }
+  function setTelopInnerSelection(overlayId, inner) {
+    if (typeof overlayId !== 'string' || selectedId !== overlayId || selectedIds.length !== 1
+      || groupSelection || !selectedOverlay || !isTelopOverlay(selectedOverlay)
+      || !elementSelectionEnabled(selectedOverlay)) return false;
+    telopInnerId = inner === true ? overlayId : null;
+    if (!telopInnerId && selectedElementFocus()) focusElement(null);
+    hideHover();
+    return true;
+  }
   function focusedElement() {
     if (!selectedElementFocus() || !selectedOverlay) return null;
     const root = fragmentRoot(selectedOverlay);
@@ -1929,6 +1951,7 @@ function elementBoxCompanions(style, parentStyle, width, height) {
     const ref = element && elementAddress(root, element);
     const next = ref ? { overlayId: selectedId, ref, tag: element.tagName.toLowerCase(),
       label: elementLabel(root, element) } : null;
+    if (!next && telopInnerId === selectedId) telopInnerId = null;
     if (elementFocus?.ref === next?.ref && elementFocus?.overlayId === next?.overlayId) return;
     flushElementNudge();
     elementFocus = next;
@@ -2063,7 +2086,8 @@ function elementBoxCompanions(style, parentStyle, width, height) {
     clearBreadcrumbHover();
     const entries = [];
     const append = (label, action, target) => entries.push({ label, action, target });
-    if (selectedElementFocus() && selectedOverlay) {
+    if (selectedOverlay && (selectedElementFocus() || window.akari.capabilities?.elementSelection === true
+      && selectedIds.length === 1 && isTelopOverlay(selectedOverlay))) {
       append('全体', () => { clearSelection(); publishScopedSelection(); }, { kind: 'stage' });
       for (const id of lineage(selectionTree(), scopeId)) {
         append(treeNode(id)?.label ?? id, () => applyScopedSelection({ selectId: id, scopeId: treeNode(id)?.parentId ?? null }),
@@ -4383,7 +4407,8 @@ function elementBoxCompanions(style, parentStyle, width, height) {
       if (activeEdit?.container === hit && eventHitsElement(event, activeEdit.element)) return;
       clickOrigin.scopedHit = true;
       if (activeEdit) void commitEdit();
-      if (window.akari.capabilities?.elementSelection === true && event.isTrusted && !event.shiftKey) {
+      if (window.akari.capabilities?.elementSelection === true && event.isTrusted && !event.shiftKey
+        && (!isTelopOverlay(hit) || canFocusElement(hit))) {
         const root = fragmentRoot(hit);
         const target = event.target instanceof Element && root?.contains(event.target)
           ? nearestSelectableElement(root, event.target, stage?.getBoundingClientRect(), selectionOptions(root)) : null;
@@ -4404,7 +4429,8 @@ function elementBoxCompanions(style, parentStyle, width, height) {
         const focused = focusedElement();
         if (focused && isSelectionContainer(focused) && focused.contains(event.target)) {
           clickOrigin.preservedContainer = true;
-        } else if (clickOrigin?.hitId === selectedId) {
+        } else if ((!isTelopOverlay(selectedOverlay) || canFocusElement(selectedOverlay))
+          && clickOrigin?.hitId === selectedId) {
           focusElement(elementByAddress(fragmentRoot(selectedOverlay), clickOrigin.elementRef));
         } else focusElementAt(selectedOverlay, event);
       } else if (selectedElementFocus()) focusElement(null);
@@ -5209,7 +5235,9 @@ function elementBoxCompanions(style, parentStyle, width, height) {
     if (window.akari.capabilities?.elementSelection === true
       && event.isTrusted && !event.shiftKey && selectedOverlay) {
       if (clickOrigin?.preservedContainer) focusElementAt(selectedOverlay, event);
-      else if (!nextId && clickOrigin?.hitId === selectedId) {
+      else if ((!isTelopOverlay(selectedOverlay) || canFocusElement(selectedOverlay))
+        && (!nextId || isTelopOverlay(selectedOverlay) && telopInnerId === selectedId
+          && nextId === selectedId) && clickOrigin?.hitId === selectedId) {
         focusElement(elementByAddress(fragmentRoot(selectedOverlay), clickOrigin.elementRef));
       } else focusElementAt(selectedOverlay, event);
     }
@@ -5288,10 +5316,12 @@ function elementBoxCompanions(style, parentStyle, width, height) {
       }
     }
     if (event.key === 'Enter' && !event.shiftKey && !activeEdit && !selectedElementFocus()
-      && selectedOverlay && canFocusElement(selectedOverlay)) {
+      && selectedOverlay && elementSelectionEnabled(selectedOverlay)
+      && (!isTelopOverlay(selectedOverlay) || selectedIds.length === 1)) {
       const root = fragmentRoot(selectedOverlay);
       const first = firstSelectableElement(root, stage?.getBoundingClientRect(), selectionOptions(root));
       if (first) {
+        if (isTelopOverlay(selectedOverlay)) telopInnerId = selectedId;
         focusElement(first);
         event.preventDefault(); event.stopPropagation(); event.stopImmediatePropagation();
         return;
@@ -5339,7 +5369,8 @@ function elementBoxCompanions(style, parentStyle, width, height) {
         if (groupSelection) {
           applyScopedSelection(enterScope(selectionTree(), selectedId)); handled(); return;
         }
-        if (selectedOverlay) {
+        if (selectedOverlay && (!isTelopOverlay(selectedOverlay)
+          || telopInnerId === selectedId && Boolean(selectedElementFocus()))) {
           const root = fragmentRoot(selectedOverlay);
           const text = root && [root, ...root.querySelectorAll('*')].find(canEditText);
           if (text) { beginEdit(selectedOverlay, text); handled(); }
@@ -5827,6 +5858,9 @@ function elementBoxCompanions(style, parentStyle, width, height) {
     releasePointerOwner,
     get selectedId() { return selectedId; },
     get elementFocus() { return selectedElementFocus(); },
+    get selectedTelop() { return Boolean(selectedOverlay && selectedIds.length === 1 && isTelopOverlay(selectedOverlay)); },
+    get telopInner() { return telopInnerId !== null && telopInnerId === selectedId; },
+    setTelopInnerSelection,
     clearElementFocus() { if (selectedElementFocus()) focusElement(null, { notify: false }); },
     focusElementAtPoint,
     get selectedIds() { return [...selectedIds]; },