akari-video 0.1.66 → 0.1.68

package/README.md

@@ -56,6 +56,17 @@ sha256 検証・fail-closed は resolver 側の責務のまま。`src/assets-com
 `akari clean [project-dir] [--dry-run] [--yes] [--json]`（使い捨ての中間ファイル、保持する
 正本、判断が必要なものを容量付きで一覧する。既定は一覧のみで、削除可能なものだけを承認後に削除）。
 
+## 拡張キット
+
+`manifest.json` を持つ配布物を `akari store install <productId>` で導入すると、CLI / runtime の要件を検査し、素材とスキルを `~/.akari` 配下へ symlink で合成する。導入状況は `akari store status`、解除は `akari store uninstall <productId>` で確認・操作できる。Claude Code では初回だけ次を実行する。
+
+```sh
+claude plugin marketplace add ~/.akari/kits
+claude plugin install akari-kits@akari-kits
+```
+
+`claude` が PATH に無い場合は、Claude Code のプラグイン設定で `~/.akari/kits` を marketplace として追加する。
+
 `akari` に渡した引数はそのまま `opencode` に転送する（例: `akari --continue` は
 `opencode --continue` を起動する）。
 

package/bin/akari.mjs

@@ -13,6 +13,9 @@ import { runAssetsCommand } from '../src/assets-command.mjs';
 import { runMigrateCommand } from '../src/migrate-command.mjs';
 import { runCleanCommand } from '../src/clean-command.mjs';
 import { runDoctorCommand } from '../src/doctor-command.mjs';
+import { runGenerateCommand } from '../src/generate-command.mjs';
+import { runStoryboardCommand } from '../src/storyboard-command.mjs';
+import { runWorldCommand } from '../src/world-command.mjs';
 import { resolveRuntimePaths } from '../src/runtime-diagnostics.mjs';
 import { maybeApplyPendingUpdateOnLaunch, resolveInstalledVersionInfo } from '../src/update-check.mjs';
 import { describeCliHelp, describeInstalledVersions } from '../src/messages.mjs';
@@ -35,7 +38,7 @@ async function printVersion() {
 // `--help` は claude/opencode へそのまま転送されてしまっていた — AKARI Video 自身の
 // コマンド一覧が一度も出ない行き止まりだったため新設した）。
 async function printCliHelp() {
-  for (const line of describeCliHelp()) {
+  for (const line of [...describeCliHelp(), '  world                    ワールド地図を検査・生成・プレビュー']) {
     console.log(line);
   }
   return { exitCode: 0 };
@@ -80,6 +83,9 @@ const invoke = (argv[0] === '--version' || argv[0] === '-v') ? printVersion()
   : argv[0] === 'assets' ? runAssetsCommand(argv.slice(1))
   : argv[0] === 'migrate' ? runMigrateCommand(argv.slice(1))
   : argv[0] === 'clean' ? runCleanCommand(argv.slice(1))
+  : argv[0] === 'generate' ? runGenerateCommand(argv.slice(1))
+  : argv[0] === 'storyboard' ? runStoryboardCommand(argv.slice(1))
+  : argv[0] === 'world' ? runWorldCommand(argv.slice(1))
   : run(argv);
 
 const result = await invoke.catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akari-video",
-  "version": "0.1.66",
+  "version": "0.1.68",
   "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/src/doctor-command.mjs

@@ -36,6 +36,11 @@ export function formatDoctorReport(report) {
     ['ffmpeg', report.ffmpeg.origin, report.ffmpeg.path ?? '見つかりません'],
     ['ffprobe', report.ffprobe.origin, report.ffprobe.path ?? '見つかりません'],
     ['gpu_export', report.gpu_export?.available ? 'ok' : 'unavailable', report.gpu_export?.reason ?? '診断情報がありません'],
+    ['fal_key', report.fal_key?.source ?? 'missing', report.fal_key?.source === 'env'
+      ? '環境変数 FAL_KEY'
+      : report.fal_key?.source === 'credentials.env'
+        ? report.fal_key.credentials_path
+        : '環境変数にも credentials.env にもありません'],
     ['path', report.path.on_path ? 'ok' : 'missing', report.path.cli_shim_dir],
   ];
   const widths = [

package/src/generate-command.mjs

@@ -0,0 +1,16 @@
+import { spawnSync } from "node:child_process";
+
+import { resolveLauncherAssets } from "./repo-assets.mjs";
+
+export async function runGenerateCommand(args, options = {}) {
+  const logError = options.logError ?? ((line) => console.error(line));
+  const assets = options.assets ?? resolveLauncherAssets();
+  const spawn = options.spawn ?? spawnSync;
+  if (!assets.generateScript) {
+    logError("akari generate の実行スクリプトが見つかりません。完全な AKARI Video を再導入してください:");
+    logError("  npm install -g akari-video");
+    return { exitCode: 1 };
+  }
+  const result = spawn(process.execPath, [assets.generateScript, ...args], { stdio: "inherit" });
+  return { exitCode: typeof result?.status === "number" ? result.status : 1 };
+}

package/src/kits.mjs

@@ -0,0 +1,238 @@
+import { spawnSync } from 'node:child_process';
+import {
+  existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync,
+  renameSync, rmSync, symlinkSync, writeFileSync
+} from 'node:fs';
+import path from 'node:path';
+
+import { resolveLauncherAssets } from './repo-assets.mjs';
+
+const KITS_SCHEMA = 'akari-installed-kits/v0';
+const PLUGIN_DESCRIPTION = 'AKARI Video 拡張キットのスキルをまとめて提供するローカルプラグイン。';
+
+function parseVersion(value) {
+  const match = String(value).match(/^(\d+)\.(\d+)\.(\d+)$/u);
+  return match ? match.slice(1).map(Number) : null;
+}
+
+function compareVersions(left, right) {
+  for (let index = 0; index < 3; index += 1) {
+    if (left[index] !== right[index]) return left[index] - right[index];
+  }
+  return 0;
+}
+
+function satisfies(version, range) {
+  const actual = parseVersion(version);
+  const match = String(range).match(/^(\^|~|>=)?(\d+\.\d+\.\d+)$/u);
+  if (!actual || !match) return false;
+  const required = parseVersion(match[2]);
+  if (compareVersions(actual, required) < 0) return false;
+  if (match[1] === '^') {
+    return actual[0] === required[0] && (required[0] !== 0 || actual[1] === required[1]);
+  }
+  if (match[1] === '~') return actual[0] === required[0] && actual[1] === required[1];
+  if (match[1] === '>=') return true;
+  return compareVersions(actual, required) === 0;
+}
+
+export function readKitManifest(kitDir) {
+  const manifestPath = path.join(kitDir, 'manifest.json');
+  return existsSync(manifestPath) ? JSON.parse(readFileSync(manifestPath, 'utf8')) : null;
+}
+
+export function checkRequires(manifest, { cliVersion, runtimeIds = [], entitledProductIds = [] }) {
+  const blockers = [];
+  const warnings = [];
+  const requires = manifest?.requires ?? {};
+  if (!satisfies(cliVersion, requires.cli)) {
+    blockers.push(`CLI ${requires.cli} が必要です（現在 ${cliVersion}）。AKARI Video を更新してください。`);
+  }
+  const availableRuntimes = new Set(runtimeIds);
+  for (const runtimeId of requires.runtimes ?? []) {
+    if (!availableRuntimes.has(runtimeId)) {
+      blockers.push(`runtime ${runtimeId} がありません。このアプリ版ではキットを利用できません。`);
+    }
+  }
+  const entitled = new Set(entitledProductIds);
+  for (const productId of requires.products ?? []) {
+    if (!entitled.has(productId)) {
+      warnings.push(`依存商品 ${productId} の購入が確認できません。\`akari store install ${productId}\` で導入してください。`);
+    }
+  }
+  return { ok: blockers.length === 0, blockers, warnings };
+}
+
+function safeKitPath(kitDir, ...parts) {
+  const root = path.resolve(kitDir);
+  const candidate = path.resolve(root, ...parts);
+  if (candidate !== root && !candidate.startsWith(`${root}${path.sep}`)) {
+    throw new Error(`キット外のパスは参照できません: ${parts.join('/')}`);
+  }
+  return candidate;
+}
+
+function replaceSymlink(source, destination, {
+  platform = process.platform,
+  relativeTarget,
+  symlinkSyncImpl = symlinkSync
+} = {}) {
+  if (existsSync(destination) || (() => { try { lstatSync(destination); return true; } catch { return false; } })()) {
+    const stat = lstatSync(destination);
+    if (!stat.isSymbolicLink()) return { status: 'occupied' };
+    rmSync(destination);
+  }
+  mkdirSync(path.dirname(destination), { recursive: true });
+  const target = relativeTarget ?? path.relative(path.dirname(destination), source);
+  try {
+    symlinkSyncImpl(target, destination, 'dir');
+    return { status: 'linked', target };
+  } catch (error) {
+    if (platform === 'win32' && error?.code === 'EPERM') return { status: 'permission-denied' };
+    throw error;
+  }
+}
+
+export function linkKitAssets(kitDir, manifest, home, options = {}) {
+  const warnings = [];
+  const linked = [];
+  const assets = options.assets?.schemasSourceDir !== undefined
+    ? options.assets
+    : resolveLauncherAssets(options.assets);
+  const validator = options.validateAssetPath
+    ?? (assets.schemasSourceDir ? path.join(assets.schemasSourceDir, 'bin', 'validate-asset.mjs') : null);
+  for (const asset of manifest.assets ?? []) {
+    const source = safeKitPath(kitDir, 'assets', asset.category, asset.id);
+    if (validator && existsSync(validator)) {
+      const result = (options.spawnSyncImpl ?? spawnSync)(process.execPath, [validator, source], { stdio: 'pipe' });
+      if (result.status !== 0) {
+        warnings.push(`素材 ${asset.category}/${asset.id} は検査に失敗したためリンクしませんでした。`);
+        continue;
+      }
+    } else {
+      warnings.push(`素材 ${asset.category}/${asset.id} の検査ツールが見つからないため検査をスキップしました。`);
+    }
+    const destination = path.join(home, 'assets', asset.category, asset.id);
+    const result = replaceSymlink(source, destination, {
+      ...options,
+      relativeTarget: path.join('..', '..', 'assets', 'store', manifest.id, 'assets', asset.category, asset.id)
+    });
+    if (result.status === 'occupied') {
+      warnings.push(`既存の実ディレクトリを保持しました: ${destination}`);
+    } else if (result.status === 'permission-denied') {
+      warnings.push(`symlink を作成できませんでした（Windows の権限を確認してください）: ${destination}`);
+    } else {
+      linked.push({ category: asset.category, id: asset.id });
+    }
+  }
+  return { linked, warnings };
+}
+
+export function linkKitSkills(kitDir, manifest, home, options = {}) {
+  const warnings = [];
+  const blockers = [];
+  const linked = [];
+  const planned = [];
+  for (const skill of manifest.skills ?? []) {
+    const source = safeKitPath(kitDir, skill.dir);
+    const destination = path.join(home, 'kits', 'plugin', 'skills', skill.name);
+    try {
+      const stat = lstatSync(destination);
+      if (!stat.isSymbolicLink()) {
+        blockers.push(`スキル名 ${skill.name} は既存の実ディレクトリと重複しています。`);
+        continue;
+      }
+      const current = path.resolve(path.dirname(destination), readlinkSync(destination));
+      if (current !== source) {
+        blockers.push(`スキル名 ${skill.name} は別のキットと重複しています。`);
+        continue;
+      }
+    } catch (error) {
+      if (error?.code !== 'ENOENT') throw error;
+    }
+    planned.push({ skill, source, destination });
+  }
+  if (blockers.length > 0) return { linked, blockers, warnings };
+  for (const { skill, source, destination } of planned) {
+    const result = replaceSymlink(source, destination, options);
+    if (result.status === 'permission-denied') {
+      warnings.push(`symlink を作成できませんでした（Windows の権限を確認してください）: ${destination}`);
+    } else {
+      linked.push(skill.name);
+    }
+  }
+  return { linked, blockers, warnings };
+}
+
+export function readKitsLedger(home) {
+  const ledgerPath = path.join(home, 'kits', 'installed.json');
+  if (!existsSync(ledgerPath)) return { schema: KITS_SCHEMA, kits: [] };
+  const ledger = JSON.parse(readFileSync(ledgerPath, 'utf8'));
+  if (ledger?.schema !== KITS_SCHEMA || !Array.isArray(ledger.kits)) {
+    throw new Error(`拡張キット台帳の形式が想定と違います: ${ledgerPath}`);
+  }
+  return ledger;
+}
+
+export function writeKitsLedger(home, entry) {
+  const ledger = readKitsLedger(home);
+  ledger.kits = [...ledger.kits.filter((kit) => kit.id !== entry.id), entry];
+  const ledgerPath = path.join(home, 'kits', 'installed.json');
+  mkdirSync(path.dirname(ledgerPath), { recursive: true });
+  const temporary = `${ledgerPath}.tmp-${process.pid}`;
+  writeFileSync(temporary, `${JSON.stringify(ledger, null, 2)}\n`, { mode: 0o600 });
+  renameSync(temporary, ledgerPath);
+  return ledger;
+}
+
+export function removeKit(home, productId) {
+  const ledger = readKitsLedger(home);
+  const entry = ledger.kits.find((kit) => kit.id === productId);
+  if (!entry) return false;
+  for (const name of entry.skills ?? []) removeOwnedSymlink(path.join(home, 'kits', 'plugin', 'skills', name), entry.kitDir);
+  for (const asset of entry.assets ?? []) {
+    removeOwnedSymlink(path.join(home, 'assets', asset.category, asset.id), entry.kitDir);
+  }
+  ledger.kits = ledger.kits.filter((kit) => kit.id !== productId);
+  const ledgerPath = path.join(home, 'kits', 'installed.json');
+  const temporary = `${ledgerPath}.tmp-${process.pid}`;
+  writeFileSync(temporary, `${JSON.stringify(ledger, null, 2)}\n`, { mode: 0o600 });
+  renameSync(temporary, ledgerPath);
+  return true;
+}
+
+function removeOwnedSymlink(linkPath, kitDir) {
+  try {
+    if (!lstatSync(linkPath).isSymbolicLink()) return;
+    const target = path.resolve(path.dirname(linkPath), readlinkSync(linkPath));
+    if (target === path.resolve(kitDir) || target.startsWith(`${path.resolve(kitDir)}${path.sep}`)) rmSync(linkPath);
+  } catch (error) {
+    if (error?.code !== 'ENOENT') throw error;
+  }
+}
+
+export function ensureKitsMarketplace(home) {
+  const marketplacePath = path.join(home, 'kits', '.claude-plugin', 'marketplace.json');
+  const pluginPath = path.join(home, 'kits', 'plugin', '.claude-plugin', 'plugin.json');
+  const marketplace = {
+    name: 'akari-kits',
+    owner: { name: 'AKARI Video' },
+    plugins: [{ name: 'akari-kits', source: './plugin', description: PLUGIN_DESCRIPTION }]
+  };
+  const plugin = { name: 'akari-kits', description: PLUGIN_DESCRIPTION };
+  for (const [filePath, value] of [[marketplacePath, marketplace], [pluginPath, plugin]]) {
+    mkdirSync(path.dirname(filePath), { recursive: true });
+    const content = `${JSON.stringify(value, null, 2)}\n`;
+    if (!existsSync(filePath) || readFileSync(filePath, 'utf8') !== content) writeFileSync(filePath, content);
+  }
+  return { marketplacePath, pluginPath };
+}
+
+export function enableHint() {
+  return [
+    'Claude Code で拡張キットを有効化してください:',
+    '  claude plugin marketplace add ~/.akari/kits',
+    '  claude plugin install akari-kits@akari-kits',
+    'claude が PATH に無い場合は、Claude Code のプラグイン設定で ~/.akari/kits を marketplace として追加してください。'
+  ].join('\n');
+}

