@captain_z/zsk 0.1.0 → 1.0.1

package/README.md

@@ -36,8 +36,8 @@ npx @captain_z/zsk project-init
 target-first → 预检 manifest
 ├─ 有 manifest → 刷新 / 追加 / 退出
 │              ↳ 刷新：全部官方变更（跳过手改） / 含手改强刷（备份）
-└─ 空 target → 套件 vs 自选（两级多选）
-               ↳ groupMultiselect 按领域分组；套件预勾选
+└─ 空 target → skill 包多选 → skill 多选
+               ↳ 可同时勾选多个预设包；也可叠加自选 skill
 ```
 
 完整 UX 见 [ARCHITECTURE.md §6.4](../../ARCHITECTURE.md#64-zsk-add-自适应-clack-向导)。
@@ -65,8 +65,8 @@ target-first → 预检 manifest
 
 | Flag 给了 | 跳过哪一步 |
 | --- | --- |
-| `--target` | "装到哪里？" |
-| `<pattern>` = bundle 名 | 第 1 屏（直接进 groupMultiselect，预勾选） |
+| `--target` | "选择安装位置（可多选）" |
+| `<pattern>` = bundle 名 | 跳过 skill 包选择；直接按 bundle 预选 skill |
 | `<pattern>` = `zsk:...` / glob | 两屏都跳过，pattern 匹配即装 |
 | `--skill='*'` | 整个"装什么"两屏跳过（= 该类型全装） |
 | `--on-conflict` | "冲突策略" |

package/dist/commands/add-flow.d.ts

@@ -0,0 +1,33 @@
+import type { Bundles } from "../core/bundles.js";
+export declare const MANUAL_PATH_CHOICE: "__manual_path__";
+export declare const DEFAULT_BUNDLE = "frontend-project";
+export type PromptOption<T extends string> = {
+    value: T;
+    label: string;
+    hint?: string;
+};
+export type ExistingTargetAction = "append" | "refresh" | "exit";
+export type PlanMode = "new" | "append" | "refresh" | "exit";
+export type SkillMode = "bundle" | "custom";
+type TargetLike = {
+    kind: string;
+    label: string;
+};
+export declare function isMaintenanceRun(args: {
+    targetProvided: boolean;
+    hasManifest: boolean;
+    hasExplicitPicks: boolean;
+}): boolean;
+export declare function buildTargetPromptModel<T extends TargetLike>(targets: T[], hints: Record<string, string>): {
+    presetOptions: Array<PromptOption<Exclude<T["kind"], "custom">>>;
+    manualPathOption: PromptOption<typeof MANUAL_PATH_CHOICE>;
+};
+export declare function buildSkillModeOptions(bundles: Bundles, availableSkillCount: number): PromptOption<SkillMode>[];
+export declare function buildBundleOptions(bundles: Bundles): PromptOption<string>[];
+export declare function resolvePlanMode(args: {
+    hasManifest: boolean;
+    hasExplicitPicks: boolean;
+    requestedAction?: ExistingTargetAction;
+}): PlanMode;
+export declare function inferBundleName(selectedBundleName: string | null, selectedSkills: string[], bundles: Bundles, availableSkills: string[]): string | null;
+export {};

package/dist/commands/add-flow.js

@@ -0,0 +1,80 @@
+export const MANUAL_PATH_CHOICE = "__manual_path__";
+export const DEFAULT_BUNDLE = "frontend-project";
+export function isMaintenanceRun(args) {
+    return args.targetProvided && args.hasManifest && !args.hasExplicitPicks;
+}
+export function buildTargetPromptModel(targets, hints) {
+    const presetOptions = targets
+        .filter((target) => target.kind !== "custom")
+        .map((target) => ({
+        value: target.kind,
+        label: target.label,
+        hint: hints[target.kind],
+    }));
+    return {
+        presetOptions,
+        manualPathOption: {
+            value: MANUAL_PATH_CHOICE,
+            label: "手动输入路径...",
+            hint: hints.custom,
+        },
+    };
+}
+export function buildSkillModeOptions(bundles, availableSkillCount) {
+    const bundleCount = Object.values(bundles).filter((bundle) => bundle.skills.length > 0).length;
+    return [
+        {
+            value: "bundle",
+            label: "预设 bundle",
+            hint: `先选 1 个预设，再微调其中的 skill（${bundleCount} 个可选）`,
+        },
+        {
+            value: "custom",
+            label: "按 skill 自选",
+            hint: `按领域分组浏览 ${availableSkillCount} 颗`,
+        },
+    ];
+}
+export function buildBundleOptions(bundles) {
+    return Object.entries(bundles)
+        .filter(([, bundle]) => bundle.skills.length > 0)
+        .map(([name, bundle]) => ({
+        value: name,
+        label: name,
+        hint: `${bundle.skills.length} · ${bundle.hint}`,
+    }))
+        .sort((left, right) => {
+        if (left.value === DEFAULT_BUNDLE)
+            return -1;
+        if (right.value === DEFAULT_BUNDLE)
+            return 1;
+        return left.value.localeCompare(right.value);
+    });
+}
+export function resolvePlanMode(args) {
+    if (!args.hasManifest)
+        return "new";
+    if (args.hasExplicitPicks)
+        return "append";
+    return args.requestedAction ?? "exit";
+}
+export function inferBundleName(selectedBundleName, selectedSkills, bundles, availableSkills) {
+    if (!selectedBundleName)
+        return null;
+    const bundle = bundles[selectedBundleName];
+    if (!bundle)
+        return null;
+    const expected = bundleToAvailable(bundle, availableSkills);
+    return sameMembers(selectedSkills, expected) ? selectedBundleName : null;
+}
+function bundleToAvailable(bundle, availableSkills) {
+    const set = new Set(availableSkills);
+    return bundle.skills.filter((skill) => set.has(skill));
+}
+function sameMembers(left, right) {
+    if (left.length !== right.length)
+        return false;
+    const rightSet = new Set(right);
+    return left.every((value) => rightSet.has(value));
+}
+//# sourceMappingURL=add-flow.js.map

package/dist/commands/add-flow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-flow.js","sourceRoot":"","sources":["../../src/commands/add-flow.ts"],"names":[],"mappings":"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"}

package/dist/commands/add.js

@@ -1,15 +1,14 @@
 // `zsk add` — adaptive install wizard.
 //
-// ARCHITECTURE.md §6.4:
-//   - Target-first; pre-check manifest to label each target in the prompt.
-//   - Branch A (installed): refresh / append / exit + refresh scope.
-//   - Branch B (empty): preset bundle vs cherry-pick → groupMultiselect by domain.
-//   - Flag preloading skips the corresponding clack step.
+// Interactive flow:
+//   - Default path is payload-first: pick skills/bundle, then pick one target.
+//   - Explicit existing target + no payload enters maintenance mode (refresh/append).
+//   - "手动输入路径..." and "按 skill 自选" are actions, not fake multiselect items.
 //   - Writes zsk-manifest.json on success so future runs can branch correctly.
 import pc from "picocolors";
 import { readFile, access } from "node:fs/promises";
 import { join } from "node:path";
-import { intro, outro, select, groupMultiselect, text, confirm, log, spinner, note, } from "../ui/prompts.js";
+import { intro, outro, select, groupMultiselect, text, log, spinner, note, } from "../ui/prompts.js";
 import { loadBundles } from "../core/bundles.js";
 import { enumerateSkills, loadSkill, DOMAINS, } from "../core/skills.js";
 import { TARGET_OPTIONS, resolvePath, } from "../core/targets.js";
@@ -17,6 +16,7 @@ import { install } from "../core/installer.js";
 import { fileExists } from "../core/scaffolder.js";
 import { readManifest, writeManifest, buildManifest, detectDrift, sha256File, } from "../core/manifest.js";
 import { expandCapabilityFilters, classifyPattern, hasCapabilityFilter, } from "../core/capabilities.js";
+import { DEFAULT_BUNDLE, MANUAL_PATH_CHOICE, buildBundleOptions, buildSkillModeOptions, buildTargetPromptModel, inferBundleName, isMaintenanceRun, resolvePlanMode, } from "./add-flow.js";
 export async function run(positional, opts, zskVersion) {
     intro(`${pc.bold("zsk")} · add`);
     const isTTY = Boolean(process.stdout.isTTY);
@@ -43,109 +43,153 @@ export async function run(positional, opts, zskVersion) {
             process.exit(1);
         }
     }
-    // Step 0 — offer project-init when project-config.md missing (interactive only)
-    if (isTTY && !opts.yes) {
-        await maybeOfferProjectInit();
-    }
-    // Step 1 — target (flag preloads)
     const bundles = await loadBundles();
-    const targetPath = await selectTarget(opts, bundles);
-    // Step 2 — read manifest → branch A vs B
-    const manifest = await readManifest(targetPath);
-    const drift = manifest ? await detectDrift(targetPath, manifest) : [];
     const filters = capabilityFiltersFromOptions(opts);
     const allSkills = await enumerateSkills();
     const allSkillNames = allSkills.map((s) => s.name);
     // Resolve positional into bundle or skill pattern (if any)
-    const bundleFromArg = positional.find((p) => classifyPattern(p, Object.keys(bundles)) === "bundle");
+    const bundlePatternsFromArgs = positional.filter((p) => classifyPattern(p, Object.keys(bundles)) === "bundle");
     const skillPatternsFromArgs = positional.filter((p) => classifyPattern(p, Object.keys(bundles)) !== "bundle");
-    let pickedSkills = [];
-    let chosenBundle = null;
-    let mode = "new";
     const hasExplicitPicks = positional.length > 0 || hasCapabilityFilter(filters);
-    if (manifest) {
-        // Explicit pattern/filter → user wants to install/reinstall those specific
-        // skills, not a blanket refresh. Treat as append against the full pool
-        // (existing entries merge + conflict policy takes over per-file).
-        const action = hasExplicitPicks
-            ? "append"
-            : await askExistingAction(manifest, drift, opts);
-        if (action === "exit") {
+    const explicitTargetPath = opts.target ? resolvePath(opts.target) : null;
+    const explicitManifest = explicitTargetPath
+        ? await readManifest(explicitTargetPath).catch(() => null)
+        : null;
+    const maintenanceRun = isMaintenanceRun({
+        targetProvided: Boolean(explicitTargetPath),
+        hasManifest: Boolean(explicitManifest),
+        hasExplicitPicks,
+    });
+    let sharedPickedPromise;
+    async function getSharedPicked() {
+        sharedPickedPromise ??= pickSkills({
+            bundles,
+            availableSkills: allSkillNames,
+            bundlePatternsFromArgs,
+            skillPatternsFromArgs,
+            filters,
+            opts,
+        });
+        return sharedPickedPromise;
+    }
+    let plan;
+    if (maintenanceRun && explicitTargetPath && explicitManifest) {
+        const drift = await detectDrift(explicitTargetPath, explicitManifest);
+        const action = await askExistingAction(explicitManifest, drift, opts, false);
+        const mode = resolvePlanMode({
+            hasManifest: true,
+            hasExplicitPicks,
+            requestedAction: action,
+        });
+        if (mode === "exit") {
             outro("取消");
             return;
         }
-        if (action === "refresh") {
-            mode = "refresh";
-            pickedSkills = await askRefreshScope(manifest, drift, opts);
-            chosenBundle = manifest.bundle;
+        if (mode === "refresh") {
+            plan = {
+                targetPath: explicitTargetPath,
+                manifest: explicitManifest,
+                mode,
+                skills: await askRefreshScope(explicitManifest, drift, opts),
+                bundle: explicitManifest.bundle,
+            };
         }
         else {
-            mode = "append";
-            const picked = await pickSkills({
-                bundles,
-                availableSkills: allSkillNames,
-                allSkills,
-                bundleFromArg,
-                skillPatternsFromArgs,
-                filters,
-                opts,
-            });
-            pickedSkills = picked.skills;
-            chosenBundle = picked.bundle ?? manifest.bundle;
+            const picked = await getSharedPicked();
+            if (picked.skills.length === 0) {
+                log.warn("未选任何 skill，退出。");
+                outro("bye");
+                return;
+            }
+            plan = {
+                targetPath: explicitTargetPath,
+                manifest: explicitManifest,
+                mode,
+                skills: picked.skills,
+                bundle: picked.bundle ?? explicitManifest.bundle,
+            };
         }
     }
     else {
-        mode = "new";
-        const picked = await pickSkills({
-            bundles,
-            availableSkills: allSkillNames,
-            allSkills,
-            bundleFromArg,
-            skillPatternsFromArgs,
-            filters,
-            opts,
+        const picked = await getSharedPicked();
+        if (picked.skills.length === 0) {
+            log.warn("未选任何 skill，退出。");
+            outro("bye");
+            return;
+        }
+        const targetPath = explicitTargetPath ?? await selectTarget();
+        const manifest = explicitTargetPath && explicitTargetPath === targetPath
+            ? explicitManifest
+            : await readManifest(targetPath);
+        const drift = manifest ? await detectDrift(targetPath, manifest) : [];
+        const action = manifest && !hasExplicitPicks
+            ? await askExistingAction(manifest, drift, opts, true)
+            : undefined;
+        const mode = resolvePlanMode({
+            hasManifest: Boolean(manifest),
+            hasExplicitPicks,
+            requestedAction: action,
         });
-        pickedSkills = picked.skills;
-        chosenBundle = picked.bundle;
-    }
-    if (pickedSkills.length === 0) {
-        log.warn("未选任何 skill，退出。");
-        outro("bye");
-        return;
+        if (mode === "exit") {
+            outro("取消");
+            return;
+        }
+        if (mode === "refresh" && manifest) {
+            plan = {
+                targetPath,
+                manifest,
+                mode,
+                skills: await askRefreshScope(manifest, drift, opts),
+                bundle: manifest.bundle,
+            };
+        }
+        else {
+            plan = {
+                targetPath,
+                manifest,
+                mode,
+                skills: picked.skills,
+                bundle: manifest ? picked.bundle ?? manifest.bundle : picked.bundle,
+            };
+        }
     }
     // Step 3 — conflict policy (flag preloads; refresh + drift defaults to backup)
-    const onConflict = await askConflict(opts, mode);
+    const onConflict = await askConflict(opts, plan.mode === "refresh" ? "refresh" : "append");
     const dryRun = Boolean(opts.dryRun);
     // Step 4 — dry-run preview short-circuit
     if (dryRun) {
-        const lines = pickedSkills.map((n) => `  + ${n}`).join("\n");
-        note(`[dry-run] 将写入 ${pickedSkills.length} 个 skill → ${pc.cyan(targetPath)}\n${lines}`, "预览");
+        note([
+            `[dry-run] 将处理 1 个安装位置`,
+            "",
+            `${pc.cyan(plan.targetPath)} · ${plan.mode} · ${plan.skills.length} 个 skill`,
+            ...plan.skills.map((name) => `  + ${name}`),
+        ].join("\n"), "预览");
         outro("完成 (dry-run)");
         return;
     }
     // Step 5 — execute install
     const s = spinner();
-    s.start(`${mode === "refresh" ? "刷新" : "安装"} ${pickedSkills.length} skill → ${targetPath}`);
+    s.start(`${plan.mode === "refresh" ? "刷新" : "安装"} ${plan.skills.length} skill → ${plan.targetPath}`);
     let result;
     try {
         result = await install({
-            skills: pickedSkills,
-            target: targetPath,
+            skills: plan.skills,
+            target: plan.targetPath,
             onConflict,
             dryRun: false,
         });
-        s.stop(mode === "refresh" ? "刷新完成" : "安装完成");
+        s.stop(plan.mode === "refresh" ? "刷新完成" : "安装完成");
     }
     catch (err) {
         s.stop("失败");
         throw err;
     }
     // Step 6 — update manifest (merge with existing for append mode)
-    const records = await buildRecords(pickedSkills, targetPath, zskVersion);
-    const mergedSkills = mergeSkillRecords(mode === "append" ? manifest?.skills ?? [] : [], records);
-    await writeManifest(targetPath, buildManifest({
+    const records = await buildRecords(plan.skills, plan.targetPath, zskVersion);
+    const mergedSkills = mergeSkillRecords(plan.mode === "append" ? plan.manifest?.skills ?? [] : [], records);
+    await writeManifest(plan.targetPath, buildManifest({
         zskVersion,
-        bundle: chosenBundle,
+        bundle: plan.bundle,
         skills: mergedSkills,
     }));
     // Step 7 — summary
@@ -160,12 +204,13 @@ export async function run(positional, opts, zskVersion) {
     ]
         .filter(Boolean)
         .join("\n");
-    note(summary, mode === "refresh" ? "刷新摘要" : "安装摘要");
+    note(summary, `${plan.mode === "refresh" ? "刷新摘要" : "安装摘要"} · ${plan.targetPath}`);
     if (result.errors.length > 0) {
         for (const err of result.errors)
             log.error(`${err.skill}: ${err.message}`);
     }
-    outro(`完成 · 运行 ${pc.cyan("zsk doctor")} 校验`);
+    await maybeRemindProjectInit();
+    outro(`完成 · 已处理 1 个安装位置 · 运行 ${pc.cyan("zsk doctor")} 校验`);
 }
 // ---- helpers ----------------------------------------------------------------
 function hasAnySource(positional, opts) {
@@ -187,60 +232,47 @@ function capabilityFiltersFromOptions(opts) {
         prompt: opts.prompt ?? [],
     };
 }
-async function maybeOfferProjectInit() {
+async function maybeRemindProjectInit() {
     const cwd = process.cwd();
     const has = await fileExists(join(cwd, "project-config.md"));
     if (has)
         return;
-    log.warn(`当前目录缺 ${pc.cyan("project-config.md")}（skill 的 ${pc.yellow("{{config.*}}")} 解析源）`);
-    const wantsBootstrap = await confirm("先跑 zsk project-init 创建 project-config.md + .raws/ + CLAUDE.md？", true);
-    if (wantsBootstrap) {
-        const { run: runProjectInit } = await import("./project-init.js");
-        await runProjectInit({ target: cwd, yes: true });
-        log.step("项目 bootstrap 完成，继续 skill 安装…");
-    }
+    log.info(`当前目录仍缺 ${pc.cyan("project-config.md")}；如需填充 ${pc.yellow("{{config.*}}")}，稍后运行 ${pc.cyan("zsk project-init")}`);
 }
-async function selectTarget(opts, bundles) {
-    if (opts.target)
-        return resolvePath(opts.target);
+async function selectTarget() {
     // pre-check each preset for manifest status to show in the label
-    const precheck = await Promise.all(TARGET_OPTIONS.map(async (t) => {
-        if (t.kind === "custom")
-            return { kind: t.kind, hint: t.hint };
-        const path = t.resolve();
+    const hints = {};
+    await Promise.all(TARGET_OPTIONS.map(async (target) => {
+        if (target.kind === "custom") {
+            hints.custom = target.hint;
+            return;
+        }
+        const path = target.resolve();
         const manifest = await readManifest(path).catch(() => null);
         if (manifest) {
-            const bLabel = manifest.bundle
-                ? `${manifest.bundle} v${manifest.zskVersion}`
-                : `custom v${manifest.zskVersion}`;
-            return {
-                kind: t.kind,
-                hint: `${t.hint} · 已装 ${manifest.skills.length} 颗 ${bLabel}`,
-            };
+            hints[target.kind] = `${target.hint} · 已装 ${manifest.skills.length} 颗`;
+            return;
         }
         const exists = await directoryNonEmpty(path);
-        return {
-            kind: t.kind,
-            hint: exists ? `${t.hint} · 目录存在（非 zsk 管理）` : `${t.hint} · 空`,
-        };
+        hints[target.kind] = exists
+            ? `${target.hint} · 非 zsk 管理`
+            : `${target.hint} · 空`;
     }));
-    const targetKind = await select("装到哪里？", TARGET_OPTIONS.map((t, i) => ({
-        value: t.kind,
-        label: `${t.label.padEnd(24)} ${pc.dim(precheck[i]?.hint ?? t.hint)}`,
-    })));
-    if (targetKind === "custom") {
-        const input = await text("自定义路径（支持 ~ / 相对 / 绝对）", {
+    const model = buildTargetPromptModel(TARGET_OPTIONS, hints);
+    const targetChoice = await select("安装到哪里？", [...model.presetOptions, model.manualPathOption]);
+    if (targetChoice === MANUAL_PATH_CHOICE) {
+        const input = await text("自定义安装路径（支持 ~ / 相对 / 绝对）", {
             placeholder: "./zsk-skills",
-            validate: (v) => (v.trim().length === 0 ? "路径不能为空" : undefined),
+            validate: (value) => (value.trim().length === 0 ? "路径不能为空" : undefined),
         });
         return resolvePath(input);
     }
-    const opt = TARGET_OPTIONS.find((t) => t.kind === targetKind);
-    if (!opt)
-        throw new Error(`unknown target kind: ${targetKind}`);
-    return opt.resolve();
+    const option = TARGET_OPTIONS.find((target) => target.kind === targetChoice);
+    if (!option)
+        throw new Error(`unknown target kind: ${targetChoice}`);
+    return option.resolve();
 }
-async function askExistingAction(manifest, drift, opts) {
+async function askExistingAction(manifest, drift, opts, selectionPrepared) {
     const modifiedCount = drift.filter((d) => d.kind === "modified").length;
     const missingCount = drift.filter((d) => d.kind === "missing").length;
     if (opts.yes)
@@ -254,11 +286,14 @@ async function askExistingAction(manifest, drift, opts) {
         .filter(Boolean)
         .join(" ");
     log.info(`当前状态：${label}`);
-    return select("接下来？", [
-        { value: "refresh", label: "刷新到最新（按 manifest 重装）" },
-        { value: "append", label: "追加其他 skill" },
+    return select(selectionPrepared ? "这个安装位置已经由 zsk 管理，接下来？" : "接下来？", [
+        {
+            value: "append",
+            label: selectionPrepared ? "把本次选择追加进去" : "追加其他 skill",
+        },
+        { value: "refresh", label: "按 manifest 刷新已装内容" },
         { value: "exit", label: "退出" },
-    ], "refresh");
+    ], selectionPrepared ? "append" : "refresh");
 }
 async function askRefreshScope(manifest, drift, opts) {
     const modifiedNames = new Set(drift.filter((d) => d.kind === "modified").map((d) => d.name));
@@ -284,7 +319,7 @@ async function askRefreshScope(manifest, drift, opts) {
     return manifest.skills.map((s) => s.name).filter((n) => !modifiedNames.has(n));
 }
 async function pickSkills(args) {
-    const { bundles, availableSkills, allSkills, bundleFromArg, skillPatternsFromArgs, filters, opts } = args;
+    const { bundles, availableSkills, bundlePatternsFromArgs, skillPatternsFromArgs, filters, opts, } = args;
     // Priority 1 — capability filters (--skill='*' / --skill='zsk:spec' / glob)
     const filterMatched = expandCapabilityFilters(filters.skill ?? [], availableSkills);
     if (filterMatched.length > 0 || Object.values(filters).some((v) => v?.length)) {
@@ -292,57 +327,56 @@ async function pickSkills(args) {
         // Non-skill filters currently resolve to empty sets (see §3).
         return { skills: filterMatched, bundle: null };
     }
-    // Priority 2 — positional skill/glob patterns
-    if (skillPatternsFromArgs.length > 0) {
+    // Priority 2 — positional bundle(s) / skill-glob patterns
+    if (bundlePatternsFromArgs.length > 0 || skillPatternsFromArgs.length > 0) {
         const matched = expandCapabilityFilters(skillPatternsFromArgs, availableSkills);
-        if (matched.length === 0) {
-            log.error(`未匹配到任何 skill：${skillPatternsFromArgs.join(", ")}`);
+        const selected = uniqueStrings([
+            ...bundlePatternsFromArgs.flatMap((name) => {
+                const bundle = bundles[name];
+                return bundle ? bundleToAvailable(bundle, availableSkills) : [];
+            }),
+            ...matched,
+        ]);
+        if (selected.length === 0) {
+            log.error(`未匹配到任何 skill：${[
+                ...bundlePatternsFromArgs,
+                ...skillPatternsFromArgs,
+            ].join(", ")}`);
             return { skills: [], bundle: null };
         }
-        return { skills: matched, bundle: null };
-    }
-    // Priority 3 — positional bundle
-    if (bundleFromArg) {
-        const bundle = bundles[bundleFromArg];
-        if (!bundle)
-            return { skills: [], bundle: null };
-        const pool = bundleToAvailable(bundle, availableSkills);
-        const selected = opts.yes
-            ? pool
-            : await groupMultiselect(`本次要装的 skill（${pool.length}/${bundle.skills.length}）`, await groupByDomain(pool), pool);
-        return { skills: selected, bundle: bundleFromArg };
+        return {
+            skills: selected,
+            bundle: bundlePatternsFromArgs.length === 1
+                ? inferBundleName(bundlePatternsFromArgs[0] ?? null, selected, bundles, availableSkills)
+                : null,
+        };
     }
-    // Priority 4 — interactive two-level pick
-    return interactiveTwoLevelPick(bundles, availableSkills, allSkills);
+    // Priority 3 — interactive two-level pick
+    return interactiveTwoLevelPick(bundles, availableSkills);
 }
 function bundleToAvailable(bundle, available) {
     const set = new Set(available);
     return bundle.skills.filter((s) => set.has(s));
 }
-async function interactiveTwoLevelPick(bundles, availableSkills, allSkills) {
-    // Level 1 — preset bundle vs cherry-pick
-    const presetEntries = Object.entries(bundles).filter(([, b]) => b.skills.length > 0);
-    const level1 = await select("装什么？", [
-        ...presetEntries.map(([name, b]) => ({
-            value: name,
-            label: `${pc.cyan(name.padEnd(32))} ${pc.dim(`${b.skills.length} · ${b.hint}`)}`,
-        })),
-        {
-            value: "__cherry__",
-            label: `${pc.cyan("挑单颗 / 几颗 skill".padEnd(32))} ${pc.dim(`按领域分组浏览 ${availableSkills.length} 颗`)}`,
-        },
-    ], presetEntries.find(([n]) => n === "frontend-project")?.[0] ?? presetEntries[0]?.[0]);
-    if (level1 === "__cherry__") {
-        const selected = await groupMultiselect("本次要装的 skill（Space 切换 · a 全选 · A 全不选 · Enter 确认）", await groupByDomain(availableSkills), []);
-        return { skills: selected, bundle: null };
+async function interactiveTwoLevelPick(bundles, availableSkills) {
+    const skillMode = await select("你要安装什么？", buildSkillModeOptions(bundles, availableSkills.length), "bundle");
+    if (skillMode === "bundle") {
+        const bundleOptions = buildBundleOptions(bundles);
+        const initialBundle = bundleOptions.some((option) => option.value === DEFAULT_BUNDLE)
+            ? DEFAULT_BUNDLE
+            : bundleOptions[0]?.value;
+        const selectedBundle = await select("选择一个 bundle", bundleOptions, initialBundle);
+        const defaultSkills = bundleToAvailable(bundles[selectedBundle], availableSkills);
+        const selected = await groupMultiselect("本次要安装哪些 skill？（可多选）", await groupByDomain(availableSkills), defaultSkills);
+        return {
+            skills: selected,
+            bundle: inferBundleName(selectedBundle, selected, bundles, availableSkills),
+        };
     }
-    // preset bundle chosen → defaults prefilled
-    const bundle = bundles[level1];
-    if (!bundle)
-        return { skills: [], bundle: null };
-    const pool = bundleToAvailable(bundle, availableSkills);
-    const selected = await groupMultiselect(`本次要装的 skill（默认全选；可取消个别）`, await groupByDomain(pool), pool);
-    return { skills: selected, bundle: level1 };
+    return {
+        skills: await groupMultiselect("本次要安装哪些 skill？（可多选）", await groupByDomain(availableSkills), []),
+        bundle: null,
+    };
 }
 async function groupByDomain(skillNames) {
     const groups = {};
@@ -415,4 +449,7 @@ async function directoryNonEmpty(p) {
         return false;
     }
 }
+function uniqueStrings(values) {
+    return [...new Set(values)].sort((a, b) => a.localeCompare(b));
+}
 //# sourceMappingURL=add.js.map

package/dist/commands/add.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,EAAE;AACF,wBAAwB;AACxB,2EAA2E;AAC3E,qEAAqE;AACrE,mFAAmF;AACnF,0DAA0D;AAC1D,+EAA+E;AAE/E,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,GAAG,EACH,OAAO,EACP,IAAI,GACL,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAA6B,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EACL,eAAe,EACf,SAAS,EACT,OAAO,GAER,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,cAAc,EACd,WAAW,GAEZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAqB,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,YAAY,EACZ,aAAa,EACb,aAAa,EACb,WAAW,EACX,UAAU,GAIX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,uBAAuB,EACvB,eAAe,EACf,mBAAmB,GAEpB,MAAM,yBAAyB,CAAC;AAgBjC,MAAM,CAAC,KAAK,UAAU,GAAG,CACvB,UAAoB,EACpB,IAAgB,EAChB,UAAkB;IAElB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEjC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE5C,gFAAgF;IAChF,4EAA4E;IAC5E,8BAA8B;IAC9B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAC/B,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAClC,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,GAAG,CAAC,KAAK,CACP,sFAAsF,CACvF,CAAC;YACF,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,gFAAgF;IAChF,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,qBAAqB,EAAE,CAAC;IAChC,CAAC;IAED,kCAAkC;IAClC,MAAM,OAAO,GAAG,MAAM,WAAW,EAAE,CAAC;IACpC,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAErD,yCAAyC;IACzC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEtE,MAAM,OAAO,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,MAAM,eAAe,EAAE,CAAC;IAC1C,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEnD,2DAA2D;IAC3D,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1C,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,QAAQ,CACtD,CAAC;IACF,MAAM,qBAAqB,GAAG,UAAU,CAAC,MAAM,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,QAAQ,CAC7D,CAAC;IAEF,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,YAAY,GAAkB,IAAI,CAAC;IACvC,IAAI,IAAI,GAAiC,KAAK,CAAC;IAE/C,MAAM,gBAAgB,GACpB,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAExD,IAAI,QAAQ,EAAE,CAAC;QACb,2EAA2E;QAC3E,uEAAuE;QACvE,kEAAkE;QAClE,MAAM,MAAM,GAAG,gBAAgB;YAC7B,CAAC,CAAE,QAAkB;YACrB,CAAC,CAAC,MAAM,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,KAAK,CAAC,IAAI,CAAC,CAAC;YACZ,OAAO;QACT,CAAC;QACD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,GAAG,SAAS,CAAC;YACjB,YAAY,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC5D,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,QAAQ,CAAC;YAChB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;gBAC9B,OAAO;gBACP,eAAe,EAAE,aAAa;gBAC9B,SAAS;gBACT,aAAa;gBACb,qBAAqB;gBACrB,OAAO;gBACP,IAAI;aACL,CAAC,CAAC;YACH,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;YAC7B,YAAY,GAAG,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;QAClD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,KAAK,CAAC;QACb,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;YAC9B,OAAO;YACP,eAAe,EAAE,aAAa;YAC9B,SAAS;YACT,aAAa;YACb,qBAAqB;YACrB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;QACH,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,OAAO;IACT,CAAC;IAED,+EAA+E;IAC/E,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEpC,yCAAyC;IACzC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CACF,iBAAiB,YAAY,CAAC,MAAM,cAAc,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE,EACjF,IAAI,CACL,CAAC;QACF,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,OAAO;IACT,CAAC;IAED,2BAA2B;IAC3B,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,YAAY,CAAC,MAAM,YAAY,UAAU,EAAE,CAAC,CAAC;IAE5F,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC;YACrB,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,UAAU;YAClB,UAAU;YACV,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,iEAAiE;IACjE,MAAM,OAAO,GAAG,MAAM,YAAY,CAChC,YAAY,EACZ,UAAU,EACV,UAAU,CACX,CAAC;IACF,MAAM,YAAY,GAAG,iBAAiB,CACpC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAC/C,OAAO,CACR,CAAC;IACF,MAAM,aAAa,CACjB,UAAU,EACV,aAAa,CAAC;QACZ,UAAU;QACV,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,YAAY;KACrB,CAAC,CACH,CAAC;IAEF,mBAAmB;IACnB,MAAM,OAAO,GAAG;QACd,QAAQ,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK;QAClC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,EAAE;QACnE,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YACxB,CAAC,CAAC,QAAQ,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAS,MAAM,CAAC,SAAS,EAAE;YAC3D,CAAC,CAAC,EAAE;QACN,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,EAAE;QAC9D,2BAA2B,YAAY,CAAC,MAAM,SAAS;KACxD;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAEpD,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM;YAAE,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED,gFAAgF;AAEhF,SAAS,YAAY,CAAC,UAAoB,EAAE,IAAgB;IAC1D,OAAO,CACL,UAAU,CAAC,MAAM,GAAG,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAC7B,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAgB;IACpD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE;QAC3B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;QACrB,YAAY,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE;QAClC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;KAC1B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,qBAAqB;IAClC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC7D,IAAI,GAAG;QAAE,OAAO;IAChB,GAAG,CAAC,IAAI,CACN,SAAS,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAClF,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAClC,gEAAgE,EAChE,IAAI,CACL,CAAC;IACF,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAClE,MAAM,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,IAAgB,EAChB,OAAgB;IAEhB,IAAI,IAAI,CAAC,MAAM;QAAE,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjD,iEAAiE;IACjE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM;gBAC5B,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,UAAU,EAAE;gBAC9C,CAAC,CAAC,WAAW,QAAQ,CAAC,UAAU,EAAE,CAAC;YACrC,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,MAAM,MAAM,EAAE;aAC7D,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO;YACL,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM;SAC9D,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,MAAM,CAC7B,OAAO,EACP,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5B,KAAK,EAAE,CAAC,CAAC,IAAI;QACb,KAAK,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE;KACtE,CAAC,CAAC,CACJ,CAAC;IAEF,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE;YAChD,WAAW,EAAE,cAAc;YAC3B,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;SAChE,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IAC9D,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,UAAU,EAAE,CAAC,CAAC;IAChE,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,QAAkB,EAClB,KAAmB,EACnB,IAAgB;IAEhB,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM,CAAC;IACxE,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,MAAM,CAAC;IAEtE,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC,CAAC,uCAAuC;IAEvE,MAAM,KAAK,GAAG;QACZ,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,QAAQ,CAAC,UAAU,EAAE;QACjE,QAAQ,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;QAChC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3D,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;KAC1D;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;IAE1B,OAAO,MAAM,CACX,MAAM,EACN;QACE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,sBAAsB,EAAE;QACnD,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE;QACxC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;KAC/B,EACD,SAAS,CACV,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,QAAkB,EAClB,KAAmB,EACnB,IAAgB;IAEhB,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC9D,CAAC;IAEF,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,8CAA8C;QAC9C,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,MAAM,CACxB,QAAQ,aAAa,CAAC,IAAI,SAAS,EACnC;QACE;YACE,KAAK,EAAE,cAAc;YACrB,KAAK,EAAE,aAAa,aAAa,CAAC,IAAI,MAAM;SAC7C;QACD;YACE,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,aAAa;SACrB;KACF,EACD,cAAc,CACf,CAAC;IAEF,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjE,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAQzB;IACC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAE1G,4EAA4E;IAC5E,MAAM,aAAa,GAAG,uBAAuB,CAC3C,OAAO,CAAC,KAAK,IAAI,EAAE,EACnB,eAAe,CAChB,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;QAC9E,qEAAqE;QACrE,8DAA8D;QAC9D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjD,CAAC;IAED,8CAA8C;IAC9C,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,uBAAuB,CACrC,qBAAqB,EACrB,eAAe,CAChB,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,GAAG,CAAC,KAAK,CAAC,gBAAgB,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9D,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC3C,CAAC;IAED,iCAAiC;IACjC,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG;YACvB,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,MAAM,gBAAgB,CACpB,eAAe,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,EACrD,MAAM,aAAa,CAAC,IAAI,CAAC,EACzB,IAAI,CACL,CAAC;QACN,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IACrD,CAAC;IAED,0CAA0C;IAC1C,OAAO,uBAAuB,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc,EAAE,SAAmB;IAC5D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,OAAgB,EAChB,eAAyB,EACzB,SAAkB;IAElB,yCAAyC;IACzC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAClD,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAC/B,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,MAAM,CACzB,MAAM,EACN;QACE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnC,KAAK,EAAE,IAAgB;YACvB,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE;SACjF,CAAC,CAAC;QACH;YACE,KAAK,EAAE,YAAwB;YAC/B,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,WAAW,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;SAClG;KACF,EACD,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CACpF,CAAC;IAEF,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,iDAAiD,EACjD,MAAM,aAAa,CAAC,eAAe,CAAC,EACpC,EAAE,CACH,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC5C,CAAC;IAED,4CAA4C;IAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjD,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,yBAAyB,EACzB,MAAM,aAAa,CAAC,IAAI,CAAC,EACzB,IAAI,CACL,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC9C,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,UAAoB;IAEpB,MAAM,MAAM,GAA4D,EAAE,CAAC;IAC3E,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IAClD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,CAAC,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,YAAY,EAAE,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IACD,mDAAmD;IACnD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,CAAC,CAAE,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,IAAgB,EAChB,IAAkC;IAElC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC,UAAU,CAAC;IAC5D,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE9D,OAAO,MAAM,CACX,eAAe,EACf;QACE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE;QACvC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;QAChC,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE;KAC1C,EACD,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,CAAU;IAChC,OAAO,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,QAAQ,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,UAAoB,EACpB,UAAkB,EAClB,UAAkB;IAElB,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,IAAI,WAAW,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;YACtD,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI;gBACJ,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC;gBACvB,OAAO;aACR,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,mEAAmE;QACrE,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,iBAAiB,CACxB,QAAyB,EACzB,KAAsB;IAEtB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,QAAQ;QAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,KAAK;QAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa;IACxD,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,CAAS;IACxC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,EAAE;AACF,oBAAoB;AACpB,+EAA+E;AAC/E,sFAAsF;AACtF,4EAA4E;AAC5E,+EAA+E;AAE/E,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,gBAAgB,EAChB,IAAI,EAEJ,GAAG,EACH,OAAO,EACP,IAAI,GACL,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAA6B,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EACL,eAAe,EACf,SAAS,EACT,OAAO,GAER,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,cAAc,EACd,WAAW,GAEZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAqB,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,YAAY,EACZ,aAAa,EACb,aAAa,EACb,WAAW,EACX,UAAU,GAIX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,mBAAmB,GAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,gBAAgB,EAChB,eAAe,GAGhB,MAAM,eAAe,CAAC;AAgBvB,MAAM,CAAC,KAAK,UAAU,GAAG,CACvB,UAAoB,EACpB,IAAgB,EAChB,UAAkB;IAElB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEjC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE5C,gFAAgF;IAChF,4EAA4E;IAC5E,8BAA8B;IAC9B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAC/B,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAClC,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,GAAG,CAAC,KAAK,CACP,sFAAsF,CACvF,CAAC;YACF,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,WAAW,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,MAAM,eAAe,EAAE,CAAC;IAC1C,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEnD,2DAA2D;IAC3D,MAAM,sBAAsB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACrD,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,QAAQ,CACtD,CAAC;IACF,MAAM,qBAAqB,GAAG,UAAU,CAAC,MAAM,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,QAAQ,CAC7D,CAAC;IAEF,MAAM,gBAAgB,GACpB,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzE,MAAM,gBAAgB,GAAG,kBAAkB;QACzC,CAAC,CAAC,MAAM,YAAY,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;QAC1D,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,cAAc,GAAG,gBAAgB,CAAC;QACtC,cAAc,EAAE,OAAO,CAAC,kBAAkB,CAAC;QAC3C,WAAW,EAAE,OAAO,CAAC,gBAAgB,CAAC;QACtC,gBAAgB;KACjB,CAAC,CAAC;IAEH,IAAI,mBAES,CAAC;IACd,KAAK,UAAU,eAAe;QAC5B,mBAAmB,KAAK,UAAU,CAAC;YACjC,OAAO;YACP,eAAe,EAAE,aAAa;YAC9B,sBAAsB;YACtB,qBAAqB;YACrB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;QACH,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAUD,IAAI,IAAgB,CAAC;IAErB,IAAI,cAAc,IAAI,kBAAkB,IAAI,gBAAgB,EAAE,CAAC;QAC7D,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC,gBAAgB,EAChB,KAAK,EACL,IAAI,EACJ,KAAK,CACN,CAAC;QACF,MAAM,IAAI,GAAG,eAAe,CAAC;YAC3B,WAAW,EAAE,IAAI;YACjB,gBAAgB;YAChB,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;QAEH,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,CAAC;YACZ,OAAO;QACT,CAAC;QAED,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAI,GAAG;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,QAAQ,EAAE,gBAAgB;gBAC1B,IAAI;gBACJ,MAAM,EAAE,MAAM,eAAe,CAAC,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAAC;gBAC5D,MAAM,EAAE,gBAAgB,CAAC,MAAM;aAChC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,MAAM,eAAe,EAAE,CAAC;YACvC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;gBACb,OAAO;YACT,CAAC;YACD,IAAI,GAAG;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,QAAQ,EAAE,gBAAgB;gBAC1B,IAAI;gBACJ,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,gBAAgB,CAAC,MAAM;aACjD,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,MAAM,eAAe,EAAE,CAAC;QACvC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,kBAAkB,IAAI,MAAM,YAAY,EAAE,CAAC;QAC9D,MAAM,QAAQ,GACZ,kBAAkB,IAAI,kBAAkB,KAAK,UAAU;YACrD,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,MAAM,GACV,QAAQ,IAAI,CAAC,gBAAgB;YAC3B,CAAC,CAAC,MAAM,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;YACtD,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,IAAI,GAAG,eAAe,CAAC;YAC3B,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC;YAC9B,gBAAgB;YAChB,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;QAEH,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,CAAC;YACZ,OAAO;QACT,CAAC;QAED,IAAI,IAAI,KAAK,SAAS,IAAI,QAAQ,EAAE,CAAC;YACnC,IAAI,GAAG;gBACL,UAAU;gBACV,QAAQ;gBACR,IAAI;gBACJ,MAAM,EAAE,MAAM,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC;gBACpD,MAAM,EAAE,QAAQ,CAAC,MAAM;aACxB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,GAAG;gBACL,UAAU;gBACV,QAAQ;gBACR,IAAI;gBACJ,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM;aACpE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,+EAA+E;IAC/E,MAAM,UAAU,GAAG,MAAM,WAAW,CAClC,IAAI,EACJ,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAC/C,CAAC;IACF,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEpC,yCAAyC;IACzC,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CACF;YACE,uBAAuB;YACvB,EAAE;YACF,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,UAAU;YAC5E,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC;SAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,IAAI,CACL,CAAC;QACF,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,OAAO;IACT,CAAC;IAED,2BAA2B;IAC3B,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,KAAK,CACL,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,YAAY,IAAI,CAAC,UAAU,EAAE,CAC5F,CAAC;IAEF,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,UAAU;YACV,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,iEAAiE;IACjE,MAAM,OAAO,GAAG,MAAM,YAAY,CAChC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,EACf,UAAU,CACX,CAAC;IACF,MAAM,YAAY,GAAG,iBAAiB,CACpC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EACzD,OAAO,CACR,CAAC;IACF,MAAM,aAAa,CACjB,IAAI,CAAC,UAAU,EACf,aAAa,CAAC;QACZ,UAAU;QACV,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,YAAY;KACrB,CAAC,CACH,CAAC;IAEF,mBAAmB;IACnB,MAAM,OAAO,GAAG;QACd,QAAQ,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK;QAClC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,EAAE;QACnE,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YACxB,CAAC,CAAC,QAAQ,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAS,MAAM,CAAC,SAAS,EAAE;YAC3D,CAAC,CAAC,EAAE;QACN,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,EAAE;QAC9D,2BAA2B,YAAY,CAAC,MAAM,SAAS;KACxD;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,IAAI,CACF,OAAO,EACP,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,MAAM,IAAI,CAAC,UAAU,EAAE,CACpE,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM;YAAE,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,sBAAsB,EAAE,CAAC;IAE/B,KAAK,CACH,yBAAyB,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CACpD,CAAC;AACJ,CAAC;AAED,gFAAgF;AAEhF,SAAS,YAAY,CAAC,UAAoB,EAAE,IAAgB;IAC1D,OAAO,CACL,UAAU,CAAC,MAAM,GAAG,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAC7B,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAgB;IACpD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE;QAC3B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;QACrB,YAAY,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE;QAClC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;KAC1B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,sBAAsB;IACnC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC7D,IAAI,GAAG;QAAE,OAAO;IAChB,GAAG,CAAC,IAAI,CACN,UAAU,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAC/G,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY;IACzB,iEAAiE;IACjE,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAClC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,SAAS,QAAQ,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC;YACvE,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM;YACzB,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,aAAa;YAC7B,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,MAAM,CAAC;IAC3B,CAAC,CAAC,CACH,CAAC;IACF,MAAM,KAAK,GAAG,sBAAsB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAE5D,MAAM,YAAY,GAAG,MAAM,MAAM,CAC/B,QAAQ,EACR,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,gBAAgB,CAAC,CACjD,CAAC;IAEF,IAAI,YAAY,KAAK,kBAAkB,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE;YAClD,WAAW,EAAE,cAAc;YAC3B,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;SACxE,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC7E,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,EAAE,CAAC,CAAC;IACrE,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,QAAkB,EAClB,KAAmB,EACnB,IAAgB,EAChB,iBAA0B;IAE1B,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM,CAAC;IACxE,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,MAAM,CAAC;IAEtE,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC,CAAC,uCAAuC;IAEvE,MAAM,KAAK,GAAG;QACZ,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,QAAQ,CAAC,UAAU,EAAE;QACjE,QAAQ,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;QAChC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3D,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;KAC1D;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;IAE1B,OAAO,MAAM,CACX,iBAAiB,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,MAAM,EACpD;QACE;YACE,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY;SACtD;QACD,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,mBAAmB,EAAE;QAChD,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;KAC/B,EACD,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CACzC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,QAAkB,EAClB,KAAmB,EACnB,IAAgB;IAEhB,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC9D,CAAC;IAEF,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,8CAA8C;QAC9C,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,MAAM,CACxB,QAAQ,aAAa,CAAC,IAAI,SAAS,EACnC;QACE;YACE,KAAK,EAAE,cAAc;YACrB,KAAK,EAAE,aAAa,aAAa,CAAC,IAAI,MAAM;SAC7C;QACD;YACE,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,aAAa;SACrB;KACF,EACD,cAAc,CACf,CAAC;IAEF,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjE,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAOzB;IACC,MAAM,EACJ,OAAO,EACP,eAAe,EACf,sBAAsB,EACtB,qBAAqB,EACrB,OAAO,EACP,IAAI,GACL,GAAG,IAAI,CAAC;IAET,4EAA4E;IAC5E,MAAM,aAAa,GAAG,uBAAuB,CAC3C,OAAO,CAAC,KAAK,IAAI,EAAE,EACnB,eAAe,CAChB,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;QAC9E,qEAAqE;QACrE,8DAA8D;QAC9D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACjD,CAAC;IAED,0DAA0D;IAC1D,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1E,MAAM,OAAO,GAAG,uBAAuB,CAAC,qBAAqB,EAAE,eAAe,CAAC,CAAC;QAChF,MAAM,QAAQ,GAAG,aAAa,CAAC;YAC7B,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC7B,OAAO,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,CAAC,CAAC;YACF,GAAG,OAAO;SACX,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,GAAG,CAAC,KAAK,CACP,gBAAgB;gBACd,GAAG,sBAAsB;gBACzB,GAAG,qBAAqB;aACzB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACf,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACtC,CAAC;QACD,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,sBAAsB,CAAC,MAAM,KAAK,CAAC;gBACzC,CAAC,CAAC,eAAe,CACb,sBAAsB,CAAC,CAAC,CAAC,IAAI,IAAI,EACjC,QAAQ,EACR,OAAO,EACP,eAAe,CAChB;gBACH,CAAC,CAAC,IAAI;SACT,CAAC;IACJ,CAAC;IAED,0CAA0C;IAC1C,OAAO,uBAAuB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc,EAAE,SAAmB;IAC5D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,OAAgB,EAChB,eAAyB;IAEzB,MAAM,SAAS,GAAG,MAAM,MAAM,CAC5B,SAAS,EACT,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,EACtD,QAAQ,CACT,CAAC;IAEF,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,cAAc,CAAC;YACnF,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;QAC5B,MAAM,cAAc,GAAG,MAAM,MAAM,CACjC,aAAa,EACb,aAAa,EACb,aAAa,CACd,CAAC;QACF,MAAM,aAAa,GAAG,iBAAiB,CACrC,OAAO,CAAC,cAAc,CAAW,EACjC,eAAe,CAChB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CACrC,qBAAqB,EACrB,MAAM,aAAa,CAAC,eAAe,CAAC,EACpC,aAAa,CACd,CAAC;QACF,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,eAAe,CACrB,cAAc,EACd,QAAQ,EACR,OAAO,EACP,eAAe,CAChB;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,gBAAgB,CAC5B,qBAAqB,EACrB,MAAM,aAAa,CAAC,eAAe,CAAC,EACpC,EAAE,CACH;QACD,MAAM,EAAE,IAAI;KACb,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,UAAoB;IAEpB,MAAM,MAAM,GAA4D,EAAE,CAAC;IAC3E,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IAClD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,CAAC,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,YAAY,EAAE,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IACD,mDAAmD;IACnD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,CAAC,CAAE,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,IAAgB,EAChB,IAAkC;IAElC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC,UAAU,CAAC;IAC5D,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE9D,OAAO,MAAM,CACX,eAAe,EACf;QACE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE;QACvC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;QAChC,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE;KAC1C,EACD,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,CAAU;IAChC,OAAO,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,WAAW,IAAI,CAAC,KAAK,QAAQ,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,UAAoB,EACpB,UAAkB,EAClB,UAAkB;IAElB,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,IAAI,WAAW,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;YACtD,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI;gBACJ,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC;gBACvB,OAAO;aACR,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,mEAAmE;QACrE,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,iBAAiB,CACxB,QAAyB,EACzB,KAAsB;IAEtB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,QAAQ;QAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,KAAK;QAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa;IACxD,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,CAAS;IACxC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,MAAgB;IACrC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@captain_z/zsk",
-  "version": "0.1.0",
+  "version": "1.0.1",
   "description": "ZNorth Standard Kit — CLI installer for zsk skill bundles (npx @captain_z/zsk add)",
   "license": "MIT",
   "type": "module",
@@ -18,7 +18,7 @@
     "commander": "^12.1.0",
     "picocolors": "^1.1.1",
     "yaml": "^2.7.0",
-    "@captain_z/zsk-skills": "0.1.0"
+    "@captain_z/zsk-skills": "1.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",