package/src/messages.mjs

@@ -330,6 +330,8 @@ export function describeCliHelp() {
     '  update [--force]       更新を確認する（--force で install.sh 経路の本体を入れ直す）',
     '  status                 接続状態を確認する',
     '  migrate [dir]          古い edit.json を退避バックアップ付きで v2 へ変換',
+    '  generate               台本のビートから静止画クリップを生成',
+    '  storyboard             タイムラインから印刷用の絵コンテを作成',
     '  akari clean [dir]      使い捨ての中間ファイルを一覧・削除（既定は一覧のみ）',
     '',
     '開発者向け:',

package/src/repo-assets.mjs

@@ -39,6 +39,8 @@ const CAPTIONS_SCRIPT_RELATIVE = path.join('packages', 'akari-tools', 'bin', 'ca
 export const CAPTURE_SCRIPT_RELATIVE = path.join('packages', 'akari-tools', 'bin', 'capture.mjs');
 const RENDER_WHEN_IDLE_SCRIPT_RELATIVE = path.join('packages', 'akari-tools', 'bin', 'render-when-idle.sh');
 const EYE_BAR_SCRIPT_RELATIVE = path.join('packages', 'akari-tools', 'bin', 'eye-bar.mjs');
+export const GENERATE_CLI_RELATIVE = path.join('packages', 'generate', 'src', 'cli', 'index.mjs');
+export const STORYBOARD_CLI_RELATIVE = path.join('packages', 'decision-cards', 'render-storyboard-print.mjs');
 
 /**
  * 指定ルート配下に同梱されているスキル正本・雛形・schemas・scaffold 実装・creator-root
@@ -60,6 +62,8 @@ export function resolveRepoAssets(repoRoot = DEFAULT_REPO_ROOT_CANDIDATE) {
   const mediaScript = path.join(repoRoot, 'packages', 'akari-tools', 'bin', 'media.mjs');
   const decisionLogScript = path.join(repoRoot, DECISION_LOG_SCRIPT_RELATIVE);
   const wordBookScript = path.join(repoRoot, 'packages', 'akari-tools', 'bin', 'word-book.mjs');
+  const generateScript = path.join(repoRoot, GENERATE_CLI_RELATIVE);
+  const storyboardScript = path.join(repoRoot, STORYBOARD_CLI_RELATIVE);
 
   return {
     repoRoot,
@@ -79,7 +83,9 @@ export function resolveRepoAssets(repoRoot = DEFAULT_REPO_ROOT_CANDIDATE) {
     eyeBarScript: existsSync(eyeBarScript) ? eyeBarScript : null,
     mediaScript: existsSync(mediaScript) ? mediaScript : null,
     ...(existsSync(decisionLogScript) ? { decisionLogScript } : {}),
-    ...(existsSync(wordBookScript) ? { wordBookScript } : {})
+    ...(existsSync(wordBookScript) ? { wordBookScript } : {}),
+    ...(existsSync(generateScript) ? { generateScript } : {}),
+    ...(existsSync(storyboardScript) ? { storyboardScript } : {})
   };
 }
 
@@ -115,6 +121,12 @@ export function resolveLauncherAssets({
     renderWhenIdleScript: candidate.renderWhenIdleScript ?? vendor.renderWhenIdleScript,
     eyeBarScript: candidate.eyeBarScript ?? vendor.eyeBarScript,
     mediaScript: candidate.mediaScript ?? vendor.mediaScript,
+    ...(candidate.generateScript ?? vendor.generateScript
+      ? { generateScript: candidate.generateScript ?? vendor.generateScript }
+      : {}),
+    ...(candidate.storyboardScript ?? vendor.storyboardScript
+      ? { storyboardScript: candidate.storyboardScript ?? vendor.storyboardScript }
+      : {}),
     ...(candidate.decisionLogScript ?? vendor.decisionLogScript ? { decisionLogScript: candidate.decisionLogScript ?? vendor.decisionLogScript } : {}),
     ...(candidate.wordBookScript ?? vendor.wordBookScript
       ? { wordBookScript: candidate.wordBookScript ?? vendor.wordBookScript }

package/src/runtime-diagnostics.mjs

@@ -1,4 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
 import path, { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -132,6 +133,7 @@ export async function resolveDoctorReport(options = {}) {
   const runtime = resolveRuntimePaths(options);
   const mediaBin = await resolveMediaTools({ ...options, env, platform, pathEnv, pathExt });
   const gpuExport = await resolveGpuExportAvailability({ ...options, env, platform });
+  const falKey = resolveFalKeySource({ env, homeDirectory: options.homeDirectory });
   const akariHome = resolveAkariHome(env);
   const cliShimDir = join(akariHome, 'cli', 'bin');
   const report = {
@@ -148,6 +150,7 @@ export async function resolveDoctorReport(options = {}) {
     ffmpeg: mediaBin.ffmpeg,
     ffprobe: mediaBin.ffprobe,
     gpu_export: gpuExport,
+    fal_key: falKey,
     path: {
       cli_shim_dir: cliShimDir,
       on_path: pathContains(pathEnv, cliShimDir, platform),
@@ -158,6 +161,29 @@ export async function resolveDoctorReport(options = {}) {
   return report;
 }
 
+function resolveFalKeySource({ env, homeDirectory }) {
+  const credentialsPath = env.AKARI_CREDENTIALS_FILE
+    ?? join(homeDirectory ?? homedir(), '.config', 'akari-video', 'credentials.env');
+  if (typeof env.FAL_KEY === 'string' && env.FAL_KEY.trim().length > 0) {
+    return { source: 'env', credentials_path: credentialsPath };
+  }
+  try {
+    const source = readFileSync(credentialsPath, 'utf8');
+    for (const originalLine of source.split(/\r?\n/u)) {
+      const line = originalLine.trim();
+      if (!line || line.startsWith('#')) continue;
+      const separator = line.indexOf('=');
+      if (separator < 1 || line.slice(0, separator).trim() !== 'FAL_KEY') continue;
+      if (line.slice(separator + 1).trim().length > 0) {
+        return { source: 'credentials.env', credentials_path: credentialsPath };
+      }
+    }
+  } catch {
+    // credentials.env が無い・読めない場合も doctor 自体は継続する。
+  }
+  return { source: 'missing', credentials_path: credentialsPath };
+}
+
 export async function resolveGpuExportAvailability(options = {}) {
   const platform = options.platform ?? process.platform;
   try {
@@ -265,6 +291,9 @@ function doctorNextSteps(report) {
   if (!report.path.on_path && report.render_cut.origin !== 'monorepo') {
     steps.push('`~/.akari/cli/bin` を PATH に追加してください。');
   }
+  if (report.fal_key?.source === 'missing') {
+    steps.push('FAL_KEY がありません。環境変数 FAL_KEY か credentials.env に置くと fal の生成が使えます（無くても書き出しは動きます）。');
+  }
   return steps;
 }
 

package/src/store-command.mjs

@@ -5,6 +5,7 @@ import {
 } from 'node:fs';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
+import { pathToFileURL } from 'node:url';
 import {
   DEFAULT_STORE_BASE_URL,
   defaultOpenBrowser,
@@ -17,6 +18,19 @@ import {
   startDeviceConnection,
   validateAndSaveCredentials
 } from './store-device-connect.mjs';
+import { readOwnVersion } from './update-check.mjs';
+import { resolveLauncherAssets } from './repo-assets.mjs';
+import {
+  checkRequires,
+  enableHint,
+  ensureKitsMarketplace,
+  linkKitAssets,
+  linkKitSkills,
+  readKitManifest,
+  readKitsLedger,
+  removeKit,
+  writeKitsLedger
+} from './kits.mjs';
 
 export { readCredentials, resolveCredentialsPath } from './store-device-connect.mjs';
 
@@ -288,6 +302,27 @@ export async function runStoreCommand(args, options = {}) {
     }
     log(`接続中: ${data.email}（${creds.url}）`);
     formatStoreEntitlements(data, log);
+    const kits = readKitsLedger(resolveAkariHome(env)).kits;
+    if (kits.length > 0) {
+      log('拡張キット:');
+      for (const kit of kits) {
+        log(`  ${kit.id} v${kit.version} / スキル: ${(kit.skills ?? []).join(', ') || 'なし'} / 素材: ${(kit.assets ?? []).length} 件`);
+      }
+    }
+    return { exitCode: 0 };
+  }
+
+  if (sub === 'uninstall') {
+    const productId = args[1];
+    if (!isSafePathSegment(productId) || productId.startsWith('--')) {
+      log('使い方: akari store uninstall <productId>');
+      return { exitCode: 1 };
+    }
+    if (!removeKit(resolveAkariHome(env), productId)) {
+      log(`導入済みの拡張キットが見つかりません: ${productId}`);
+      return { exitCode: 1 };
+    }
+    log(`拡張キットを無効化しました: ${productId}（展開済みファイルは残しています）`);
     return { exitCode: 0 };
   }
 
@@ -415,6 +450,107 @@ export async function runStoreCommand(args, options = {}) {
       const readme = findFile(destDir, 'README.md');
       log(`展開しました: ${destDir}`);
       if (readme) log(`導入手順: ${readme}`);
+      // 深い階層の無関係な manifest.json をキットと誤認すると、従来成功していた素材商品の
+      // install を壊す。キットの規定位置は展開ルート、または zip が単一トップディレクトリを
+      // 持つ場合のその直下だけとし、JSON として読めても kind !== kit なら完全に素通りする。
+      let manifestPath = path.join(destDir, 'manifest.json');
+      if (!existsSync(manifestPath)) {
+        const rootEntries = readdirSync(destDir, { withFileTypes: true });
+        manifestPath = rootEntries.length === 1 && rootEntries[0].isDirectory()
+          ? path.join(destDir, rootEntries[0].name, 'manifest.json')
+          : null;
+        if (manifestPath && !existsSync(manifestPath)) manifestPath = null;
+      }
+      let manifest = null;
+      if (manifestPath) {
+        try {
+          manifest = readKitManifest(path.dirname(manifestPath));
+        } catch {
+          log('キットの検査に失敗しました。展開済みファイルを確認してください。');
+          return { exitCode: 1 };
+        }
+      }
+      if (manifest?.kind === 'kit') {
+        const kitDir = path.dirname(manifestPath);
+        const home = resolveAkariHome(env);
+        const launcherAssets = options.assets ?? resolveLauncherAssets();
+        const validator = launcherAssets.schemasSourceDir
+          ? path.join(launcherAssets.schemasSourceDir, 'bin', 'validate-kit-manifest.mjs')
+          : null;
+        if (validator && existsSync(validator)) {
+          const validateArgs = [validator, kitDir];
+          if (launcherAssets.skillsSourceDir) validateArgs.push('--public-skills', launcherAssets.skillsSourceDir);
+          const validation = (options.spawnSync ?? spawnSync)(process.execPath, validateArgs, { stdio: 'pipe' });
+          if (validation.status !== 0) {
+            log('キットの検査に失敗しました。展開済みファイルを確認してください。');
+            return { exitCode: 1 };
+          }
+        } else {
+          // npm 配布物には schemas の検査 bin が無い場合がある。runtime と同じく、
+          // 器の欠落で購入済みコンテンツを利用不能にしないため warning へ degrade する。
+          log('キットの検査ツールが見つからないため検査をスキップしました');
+        }
+        const requirementWarnings = [];
+        let runtimeIds;
+        const runtimePath = path.join(launcherAssets.repoRoot, 'packages', 'overlay-runtime', 'runtimes.mjs');
+        if (existsSync(runtimePath)) {
+          try {
+            const runtimeModule = await import(pathToFileURL(runtimePath).href);
+            runtimeIds = runtimeModule.runtimes.map((runtime) => runtime.id);
+          } catch {
+            runtimeIds = null;
+          }
+        }
+        if (!runtimeIds) {
+          // overlay-runtime は launcher の npm tarball に同梱されない。照合不能は
+          // manifest 不備ではないため warning に落とし、要求 id を既知扱いして続行する。
+          requirementWarnings.push('runtime registry が見つからないため runtime id の照合をスキップしました。');
+          runtimeIds = manifest.requires?.runtimes ?? [];
+        }
+        let entitledProductIds = [];
+        const credentials = readCredentials(env);
+        if (credentials) {
+          const entitlementResult = await fetchStoreEntitlements(fetchImpl, credentials.url, credentials.token);
+          entitledProductIds = (entitlementResult.data?.entitlements ?? [])
+            .map((entry) => entry.product_id ?? entry.id)
+            .filter(Boolean);
+        }
+        const requires = checkRequires(manifest, {
+          cliVersion: options.cliVersion ?? readOwnVersion(),
+          runtimeIds,
+          entitledProductIds
+        });
+        if (manifest.id !== productId) requires.blockers.push(`manifest id が商品 id と一致しません: ${manifest.id} != ${productId}`);
+        requires.ok = requires.blockers.length === 0;
+        for (const warning of [...requirementWarnings, ...requires.warnings]) log(`警告: ${warning}`);
+        if (!requires.ok) {
+          for (const blocker of requires.blockers) log(`導入できません: ${blocker}`);
+          return { exitCode: 1 };
+        }
+
+        const hadInstalledKit = readKitsLedger(home).kits.length > 0;
+        const assetLinks = linkKitAssets(kitDir, manifest, home, {
+          assets: options.assets,
+          spawnSyncImpl: options.spawnSync,
+          platform: options.platform
+        });
+        const skillLinks = linkKitSkills(kitDir, manifest, home, { platform: options.platform });
+        for (const warning of [...assetLinks.warnings, ...skillLinks.warnings]) log(`警告: ${warning}`);
+        if (skillLinks.blockers.length > 0) {
+          for (const blocker of skillLinks.blockers) log(`導入できません: ${blocker}`);
+          return { exitCode: 1 };
+        }
+        writeKitsLedger(home, {
+          id: manifest.id,
+          version: manifest.version,
+          installedAt: new Date().toISOString(),
+          kitDir,
+          skills: skillLinks.linked,
+          assets: assetLinks.linked
+        });
+        ensureKitsMarketplace(home);
+        if (!hadInstalledKit) log(enableHint());
+      }
       const packPath = findFile(destDir, 'PACK.json');
       if (packPath) {
         const items = registerInstalledPack(env, productId, packPath);
@@ -436,10 +572,11 @@ export async function runStoreCommand(args, options = {}) {
     return { exitCode: 0 };
   }
 
-  log('使い方: akari store <connect|status|install|download|disconnect>');
+  log('使い方: akari store <connect|status|install|uninstall|download|disconnect>');
   log('  connect                              ブラウザで承認して接続（既定。--token akst_... で手動 / --no-open でブラウザを開かない / --url <base>）');
   log('  status                               接続状態と購入済み一覧');
   log('  install <productId> [--from <zip>]   購入済み商品の導入（--from は手元 zip / PACK.json 素材を installed 索引へ登録）');
+  log('  uninstall <productId>                拡張キットの symlink と台帳登録を解除（展開済みファイルは保持）');
   log('  download <productId> [--dest <dir>]  購入済み配布物の取得のみ');
   log('  disconnect                           接続解除');
   return { exitCode: sub ? 1 : 0 };

package/src/storyboard-command.mjs

@@ -0,0 +1,24 @@
+import { spawnSync } from "node:child_process";
+
+import { resolveLauncherAssets } from "./repo-assets.mjs";
+
+const USAGE = "使い方: akari storyboard <projectDir> [--no-capture] [--captures <dir>] [--out <dir>]";
+
+export async function runStoryboardCommand(args, options = {}) {
+  const log = options.log ?? ((line) => console.log(line));
+  if (args.includes("--help")) {
+    log(USAGE);
+    return { exitCode: 0 };
+  }
+
+  const logError = options.logError ?? ((line) => console.error(line));
+  const assets = options.assets ?? resolveLauncherAssets();
+  const spawn = options.spawn ?? spawnSync;
+  if (!assets.storyboardScript) {
+    logError("akari storyboard の実行スクリプトが見つかりません。完全な AKARI Video を再導入してください:");
+    logError("  npm install -g akari-video");
+    return { exitCode: 2 };
+  }
+  const result = spawn(process.execPath, [assets.storyboardScript, ...args], { stdio: "inherit" });
+  return { exitCode: typeof result?.status === "number" ? result.status : 1 };
+}

package/src/world-command.mjs

@@ -0,0 +1,17 @@
+import { existsSync } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+import path from 'node:path';
+
+import { resolveLauncherAssets } from './repo-assets.mjs';
+
+export async function runWorldCommand(args, options = {}) {
+  const logError = options.logError ?? ((line) => console.error(line));
+  const assets = options.assets ?? resolveLauncherAssets();
+  const script = assets.repoRoot ? path.join(assets.repoRoot, 'packages', 'akari-tools', 'bin', 'world.mjs') : null;
+  if (!script || !existsSync(script)) {
+    logError('内部コマンド world の実行スクリプトが見つかりません。AKARI Video の完全な checkout または配布物を確認してください。');
+    return { exitCode: 1 };
+  }
+  const result = (options.spawn ?? spawnSync)(process.execPath, [script, ...args], { stdio: 'inherit' });
+  return { exitCode: typeof result?.status === 'number' ? result.status : 1 };
+}